added Watcher

Author: coder114514

emulator/src/Chipset/CPU.cpp

@@ -10,6 +10,10 @@
 #include <sstream>
 
 namespace casioemu {
+    size_t CPU::GetCurrentRealPC() {
+        return (reg_csr << 16) | reg_pc;
+    }
+
     CPU::OpcodeSource CPU::opcode_sources[] = {
         //       function                hints            opcode    operand {size, mask, shift} x2
         // * Arithmetic Instructions

emulator/src/Chipset/CPU.hpp

@@ -80,6 +80,7 @@ namespace casioemu {
         CPU(Emulator &emulator);
         ~CPU();
         void SetupInternals();
+        size_t GetCurrentRealPC();
 
         /**
          * See 1.2.2.1 in the nX-U8 manual.

emulator/src/Gui/CodeViewer.cpp

@@ -128,7 +128,10 @@ void CodeViewer::DrawContent() {
             ImGui::SameLine();
             ImGui::TextColored(ImVec4(1.0, 1.0, 0.0, 1.0), "%05zX", get_real_pc(e));
             ImGui::SameLine();
-            ImGui::Text("%s", e.srcbuf);
+            if (m_emu->chipset.cpu.GetCurrentRealPC() == get_real_pc(e))
+                ImGui::TextColored(ImVec4(0.0, 1.0, 0.0, 1.0), "%s", e.srcbuf);
+            else
+                ImGui::Text("%s", e.srcbuf);
         }
     }
     if (need_roll) {
@@ -138,14 +141,6 @@ void CodeViewer::DrawContent() {
     }
 }
 
-void CodeViewer::DrawMonitor() {
-    if (m_emu != nullptr) {
-        casioemu::Chipset &chipset = m_emu->chipset;
-        std::string s = chipset.cpu.GetBacktrace();
-        ImGui::InputTextMultiline("##as", (char *)s.c_str(), s.size(), ImVec2(ImGui::GetWindowWidth(), 0), ImGuiInputTextFlags_ReadOnly);
-    }
-}
-
 static bool step_debug = false, trace_debug = false;
 
 void CodeViewer::DrawWindow() {
@@ -161,10 +156,9 @@ void CodeViewer::DrawWindow() {
         return;
     }
     ImGui::Begin("Disassembly", 0);
-    ImGui::BeginChild("##scrolling", ImVec2(0, -ImGui::GetWindowHeight() / 2));
+    ImGui::BeginChild("##scrolling", ImVec2(0, -ImGui::GetTextLineHeight() * 1.8f));
     DrawContent();
     ImGui::EndChild();
-    ImGui::Separator();
     ImGui::Text("Go to Addr:");
     ImGui::SameLine();
     ImGui::SetNextItemWidth(ImGui::CalcTextSize("000000").x);
@@ -187,7 +181,6 @@ void CodeViewer::DrawWindow() {
             triggered_bp_line = -1;
         }
     }
-    DrawMonitor();
     ImGui::End();
     debug_flags = DEBUG_BREAKPOINT | (step_debug ? DEBUG_STEP : 0) | (trace_debug ? DEBUG_RET_TRACE : 0);
 }

emulator/src/Gui/Watcher.cpp

@@ -0,0 +1,27 @@
+#include "Watcher.hpp"
+#include "../Chipset/CPU.hpp"
+#include "../Chipset/Chipset.hpp"
+#include "../Peripheral/BatteryBackedRAM.hpp"
+#include "imgui/imgui.h"
+#include <cstdint>
+#include <cstdio>
+
+void Watcher::DrawWindow() {
+    ImGui::Begin("Watcher");
+    ImGui::Text("Stack Trace");
+    ImGui::BeginChild("##stack_trace", ImVec2(0, 8 * ImGui::GetTextLineHeight()));
+    casioemu::Chipset &chipset = emu->chipset;
+    casioemu::CPU &cpu = chipset.cpu;
+    std::string s = cpu.GetBacktrace();
+    ImGui::InputTextMultiline("##as", (char *)s.c_str(), s.size(), ImVec2(ImGui::GetWindowWidth(), 0), ImGuiInputTextFlags_ReadOnly);
+    ImGui::EndChild();
+    ImGui::Text("Registers");
+    ImGui::BeginChild("##registers");
+    ImGui::Text("r0  %02X | r1  %02X | r2  %02X | r3  %02X | PSW   %02X | LR   %01X:%04X", cpu.reg_r[ 0] & 0xff, cpu.reg_r[ 1] & 0xff, cpu.reg_r[ 2] & 0xff, cpu.reg_r[ 3] & 0xff, cpu.reg_psw     & 0xff, cpu.reg_lcsr    & 0xf, cpu.reg_lr     & 0xffff);
+    ImGui::Text("r4  %02X | r5  %02X | r6  %02X | r7  %02X | EPSW1 %02X | ELR1 %01X:%04X", cpu.reg_r[ 4] & 0xff, cpu.reg_r[ 5] & 0xff, cpu.reg_r[ 6] & 0xff, cpu.reg_r[ 7] & 0xff, cpu.reg_epsw[1] & 0xff, cpu.reg_ecsr[1] & 0xf, cpu.reg_elr[1] & 0xffff);
+    ImGui::Text("r8  %02X | r9  %02X | r10 %02X | r11 %02X | EPSW2 %02X | ELR2 %01X:%04X", cpu.reg_r[ 8] & 0xff, cpu.reg_r[ 9] & 0xff, cpu.reg_r[10] & 0xff, cpu.reg_r[11] & 0xff, cpu.reg_epsw[2] & 0xff, cpu.reg_ecsr[2] & 0xf, cpu.reg_elr[2] & 0xffff);
+    ImGui::Text("r12 %02X | r13 %02X | r14 %02X | r15 %02X | EPSW3 %02X | ELR3 %01X:%04X", cpu.reg_r[12] & 0xff, cpu.reg_r[13] & 0xff, cpu.reg_r[14] & 0xff, cpu.reg_r[15] & 0xff, cpu.reg_epsw[3] & 0xff, cpu.reg_ecsr[3] & 0xf, cpu.reg_elr[3] & 0xffff);
+    ImGui::Text("SP %04X, EA %04X, ELVL %01X, PC %01X:%04X", cpu.reg_sp & 0xffff, cpu.reg_ea & 0xffff, cpu.reg_psw & 3, cpu.reg_csr & 0xf, cpu.reg_pc & 0xffff);
+    ImGui::EndChild();
+    ImGui::End();
+}

emulator/src/Gui/Watcher.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "../Emulator.hpp"
+
+class Watcher {
+private:
+    casioemu::Emulator* emu;
+public:
+    Watcher(casioemu::Emulator *_emu): emu(_emu) {}
+    void DrawWindow();
+};

emulator/src/Gui/hex.hpp

@@ -73,7 +73,6 @@ struct MemoryEditor {
     };
 
     // Settings
-    bool Open;                                         // = true   // set to false when DrawWindow() was closed. ignore if not using DrawWindow().
     bool ReadOnly;                                     // = false  // disable any editing.
     int Cols;                                          // = 16     // number of columns to display.
     bool OptShowOptions;                               // = true   // display options button/context menu. when disabled, options will be locked unless you provide your own UI for them.
@@ -104,7 +103,6 @@ struct MemoryEditor {
 
     MemoryEditor() {
         // Settings
-        Open = true;
         ReadOnly = false;
         Cols = 16;
         OptShowOptions = true;
@@ -183,8 +181,7 @@ struct MemoryEditor {
         ImGui::SetNextWindowSize(ImVec2(s.WindowWidth, s.WindowWidth * 0.60f), ImGuiCond_FirstUseEver);
         ImGui::SetNextWindowSizeConstraints(ImVec2(0.0f, 0.0f), ImVec2(s.WindowWidth, FLT_MAX));
 
-        Open = true;
-        if (ImGui::Begin(title, &Open, ImGuiWindowFlags_NoScrollbar)) {
+        if (ImGui::Begin(title, nullptr, ImGuiWindowFlags_NoScrollbar)) {
             if (ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows) && ImGui::IsMouseReleased(ImGuiMouseButton_Right))
                 ImGui::OpenPopup("context");
             DrawContents(mem_data, mem_size, base_display_addr);

emulator/src/Gui/ui.cpp

@@ -1,5 +1,6 @@
 #include "../Data/HardwareId.hpp"
 #include "CodeViewer.hpp"
+#include "Watcher.hpp"
 #include "SDL_timer.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_impl_sdl2.h"
@@ -13,6 +14,8 @@
 
 char *n_ram_buffer = nullptr;
 CodeViewer *code_viewer = nullptr;
+Watcher *watcher = nullptr;
+
 static SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
 static SDL_Window *window;
 static SDL_Renderer *renderer;
@@ -35,6 +38,7 @@ void debugger_gui_loop() {
         mem_edit.DrawWindow("RAM Editor", n_ram_buffer, size, base);
     }
     code_viewer->DrawWindow();
+    watcher->DrawWindow();
 
     // Rendering
     ImGui::Render();
@@ -68,6 +72,7 @@ int init_debugger_window() {
     ImGui_ImplSDLRenderer2_Init(renderer);
 
     code_viewer = new CodeViewer(m_emu->GetModelFilePath("_disas.txt"));
+    watcher = new Watcher(m_emu);
 
     return 0;
 }

emulator/src/Gui/ui.hpp

@@ -1,9 +1,11 @@
 #pragma once
 #include "../Emulator.hpp"
 #include "CodeViewer.hpp"
+#include "Watcher.hpp"
 
 int init_debugger_window();
 void debugger_gui_loop();
 extern char *n_ram_buffer;
 extern casioemu::Emulator *m_emu;
 extern CodeViewer *code_viewer;
+extern Watcher *watcher;