CORE: Few fixes from mupen64plus-ae

diff --git a/source/mupen64plus-core/src/main/cheat.c b/source/mupen64plus-core/src/main/cheat.c
old mode 100644 (file)
new mode 100755 (executable)
index 7266762..d081b7a
--- a/source/mupen64plus-core/src/main/cheat.c
+++ b/source/mupen64plus-core/src/main/cheat.c
@@ -281,9 +281,9 @@ void cheat_apply_cheats(int entry)
         if (subscreen_address) {
             execute_cheat(subscreen_address, 0x0002, NULL);
             if (credits_address[0]){
-                if (execute_cheat(credits_address[0], 0x0320, NULL));
+                if (execute_cheat(credits_address[0], 0x0320, NULL))
                     execute_cheat(credits_address[1], 0x0000, NULL);
-                if (execute_cheat(credits_address[2], 0xF809, NULL));
+                if (execute_cheat(credits_address[2], 0xF809, NULL))
                     execute_cheat(credits_address[3], 0x0000, NULL);
             }
         }

diff --git a/source/mupen64plus-core/src/r4300/pure_interp.c b/source/mupen64plus-core/src/r4300/pure_interp.c
old mode 100644 (file)
new mode 100755 (executable)
index 0ddcf42..8b93c21
--- a/source/mupen64plus-core/src/r4300/pure_interp.c
+++ b/source/mupen64plus-core/src/r4300/pure_interp.c
@@ -97,15 +97,15 @@ static void prefetch(void);
    }
 #define CHECK_MEMORY()
 
-#include "interpreter.def"
-
 // two functions are defined from the macros above but never used
 // these prototype declarations will prevent a warning
 #if defined(__GNUC__)
-  void JR_IDLE(void) __attribute__((used));
-  void JALR_IDLE(void) __attribute__((used));
+  static void JR_IDLE(void) __attribute__((used));
+  static void JALR_IDLE(void) __attribute__((used));
 #endif
 
+#include "interpreter.def"
+
 static cpu_instruction_table pure_interpreter_table = {
    LB,
    LBU,

diff --git a/source/mupen64plus-core/src/r4300/r4300.c b/source/mupen64plus-core/src/r4300/r4300.c
index 5b57ce6..b7ed7c3 100755 (executable)
--- a/source/mupen64plus-core/src/r4300/r4300.c
+++ b/source/mupen64plus-core/src/r4300/r4300.c
@@ -167,15 +167,15 @@ int rounding_mode = 0x33F, trunc_mode = 0xF3F, round_mode = 0x33F,
           current_instruction_table.NOTCOMPILED) \
          invalid_code[address>>12] = 1;
 
-#include "interpreter.def"
-
 // two functions are defined from the macros above but never used
 // these prototype declarations will prevent a warning
 #if defined(__GNUC__)
-  void JR_IDLE(void) __attribute__((used));
-  void JALR_IDLE(void) __attribute__((used));
+  static void JR_IDLE(void) __attribute__((used));
+  static void JALR_IDLE(void) __attribute__((used));
 #endif
 
+#include "interpreter.def"
+
 // -----------------------------------------------------------
 // Flow control 'fake' instructions
 // -----------------------------------------------------------