X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=Scripts%2Fcormackscript;h=9f7cc728e616c85f7b3aed948e5c413483e8d139;hp=f6bdf336bd3b7620a1e6e9f6c5a8577e13996b65;hb=bb16cdd8187a06a71fb5b3b3afe8c3c9ad3b81a3;hpb=ea647b01ed4784be06204090b3042f51a8267f70

diff --git a/Scripts/cormackscript b/Scripts/cormackscript
index f6bdf33..9f7cc72 100755
--- a/Scripts/cormackscript
+++ b/Scripts/cormackscript
@@ -6,25 +6,40 @@
 # Usage: cormackscript [cmks file] [output file]
 #
 # IMPORTANT!
-# Place the comments:
+# Place the comments (important to get spaces right too):
 # ; CMKS START
 # ; CMKS END
-# into your racket program, the 'compiled' code will be injected here.
+# into your racket program, the 'assembled' code will be injected here.
 #
-# For extra niceness, if you have the racket program installed it will auto execute it.
+# For extra niceness, if you have the racket program installed it will auto execute it your file.
 #
 # A CormackScript file contains 3 columns separated by whitespace in the format [opcode|target|source]  
+# - The inc, print and read instructions read from the first column
+# - The quit instruction can be standalone
+# - you can comment with ;
+# - extraneous whitespace is ignored
+#
 # Here's some sample code
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+# ; setting up memory
+# 6     ; [0]: first instruction
+# 1     ; [1]: literal 1
+# 2     ; [2]: literal 2
+# 7     ; [3]: literal 7
+# 0     ; [4]: n
+# 0     ; [5]: acc
 #
-# mov 20 30
-# inc 1
-# read 21
-# print 21
+# ; actual instructions 
+# read 4 ; input n
+# addeq 00 4 ; skip next if n = 0
+# add 00 2 ; skip next 2 instructions
+# print 5 ; out acc
 # quit
+# add 05 04 ; acc = acc + n
+# sub 04 01 ; n = n - 1
+# sub 00 03 ; go back 7 (from next instr)
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #
-# Note, for commands that only need one param you don't need to add empty columns
-# oh yeah, you can also comment with ;
-
 # You can redefine these to whatever you want
 
 inst0="inc"   # [tt] = [tt] + 1
@@ -46,9 +61,20 @@ scriptfile="$1"; targetfile="$2"
 
 tmp="$(mktemp 'tempXXX')"
 cat "$scriptfile" |\
-    sed -r "s/\s*;.*//g; /^\s*$/ d; s/\s+/ /g; s/^\s+//; s/ [0-9]{1} / 0&/; s/ [0-9]{1}\$/ 0&/; s/$inst0/0/; s/$inst1/1/; s/$inst2/2/; s/$inst3/3/; s/$inst4/4/; s/$inst5/5/; s/$inst6/6/; s/$inst7/700/; s/$inst8/8/; s/$inst9/9/; s/ //g" |\
-    sed -e :a -e 's/^.\{1,4\}$/&0/;ta' |\
-    sed 's/![0-9]//g' >> "$tmp"
+    sed -r "s/\s*;.*//g; /^\s*$/ d; s/\s+/ /g; s/^\s+//" |\
+        awk "
+                /^$inst0\s/ {printf \"0%02d00 ; [%02d] = [%02d] + 1\n\",\$2,\$2,\$2}
+                /^$inst1\s/ {printf \"1%02d%02d ; [%02d] = [%02d] + [%02d]\n\",\$2,\$3,\$2,\$2,\$3}
+                /^$inst2\s/ {printf \"2%02d%02d ; [%02d] = max([%02d] - [%02d], 0)\n\",\$2,\$3,\$2,\$2,\$3}
+                /^$inst3\s/ {printf \"3%02d%02d ; [%02d] = [%02d]\n\",\$2,\$3,\$2,\$3}
+                /^$inst4\s/ {printf \"4%02d%02d ; [%02d] = [%02d] + 1, if [%02d] = 0\n\",\$2,\$3,\$2,\$2,\$3}
+                /^$inst5\s/ {printf \"5%02d%02d ; [%02d] = [[%02d]]\n\",\$2,\$3,\$2,\$3}
+                /^$inst6\s/ {printf \"6%02d%02d ; [[%02d]] = [%02d]\n\",\$2,\$3,\$2,\$3}
+                /^$inst7\s/ {printf \"700%02d ; display [%02d]\n\",\$2,\$2}
+                /^$inst8\s/ {printf \"8%02d00 ; read [%02d]\n\",\$2,\$2}
+                /^$inst9/ {print \"90000 ; halt\"}
+                !/^$inst0\s|^$inst1\s|^$inst2\s|^$inst3\s|^$inst4\s|^$inst5\s|^$inst6\s|^$inst7\s|^$inst8\s|^$inst9/
+            " >> "$tmp"
 sed -i "/\; CMKS START/,/\; CMKS END/{/\; CMKS START/!{/\; CMKS END/!d}}; /\; CMKS START/r $tmp" "$targetfile"
 rm "$tmp"