show chispet run_mode

Author: coder114514

emulator/lua-common.lua

@@ -57,6 +57,33 @@ local break_targets = {}
 
 local posttickfns = {}
 
+function run_mode(rm)
+    if rm == nil then
+        if emu:run_mode() == 0 then
+            print("RM_STOP(0)")
+        end
+        if emu:run_mode() == 1 then
+            print("RM_HALT(1)")
+        end
+        if emu:run_mode() == 2 then
+            print("RM_RUN(2)")
+        end
+        return
+    end
+    if rm == 'RM_STOP' then
+        rm = 0
+    end
+    if rm == 'RM_HALT' then
+        rm = 1
+    end
+    if rm == 'RM_RUN' then
+        rm = 2
+    end
+    if type(rm) == 'number' then
+        emu:run_mode(rm)
+    end
+end
+
 function addposttick(fn)
     if type(fn) ~= 'function' then
         print('Argument is not a function')

emulator/src/Chipset/Chipset.hpp

@@ -26,13 +26,6 @@ namespace casioemu {
             INT_COUNT = 128
         };
 
-        enum RunMode {
-            RM_STOP,
-            RM_HALT,
-            RM_RUN
-        };
-        RunMode run_mode;
-
         std::forward_list<Peripheral *> peripherals;
 
         /**
@@ -54,6 +47,13 @@ namespace casioemu {
         static const uint16_t interrupt_bitfield_mask = (1 << managed_interrupt_amount) - 1;
 
     public:
+        enum RunMode {
+            RM_STOP,
+            RM_HALT,
+            RM_RUN
+        };
+        RunMode run_mode;
+
         Chipset(Emulator &emulator);
         void Setup(); // must be called after emulator.hardware_id is initialized
         ~Chipset();

emulator/src/Emulator.cpp

@@ -200,6 +200,28 @@ namespace casioemu {
         });
         lua_setfield(lua_state, -2, "set_paused");
 
+        lua_pushcfunction(lua_state, [](lua_State *lua_state) {
+            Emulator *emu = *(Emulator **)lua_topointer(lua_state, 1);
+            switch (lua_gettop(lua_state)) {
+            case 1: {
+                int run_mode = emu->chipset.run_mode;
+                lua_pushinteger(lua_state, run_mode);
+                return 1;
+            }
+            case 2: {
+                // RM_STOP, RM_HALT, RM_RUN
+                int run_mode = lua_tointeger(lua_state, 2);
+                if (Chipset::RM_STOP <= run_mode && run_mode <= Chipset::RM_RUN) {
+                    emu->chipset.run_mode = (Chipset::RunMode)run_mode;
+                }
+                return 0;
+            }
+            default:
+                return 0;
+            }
+        });
+        lua_setfield(lua_state, -2, "run_mode");
+
         lua_model_ref = LUA_REFNIL;
         lua_pushcfunction(lua_state, [](lua_State *lua_state) {
             Emulator *emu = *(Emulator **)lua_topointer(lua_state, 1);

emulator/src/Gui/Watcher.cpp

@@ -13,6 +13,14 @@ void Watcher::DrawWindow() {
     casioemu::Chipset &chipset = emu->chipset;
     casioemu::CPU &cpu = chipset.cpu;
     std::string s = cpu.GetBacktrace();
+    std::string run_mode;
+    if (chipset.run_mode == casioemu::Chipset::RM_STOP) {
+        run_mode = "RM_STOP";
+    } else if (chipset.run_mode == casioemu::Chipset::RM_HALT) {
+        run_mode = "RM_HALT";
+    } else { // RM_RUN
+        run_mode = "RM_RUN";
+    }
     ImGui::InputTextMultiline("##as", (char *)s.c_str(), s.size(), ImVec2(ImGui::GetWindowWidth(), 0), ImGuiInputTextFlags_ReadOnly);
     ImGui::EndChild();
     ImGui::Text("Registers");
@@ -21,7 +29,7 @@ void Watcher::DrawWindow() {
     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::Text("SP %04X, EA %04X, ELVL %01X, PC %01X:%04X, %s", cpu.reg_sp & 0xffff, cpu.reg_ea & 0xffff, cpu.reg_psw & 3, cpu.reg_csr & 0xf, cpu.reg_pc & 0xffff, run_mode.c_str());
     ImGui::EndChild();
     ImGui::End();
 }