Merge pull request #9 from ecsv/interpreter_link

Save link information in *AL(L) instructions unconditionally
mupen64plus · Jan 29, 2014 · b0720b5 · b0720b5
2 parents c757653 + cb891a0
commit b0720b5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/r4300/pure_interp.c b/src/r4300/pure_interp.c
@@ -55,6 +55,11 @@ static void prefetch(void);
       const unsigned int jump_target = (destination); \
       long long int *link_register = (link); \
       if (cop1 && check_cop1_unusable()) return; \
+      if (link_register != &reg[0]) \
+      { \
+          *link_register=interp_PC.addr + 8; \
+          sign_extended(*link_register); \
+      } \
       if (!likely || take_jump) \
       { \
         interp_PC.addr += 4; \
@@ -65,11 +70,6 @@ static void prefetch(void);
         delay_slot=0; \
         if (take_jump && !skip_jump) \
         { \
-          if (link_register != &reg[0]) \
-          { \
-              *link_register=interp_PC.addr; \
-              sign_extended(*link_register); \
-          } \
           interp_PC.addr = jump_target; \
         } \
       } \

diff --git a/src/r4300/r4300.c b/src/r4300/r4300.c
@@ -88,6 +88,11 @@ int rounding_mode = 0x33F, trunc_mode = 0xF3F, round_mode = 0x33F,
       const unsigned int jump_target = (destination); \
       long long int *link_register = (link); \
       if (cop1 && check_cop1_unusable()) return; \
+      if (link_register != &reg[0]) \
+      { \
+         *link_register=PC->addr + 8; \
+         sign_extended(*link_register); \
+      } \
       if (!likely || take_jump) \
       { \
          PC++; \
@@ -98,11 +103,6 @@ int rounding_mode = 0x33F, trunc_mode = 0xF3F, round_mode = 0x33F,
          delay_slot=0; \
          if (take_jump && !skip_jump) \
          { \
-            if (link_register != &reg[0]) \
-            { \
-               *link_register=PC->addr; \
-               sign_extended(*link_register); \
-            } \
             PC=actual->block+((jump_target-actual->start)>>2); \
          } \
       } \
@@ -120,6 +120,11 @@ int rounding_mode = 0x33F, trunc_mode = 0xF3F, round_mode = 0x33F,
       const unsigned int jump_target = (destination); \
       long long int *link_register = (link); \
       if (cop1 && check_cop1_unusable()) return; \
+      if (link_register != &reg[0]) \
+      { \
+         *link_register=PC->addr + 8; \
+         sign_extended(*link_register); \
+      } \
       if (!likely || take_jump) \
       { \
          PC++; \
@@ -130,11 +135,6 @@ int rounding_mode = 0x33F, trunc_mode = 0xF3F, round_mode = 0x33F,
          delay_slot=0; \
          if (take_jump && !skip_jump) \
          { \
-            if (link_register != &reg[0]) \
-            { \
-               *link_register=PC->addr; \
-               sign_extended(*link_register); \
-            } \
             jump_to(jump_target); \
          } \
       } \