Changeset 2864 for driver

Timestamp:

Mar 13, 2013, 2:27:55 PM (7 years ago)

Author:

sacerdot

Message:

I must have drunk yesterday: all RTL passes are printed correctly; the
pass that used to fail was RTLabs which is NOT a back-end pass.

Location:

driver

Files:

• backendPrinter.ml (modified) (2 diffs)
• cerco.ml (modified) (1 diff)

driver/backendPrinter.ml

@@ -122 +122 @@
 let rTL_printing_params =
  { Extracted.Joint_printer.print_pass_ind = printing_pass_independent_params
- ; print_acc_a_reg = (fun _ -> "FOO")(*Obj.magic print_register*)
- ; print_acc_b_reg = (fun _ -> "FOO")(*Obj.magic print_register*)
- ; print_acc_a_arg = (fun _ -> "FOO")(*Obj.magic (print_argument print_register)*)
- ; print_acc_b_arg = (fun _ -> "FOO")(*Obj.magic (print_argument print_register)*)
- ; print_dpl_reg = (fun _ -> "FOO")(*Obj.magic print_register*)
- ; print_dph_reg = (fun _ -> "FOO")(*Obj.magic print_register*)
- ; print_dpl_arg = (fun _ -> "FOO")(*Obj.magic (print_argument print_register)*)
- ; print_dph_arg = (fun _ -> "FOO")(*Obj.magic (print_argument print_register)*)
- ; print_snd_arg = (fun _ -> "FOO")(*Obj.magic (print_argument print_register)*)
- ; print_pair_move = (fun _ -> "FOO")(*Obj.magic
+ ; print_acc_a_reg = Obj.magic print_register
+ ; print_acc_b_reg = Obj.magic print_register
+ ; print_acc_a_arg = Obj.magic (print_argument print_register)
+ ; print_acc_b_arg = Obj.magic (print_argument print_register)
+ ; print_dpl_reg = Obj.magic print_register
+ ; print_dph_reg = Obj.magic print_register
+ ; print_dpl_arg = Obj.magic (print_argument print_register)
+ ; print_dph_arg = Obj.magic (print_argument print_register)
+ ; print_snd_arg = Obj.magic (print_argument print_register)
+ ; print_pair_move = Obj.magic
     (fun {Extracted.Types.fst = reg; snd = arg} ->
-      print_register reg ^ " " ^ print_argument print_register arg)*)
- ; print_call_args = (fun _ -> "FOO")(*Obj.magic
-    (fun l -> String.concat " " (List.map (print_argument print_register) l))*)
- ; print_call_dest = (fun _ -> "FOO")(*Obj.magic
-    (fun l -> String.concat " " (List.map print_register l))*)
+      print_register reg ^ " " ^ print_argument print_register arg)
+ ; print_call_args = Obj.magic
+    (fun l -> String.concat " " (List.map (print_argument print_register) l))
+ ; print_call_dest = Obj.magic
+    (fun l -> String.concat " " (List.map print_register l))
  ; print_ext_seq = (fun rtl_seq -> assert false )
  }
@@ -176 +176 @@
     l)
 
-let print_program pass program =
- let f =
+let print_program pass (program : Extracted.Preamble.__) =
+ let lines =
   match pass with
-   | Extracted.Compiler.Rtlabs_pass ->
-      Extracted.RTL_printer.print_RTL_program rTL_printing_params
    | Extracted.Compiler.Rtl_separate_pass ->
       Extracted.RTL_printer.print_RTL_program rTL_printing_params
+       (Extracted.Types.fst (Obj.magic program))
    | Extracted.Compiler.Rtl_uniq_pass ->
       Extracted.RTL_printer.print_RTL_program rTL_printing_params
+       (Extracted.Types.fst (Obj.magic program))
    | Extracted.Compiler.Ltl_pass ->
       Extracted.LTL_printer.print_LTL_program joint_LTL_LIN_printing_params
-   | _ -> fun _ -> Extracted.List.Nil
+       (Extracted.Types.fst (Obj.magic program))
+   | _ -> Extracted.List.Nil
  in
-  "\n" ^ print_graph (f (Obj.magic program)) ^ "\n"
+  "\n" ^ print_graph lines ^ "\n"

driver/cerco.ml

@@ -42 +42 @@
   let rec infinity = Extracted.Nat.S infinity in
   (fun pass prog ->
-    print_string (BackendPrinter.print_program pass (fst (Obj.magic prog)));
+    print_string (BackendPrinter.print_program pass prog);
     Extracted.Semantics.run_and_print pass prog infinity
      (fun p -> print_endline ("\n" ^ string_of_pass p ^ ":"); Extracted.Types.It)