fix: comment instruction branch formatting hack, fix riscv asm

Author: Samir-Rashid

src/instruction.rs

@@ -658,6 +658,10 @@ impl Into<String> for ArmInstruction {
             ArmInstruction::B { target } => {
                 format!("b {}", target)
             }
+            // TODO: Fix these branching instructions need to map to
+            // multiple instructions. Would be better separation of concerns
+            // if this was produced by the translation function instead of a
+            // hack in the string formatting.
             ArmInstruction::Ble { arg1, arg2, target } => {
                 format!("cmp {}, {}\nble {}", arg1, arg2, target)
             }

tests/fib/fib.riscv.s

@@ -1,12 +1,12 @@
-; int main() {
-;     int i;
-;     int a[10] = {};
-;     a[1] = 1;
-;     for (i = 2; i < 10; i++) {
-;         a[i] = a[i-1] + a[i-2];
-;     }
-;     return a[9];
-; }
+# int main() {
+#     int i;
+#     int a[10] = {};
+#     a[1] = 1;
+#     for (i = 2; i < 10; i++) {
+#         a[i] = a[i-1] + a[i-2];
+#     }
+#     return a[9];
+# }
 
 main:
 addi    sp,sp,-64

tests/prime/prime.riscv.s

@@ -1,24 +1,24 @@
-; int is_prime(int n) {
-;     if (n <= 1) {
-;         return 0;
-;     }
-;     for (int i = 2; i < n; i++) {
-;         int temp = n - i;
-;         while (temp >= i) {
-;             temp = temp - i;
-;         }
-;         if (temp == 0) {
-;             // i divides n
-;             return 0;
-;         }
-;     }
-;     return 1;
-; }
-; int main(void) {
-; 	return is_prime(4093);
-; }
+# int is_prime(int n) {
+#     if (n <= 1) {
+#         return 0;
+#     }
+#     for (int i = 2; i < n; i++) {
+#         int temp = n - i;
+#         while (temp >= i) {
+#             temp = temp - i;
+#         }
+#         if (temp == 0) {
+#             // i divides n
+#             return 0;
+#         }
+#     }
+#     return 1;
+# }
+# int main(void) {
+# 	return is_prime(4093);
+# }
 
-is_prime(int):
+is_prime: # is_prime(int):
 addi    sp,sp,-48
 sd      s0,40(sp)
 addi    s0,sp,48
@@ -82,11 +82,11 @@ sd      ra,8(sp)
 sd      s0,0(sp)
 addi    s0,sp,16
 li      a0,4093
-call    is_prime(int)
+call    is_prime
 mv      a5,a0
 nop
 mv      a0,a5
 ld      ra,8(sp)
 ld      s0,0(sp)
 addi    sp,sp,16
-jr      ra
+jr      ra