From 439e5795eac4b7d33622befdf91c278f82cb796e Mon Sep 17 00:00:00 2001
From: Maxim Poliakovski <maximumspatium@googlemail.com>
Date: Tue, 4 Feb 2020 14:21:59 +0100
Subject: [PATCH] Revert "Write to GPRs in debugger + VS 2019 compile fix"

This reverts commit 90e229d9b421441a9db3482f5f71a979bede0741.
---
 debugger/debugger.cpp | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/debugger/debugger.cpp b/debugger/debugger.cpp
index 4e87ba8..bb05ae5 100644
--- a/debugger/debugger.cpp
+++ b/debugger/debugger.cpp
@@ -14,20 +14,9 @@
 #include "ppcemu.h"
 #include "../cpu/ppc/ppcmmu.h"
 
+
 using namespace std;
 
-uint32_t gpr_num;
-
-const string array_gprs[32] =
-{"gpr0",  "gpr1",  "gpr2",  "gpr3",
- "gpr4",  "gpr5",  "gpr6",  "gpr7",
- "gpr8",  "gpr9",  "gpr10", "gpr11",
- "gpr12", "gpr13", "gpr14", "gpr15",
- "gpr16", "gpr17", "gpr18", "gpr19",
- "gpr20", "gpr21", "gpr22", "gpr23",
- "gpr24", "gpr25", "gpr26", "gpr27",
- "gpr28", "gpr29", "gpr30", "gpr31" };
-
 void show_help()
 {
     cout << "Debugger commands:" << endl;
@@ -56,22 +45,10 @@ void dump_regs()
     cout << "MSR: " << hex << ppc_state.ppc_msr           << endl;
 }
 
-bool find_gpr(string entry) {
-    for (int gpr_index = 0; gpr_index < 32; gpr_index++) {
-        string str_grab = array_gprs[gpr_index];
-        if (str_grab.compare(entry) == 0) {
-            gpr_num = gpr_index;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 void enter_debugger()
 {
-    string inp, cmd, addr_str, expr_str, reg_expr, last_cmd, reg_value_str;
-    uint32_t addr, reg_value;
+    string inp, cmd, addr_str, expr_str, reg_expr, last_cmd;
+    uint32_t addr;
     std::stringstream ss;
 
     cout << "Welcome to the PowerPC debugger." << endl;
@@ -112,22 +89,16 @@ void enter_debugger()
             reg_expr = expr_str.substr(0, expr_str.find("="));
             if (reg_expr == "pc") {
                 addr_str = expr_str.substr(expr_str.find("=") + 1);
-                addr = stoul(addr_str, NULL, 0);
+                addr = stol(addr_str, NULL, 0);
                 ppc_state.ppc_pc = addr;
-            }
-            else if (find_gpr(reg_expr)){
-                reg_value_str = expr_str.substr(expr_str.find("=") + 1);
-                reg_value = stoul(addr_str, NULL, 0);
-                ppc_state.ppc_gpr[gpr_num] = reg_value;
-            }
-            else {
+            } else {
                 cout << "Unknown register " << reg_expr << endl;
             }
         } else if (cmd == "step") {
             ppc_exec_single();
         } else if (cmd == "until") {
             ss >> addr_str;
-            addr = stoul(addr_str, NULL, 16);
+            addr = stol(addr_str, NULL, 16);
             ppc_exec_until(addr);
         } else if (cmd == "disas") {
             cout << "Disassembling not implemented yet. Sorry!" << endl;