From 8ff2125312b6fd884593b515eb22a1ea5a0b7aef Mon Sep 17 00:00:00 2001
From: Maxim Poliakovski <maximumspatium@googlemail.com>
Date: Mon, 18 Sep 2023 20:45:35 +0200
Subject: [PATCH] Revert "Minor checks for Data Cache opcodes and LMW"

This reverts commit fd6327ab62482abefdc61ea3aa22399a56ae7c83.
---
 cpu/ppc/ppcopcodes.cpp | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/cpu/ppc/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp
index 8ced0b4..6ddb505 100644
--- a/cpu/ppc/ppcopcodes.cpp
+++ b/cpu/ppc/ppcopcodes.cpp
@@ -1507,9 +1507,6 @@ void dppc_interpreter::ppc_icbi() {
 
 void dppc_interpreter::ppc_dcbf() {
     /* placeholder */
-    ppc_grab_regsdab();
-    ppc_effective_address = (reg_a == 0) ? ppc_result_b : (ppc_result_a + ppc_result_b);
-    LOG_F(9, "DCBF attempted; EA: %d", ppc_effective_address);
 }
 
 void dppc_interpreter::ppc_dcbi() {
@@ -1517,18 +1514,10 @@ void dppc_interpreter::ppc_dcbi() {
     num_supervisor_instrs++;
 #endif
     /* placeholder */
-    ppc_grab_regsdab();
-    ppc_effective_address = (reg_a == 0) ? ppc_result_b : (ppc_result_a + ppc_result_b);
-    if (ppc_state.msr & 0x100000) {
-        ppc_exception_handler(Except_Type::EXC_PROGRAM, 0x100000);
-    }
-    LOG_F(WARNING, "DCBI attempted; EA: %d", ppc_effective_address);
 }
 
 void dppc_interpreter::ppc_dcbst() {
-    ppc_grab_regsdab();
-    ppc_effective_address = (reg_a == 0) ? ppc_result_b : (ppc_result_a + ppc_result_b);
-    LOG_F(WARNING, "DCBST attempted; EA: %d", ppc_effective_address);
+    /* placeholder */
 }
 
 void dppc_interpreter::ppc_dcbt() {
@@ -2066,18 +2055,11 @@ void dppc_interpreter::ppc_lmw() {
     ppc_grab_regsda();
     ppc_effective_address = (int32_t)((int16_t)(ppc_cur_instruction & 0xFFFF));
     ppc_effective_address += (reg_a > 0) ? ppc_result_a : 0;
-    if (ppc_state.spr[PVR] != MPC601) {
-        if (reg_d <= reg_a) {
-            ppc_exception_handler(Except_Type::EXC_PROGRAM, 0x80000);
-        }
-    }
     // How many words to load in memory - using a do-while for this
     do {
         //ppc_state.gpr[reg_d] = mem_grab_dword(ppc_effective_address);
-        if (reg_d != reg_a){
-            ppc_state.gpr[reg_d] = mmu_read_vmem<uint32_t>(ppc_effective_address);
-            ppc_effective_address += 4;
-        }
+        ppc_state.gpr[reg_d] = mmu_read_vmem<uint32_t>(ppc_effective_address);
+        ppc_effective_address += 4;
         reg_d++;
     } while (reg_d < 32);
 }