Changeset 2856 for driver

Timestamp:

Mar 12, 2013, 7:11:56 PM (8 years ago)

Author:

sacerdot

Message:

Pretty printing of LTL almost finished.

Location:

driver

Files:

• IntelHex.mli (modified) (1 diff)
• backendPrinter.ml (modified) (2 diffs)
• build (modified) (1 diff)

driver/IntelHex.mli

@@ -1 +1 @@
 type intel_hex_format
 
+val int_of_vect : Extracted.BitVector.bitVector -> int
+
 val string_of_intel_hex_format: intel_hex_format -> string
+
 val pack_exported_code_memory: int -> int -> Extracted.BitVector.byte Extracted.BitVectorTrie.bitVectorTrie -> intel_hex_format

driver/backendPrinter.ml

@@ -59 +59 @@
  }
 
+let print_byte b = string_of_int (IntelHex.int_of_vect b)
+
+let print_argument print_arg =
+ function
+    Extracted.Joint.Imm b -> print_byte b
+  | Extracted.Joint.Reg x -> print_arg x
+
+let print_Register =
+ function
+  | Extracted.I8051.Register00     -> "Register00"
+  | Extracted.I8051.Register01     -> "Register01"
+  | Extracted.I8051.Register02     -> "Register02"
+  | Extracted.I8051.Register03     -> "Register03"
+  | Extracted.I8051.Register04     -> "Register04"
+  | Extracted.I8051.Register05     -> "Register05"
+  | Extracted.I8051.Register06     -> "Register06"
+  | Extracted.I8051.Register07     -> "Register07"
+  | Extracted.I8051.Register10     -> "Register10"
+  | Extracted.I8051.Register11     -> "Register11"
+  | Extracted.I8051.Register12     -> "Register12"
+  | Extracted.I8051.Register13     -> "Register13"
+  | Extracted.I8051.Register14     -> "Register14"
+  | Extracted.I8051.Register15     -> "Register15"
+  | Extracted.I8051.Register16     -> "Register16"
+  | Extracted.I8051.Register17     -> "Register17"
+  | Extracted.I8051.Register20     -> "Register20"
+  | Extracted.I8051.Register21     -> "Register21"
+  | Extracted.I8051.Register22     -> "Register22"
+  | Extracted.I8051.Register23     -> "Register23"
+  | Extracted.I8051.Register24     -> "Register24"
+  | Extracted.I8051.Register25     -> "Register25"
+  | Extracted.I8051.Register26     -> "Register26"
+  | Extracted.I8051.Register27     -> "Register27"
+  | Extracted.I8051.Register30     -> "Register30"
+  | Extracted.I8051.Register31     -> "Register31"
+  | Extracted.I8051.Register32     -> "Register32"
+  | Extracted.I8051.Register33     -> "Register33"
+  | Extracted.I8051.Register34     -> "Register34"
+  | Extracted.I8051.Register35     -> "Register35"
+  | Extracted.I8051.Register36     -> "Register36"
+  | Extracted.I8051.Register37     -> "Register37"
+  | Extracted.I8051.RegisterA      -> "RegisterA"
+  | Extracted.I8051.RegisterB      -> "RegisterB"
+  | Extracted.I8051.RegisterDPL    -> "RegisterDPL"
+  | Extracted.I8051.RegisterDPH    -> "RegisterDPH"
+  | Extracted.I8051.RegisterCarry  -> "RegisterCarry"
+
+let print_registers_move =
+ function
+  | Extracted.Joint_LTL_LIN.From_acc (reg,_unit) ->
+     print_Register reg ^ " " ^ "ACC_A"
+  | Extracted.Joint_LTL_LIN.To_acc (_unit,reg) ->
+     "ACC_A " ^ print_Register reg
+  | Extracted.Joint_LTL_LIN.Int_to_reg (reg,byte) ->
+     print_Register reg ^ " " ^ print_byte byte
+  | Extracted.Joint_LTL_LIN.Int_to_acc (_unit,byte) ->
+     "ACC_A " ^ print_byte byte
+
 let joint_LTL_LIN_printing_params =
  { Extracted.Joint_printer.print_pass_ind = printing_pass_independent_params
@@ -69 +127 @@
  ; print_dpl_arg = (fun _ -> "DPL")
  ; print_dph_arg = (fun _ -> "DPH")
- ; print_snd_arg = (fun hdw_arg -> "ACC_B")
- ; print_pair_move = (fun pair_move -> "ACC_B")
- ; print_call_args = (fun n -> "ACC_B")
+ ; print_snd_arg = (fun hdw_arg -> print_argument print_Register (Obj.magic hdw_arg))
+ ; print_pair_move = Obj.magic print_registers_move
+ ; print_call_args =
+    (fun n ->string_of_int (Extracted.Glue.int_of_matitanat (Obj.magic n)))
  ; print_call_dest = (fun _ -> "")
  ; print_ext_seq = (fun ltl_lin_seq -> assert false )

driver/build

@@ -12 +12 @@
 ocamlc -I ../Deliverables/D2.2/8051/lib -c -g error.ml
 ocamlc -I ../Deliverables/D2.2/8051/lib -c -g *.ml
-ocamlc -custom -g -I ../Deliverables/D2.2/8051/lib extracted.cmo  ../Deliverables/D2.2/8051/lib/libcparser.a ../Deliverables/D2.2/8051/lib/cparser.cma clightFromC.cmo clightParser.cmo clightPrinter.cmo backendPrinter.cmo IntelHex.cmo ASMPrinter.cmo error.cmo cerco.cmo -o cerco
+ocamlc -custom -g -I ../Deliverables/D2.2/8051/lib extracted.cmo  ../Deliverables/D2.2/8051/lib/libcparser.a ../Deliverables/D2.2/8051/lib/cparser.cma clightFromC.cmo clightParser.cmo IntelHex.cmo clightPrinter.cmo backendPrinter.cmo ASMPrinter.cmo error.cmo cerco.cmo -o cerco