M examples/on-error.xyw → examples/on-error.xyw

@@ -9,12 +9,14 @@ end JMPw
 
 ; on error handler
 .label on_error
-    system.error $1 EQU on_error.print JCNw
-    RTS
-    .label on_error.print
-        error print JSRw
-        $2 system.error STB
+    system.error $1 EQU on_error.div-by-zero.print JCNw
+    unknown-error print JSRw
+    $0 system.error STB
     RTS
+    .label on_error.div-by-zero.print
+        div-by-zero-error print JSRw
+        $0 system.error STB
+        RTS
 
 ; printing subroutine
 ; a16 --
@@ -26,6 +28,8 @@ INCxw LDBxw print.loop JCNw
     CLRxw
     RTS
 
-.label error
+.label div-by-zero-error
 .string "Error: Division by zero.\n"
+.label unknown-error
+.string "Error: Unknown error.\n"
 .label end

M xywrun.c → xywrun.c

@@ -305,7 +305,6 @@ }
 
     while ((xyw_memory[SYSTEM_STATE] & SYSTEM_STATE_RUNNING) && *pc < SYSTEM_MEMORY_START)
     {
-        // printf("ERROR: %d - State: %04X\n", xyw_memory[SYSTEM_ERROR], xyw_memory[SYSTEM_STATE]);
         if (xyw_memory[SYSTEM_ERROR] == XYW_ERROR_NONE)
         {
             // Clear error state if no error