Simplified LoadImm instruction format

phases/assemble.ml

@@ -126,8 +126,8 @@ let assemble program =
             (trav value) @ pop
 
         (* Expressions *)
-        | Const (BoolVal _, _) ->
-            [LoadImm node]
+        | Const (BoolVal _ as value, _) ->
+            [LoadImm value]
 
         | Const (value, _) ->
             Hashtbl.replace consts value (typeof node, indexof node);

phases/print.ml

@@ -79,13 +79,13 @@ let rec instr2str = function
         tab ^ prefix ctype ^ "load" ^ suffix scope ^ " " ^ si index
     | LoadConst (ctype, index) ->
         tab ^ prefix ctype ^ "loadc " ^ si index
-    | LoadImm (Const (BoolVal b, _)) ->
+    | LoadImm (BoolVal b) ->
         tab ^ "bloadc_" ^ (if b then "t" else "f")
-    | LoadImm (Const (IntVal i, _)) when i < 0 ->
+    | LoadImm (IntVal i) when i < 0 ->
         tab ^ "iloadc_m" ^ si (-i)
-    | LoadImm (Const (IntVal i, _)) ->
+    | LoadImm (IntVal i) ->
         tab ^ "iloadc_" ^ si i
-    | LoadImm (Const (FloatVal i, _)) ->
+    | LoadImm (FloatVal i) ->
         tab ^ "floadc_" ^ si (int_of_float i)
 
     (* Operators *)

types.ml

@@ -95,7 +95,7 @@ type instr =
 
     | Load of ctype * stack_scope * int  (* [ifb]load[ gn] G *)
     | LoadConst of ctype * int           (* [ifb]loadc C *)
-    | LoadImm of node                    (* [ifb]load_[01tf] <value> *)
+    | LoadImm of const                   (* [ifb]load_[01tf] <value> *)
 
     | Op of operator * ctype             (* [ifb]() *)
     | Convert of ctype * ctype           (* i2f|f2i *)