Update error messages

example-asm/digit.s

@@ -7,7 +7,7 @@ print:
     add x0, x0, num@PAGEOFF
 
     // Load value from the stack.
-    ldr x1, [sp], #64
+    ldr x1, [sp], #16
 
     // Convert number in x1 to its ASCII representation
     mov x2, #10              // Base 10
@@ -28,21 +28,32 @@ convert_loop:
     mov x1, x4               // Update x1 with quotient
 
     cmp x1, #0               // Check if quotient is zero
-    bne convert_loop         // If not zero, continue loop
+    beq zero_done           // If quotient is zero, terminate early
 
+    cmp x3, #0               // Check if index is zero
+    beq zero_done           // If index is zero, terminate early
+
+    b convert_loop         // If not zero, continue loop
+
+zero_done:
     // Recompute the address of num
     adrp x4, num@PAGE
     add x4, x4, num@PAGEOFF
 
-    mov x1, x4               // Load the correct address into x1
+    // Find the actual length of the converted number
+    mov x2, #20               // Length of num
 
+    sub x2, x2, x3          // Subtract remaining index from the total length
+    add x4, x4, x3           // Move the address forward by the remaining index
+
+    mov x1, x4               // Load the correct address into x1
 
     mov x0, #1               // 1 = StdOut
-    mov x2, #20               // Length of num
     mov x16, #4              // Unix write system call
     svc #0x80                 // Call kernel to output the string
 
 	// Print newline character
+    mov x0, #0
     adrp x0, newline@PAGE
     add x0, x0, newline@PAGEOFF
 
@@ -65,11 +76,11 @@ loop:
 _start: 
     // push 
     ldr x0, =34
-    str x0, [sp, #-64]!
+    str x0, [sp, #-16]!
 
     // push 
     ldr x0, =12345678912345678912
-    str x0, [sp, #-64]!
+    str x0, [sp, #-16]!
 
     bl print
 

examples/stack.rorth

@@ -22,3 +22,5 @@
 
 10 20 < print               // prints 1
 100 20 < print              // prints 0
+
+2 rot

src/main.rs

@@ -312,7 +312,7 @@ fn simulate_program(program: &[Op]) {
                 }
                 ip += 1;
             }
-            OpKind::If => {
+            OpKind::If | OpKind::Do => {
                 if let Some(a) = stack.pop() {
                     if a == 1 {
                         ip += 1;
@@ -326,17 +326,6 @@ fn simulate_program(program: &[Op]) {
             OpKind::While => {
                 ip += 1;
             }
-            OpKind::Do => {
-                if let Some(a) = stack.pop() {
-                    if a == 1 {
-                        ip += 1;
-                    } else if let Some(ind) = op.value {
-                        if let Ok(ind) = ind.try_into() {
-                            ip = ind;
-                        }
-                    }
-                }
-            }
             OpKind::End => {
                 if let Some(ind) = op.value {
                     if let Ok(ind) = ind.try_into() {
@@ -562,7 +551,7 @@ fn compile_program_darwin_arm64(program: &[Op], filename: &str) {
 fn main() {
     let args: Vec<String> = env::args().collect();
     if args.len() < 3 {
-        eprintln!("[ERROR] You have to pass in a mode and a file path.");
+        eprintln!("ERROR: You have to pass in a mode and a file path.");
         eprintln!("Usage: rorth [OPTIONS] <SUBCOMMAND> [ARGS]");
         eprintln!("  SUBCOMMAND:");
         eprintln!("    sim <file>            Simulate the program");
@@ -583,7 +572,7 @@ fn main() {
         } else if &args[2] == "-s" {
             silence_flag = true;
         } else {
-            eprintln!("[ERROR] Unknown option: {}", &args[2]);
+            eprintln!("ERROR: Unknown option: {}", &args[2]);
             eprintln!("Usage: rorth [OPTIONS] <SUBCOMMAND> [ARGS]");
             eprintln!("  SUBCOMMAND:");
             eprintln!("    sim <file>            Simulate the program");
@@ -598,7 +587,7 @@ fn main() {
 
     if args.len() > 4 {
         if &args[2] != "-r" && &args[2] != "-s" {
-            eprintln!("[ERROR] Unknown option: {}", &args[2]);
+            eprintln!("ERROR: Unknown option: {}", &args[2]);
             eprintln!("Usage: rorth [OPTIONS] <SUBCOMMAND> [ARGS]");
             eprintln!("  SUBCOMMAND:");
             eprintln!("    sim <file>            Simulate the program");
@@ -610,7 +599,7 @@ fn main() {
         }
 
         if &args[3] != "-r" && &args[3] != "-s" {
-            eprintln!("[ERROR] Unknown option: {}", &args[3]);
+            eprintln!("ERROR: Unknown option: {}", &args[3]);
             eprintln!("Usage: rorth [OPTIONS] <SUBCOMMAND> [ARGS]");
             eprintln!("  SUBCOMMAND:");
             eprintln!("    sim <file>            Simulate the program");
@@ -691,19 +680,19 @@ fn main() {
                                 }
 
                                 if let Some(err) = res.err() {
-                                    eprintln!("[ERROR] Failed to execute compiled program: {err}");
+                                    eprintln!("ERROR: Failed to execute compiled program: {err}");
                                 }
                             }
                         }
                     }
                 }
             }
         } else {
-            eprintln!("[ERROR] Unknown mode '{mode}'");
+            eprintln!("ERROR: Unknown mode '{mode}'");
             exit(1);
         }
     } else {
-        eprintln!("[ERROR] Cannot read file: {filename}");
+        eprintln!("ERROR: Cannot read file: {filename}");
         exit(1);
     }
 }