ui

Author: coder114514

emulator/src/Chipset/CPU.cpp

@@ -386,19 +386,20 @@ namespace casioemu {
              */
             impl_flags_out = PSW_Z;
             (this->*(handler->handler_function))();
+            reg_psw &= ~impl_flags_changed;
+            reg_psw |= impl_flags_out & impl_flags_changed;
+
+            if (handler->hint & H_WB && impl_operands[0].register_size)
+                for (size_t bx = 0; bx != impl_operands[0].register_size; ++bx)
+                    reg_r[impl_operands[0].register_index + bx] = (uint8_t)(impl_operands[0].value >> (bx * 8));
+
             if (code_viewer) {
                 if ((code_viewer->debug_flags & DEBUG_BREAKPOINT) && code_viewer->TryTrigBP(reg_csr, reg_pc)) {
                     emulator.SetPaused(true);
                 } else if ((code_viewer->debug_flags & DEBUG_STEP) && code_viewer->TryTrigBP(reg_csr, reg_pc, false)) {
                     emulator.SetPaused(true);
                 }
             }
-            reg_psw &= ~impl_flags_changed;
-            reg_psw |= impl_flags_out & impl_flags_changed;
-
-            if (handler->hint & H_WB && impl_operands[0].register_size)
-                for (size_t bx = 0; bx != impl_operands[0].register_size; ++bx)
-                    reg_r[impl_operands[0].register_index + bx] = (uint8_t)(impl_operands[0].value >> (bx * 8));
 
             if (!(handler->hint & H_DS))
                 break;
@@ -441,14 +442,11 @@ namespace casioemu {
         output << std::hex << std::setfill('0') << std::uppercase;
         for (StackFrame frame : stack) {
             output << "  function "
-                   << frame.new_csr << ":" << frame.new_pc
-                   << " returns to " << std::setw(6);
+                   << frame.new_csr << ":" << frame.new_pc << " returns to ";
             if (frame.lr_pushed) {
                 uint16_t saved_lr, saved_lcsr = 0;
                 MMU &mmu = emulator.chipset.mmu;
-                saved_lr = ((uint16_t)mmu.ReadData(frame.lr_push_address + 1))
-                               << 8 |
-                           mmu.ReadData(frame.lr_push_address);
+                saved_lr = ((uint16_t)mmu.ReadData(frame.lr_push_address + 1)) << 8 | mmu.ReadData(frame.lr_push_address);
                 if (memory_model == MM_LARGE)
                     saved_lcsr = mmu.ReadData(frame.lr_push_address + 2);
                 output << saved_lcsr << ":" << saved_lr;

emulator/src/Gui/CodeViewer.cpp

@@ -79,8 +79,8 @@ CodeElem CodeViewer::LookUp(uint8_t seg, uint16_t offset, int *idx) {
 }
 
 /**
- * called after an instruction is done (in CPU.cpp) or
- * a POP PC is executed (in CPUPushPop.cpp)
+ * called before the instruction is executed (for breakpoints/step, in CPU.cpp) or
+ * right after a POP PC is executed (for RET TRACE, in CPUPushPop.cpp)
  */
 bool CodeViewer::TryTrigBP(uint8_t seg, uint16_t offset, bool bp_mode) {
     for (auto it = break_points.begin(); it != break_points.end(); it++) {
@@ -136,7 +136,7 @@ void CodeViewer::DrawContent() {
                 ImGui::Text("%s", e.srcbuf);
                 if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(0)) {
                     cur_row = line_i;
-                    need_roll = true;
+                    selected_addr = codes[cur_row].segment * 0x10000 + codes[cur_row].offset;
                 }
             } else { // selected
                 ImGui::InputText("##data", e.srcbuf, strlen(e.srcbuf), ImGuiInputTextFlags_ReadOnly | ImGuiInputTextFlags_AlwaysOverwrite);
@@ -152,18 +152,15 @@ void CodeViewer::DrawContent() {
                             cur_row = 0;
                         need_roll = true;
                     }
-                    if (!ImGui::IsItemActive()) {
-                        selected_addr = -1;
-                    }
                 }
             }
         }
     }
     if (need_roll) {
         float v = (float)cur_row / max_row * ImGui::GetScrollMaxY();
         ImGui::SetScrollY(v);
-        need_roll = false;
         selected_addr = codes[cur_row].segment * 0x10000 + codes[cur_row].offset;
+        need_roll = false;
     }
 }
 
@@ -228,9 +225,7 @@ void CodeViewer::DrawWindow() {
         }
     }
 
-    ImGui::BeginChild("##scrolling");
     DrawMonitor();
-    ImGui::EndChild();
     ImGui::End();
     debug_flags = DEBUG_BREAKPOINT | (step_debug ? DEBUG_STEP : 0) | (trace_debug ? DEBUG_RET_TRACE : 0);
 }