From a1fe631844ae6959afd0f0b90eb6a19c34aaec1d Mon Sep 17 00:00:00 2001
From: Anton Lydike <me@antonlydike.de>
Date: Thu, 22 Apr 2021 13:00:37 +0200
Subject: [PATCH] improved debugging output on early exit and reformatted cpu
 file

---
 riscemu/CPU.py   | 10 ++++------
 riscemu/debug.py |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/riscemu/CPU.py b/riscemu/CPU.py
index fac3519..4223842 100644
--- a/riscemu/CPU.py
+++ b/riscemu/CPU.py
@@ -26,7 +26,7 @@ class CPU:
         self.exit = False
         self.exit_code = 0
         self.conf = conf
-        self.active_debug = False # if a debugging session is currently runnign
+        self.active_debug = False  # if a debugging session is currently runnign
 
         # setup MMU, registers and syscall handlers
         self.mmu = MMU(conf)
@@ -90,7 +90,6 @@ class CPU:
                 self.pc -= 1
                 print(ex.message())
 
-
     def __run(self, verbose=False):
         if self.pc <= 0:
             return False
@@ -105,7 +104,7 @@ class CPU:
                 self.__run_instruction(ins)
         except RiscemuBaseException as ex:
             if not isinstance(ex, LaunchDebuggerException):
-                print(FMT_ERROR + "[CPU] excpetion caught at 0x{:08X}: {}:".format(self.pc-1, ins) + FMT_NONE)
+                print(FMT_ERROR + "[CPU] excpetion caught at 0x{:08X}: {}:".format(self.pc - 1, ins) + FMT_NONE)
                 print(ex.message())
                 self.pc -= 1
 
@@ -122,8 +121,7 @@ class CPU:
             sys.exit(self.exit_code)
         else:
             print()
-            print(FMT_CPU + "Program stopped without exiting!" + FMT_NONE)
-
+            print(FMT_CPU + "Program stopped without exiting - perhaps you stopped the debugger?" + FMT_NONE)
 
     def __run_instruction(self, ins: 'LoadedInstruction'):
         if ins.name in self.instructions:
@@ -140,4 +138,4 @@ class CPU:
             self.pc,
             self.cycle,
             " ".join(s.name for s in self.instruction_sets)
-        )
\ No newline at end of file
+        )
diff --git a/riscemu/debug.py b/riscemu/debug.py
index 1681ef9..5cae80c 100644
--- a/riscemu/debug.py
+++ b/riscemu/debug.py
@@ -33,7 +33,7 @@ def launch_debug_session(cpu: 'CPU', mmu: 'MMU', reg: 'Registers', prompt=""):
         print("Current instruction at 0x{:08X}:".format(cpu.pc))
         return mmu.read_ins(cpu.pc)
 
-    def cont(verbose=True):
+    def cont(verbose=False):
         cpu.continue_from_debugger(verbose)
 
     def step():