From f377bfeb76e159d42764901adf4571143590601f Mon Sep 17 00:00:00 2001 From: rogerman Date: Sat, 5 Aug 2017 14:07:56 -0700 Subject: [PATCH] cheatSystem.cpp: Fix compiling on non-x86 systems. --- desmume/src/cheatSystem.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/desmume/src/cheatSystem.cpp b/desmume/src/cheatSystem.cpp index d60f79fab..9ba400437 100644 --- a/desmume/src/cheatSystem.cpp +++ b/desmume/src/cheatSystem.cpp @@ -224,7 +224,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x03: //Greater Than (Conditional 32-Bit Code Types) //3XXXXXXX YYYYYYYY - //Checks if YYYYYYYY > (word at [XXXXXXX]) + //Checks if YYYYYYYY > (word at [XXXXXXX]) //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo; @@ -236,7 +236,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x04: //Less Than (Conditional 32-Bit Code Types) //4XXXXXXX YYYYYYYY - //Checks if YYYYYYYY < (word at [XXXXXXX]) + //Checks if YYYYYYYY < (word at [XXXXXXX]) //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo; @@ -248,7 +248,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x05: //Equal To (Conditional 32-Bit Code Types) //5XXXXXXX YYYYYYYY - //Checks if YYYYYYYY == (word at [XXXXXXX]) + //Checks if YYYYYYYY == (word at [XXXXXXX]) //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo; @@ -260,7 +260,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x06: //Not Equal To (Conditional 32-Bit Code Types) //6XXXXXXX YYYYYYYY - //Checks if YYYYYYYY != (word at [XXXXXXX]) + //Checks if YYYYYYYY != (word at [XXXXXXX]) //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo; @@ -272,7 +272,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x07: //Greater Than (Conditional 16-Bit + Masking RAM "Writes") (but WRITING has nothing to do with this) //7XXXXXXX ZZZZYYYY - //Checks if (YYYY) > (not (ZZZZ) & halfword at [XXXX]). + //Checks if (YYYY) > (not (ZZZZ) & halfword at [XXXX]). //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo&0xFFFF; @@ -285,7 +285,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x08: //Less Than (Conditional 16-Bit + Masking RAM "Writes") (but WRITING has nothing to do with this) //8XXXXXXX ZZZZYYYY - //Checks if (YYYY) < (not (ZZZZ) & halfword at [XXXX]). + //Checks if (YYYY) < (not (ZZZZ) & halfword at [XXXX]). //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo&0xFFFF; @@ -298,7 +298,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x09: //Equal To (Conditional 16-Bit + Masking RAM "Writes") (but WRITING has nothing to do with this) //9XXXXXXX ZZZZYYYY - //Checks if (YYYY) == (not (ZZZZ) & halfword at [XXXX]). + //Checks if (YYYY) == (not (ZZZZ) & halfword at [XXXX]). //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo&0xFFFF; @@ -311,7 +311,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0x0A: //Not Equal To (Conditional 16-Bit + Masking RAM "Writes") (but WRITING has nothing to do with this) //AXXXXXXX ZZZZYYYY - //Checks if (YYYY) != (not (ZZZZ) & halfword at [XXXX]). + //Checks if (YYYY) != (not (ZZZZ) & halfword at [XXXX]). //If not, the code(s) following this one are not executed (ie. execution status is set to false) until a code type D0 or D2 is encountered, or until the end of the code list is reached. x = hi & 0x0FFFFFFF; y = lo&0xFFFF; @@ -334,7 +334,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0xC0: //(Loop Code) //C0000000 YYYYYYYY - //This sets the 'Dx repeat value' to YYYYYYYY and saves the 'Dx nextcode to be executed' and the 'Dx execution status'. Repeat will be executed when a D1/D2 code is encountered. + //This sets the 'Dx repeat value' to YYYYYYYY and saves the 'Dx nextcode to be executed' and the 'Dx execution status'. Repeat will be executed when a D1/D2 code is encountered. //When repeat is executed, the AR reloads the 'next code to be executed' and the 'execution status' from the Dx registers. // FOR loopcount=0 to YYYYYYYY ;execute Y+1 times y = lo; @@ -454,7 +454,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) break; case 0xD7: - //16-Bit Incrementive Write (Data Register Codes) + //16-Bit Incrementive Write (Data Register Codes) //D7000000 XXXXXXXX //Writes the 'Dx data' halfword to [XXXXXXXX+offset], and increments the offset by 2. // half[XXXXXXXX+offset]=datareg, offset=offset+2 @@ -465,7 +465,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) break; case 0xD8: - //8-Bit Incrementive Write (Data Register Codes) + //8-Bit Incrementive Write (Data Register Codes) //D8000000 XXXXXXXX //Writes the 'Dx data' byte to [XXXXXXXX+offset], and increments the offset by 1. // byte[XXXXXXXX+offset]=datareg, offset=offset+1 @@ -496,7 +496,7 @@ void CHEATS::ARparser(CHEATS_LIST& list) case 0xDB: //8-Bit Load (Data Register Codes) //DB000000 XXXXXXXX - //Loads the byte at [XXXXXXXX+offset] and stores it in the'Dx data register'. + //Loads the byte at [XXXXXXXX+offset] and stores it in the'Dx data register'. //This is a bugged code type. Check 'AR Hack #0' for the fix. x = lo; addr = x + st.offset; @@ -1016,12 +1016,14 @@ void CHEATS::process(int targetType) default: continue; } } - + +#ifdef HAVE_JIT if(cheatsResetJit) { if(CommonSettings.use_jit) arm_jit_reset(true,true); } +#endif } void CHEATS::getXXcodeString(CHEATS_LIST list, char *res_buf)