A bit more clean-up

dingusdev · May 10, 2024 · ce9a1a6 · ce9a1a6
1 parent a95b06f
commit ce9a1a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cpu/ppc/ppcmacros.h b/cpu/ppc/ppcmacros.h
@@ -48,6 +48,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     uint32_t ppc_result_d = ppc_state.gpr[reg_s]; \
     uint32_t ppc_result_a = ppc_state.gpr[reg_a];
 
+#define ppc_grab_crfd_regsauimm(opcode) \
+    int crf_d             = (opcode >> 21) & 0x1C; \
+    int reg_a             = (opcode >> 16) & 31; \
+    uint32_t uimm         = uint16_t(opcode); \
+    uint32_t ppc_result_a = ppc_state.gpr[reg_a];
+
 #define ppc_grab_da(opcode)\
     int reg_d = (opcode >> 21) & 31;\
     int reg_a = (opcode >> 16) & 31;\

diff --git a/cpu/ppc/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp
@@ -1261,8 +1261,7 @@ void dppc_interpreter::ppc_cmpli() {
         return;
     }
 #endif
-    int crf_d = (ppc_cur_instruction >> 21) & 0x1C;
-    ppc_grab_regssauimm(ppc_cur_instruction);
+    ppc_grab_crfd_regsauimm(ppc_cur_instruction);
     uint32_t xercon = (ppc_state.spr[SPR::XER] & XER::SO) >> 3;
     uint32_t cmp_c = (ppc_result_a == uimm) ? 0x20000000UL : \
         (ppc_result_a > uimm) ? 0x40000000UL : 0x80000000UL;
@@ -1467,7 +1466,7 @@ void dppc_interpreter::ppc_dcbtst() {
 }
 
 void dppc_interpreter::ppc_dcbz() {
-    ppc_grab_regsdab(ppc_cur_instruction);
+    ppc_grab_regsab(ppc_cur_instruction);
     ppc_effective_address = ppc_result_b + (reg_a ? ppc_result_a : 0);
 
     ppc_effective_address &= 0xFFFFFFE0UL; // align EA on a 32-byte boundary