From a6335fe704a510261642c67015c865fd7051d38d Mon Sep 17 00:00:00 2001
From: Maxim Poliakovski <maximumspatium@googlemail.com>
Date: Mon, 29 Jul 2019 20:51:10 +0200
Subject: [PATCH] More Map->Array replacements and code simplifications.

---
 ppcemumain.h   |  7 -------
 ppcopcodes.cpp | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/ppcemumain.h b/ppcemumain.h
index 71e36d2..a08a1c1 100644
--- a/ppcemumain.h
+++ b/ppcemumain.h
@@ -624,13 +624,6 @@ extern void ppc_main_opcode();
      table, partially due to instructions that use either 6 or 11 bits
      for the instruction.
      **/
-static std::map<uint8_t, PPCOpcode> SubOpcode16Grabber=
-    {{0, &ppc_bc}, {1, &ppc_bcl}, {2, &ppc_bca}, {3, &ppc_bcla}
-    };
-
-static std::map<uint8_t, PPCOpcode> SubOpcode18Grabber=
-    {{0, &ppc_b}, {1, &ppc_bl}, {2, &ppc_ba}, {3, &ppc_bla}
-    };
 
 static std::map<uint16_t, PPCOpcode> SubOpcode19Grabber=
     {{32, &ppc_bclr},    {33, &ppc_bclrl},  {66, &ppc_crnor},   {100, &ppc_rfi},
diff --git a/ppcopcodes.cpp b/ppcopcodes.cpp
index 1f64841..2f232f8 100644
--- a/ppcopcodes.cpp
+++ b/ppcopcodes.cpp
@@ -77,6 +77,15 @@ static PPCOpcode OpcodeGrabber[] = {
     ppc_psq_st,    ppc_psq_stu,   ppc_illegalop, ppc_opcode63
 };
 
+/** Lookup tables for branch instructions. */
+static PPCOpcode SubOpcode16Grabber[] = {
+    ppc_bc, ppc_bcl, ppc_bca, ppc_bcla
+};
+
+static PPCOpcode SubOpcode18Grabber[] = {
+    ppc_b, ppc_bl, ppc_ba, ppc_bla
+};
+
 /**
 Extract the registers desired and the values of the registers
 This also takes the MSR into account, mainly to determine
@@ -243,23 +252,11 @@ void ppc_opcode4(){
 }
 
 void ppc_opcode16(){
-    uint8_t subop_grab = ppc_cur_instruction & 3;
-
-    #ifdef EXHAUSTIVE_DEBUG
-    uint32_t regrab = (uint32_t)subop_grab;
-    printf("Executing Opcode 16 table subopcode entry %d \n", regrab);
-    SubOpcode16Grabber[subop_grab]();
-    #else
-    SubOpcode16Grabber[subop_grab]();
-    #endif // EXHAUSTIVE_DEBUG
+    SubOpcode16Grabber[ppc_cur_instruction & 3]();
 }
 
 void ppc_opcode18(){
-    uint8_t subop_grab = ppc_cur_instruction & 3;
-    //printf("Reading from Opcode 18 table \n");
-    //uint32_t regrab = (uint32_t)subop_grab;
-    //printf("Executing subopcode entry %d \n", regrab);
-    SubOpcode18Grabber[subop_grab]();
+    SubOpcode18Grabber[ppc_cur_instruction & 3]();
 }
 
 void ppc_opcode19(){