WIP on more dune

Signed-off-by: Kakadu <[email protected]>

Author: Kakadu

dune-project

@@ -1,3 +1,10 @@
 (lang dune 3.3)
 
 (cram enable)
+
+(generate_opam_files true)
+
+(package
+ (name Lama)
+ (synopsis "TODO")
+ (depends posix-uname))

runtime/dune

@@ -0,0 +1,7 @@
+(rule
+ (target runtime.a)
+ (mode
+  (promote (until-clean)))
+ (deps Makefile gc.c gc.h runtime_common.h runtime.c runtime.h printf.S)
+ (action
+  (run make)))

runtime32/Makefile

@@ -1,6 +1,9 @@
+RUNTIME=runtime32.a
 
-all: gc_runtime.o runtime.o
-	ar rc runtime.a gc_runtime.o runtime.o
+.DEFAULT  := $(RUNTIME)
+
+$(RUNTIME): gc_runtime.o runtime.o
+	ar rc $@ gc_runtime.o runtime.o
 
 gc_runtime.o: gc_runtime.s
 	$(CC) -g -fstack-protector-all -m32 -c gc_runtime.s

runtime32/dune

@@ -0,0 +1,7 @@
+(rule
+ (target runtime32.a)
+ (mode
+  (promote (until-clean)))
+ (deps Makefile gc_runtime.s runtime.c runtime.h)
+ (action
+  (run make)))

src/Driver.ml

@@ -12,7 +12,10 @@ let[@ocaml.warning "-32"] main =
         cmd#dump_AST (snd prog);
         cmd#dump_source (snd prog);
         match cmd#get_mode with
-        | `Default | `Compile -> ignore @@ X86_64.build cmd prog
+        | `Default | `Compile -> (
+            match cmd#march with
+            | `X86_32 -> ignore @@ X86_32.build cmd prog
+            | `AMD64 -> ignore @@ X86_64.build cmd prog)
         | `BC -> SM.ByteCode.compile cmd (SM.compile cmd prog)
         | _ ->
             let rec read acc =

src/Options.ml

@@ -43,6 +43,7 @@ class options args =
     val i = ref 1
     val infile = ref (None : string option)
     val outfile = ref (None : string option)
+    val march = ref `AMD64
     val runtime_path = runtime_path_
     val paths = ref [ runtime_path_ ]
     val mode = ref (`Default : [ `Default | `Eval | `SM | `Compile | `BC ])
@@ -79,6 +80,8 @@ class options args =
                     raise
                       (Commandline_error "Path expected after '-I' specifier")
                 | Some path -> self#add_include_path path)
+            | "-march=amd64" -> march := `AMD64
+            | "-march=x86" -> march := `X86_32
             | "-s" -> self#set_mode `SM
             | "-b" -> self#set_mode `BC
             | "-i" -> self#set_mode `Eval
@@ -139,6 +142,8 @@ class options args =
         Some args.(j))
       else None
 
+    method march : [ `AMD64 | `X86_32 ] = !march
+    method get_debug = ""
     method get_mode = !mode
 
     method get_output_option =