ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General: the definitions of ARMCPU_ARM9, ARMCPU_ARM7 and ARMPROC seem 

to fit the best in MMU.cpp ... so let's get rid of that hack.

Feel free to revert if it breaks compilation under Linux or whatever.
Worked fine under Win32.
This commit is contained in:
luigi__ 2009-08-02 21:14:27 +00:00
parent bf124165f7
commit d1fe3e3c21
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/MMU.h
View File

@ -32,12 +32,9 @@
#include "ARM9.h" #include "ARM9.h"
#include "mc.h" #include "mc.h"
//HACK!!!! REMOVE ME SOON!
#ifndef ARMCPU_ARM7
#define ARMCPU_ARM7 1 #define ARMCPU_ARM7 1
#define ARMCPU_ARM9 0 #define ARMCPU_ARM9 0
#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9) #define ARMPROC (PROCNUM ? NDS_ARM7:NDS_ARM9)
#endif
typedef const u8 TWaitState; typedef const u8 TWaitState;

32
desmume/src/armcpu.h
View File

@ -22,10 +22,6 @@
#ifndef ARM_CPU #ifndef ARM_CPU
#define ARM_CPU #define ARM_CPU
#define ARMCPU_ARM7 1
#define ARMCPU_ARM9 0
#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9)
#include "types.h" #include "types.h"
#include "bits.h" #include "bits.h"
#include "MMU.h" #include "MMU.h"
@ -158,34 +154,34 @@ typedef void* armcp_t;
typedef struct armcpu_t typedef struct armcpu_t
{ {
u32 proc_ID; u32 proc_ID;
u32 instruction; //4 u32 instruction; //4
u32 instruct_adr; //8 u32 instruct_adr; //8
u32 next_instruction; //12 u32 next_instruction; //12
u32 R[16]; //16 u32 R[16]; //16
Status_Reg CPSR; //80 Status_Reg CPSR; //80
Status_Reg SPSR; Status_Reg SPSR;
u32 R13_usr, R14_usr; u32 R13_usr, R14_usr;
u32 R13_svc, R14_svc; u32 R13_svc, R14_svc;
u32 R13_abt, R14_abt; u32 R13_abt, R14_abt;
u32 R13_und, R14_und; u32 R13_und, R14_und;
u32 R13_irq, R14_irq; u32 R13_irq, R14_irq;
u32 R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq; u32 R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq;
Status_Reg SPSR_svc, SPSR_abt, SPSR_und, SPSR_irq, SPSR_fiq; Status_Reg SPSR_svc, SPSR_abt, SPSR_und, SPSR_irq, SPSR_fiq;
armcp_t *coproc[16]; armcp_t *coproc[16];
u32 intVector; u32 intVector;
u8 LDTBit; //1 : ARMv5 style 0 : non ARMv5 u8 LDTBit; //1 : ARMv5 style 0 : non ARMv5
BOOL waitIRQ; BOOL waitIRQ;
BOOL wIRQ; BOOL wIRQ;
BOOL wirq; BOOL wirq;
u32 newIrqFlags; u32 newIrqFlags;
u32 (* *swi_tab)(); u32 (* *swi_tab)();
#ifdef GDB_STUB #ifdef GDB_STUB
/** there is a pending irq for the cpu */ /** there is a pending irq for the cpu */