piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move all core types into namespaces (#1886)

Browse Source 
* Reorganize namespaces

- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next

* Fix the build
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-25 12:32:09 -05:00
committed by GitHub
parent 651b0f680c
commit 346dd4006e
178 changed files with 529 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ARM.cpp
View File

@ -28,6 +28,8 @@
#include "GPU.h"
#include "ARMJIT_Memory.h"
namespace melonDS
{
using Platform::Log;
using Platform::LogLevel;
@ -104,7 +106,7 @@ const u32 ARM::ConditionTable[16] =
0x0000 // NE
};
ARM::ARM(u32 num, ARMJIT::ARMJIT& jit, Melon::GPU& gpu) :
ARM::ARM(u32 num, ARMJIT& jit, melonDS::GPU& gpu) :
#ifdef GDBSTUB_ENABLED
GdbStub(this, Platform::GetConfigInt(num ? Platform::GdbPortARM7 : Platform::GdbPortARM9)),
#endif
@ -128,14 +130,14 @@ ARM::~ARM()
// dorp
}
ARMv5::ARMv5(ARMJIT::ARMJIT& jit, Melon::GPU& gpu) : ARM(0, jit, gpu)
ARMv5::ARMv5(ARMJIT& jit, melonDS::GPU& gpu) : ARM(0, jit, gpu)
{
DTCM = JIT.Memory.GetARM9DTCM();
PU_Map = PU_PrivMap;
}
ARMv4::ARMv4(ARMJIT::ARMJIT& jit, Melon::GPU& gpu) : ARM(1, jit, gpu)
ARMv4::ARMv4(ARMJIT& jit, melonDS::GPU& gpu) : ARM(1, jit, gpu)
{
//
}
@ -749,7 +751,7 @@ void ARMv5::ExecuteJIT()
return;
}
ARMJIT::JitBlockEntry block = JIT.LookUpBlock(0, FastBlockLookup,
JitBlockEntry block = JIT.LookUpBlock(0, FastBlockLookup,
instrAddr - FastBlockLookupStart, instrAddr);
if (block)
ARM_Dispatch(this, block);
@ -906,7 +908,7 @@ void ARMv4::ExecuteJIT()
return;
}
ARMJIT::JitBlockEntry block = JIT.LookUpBlock(1, FastBlockLookup,
JitBlockEntry block = JIT.LookUpBlock(1, FastBlockLookup,
instrAddr - FastBlockLookupStart, instrAddr);
if (block)
ARM_Dispatch(this, block);
@ -1191,5 +1193,6 @@ u32 ARMv5::ReadMem(u32 addr, int size)
return ARM::ReadMem(addr, size);
}
}
#endif