libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-28 02:41:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mostly get rid of including "Globals.h"

Browse Source
This commit is contained in:
Henrik Rydgård 2013-12-30 10:17:11 +01:00
parent 079d9c04dd
commit 00c32ddadb
47 changed files with 114 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Core.cpp
View File

@ -16,13 +16,13 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <set>
#include "base/NativeApp.h"
#include "base/display.h"
#include "base/mutex.h"
#include "base/timeutil.h"
#include "input/input_state.h"
#include "Globals.h"
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/MemMap.h"

1
Core/Core.h
View File

@ -17,7 +17,6 @@
#pragma once
#include "Globals.h"
#include "Core/System.h"
#include "Core/CoreParameter.h"

4
Core/CoreTiming.h
View File

@ -18,6 +18,8 @@
#ifndef _CORETIMING_H
#define _CORETIMING_H
#include "Common/CommonTypes.h"
// This is a system to schedule events into the emulated machine's future. Time is measured
// in main CPU clock cycles.
@ -31,8 +33,6 @@
// inside callback:
// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
#include "../Globals.h"
class PointerWrap;
//const int CPU_HZ = 222000000;

4
Core/Debugger/Breakpoints.h
View File

@ -17,10 +17,10 @@
#pragma once
#include "../../Globals.h"
#include "DebugInterface.h"
#include <vector>
#include "Core/Debugger/DebugInterface.h"
struct BreakPointCond
{
DebugInterface *debug;

5
Core/Debugger/DisassemblyManager.h
View File

@ -16,7 +16,8 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#pragma once
#include "Globals.h"
#include "Common/CommonTypes.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/MIPS/MIPSAnalyst.h"
@ -205,4 +206,4 @@ private:
static int maxParamChars;
};
bool isInInterval(u32 start, u32 size, u32 value);
bool isInInterval(u32 start, u32 size, u32 value);

2
Core/Debugger/SymbolMap.cpp
View File

@ -24,8 +24,8 @@
#include <algorithm>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Globals.h"
#include "Core/MemMap.h"
#include "Core/Debugger/SymbolMap.h"

6
Core/Debugger/SymbolMap.h
View File

@ -17,12 +17,14 @@
#pragma once
#include "Globals.h"
#include "native/base/mutex.h"
#include <vector>
#include <set>
#include <map>
#include "native/base/mutex.h"
#include "Common/CommonTypes.h"
enum SymbolType {
ST_NONE = 0,
ST_FUNCTION = 1,

7
Core/Dialog/PSPDialog.cpp
View File

@ -15,11 +15,12 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "../Util/PPGeDraw.h"
#include "PSPDialog.h"
#include "ChunkFile.h"
#include "i18n/i18n.h"
#include "Common/ChunkFile.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/Dialog/PSPDialog.h"
#define FADE_TIME 1.0
const float FONT_SCALE = 0.55f;

2
Core/Dialog/PSPDialog.h
View File

@ -17,8 +17,8 @@
#pragma once
#include "Globals.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/Config.h"
class PointerWrap;

2
Core/ELF/ElfReader.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Globals.h"
#include "Common/CommonTypes.h"
#include "ElfTypes.h"

9
Core/ELF/ParamSFO.cpp
View File

@ -15,9 +15,12 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <stdio.h>
#include <string.h>
#include "ParamSFO.h"
#include <cstdio>
#include <cstring>
#include "Common/CommonTypes.h"
#include "Common/Log.h"
#include "Core/ELF/ParamSFO.h"
struct Header
{

4
Core/ELF/ParamSFO.h
View File

@ -15,13 +15,13 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#pragma once
#include <string>
#include <map>
#include <vector>
#include "Common/CommonTypes.h"
#include "../Globals.h"
class ParamSFOData
{

3
Core/ELF/PrxDecrypter.cpp
View File

@ -3,8 +3,7 @@ extern "C"
#include "ext/libkirk/kirk_engine.h"
}
#include "Common/Common.h"
#include "../../Globals.h"
#include "PrxDecrypter.h"
#include "Core/ELF/PrxDecrypter.h"
#define ROUNDUP16(x) (((x)+15)&~15)

3
Core/ELF/PrxDecrypter.h
View File

@ -17,7 +17,8 @@
#pragma once
#include "../../Globals.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#define MISSING_KEY -10

2
Core/FileSystems/BlockDevices.h
View File

@ -23,7 +23,7 @@
// The ISOFileSystemReader reads from a BlockDevice, so it automatically works
// with CISO images.
#include "../../Globals.h"
#include "Common/CommonTypes.h"
#include "Core/ELF/PBPReader.h"
class BlockDevice

1
Core/FileSystems/FileSystem.h
View File

@ -17,6 +17,7 @@
#pragma once
#include <vector>
#include "Core/HLE/sceKernel.h"
enum FileAccess

2
Core/FileSystems/ISOFileSystem.cpp
View File

@ -19,8 +19,8 @@
#include <cstdio>
#include <ctype.h>
#include "Globals.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/ChunkFile.h"
#include "Core/FileSystems/ISOFileSystem.h"
#include "Core/HLE/sceKernel.h"

2
Core/HLE/FunctionWrappers.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "Globals.h"
#include "Common/CommonTypes.h"
#include "Core/HLE/HLE.h"
// For easy parameter parsing and return value processing.

4
Core/HLE/HLE.h
View File

@ -17,8 +17,8 @@
#pragma once
#include "../Globals.h"
#include "../MIPS/MIPS.h"
#include "Common/CommonTypes.h"
#include "Core/MIPS/MIPS.h"
typedef void (* HLEFunc)();

4
Core/HLE/HLETables.h
View File

@ -17,8 +17,6 @@
#pragma once
#include "../../Globals.h"
#define NID_THREADRETURN 0xc0debabe
#define NID_CALLBACKRETURN 0xbadc0fee
#define NID_INTERRUPTRETURN 0xbadd00d5
@ -26,4 +24,4 @@
#define NID_MODULERETURN 0xbad0d318
#define NID_IDLE 0x1d7e1d7e
void RegisterAllModules();
void RegisterAllModules();

28
Core/HLE/__sceAudio.cpp
View File

@ -15,23 +15,25 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "__sceAudio.h"
#include "sceAudio.h"
#include "sceKernel.h"
#include "sceKernelThread.h"
#include "base/mutex.h"
#include "CommonTypes.h"
#include "../CoreTiming.h"
#include "../MemMap.h"
#include "../Host.h"
#include "../Config.h"
#include "ChunkFile.h"
#include "FixedSizeQueue.h"
#include "Globals.h" // only for clamp_s16
#include "Common/CommonTypes.h"
#include "Common/ChunkFile.h"
#include "Common/FixedSizeQueue.h"
#include "Common/Atomics.h"
#include "../../native/base/mutex.h"
#include "Core/CoreTiming.h"
#include "Core/MemMap.h"
#include "Core/Host.h"
#include "Core/Config.h"
#include "Core/HLE/__sceAudio.h"
#include "Core/HLE/sceAudio.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelThread.h"
// Should be used to lock anything related to the outAudioQueue.
//atomic locks are used on the lock. TODO: make this lock-free
// atomic locks are used on the lock. TODO: make this lock-free
atomic_flag atomicLock_;
recursive_mutex mutex_;

5
Core/HLE/sceDeflt.cpp
View File

@ -15,10 +15,11 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Globals.h"
#include "HLE.h"
#include "zlib.h"
#include "Common/CommonTypes.h"
#include "Core/HLE/HLE.h"
int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr) {
DEBUG_LOG(HLE, "sceZlibDecompress(%08x, %x, %08x, %08x)", OutBuffer, OutBufferLength, InBuffer, Crc32Addr);
int err;

1
Core/HLE/sceDmac.cpp
View File

@ -15,7 +15,6 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Globals.h"
#include "Common/ChunkFile.h"
#include "Core/CoreTiming.h"
#include "Core/MemMap.h"

5
Core/HLE/sceKernel.h
View File

@ -17,10 +17,11 @@
#pragma once
#include "../../Globals.h"
#include "Common.h"
#include <map>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
class PointerWrap;
enum

1
Core/HLE/sceKernelThread.h
View File

@ -17,6 +17,7 @@
#pragma once
#include <vector>
// There's a good description of the thread scheduling rules in:
// http://code.google.com/p/jpcsp/source/browse/trunk/src/jpcsp/HLE/modules150/ThreadManForUser.java

6
Core/HLE/sceMpeg.h
View File

@ -17,8 +17,8 @@
#pragma once
#include "../../Globals.h"
#include "../MIPS/MIPS.h"
#include "Common/CommonTypes.h"
#include "Core/MIPS/MIPS.h"
class PointerWrap;
@ -95,4 +95,4 @@ void __MpegInit();
void __MpegDoState(PointerWrap &p);
void __MpegShutdown();
void Register_sceMpeg();
void Register_sceMpeg();

6
Core/HW/MediaEngine.h
View File

@ -24,9 +24,9 @@
// An approximation of what the interface will look like. Similar to JPCSP's.
#include "../../Globals.h"
#include "../HLE/sceMpeg.h"
#include "ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/sceMpeg.h"
#include "Core/HW/MpegDemux.h"
struct SimpleAT3;

6
Core/HW/MemoryStick.h
View File

@ -1,4 +1,6 @@
#include "../../Globals.h"
#pragma once
#include "Common/ChunkFile.h"
class PointerWrap;
@ -23,4 +25,4 @@ MemStickFatState MemoryStick_FatState();
void MemoryStick_SetFatState(MemStickFatState state);
u64 MemoryStick_SectorSize();
u64 MemoryStick_FreeSpace();
u64 MemoryStick_FreeSpace();

4
Core/HW/MpegDemux.h
View File

@ -3,9 +3,9 @@
#pragma once
#include "../../Globals.h"
#include "Core/HW/BufferQueue.h"
#include "Common/CommonTypes.h"
#include "Common/ChunkFile.h"
#include "Core/HW/BufferQueue.h"
class MpegDemux
{

5
Core/HW/SasAudio.cpp
View File

@ -16,9 +16,10 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "base/basictypes.h"
#include "../MemMap.h"
#include "Globals.h"
#include "Core/MemMap.h"
#include "Core/HLE/sceAtrac.h"
#include "Core/Config.h"
#include "Core/Config.h"
#include "SasAudio.h"
#include <algorithm>

5
Core/HW/SasAudio.h
View File

@ -22,9 +22,8 @@
#pragma once
#include "../Globals.h"
#include "ChunkFile.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Core/HW/BufferQueue.h"
enum {

2
Core/MIPS/ARM/ArmJit.h
View File

@ -17,8 +17,6 @@
#pragma once
#include "../../../Globals.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/ARM/ArmRegCache.h"

1
Core/MIPS/MIPS.h
View File

@ -18,6 +18,7 @@
#pragma once
#include "util/random/rng.h"
#include "Common/CommonTypes.h"
#include "Core/MemMap.h"
typedef Memory::Opcode MIPSOpcode;

4
Core/MIPS/MIPSAnalyst.h
View File

@ -17,7 +17,9 @@
#pragma once
#include "Globals.h"
#include <vector>
#include "Common/CommonTypes.h"
#include "Core/MIPS/MIPS.h"
class DebugInterface;

13
Core/MIPS/MIPSAsm.h
View File

@ -1,11 +1,10 @@
#pragma once
#include "../../Globals.h"
#include "../Debugger/DebugInterface.h"
#include "MIPSAsmTables.h"
namespace MIPSAsm
{
#include "Core/Debugger/DebugInterface.h"
#include "Core/MIPS/MIPSAsmTables.h"
namespace MIPSAsm {
bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address, u32& dest);
enum eMipsImmediateType { MIPS_NOIMMEDIATE, MIPS_IMMEDIATE5,
@ -41,4 +40,4 @@ private:
char* GetAssembleError();
}
}

6
Core/MIPS/MIPSCodeUtils.h
View File

@ -17,11 +17,9 @@
#pragma once
#include "../../Globals.h"
#include "JitCommon/JitCommon.h"
#include "../HLE/HLE.h"
#include "Common/CommonTypes.h"
#include "Core/HLE/HLE.h"
// Invalid branch target address
#define INVALIDTARGET 0xFFFFFFFF

19
Core/MIPS/MIPSDebugInterface.cpp
View File

@ -15,16 +15,17 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "../Debugger/Breakpoints.h"
#include "../Debugger/SymbolMap.h"
#include "../Debugger/DebugInterface.h"
#include <string>
#include "MIPSDebugInterface.h"
#include "../Globals.h"
#include "../MemMap.h"
#include "../MIPS/MIPSTables.h"
#include "../MIPS/MIPS.h"
#include "../System.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/Debugger/DebugInterface.h"
#include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/MemMap.h"
#include "Core/MIPS/MIPSTables.h"
#include "Core/MIPS/MIPS.h"
#include "Core/System.h"
enum ReferenceIndexType {
REF_INDEX_PC = 32,

2
Core/MIPS/MIPSDis.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "Globals.h"
#include "Common/CommonTypes.h"
#include "Core/MIPS/MIPS.h"
extern u32 disPC;

2
Core/MIPS/MIPSDisVFPU.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Globals.h"
#include "Common/CommonTypes.h"
extern u32 disPC;

2
Core/MIPS/MIPSInt.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Globals.h"
#include "Common/CommonTypes.h"
u32 MIPS_GetNextPC();
void MIPS_ClearDelaySlot();

4
Core/MIPS/MIPSIntVFPU.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Globals.h"
#include "Common/CommonTypes.h"
u32 MIPS_GetNextPC();
void MIPS_ClearDelaySlot();
@ -81,4 +81,4 @@ namespace MIPSInt
void Int_Vwbn(MIPSOpcode op);
void Int_Vsbn(MIPSOpcode op);
void Int_Vsbz(MIPSOpcode op);
}
}

2
Core/MIPS/MIPSTables.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "Globals.h"
#include "Common/CommonTypes.h"
#include "Core/MIPS/MIPS.h"
struct MIPSInfo {

3
Core/MIPS/PPC/PpcJit.h
View File

@ -17,13 +17,14 @@
#pragma once
#include "../../../Globals.h"
#include "Common/CommonTypes.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/PPC/PpcRegCache.h"
#include "Core/MIPS/PPC/PpcRegCacheFpu.h"
#include "Core/MIPS/MIPS.h"
#include <ppcEmitter.h>
namespace MIPSComp

8
Core/MIPS/x86/Jit.h
View File

@ -17,9 +17,9 @@
#pragma once
#include "Globals.h"
#include "Common/CommonTypes.h"
#include "Common/Thunk.h"
#include "Asm.h"
#include "Core/MIPS/x86/Asm.h"
#if defined(ARM)
#error DO NOT BUILD X86 JIT ON ARM
@ -28,8 +28,8 @@
#include "Common/x64Emitter.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "RegCache.h"
#include "RegCacheFPU.h"
#include "Core/MIPS/x86/RegCache.h"
#include "Core/MIPS/x86/RegCacheFPU.h"
namespace MIPSComp
{

2
Core/PSPLoaders.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../Globals.h"
#include <string>
#include "MemMap.h"

4
Core/Util/BlockAllocator.h
View File

@ -17,10 +17,10 @@
#pragma once
#include "../../Globals.h"
class PointerWrap;
#include "Common/CommonTypes.h"
// Generic allocator thingy. Allocates blocks from a range.
class BlockAllocator

2
Core/Util/PPGeDraw.h
View File

@ -17,8 +17,8 @@
#pragma once
#include "../../Globals.h"
#include "ppge_atlas.h"
#include "Common/CommonTypes.h"
class PointerWrap;