From c89d3545cd18cea4d665eff433c1f96857a17d7b Mon Sep 17 00:00:00 2001
From: Maxim Poliakovski <maximumspatium@googlemail.com>
Date: Fri, 19 Jul 2019 22:33:28 +0200
Subject: [PATCH] Simplify initialization of ppc_cur_instruction.

---
 debugger.cpp  | 1 -
 main.cpp      | 4 ----
 ppcmemory.cpp | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debugger.cpp b/debugger.cpp
index 3010aeb..9fd916c 100644
--- a/debugger.cpp
+++ b/debugger.cpp
@@ -54,7 +54,6 @@ void execute_single_instr()
         ppc_state.ppc_pc += 4;
         ppc_tbr_update();
     }
-    ppc_cur_instruction = 0;
 }
 
 void execute_until(uint32_t goal_addr)
diff --git a/main.cpp b/main.cpp
index cb0d302..727c51f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -358,7 +358,6 @@ void execute_interpreter(){
             ppc_state.ppc_pc += 4;
             ppc_tbr_update();
         }
-        ppc_cur_instruction = 0;
     }
 }
 
@@ -775,7 +774,6 @@ int main(int argc, char **argv)
                     ppc_state.ppc_pc += 4;
                     ppc_tbr_update();
                 }
-                ppc_cur_instruction = 0;
             }
         }
         else if ((checker=="stepp")|(checker=="/stepp")|(checker=="-stepp")){
@@ -804,7 +802,6 @@ int main(int argc, char **argv)
                         ppc_state.ppc_pc += 4;
                         ppc_tbr_update();
                     }
-                    ppc_cur_instruction = 0;
                 }
             }
         }
@@ -847,7 +844,6 @@ int main(int argc, char **argv)
                         ppc_state.ppc_pc += 4;
                         ppc_tbr_update();
                     }
-                    ppc_cur_instruction = 0;
                 }
             }
         } else if (checker == "debugger") {
diff --git a/ppcmemory.cpp b/ppcmemory.cpp
index 347a847..ec92a22 100644
--- a/ppcmemory.cpp
+++ b/ppcmemory.cpp
@@ -109,7 +109,7 @@ void msr_status_update(){
 }
 
 void ppc_set_cur_instruction(uint32_t mem_index){
-    ppc_cur_instruction += (grab_macmem_ptr[mem_index]) << 24;
+    ppc_cur_instruction  = (grab_macmem_ptr[mem_index]) << 24;
     ++mem_index;
     ppc_cur_instruction += (grab_macmem_ptr[mem_index]) << 16;
     ++mem_index;