@@ -1,5 +1,4 @@

-#ifndef GLOBALS_H

-#define GLOBALS_H

+#pragma once

 #include <cstdint>

 #include "GBA.h"

@@ -104,5 +103,3 @@ extern uint16_t P1;

 extern uint16_t IE;

 extern uint16_t IF;

 extern uint16_t IME;

-

-#endif // GLOBALS_H

@@ -4,18 +4,6 @@

 #include <cstdint>

 #include "GBA.h"

-#define VERBOSE_SWI                  1

-#define VERBOSE_UNALIGNED_MEMORY     2

-#define VERBOSE_ILLEGAL_WRITE        4

-#define VERBOSE_ILLEGAL_READ         8

-#define VERBOSE_DMA0                16

-#define VERBOSE_DMA1                32

-#define VERBOSE_DMA2                64

-#define VERBOSE_DMA3               128

-#define VERBOSE_UNDEFINED          256

-#define VERBOSE_AGBPRINT           512

-#define VERBOSE_SOUNDOUTPUT       1024

-

 extern reg_pair reg[45];

 extern bool ioReadable[0x400];

 extern bool N_FLAG;

@@ -26,35 +14,18 @@ extern bool armState;

 extern bool armIrqEnable;

 extern uint32_t armNextPC;

 extern int armMode;

-extern uint32_t stop;

-extern int saveType;

-extern bool useBios;

-extern bool skipBios;

-extern int frameSkip;

-extern bool speedup;

-extern bool synchronize;

-extern bool cpuDisableSfx;

 extern bool cpuIsMultiBoot;

-extern bool parseDebug;

 extern int layerSettings;

 extern int layerEnable;

-extern bool speedHack;

-extern int cpuSaveType;

-extern bool cheatsEnabled;

-extern bool mirroringEnable;

-extern bool skipSaveGameBattery; // skip battery data when reading save states

-extern bool skipSaveGameCheats;  // skip cheat list data when reading save states

-extern int customBackdropColor;

-extern uint8_t *bios;

-extern uint8_t *rom;

-extern uint8_t *internalRAM;

-extern uint8_t *workRAM;

-extern uint8_t *paletteRAM;

-extern uint8_t *vram;

-extern uint8_t *pix;

-extern uint8_t *oam;

-extern uint8_t *ioMem;

+extern uint8_t bios[0x4000];

+extern uint8_t rom[0x2000000];

+extern uint8_t internalRAM[0x8000];

+extern uint8_t workRAM[0x40000];

+extern uint8_t paletteRAM[0x400];

+extern uint8_t vram[0x20000];

+extern uint8_t oam[0x400];

+extern uint8_t ioMem[0x400];

 extern uint16_t DISPCNT;

 extern uint16_t DISPSTAT;

@@ -1,7 +1,7 @@

 #ifndef GLOBALS_H

 #define GLOBALS_H

-#include "../common/Types.h"

+#include <cstdint>

 #include "GBA.h"

 #define VERBOSE_SWI                  1

@@ -24,9 +24,9 @@ extern bool Z_FLAG;

 extern bool V_FLAG;

 extern bool armState;

 extern bool armIrqEnable;

-extern u32 armNextPC;

+extern uint32_t armNextPC;

 extern int armMode;

-extern u32 stop;

+extern uint32_t stop;

 extern int saveType;

 extern bool useBios;

 extern bool skipBios;

@@ -46,92 +46,92 @@ extern bool skipSaveGameBattery; // skip battery data when reading save states

 extern bool skipSaveGameCheats;  // skip cheat list data when reading save states

 extern int customBackdropColor;

-extern u8 *bios;

-extern u8 *rom;

-extern u8 *internalRAM;

-extern u8 *workRAM;

-extern u8 *paletteRAM;

-extern u8 *vram;

-extern u8 *pix;

-extern u8 *oam;

-extern u8 *ioMem;

+extern uint8_t *bios;

+extern uint8_t *rom;

+extern uint8_t *internalRAM;

+extern uint8_t *workRAM;

+extern uint8_t *paletteRAM;

+extern uint8_t *vram;

+extern uint8_t *pix;

+extern uint8_t *oam;

+extern uint8_t *ioMem;

-extern u16 DISPCNT;

-extern u16 DISPSTAT;

-extern u16 VCOUNT;

-extern u16 BG0CNT;

-extern u16 BG1CNT;

-extern u16 BG2CNT;

-extern u16 BG3CNT;

-extern u16 BG0HOFS;

-extern u16 BG0VOFS;

-extern u16 BG1HOFS;

-extern u16 BG1VOFS;

-extern u16 BG2HOFS;

-extern u16 BG2VOFS;

-extern u16 BG3HOFS;

-extern u16 BG3VOFS;

-extern u16 BG2PA;

-extern u16 BG2PB;

-extern u16 BG2PC;

-extern u16 BG2PD;

-extern u16 BG2X_L;

-extern u16 BG2X_H;

-extern u16 BG2Y_L;

-extern u16 BG2Y_H;

-extern u16 BG3PA;

-extern u16 BG3PB;

-extern u16 BG3PC;

-extern u16 BG3PD;

-extern u16 BG3X_L;

-extern u16 BG3X_H;

-extern u16 BG3Y_L;

-extern u16 BG3Y_H;

-extern u16 WIN0H;

-extern u16 WIN1H;

-extern u16 WIN0V;

-extern u16 WIN1V;

-extern u16 WININ;

-extern u16 WINOUT;

-extern u16 MOSAIC;

-extern u16 BLDMOD;

-extern u16 COLEV;

-extern u16 COLY;

-extern u16 DM0SAD_L;

-extern u16 DM0SAD_H;

-extern u16 DM0DAD_L;

-extern u16 DM0DAD_H;

-extern u16 DM0CNT_L;

-extern u16 DM0CNT_H;

-extern u16 DM1SAD_L;

-extern u16 DM1SAD_H;

-extern u16 DM1DAD_L;

-extern u16 DM1DAD_H;

-extern u16 DM1CNT_L;

-extern u16 DM1CNT_H;

-extern u16 DM2SAD_L;

-extern u16 DM2SAD_H;

-extern u16 DM2DAD_L;

-extern u16 DM2DAD_H;

-extern u16 DM2CNT_L;

-extern u16 DM2CNT_H;

-extern u16 DM3SAD_L;

-extern u16 DM3SAD_H;

-extern u16 DM3DAD_L;

-extern u16 DM3DAD_H;

-extern u16 DM3CNT_L;

-extern u16 DM3CNT_H;

-extern u16 TM0D;

-extern u16 TM0CNT;

-extern u16 TM1D;

-extern u16 TM1CNT;

-extern u16 TM2D;

-extern u16 TM2CNT;

-extern u16 TM3D;

-extern u16 TM3CNT;

-extern u16 P1;

-extern u16 IE;

-extern u16 IF;

-extern u16 IME;

+extern uint16_t DISPCNT;

+extern uint16_t DISPSTAT;

+extern uint16_t VCOUNT;

+extern uint16_t BG0CNT;

+extern uint16_t BG1CNT;

+extern uint16_t BG2CNT;

+extern uint16_t BG3CNT;

+extern uint16_t BG0HOFS;

+extern uint16_t BG0VOFS;

+extern uint16_t BG1HOFS;

+extern uint16_t BG1VOFS;

+extern uint16_t BG2HOFS;

+extern uint16_t BG2VOFS;

+extern uint16_t BG3HOFS;

+extern uint16_t BG3VOFS;

+extern uint16_t BG2PA;

+extern uint16_t BG2PB;

+extern uint16_t BG2PC;

+extern uint16_t BG2PD;

+extern uint16_t BG2X_L;

+extern uint16_t BG2X_H;

+extern uint16_t BG2Y_L;

+extern uint16_t BG2Y_H;

+extern uint16_t BG3PA;

+extern uint16_t BG3PB;

+extern uint16_t BG3PC;

+extern uint16_t BG3PD;

+extern uint16_t BG3X_L;

+extern uint16_t BG3X_H;

+extern uint16_t BG3Y_L;

+extern uint16_t BG3Y_H;

+extern uint16_t WIN0H;

+extern uint16_t WIN1H;

+extern uint16_t WIN0V;

+extern uint16_t WIN1V;

+extern uint16_t WININ;

+extern uint16_t WINOUT;

+extern uint16_t MOSAIC;

+extern uint16_t BLDMOD;

+extern uint16_t COLEV;

+extern uint16_t COLY;

+extern uint16_t DM0SAD_L;

+extern uint16_t DM0SAD_H;

+extern uint16_t DM0DAD_L;

+extern uint16_t DM0DAD_H;

+extern uint16_t DM0CNT_L;

+extern uint16_t DM0CNT_H;

+extern uint16_t DM1SAD_L;

+extern uint16_t DM1SAD_H;

+extern uint16_t DM1DAD_L;

+extern uint16_t DM1DAD_H;

+extern uint16_t DM1CNT_L;

+extern uint16_t DM1CNT_H;

+extern uint16_t DM2SAD_L;

+extern uint16_t DM2SAD_H;

+extern uint16_t DM2DAD_L;

+extern uint16_t DM2DAD_H;

+extern uint16_t DM2CNT_L;

+extern uint16_t DM2CNT_H;

+extern uint16_t DM3SAD_L;

+extern uint16_t DM3SAD_H;

+extern uint16_t DM3DAD_L;

+extern uint16_t DM3DAD_H;

+extern uint16_t DM3CNT_L;

+extern uint16_t DM3CNT_H;

+extern uint16_t TM0D;

+extern uint16_t TM0CNT;

+extern uint16_t TM1D;

+extern uint16_t TM1CNT;

+extern uint16_t TM2D;

+extern uint16_t TM2CNT;

+extern uint16_t TM3D;

+extern uint16_t TM3CNT;

+extern uint16_t P1;

+extern uint16_t IE;

+extern uint16_t IF;

+extern uint16_t IME;

 #endif // GLOBALS_H

new file mode 100644

@@ -0,0 +1,137 @@

+#ifndef GLOBALS_H

+#define GLOBALS_H

+

+#include "../common/Types.h"

+#include "GBA.h"

+

+#define VERBOSE_SWI                  1

+#define VERBOSE_UNALIGNED_MEMORY     2

+#define VERBOSE_ILLEGAL_WRITE        4

+#define VERBOSE_ILLEGAL_READ         8

+#define VERBOSE_DMA0                16

+#define VERBOSE_DMA1                32

+#define VERBOSE_DMA2                64

+#define VERBOSE_DMA3               128

+#define VERBOSE_UNDEFINED          256

+#define VERBOSE_AGBPRINT           512

+#define VERBOSE_SOUNDOUTPUT       1024

+

+extern reg_pair reg[45];

+extern bool ioReadable[0x400];

+extern bool N_FLAG;

+extern bool C_FLAG;

+extern bool Z_FLAG;

+extern bool V_FLAG;

+extern bool armState;

+extern bool armIrqEnable;

+extern u32 armNextPC;

+extern int armMode;

+extern u32 stop;

+extern int saveType;

+extern bool useBios;

+extern bool skipBios;

+extern int frameSkip;

+extern bool speedup;

+extern bool synchronize;

+extern bool cpuDisableSfx;

+extern bool cpuIsMultiBoot;

+extern bool parseDebug;

+extern int layerSettings;

+extern int layerEnable;

+extern bool speedHack;

+extern int cpuSaveType;

+extern bool cheatsEnabled;

+extern bool mirroringEnable;

+extern bool skipSaveGameBattery; // skip battery data when reading save states

+extern bool skipSaveGameCheats;  // skip cheat list data when reading save states

+extern int customBackdropColor;

+

+extern u8 *bios;

+extern u8 *rom;

+extern u8 *internalRAM;

+extern u8 *workRAM;

+extern u8 *paletteRAM;

+extern u8 *vram;

+extern u8 *pix;

+extern u8 *oam;

+extern u8 *ioMem;

+

+extern u16 DISPCNT;

+extern u16 DISPSTAT;

+extern u16 VCOUNT;

+extern u16 BG0CNT;

+extern u16 BG1CNT;

+extern u16 BG2CNT;

+extern u16 BG3CNT;

+extern u16 BG0HOFS;

+extern u16 BG0VOFS;

+extern u16 BG1HOFS;

+extern u16 BG1VOFS;

+extern u16 BG2HOFS;

+extern u16 BG2VOFS;

+extern u16 BG3HOFS;

+extern u16 BG3VOFS;

+extern u16 BG2PA;

+extern u16 BG2PB;

+extern u16 BG2PC;

+extern u16 BG2PD;

+extern u16 BG2X_L;

+extern u16 BG2X_H;

+extern u16 BG2Y_L;

+extern u16 BG2Y_H;

+extern u16 BG3PA;

+extern u16 BG3PB;

+extern u16 BG3PC;

+extern u16 BG3PD;

+extern u16 BG3X_L;

+extern u16 BG3X_H;

+extern u16 BG3Y_L;

+extern u16 BG3Y_H;

+extern u16 WIN0H;

+extern u16 WIN1H;

+extern u16 WIN0V;

+extern u16 WIN1V;

+extern u16 WININ;

+extern u16 WINOUT;

+extern u16 MOSAIC;

+extern u16 BLDMOD;

+extern u16 COLEV;

+extern u16 COLY;

+extern u16 DM0SAD_L;

+extern u16 DM0SAD_H;

+extern u16 DM0DAD_L;

+extern u16 DM0DAD_H;

+extern u16 DM0CNT_L;

+extern u16 DM0CNT_H;

+extern u16 DM1SAD_L;

+extern u16 DM1SAD_H;

+extern u16 DM1DAD_L;

+extern u16 DM1DAD_H;

+extern u16 DM1CNT_L;

+extern u16 DM1CNT_H;

+extern u16 DM2SAD_L;

+extern u16 DM2SAD_H;

+extern u16 DM2DAD_L;

+extern u16 DM2DAD_H;

+extern u16 DM2CNT_L;

+extern u16 DM2CNT_H;

+extern u16 DM3SAD_L;

+extern u16 DM3SAD_H;

+extern u16 DM3DAD_L;

+extern u16 DM3DAD_H;

+extern u16 DM3CNT_L;

+extern u16 DM3CNT_H;

+extern u16 TM0D;

+extern u16 TM0CNT;

+extern u16 TM1D;

+extern u16 TM1CNT;

+extern u16 TM2D;

+extern u16 TM2CNT;

+extern u16 TM3D;

+extern u16 TM3CNT;

+extern u16 P1;

+extern u16 IE;

+extern u16 IF;

+extern u16 IME;

+

+#endif // GLOBALS_H