citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

got rid of some really poorly named macros in SkyEye core

This commit is contained in:
bunnei 2014-04-04 22:24:41 -04:00
parent 66299a4880
commit f5f6428b97
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/src/arm/interpreter/armemu.cpp
View File

@ -5826,7 +5826,7 @@ LoadMult (ARMul_State * state, ARMword instr, ARMword address, ARMword WBBase)
if (BIT (15) && !state->Aborted) if (BIT (15) && !state->Aborted)
/* PC is in the reg list. */ /* PC is in the reg list. */
WriteR15Branch (state, PC); WriteR15Branch(state, (state->Reg[15] & PCMASK));
/* To write back the final register. */ /* To write back the final register. */
/* ARMul_Icycles (state, 1, 0L);*/ /* ARMul_Icycles (state, 1, 0L);*/
@ -5959,7 +5959,7 @@ LoadSMult (ARMul_State * state,
ARMul_CPSRAltered (state); ARMul_CPSRAltered (state);
} }
WriteR15 (state, PC); WriteR15 (state, (state->Reg[15] & PCMASK));
#else #else
//chy 2006-02-16 , should not consider system mode, don't conside 26bit mode //chy 2006-02-16 , should not consider system mode, don't conside 26bit mode
if (state->Mode == USER26MODE || state->Mode == USER32MODE ) { if (state->Mode == USER26MODE || state->Mode == USER32MODE ) {

11
src/core/src/arm/interpreter/armemu.h
View File

@ -166,7 +166,6 @@ extern ARMword isize;
#define PCWRAP(pc) ((pc) & R15PCBITS) #define PCWRAP(pc) ((pc) & R15PCBITS)
#endif #endif
#define PC (state->Reg[15] & PCMASK)
#define R15CCINTMODE (state->Reg[15] & (CCBITS | R15INTBITS | R15MODEBITS)) #define R15CCINTMODE (state->Reg[15] & (CCBITS | R15INTBITS | R15MODEBITS))
#define R15INT (state->Reg[15] & R15INTBITS) #define R15INT (state->Reg[15] & R15INTBITS)
#define R15INTPC (state->Reg[15] & (R15INTBITS | R15PCBITS)) #define R15INTPC (state->Reg[15] & (R15INTBITS | R15PCBITS))
@ -181,11 +180,11 @@ extern ARMword isize;
#define ER15INT (IFFLAGS << 26) #define ER15INT (IFFLAGS << 26)
#define EMODE (state->Mode) #define EMODE (state->Mode)
#ifdef MODET //#ifdef MODET
#define CPSR (ECC | EINT | EMODE | (TFLAG << 5)) //#define CPSR (ECC | EINT | EMODE | (TFLAG << 5))
#else //#else
#define CPSR (ECC | EINT | EMODE) //#define CPSR (ECC | EINT | EMODE)
#endif //#endif
#ifdef MODE32 #ifdef MODE32
#define PATCHR15 #define PATCHR15

3
src/core/src/arm/interpreter/armsupp.cpp
View File

@ -123,7 +123,8 @@ ARMul_GetCPSR (ARMul_State * state)
{ {
//chy 2003-08-20: below is from gdb20030716, maybe isn't suitable for system simulator //chy 2003-08-20: below is from gdb20030716, maybe isn't suitable for system simulator
//return (CPSR | state->Cpsr); for gdb20030716 //return (CPSR | state->Cpsr); for gdb20030716
return (CPSR); //had be tested in old skyeye with gdb5.0-5.3 // NOTE(bunnei): Changed this from [now] commented out macro "CPSR"
return ((ECC | EINT | EMODE | (TFLAG << 5))); //had be tested in old skyeye with gdb5.0-5.3
} }
/* This routine sets the value of the CPSR. */ /* This routine sets the value of the CPSR. */