jump labels

Author: G0-G4

examples/mod3.txt

@@ -1,12 +1,30 @@
+# mod = x mod 3
+
 Z('mod')
 Z('k')
-J('k', 'a', 12)
-S('k')
-J('k', 'a', 11)
-S('k')
-J('k', 'a', 10)
-S('k')
-J(1,1,3)
+@loop
+    J('k', 'a', '@m1')
+    S('k')
+    J('k', 'a', '@m2')
+    S('k')
+    J('k', 'a', '@end')
+    S('k')
+    J(1,1,'@loop')
+@m2
 S('mod')
+@m1
 S('mod')
-Z('end')
+@end
+
+# explanation
+#while 1:
+#    if k == a:
+#        break
+#    k += 1
+#    if k == a:
+#        break
+#    k += 1
+#    if k == a:
+#        break
+#    k += 1
+#    div += 1

examples/mult.txt

@@ -1,11 +1,15 @@
+# x = x * a
+
 Z('i1')
 T('x', 'x0')
 Z('x')
-J('i1', 'a', 11)
+@loop
+J('i1', 'a', '@end')
 Z('i2')
 S('i1')
+    @innerloop
     S('x')
     S('i2')
-    J('i2', 'x0', 4)
-    J('x', 'x', 7)
-Z('end')
+    J('i2', 'x0', '@loop')
+    J('x',   'x', '@innerloop')
+@end

examples/xdiva.txt

@@ -1,9 +1,15 @@
-Z('i')
-J('i', 'a', 7)
-J('k', 'x', 9)
-S('k')
-S('i')
-J(1, 1, 2)
-S('div')
-J(1, 1, 1)
-Z('end')
+# div = x // a
+
+
+@loop
+Z('i') # i = 0
+@innerloop
+J('i', 'a', '@div') # if i == a goto div
+J('k', 'x', '@end') # if k == x goto end
+S('k') # k += 1
+S('i') # i += 1
+J(1, 1, '@innerloop') # goto innerloop
+@div
+S('div') # div += 1
+J(1, 1, '@loop') # goto loop
+@end

examples/xminusa.txt

@@ -1,5 +1,8 @@
-J('a', 'x', 5)
-    S('a')
-    S('sub')
-J(1, 1, 1)
-Z('end')
+# sub = x - a
+
+@start
+J('a', 'x', '@end') # if a == x goto end
+    S('a') # a += 1
+    S('sub') # sub += 1
+J(1, 1, '@start') # goto start
+@end

rmach.py

@@ -4,6 +4,7 @@ class machine:
 
     def __init__(self):
         self.regs = defaultdict(int)
+        self.lbls = defaultdict(int)
         self.cmds = [0]
         self.ptr = 1
 
@@ -18,7 +19,17 @@ def T(self, m, n):
 
     def J(self, m, n, q):
         if self.regs[m] == self.regs[n]:
-            self.ptr = q - 1
+            if type(q) == str:
+                self.ptr = self.lbls[q] - 1
+            else:
+                self.ptr = q - 1
+
+    def CheckLabel(self, l):
+        lbl = l.strip()
+        return len(lbl) and lbl[0] == '@' and lbl[1:]
+
+    def SaveLabel(self, lbl, ptr):
+        self.lbls['@' + lbl.strip()] = ptr
 
     def DeleteComments(self, l):
         hsh = l.find('#')
@@ -28,9 +39,13 @@ def DeleteComments(self, l):
 
     def LoadProg(self, file):
         with open(file, 'r') as f:
+            ptr = 1
             for l in f:
-                if s := self.DeleteComments(l):
+                if lbl := self.CheckLabel(l):
+                    self.SaveLabel(lbl, ptr)
+                elif s := self.DeleteComments(l):
                     self.cmds.append(f'self.{s}')
+                    ptr += 1 
 
     def SetRegs(self, reg):
         self.regs.update(reg)
@@ -50,6 +65,7 @@ def __str__(self):
 
 if __name__ == '__main__':
     m = machine()
-    m.LoadProg('examples/mult.txt')
-    m.SetRegs({'x':3, 'a': 5})
-    m.Run()
+    m.LoadProg('examples/mod3.txt')
+    m.SetRegs({'a': 12})
+    m.Run()
+    print(m.lbls)