diff options
| author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-11-25 12:32:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-25 18:32:09 +0100 |
| commit | 346dd4006ea1283136095d5c43f602324a095092 (patch) | |
| tree | edf04631782bbfcdb48eac79b79aebb11b40f479 /src/ARM.cpp | |
| parent | 651b0f680c4531558990a5beb0e638968009dc51 (diff) | |
Move all core types into namespaces (#1886)
* 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
Diffstat (limited to 'src/ARM.cpp')
| -rw-r--r-- | src/ARM.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ARM.cpp b/src/ARM.cpp index a361d77..a1485e9 100644 --- a/src/ARM.cpp +++ b/src/ARM.cpp @@ -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 |