From c13ef02ea27a178667f0efcfdec6ef2eade7ec43 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Mon, 25 Nov 2024 08:51:40 -0600
Subject: [PATCH] Add drawing2.janet so we can keep the working drawing
 example.

---
 examples/sysir/drawing.janet  | 64 ++---------------------
 examples/sysir/drawing2.janet | 95 +++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 60 deletions(-)
 create mode 100644 examples/sysir/drawing2.janet

diff --git a/examples/sysir/drawing.janet b/examples/sysir/drawing.janet
index f9ef950e..94d996b1 100644
--- a/examples/sysir/drawing.janet
+++ b/examples/sysir/drawing.janet
@@ -2,22 +2,18 @@
 ### Create a .bmp file on linux.
 ###
 
+# Quick run and view on Linux:
+# build/janet examples/sysir/drawing.janet > temp.c && cc temp.c && ./a.out > temp.bmp && feh temp.bmp
+
 (use ./frontend)
 
-(defpointer p32 uint)
-(defpointer p16 u16)
-(defpointer cursor p32)
 (defn-external write:void [fd:int mem:pointer size:uint])
 (defn-external exit:void [x:int])
-(defn-external malloc:p32 [x:uint])
-(defn-external free:void [m:p32])
 
 # assume 128x128 32 bit color image
 #   Size : 128 * 128 * 4 + align(14 + 40, 4) = 65592
 #   dib offset : align(14 + 40, 4) = 56
 
-(setdyn :verbose true)
-
 (defsys write_32:void [x:uint]
   (write 1 (address x) 4)
   (return))
@@ -26,19 +22,6 @@
   (write 1 (address x) 2)
   (return))
 
-(defsys w32:void [c:cursor x:uint]
-  (def p:p32 (load c))
-  (store p x)
-  (store c (the p32 (pointer-add p 1)))
-  (return))
-
-(defsys w16:void [c:cursor x:uint]
-  (def p:p16 (cast (the p32 (load c))))
-  (store p (the u16 (cast x)))
-  # Why so much inference...
-  (store c (the p32 (cast (the p16 (pointer-add p 1)))))
-  (return))
-
 (defsys write_header:void [w:uint h:uint]
   (write 1 "BM" 2)
   (def size:uint (+ 56 (* w h 4)))
@@ -60,41 +43,6 @@
   (write_16 0) # add "gap 1" to align pixel array to multiple of 4 bytes
   (return))
 
-(defsys makebmp:p32 [w:uint h:uint]
-  (def size:uint (+ 56 (* w h 4)))
-  (def mem:p32 (malloc size))
-  (def c:cursor (address mem))
-  (w16 c 0x424D) # ascii "BM"
-  (w32 c size)
-  (w32 c 56)
-  (w32 c 40)
-  (w32 c w)
-  (w32 c h)
-  (w32 c 0x20001)
-  (w32 c 0)
-  (w32 c 0)
-  (w32 c 4096)
-  (w32 c 4096)
-  (w32 c 0)
-  (w32 c 0)
-  (w16 c 0) # padding
-  # Draw
-  (def red:uint 0xFFFF0000)
-  (def blue:uint 0xFF0000FF)
-  (def size:uint (* w h 4))
-  (var y:uint 0)
-  (while (< y h)
-    (var x:uint 0)
-    (while (< x w)
-      #(write_32 (if (< y 32) blue red))
-      (if (> y 64)
-        (w32 c blue)
-        (w32 c red))
-      (set x (+ 1 x)))
-    (set y (+ y 1)))
-  (write 1 mem size)
-  (return mem))
-
 (defsys draw:void [w:uint h:uint]
   (def red:uint 0xFFFF0000)
   (def blue:uint 0xFF0000FF)
@@ -103,10 +51,7 @@
   (while (< y h)
     (var x:uint 0)
     (while (< x w)
-      #(write_32 (if (< y 32) blue red))
-      (if (> y 64)
-        (write_32 blue)
-        (write_32 red))
+      (write_32 (if (< y 32) blue red))
       (set x (+ 1 x)))
     (set y (+ y 1)))
   (return))
@@ -116,7 +61,6 @@
   (def h:uint 128)
   (write_header w h)
   (draw w h)
-  #(makebmp w h)
   (return 0))
 
 ####
diff --git a/examples/sysir/drawing2.janet b/examples/sysir/drawing2.janet
new file mode 100644
index 00000000..973ec1c1
--- /dev/null
+++ b/examples/sysir/drawing2.janet
@@ -0,0 +1,95 @@
+###
+### Create a .bmp file on linux.
+###
+
+(use ./frontend)
+
+(defpointer p32 uint)
+(defpointer p16 u16)
+(defpointer cursor p32)
+(defn-external write:void [fd:int mem:pointer size:uint])
+(defn-external exit:void [x:int])
+(defn-external malloc:p32 [x:uint])
+(defn-external free:void [m:p32])
+
+(defsys w32:void [c:cursor x:uint]
+  (def p:p32 (load c))
+  (store p x)
+  (store c (the p32 (pointer-add p 4)))
+  (return))
+
+(defsys w16:void [c:cursor x:uint]
+  # Casting needs revisiting
+  (def p:p16 (cast (the p32 (load c))))
+  (store p (the u16 (cast x)))
+  (store c (the p32 (cast (the p16 (pointer-add p 1)))))
+  (return))
+
+(defsys makebmp:p32 [w:uint h:uint]
+  (def size:uint (+ 56 (* w h 4)))
+  (def mem:p32 (malloc size))
+  (def c:cursor (address mem))
+  (w16 c 0x424D) # ascii "BM"
+  (w32 c size)
+  (w32 c 56)
+  (w32 c 40)
+  (w32 c w)
+  (w32 c h)
+  (w32 c 0x20001)
+  (w32 c 0)
+  (w32 c 0)
+  (w32 c 4096)
+  (w32 c 4096)
+  (w32 c 0)
+  (w32 c 0)
+  (w16 c 0) # padding
+  # Draw
+  (def red:uint 0xFFFF0000)
+  (def blue:uint 0xFF0000FF)
+  (def size:uint (* w h 4))
+  (var y:uint 0)
+  (while (< y h)
+    (var x:uint 0)
+    (while (< x w)
+      #(write_32 (if (< y 32) blue red))
+      (if (> y 64)
+        (w32 c blue)
+        (w32 c red))
+      (set x (+ 1 x)))
+    (set y (+ y 1)))
+  (write 1 mem size)
+  (return mem))
+
+(defsys makebmp2:p32 [w:uint h:uint]
+  (def size:uint 56)
+  (def mem:p32 (malloc size))
+  (def c:cursor (address mem))
+  (w32 c 0x12345678)
+  (w32 c size)
+  (w32 c 56)
+  (w32 c 40)
+  (w32 c w)
+  (w32 c h)
+  (w32 c 0x20001)
+  (w32 c 0)
+  (w32 c 0)
+  (w32 c 4096)
+  (w32 c 4096)
+  (w32 c 0)
+  (w32 c 0)
+  (write 1 mem size)
+  (return mem))
+
+(defsys main:int []
+  (def w:uint 128)
+  (def h:uint 128)
+  #(makebmp w h)
+  (makebmp2 w h)
+  (return 0))
+
+####
+
+#(dump)
+(print "#include <unistd.h>")
+(dumpc)
+#(dumpx64)