piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 14:49:53 -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

23
src/ARM.h
View File

@ -28,6 +28,8 @@
#include "debug/GdbStub.h"
#endif
namespace melonDS
{
inline u32 ROR(u32 x, u32 n)
{
return (x >> (n&0x1F)) | (x << ((32-n)&0x1F));
@ -42,15 +44,9 @@ enum
const u32 ITCMPhysicalSize = 0x8000;
const u32 DTCMPhysicalSize = 0x4000;
namespace ARMJIT
{
class ARMJIT;
}
namespace Melon
{
class GPU;
}
class ARMJIT;
class GPU;
class ARMJIT_Memory;
class ARM
@ -59,7 +55,7 @@ class ARM
#endif
{
public:
ARM(u32 num, ARMJIT::ARMJIT& jit, Melon::GPU& gpu);
ARM(u32 num, ARMJIT& jit, GPU& gpu);
virtual ~ARM(); // destroy shit
virtual void Reset();
@ -190,7 +186,7 @@ public:
Gdb::GdbStub GdbStub;
#endif
ARMJIT::ARMJIT& JIT;
ARMJIT& JIT;
protected:
u8 (*BusRead8)(u32 addr);
u16 (*BusRead16)(u32 addr);
@ -222,13 +218,13 @@ protected:
void GdbCheckB();
void GdbCheckC();
private:
Melon::GPU& GPU;
melonDS::GPU& GPU;
};
class ARMv5 : public ARM
{
public:
ARMv5(ARMJIT::ARMJIT& jit, Melon::GPU& gpu);
ARMv5(ARMJIT& jit, melonDS::GPU& gpu);
~ARMv5();
void Reset() override;
@ -372,7 +368,7 @@ public:
class ARMv4 : public ARM
{
public:
ARMv4(ARMJIT::ARMJIT& jit, Melon::GPU& gpu);
ARMv4(ARMJIT& jit, melonDS::GPU& gpu);
void Reset() override;
@ -541,4 +537,5 @@ extern ARMv4* ARM7;
}
}
#endif // ARM_H