Changeset 1392 for Deliverables/D2.2/8051-indexed-labels-branch/src/cminor/cminorPrinter.ml

Timestamp:

Oct 17, 2011, 2:08:27 PM (9 years ago)

Author:

tranquil

Message:

fiddling with Cminor: elimination of loops, blocks and exits

File:

• Deliverables/D2.2/8051-indexed-labels-branch/src/cminor/cminorPrinter.ml (modified) (5 diffs)

Deliverables/D2.2/8051-indexed-labels-branch/src/cminor/cminorPrinter.ml

@@ -137 +137 @@
 let print_table n =
   let f s (case, exit) =
-    Printf.sprintf "%s%scase %d: exit %d;\n" s (n_spaces n) case exit
+    Printf.sprintf "%s%scase %d: goto %s;\n" s (n_spaces n) case exit
   in
   List.fold_left f ""
@@ -187 +187 @@
         (print_body (n+2) s2)
         (n_spaces n)
-  | Cminor.St_loop s ->
+(*  | Cminor.St_loop s ->
       Printf.sprintf "%sloop {\n%s%s}\n"
         (n_spaces n)
@@ -198 +198 @@
         (n_spaces n)
   | Cminor.St_exit i ->
-      Printf.sprintf "%sexit %d;\n" (n_spaces n) i
+      Printf.sprintf "%sexit %d;\n" (n_spaces n) i *)
   | Cminor.St_switch (e, tbl, dflt) ->
-      Printf.sprintf "%sswitch (%s) {\n%s%sdefault: exit %d;\n%s}\n"
+      Printf.sprintf "%sswitch (%s) {\n%s%sdefault: goto %s;\n%s}\n"
         (n_spaces n)
         (print_expression e)
@@ -219 +219 @@
         | Cminor.St_ind_0 (i, s) ->
                   Printf.sprintf "%sindex %d:\n%s" (n_spaces n) i (print_body n s)
-        | Cminor.St_ind_inc (s, i) ->
-                  Printf.sprintf "%s%sincrement %d;\n" (print_body n s) (n_spaces n) i
+        | Cminor.St_ind_inc (i,s) ->
+                  Printf.sprintf "%sincrement %d:\n%s\n" (n_spaces n) i (print_body n s)
 
 let print_internal f_name f_def =
@@ -257 +257 @@
   | Cminor.St_seq(_,_) -> "seq"
   | Cminor.St_ifthenelse(_,_,_) -> "ifthenelse"
-  | Cminor.St_loop(_) -> "loop"
+(*  | Cminor.St_loop(_) -> "loop"
   | Cminor.St_block(_) -> "block"
-  | Cminor.St_exit(_) -> "exit"
+  | Cminor.St_exit(_) -> "exit" *)
   | Cminor.St_switch(_,_,_) -> "switch"
   | Cminor.St_return(_) -> "return"