Implement labels

Author: arda-guler

programs/clear_compiled.bat programs/_clear_compiled.bat

@@ -6,9 +6,11 @@
 
 MR1 200
 MR1 NULL
+
+loop:
 MR2 1
 ADD
 MR2 200
-JL 5
+JL loop
 WRITE
 HALT

programs/conditionals.ao

@@ -0,0 +1,81 @@
+; = = = = = = = = = = = = = = =
+; DECELERATION_INTEGRATOR.AO
+; = = = = = = = = = = = = = = =
+; Author: arda-guler
+; = = = = = = = = = = = = = = =
+; A symplectic Euler integrator to compute the final position 
+; of a decelerating object with given initlai position, speed 
+; and a constant rate of deceleration. 
+; Assumes constant time step of 1. (So I don't need to keep
+; calling the multiplication function every loop.)
+; = = = = = = = = = = = = = = =
+
+JMP start
+
+; - - - - - - - - - -
+; VARIABLES
+; - - - - - - - - - -
+; address 2 - position
+3000
+
+load_vel_into_r2:
+MR2
+
+; this is actually velocity + 100
+; since there are no negative numbers
+; we will use 100 as our zero point
+; address 4 - velocity
+150
+JMP return_update_pos
+
+; - - - - - - - - - -
+; PROGRAM
+; - - - - - - - - - -
+
+start:
+; - - - update velocity
+; read velocity from memory
+MR2 4
+MEMR
+
+; now, load decel rate into R2
+; which is 10
+MR2 10
+
+; update the value of velocity
+SUB
+
+; save it back onto memory
+MR2 4
+MEMW
+
+; check if we are still moving in positive direction
+MR2 100
+JL end_program
+
+; - - - update position
+; load position into R1
+MR2 2
+MEMR
+
+; load velocity onto R2
+JMP load_vel_into_r2
+
+return_update_pos:
+; update the value of position
+ADD
+MR2 100
+SUB
+
+; save it back onto memory
+MR2 2
+MEMW
+JMP start
+
+end_program:
+; write the end position onto display register R5
+MR2 2
+MEMR
+WRITE
+
+HALT

programs/deceleration_integrator.ao

@@ -5,15 +5,15 @@
 ; Also displays quotient on display register (register 5)
 
 ; Initialize the counter variable at address 2000
-MR2 2000
 MR1 1
+MR2 2000
 MEMW
 
 ; load the dividend and divisor
 MR1 100
 MR2 15
 
-; - - - LOOP - - -
+loop:
 ; subtract divisor
 SUB
 
@@ -33,11 +33,10 @@ RECALL
 
 ; if dividend is still larger than divisor, loop
 MR2 15
-JG 8
+JG loop
 
-; - - - END LOOP - - -
 ; if the int is divisible exactly, we need to increment the counter one more before halting (26)
-JL 42
+JL save_result
 WRITE
 MR2 2000
 MEMR
@@ -49,6 +48,7 @@ RECALL
 MR2 15
 SUB
 
+save_result:
 ; save remainder at address 2001
 MR2 2001
 MEMW

programs/division.ao

@@ -7,6 +7,8 @@
 
 MR1 NULL
 MR2 1
+
+loop:
 ADD
 WRITE
-JMP 5
+JMP loop

programs/infinite_loop.ao

@@ -12,7 +12,7 @@ MR1 NULL
 MR2 2000
 MEMW
 
-; - - - LOOP - - -
+loop:
 ; read value from memory
 MR2 2000
 MEMR
@@ -28,7 +28,7 @@ MR2 1
 SUB
 WRITE
 MR2 1
-JG 9
+JG loop
 
 ; write result to register 5
 MR2 2000

programs/multiplication.ao

@@ -11,10 +11,22 @@ def compile_program(input_file, output_file="output.cis"):
             inlines_sanitized.extend(split_elements)
         else:
             inlines_sanitized.append(element)
+
+    labels = {}
+    statement_pos = 1
+    for line in inlines_sanitized:
+        if line.endswith(":"):
+            labels[line[0:-1]] = str(statement_pos)
+        else:
+            statement_pos += 1
+
+    print(labels)
 
     outlines = []
     for line in inlines_sanitized:
-        if line.lower() == "add":
+        if line.lower() in labels:
+            outlines.append(labels[line.lower()])
+        elif line.lower() == "add":
             outlines.append(str(int(cpu_add)))
         elif line.lower() == "sub":
             outlines.append(str(int(cpu_sub)))
@@ -42,6 +54,8 @@ def compile_program(input_file, output_file="output.cis"):
             outlines.append(str(int(cpu_halt)))
         elif line.lower() == "null":
             outlines.append("0")
+        elif line.endswith(":"):
+            pass
         else:
             outlines.append(line)
 

src/compiler.py

@@ -173,7 +173,7 @@ def main():
                 canvas.create_text(20, 30 + i * 30, text="Register" + str(i+1) + ": " + str(cpu.registers[i].get_value()) + " (" + str(int(cpu.registers[i].get_value())) + ")", anchor="w", font=('Arial', 12))
 
             window.update()
-            time.sleep(0.1)
+            time.sleep(0.2)
 
             if int(cpu.registers[3].get_value()) < mem.size and cpu.run:
                 canvas.delete("all") 
@@ -182,4 +182,7 @@ def main():
     print(cpu)
     print(mem)
 
+    if slow:
+        input("Press Enter to exit.")
+
 main()

src/main.py

@@ -40,7 +40,7 @@ def write_to_memory(self, address, value):
             self.data[address] = value
             return
 
-        if address > len(self.data) - 1:
+        else:
             padding = address - len(self.data) + 1
             for i in range(padding):
                 self.data.append(NULL)