Changeset 619 for Deliverables/D2.2/8051/src/languages.ml

Timestamp:

Mar 2, 2011, 3:27:41 PM (9 years ago)

Author:

ayache

Message:

Update of D2.2 from Paris.

File:

• Deliverables/D2.2/8051/src/languages.ml (modified) (4 diffs)

Deliverables/D2.2/8051/src/languages.ml

@@ -199 +199 @@
 (* FIXME *)
 let instrument costs_mapping = function
-  | AstClight p -> 
-    AstClight (ClightAnnotator.instrument p costs_mapping)
+  | AstClight p ->
+    let (p', cost_incr) = ClightAnnotator.instrument p costs_mapping in
+    (AstClight p', cost_incr)
   | AstCminor p ->
-    AstCminor (CminorAnnotator.instrument p costs_mapping)
+    let (p', cost_incr) = CminorAnnotator.instrument p costs_mapping in
+    (AstCminor p', cost_incr)
   | p -> 
     Error.warning "during instrumentation"
@@ -208 +210 @@
          "Instrumentation is not implemented for source language `%s'."
          (to_string (language_of_ast p)));
-    p
+    (p, "")
 
 let annotate input_ast final = 
@@ -232 +234 @@
     ASMPrinter.print_program p
 
-let save filename ast =
-  let output_filename = 
-    Misc.SysExt.alternative 
-      (Filename.chop_extension filename 
-       ^ "." ^ extension (language_of_ast ast))
-  in
+let save exact_output filename ast =
+  let ext_chopped_filename =
+    if exact_output then filename
+    else
+      try Filename.chop_extension filename
+      with Invalid_argument ("Filename.chop_extension") -> filename in
+  let ext_filename =
+    ext_chopped_filename ^ "." ^ extension (language_of_ast ast) in
+  let output_filename =
+    if exact_output then ext_filename
+    else Misc.SysExt.alternative ext_filename in
   let cout = open_out output_filename in
   output_string cout (string_output ast);
@@ -243 +250 @@
   close_out cout
 
-let interpret = function
+let save_cost_incr filename cost_incr =
+  let cout = open_out (filename ^ ".cerco") in
+  output_string cout cost_incr;
+  flush cout;
+  close_out cout
+
+let interpret print_result = function
   | AstClight p ->
-    ClightInterpret.interpret false p
+    ClightInterpret.interpret print_result p
   | AstCminor p ->
-    CminorInterpret.interpret false p  
+    CminorInterpret.interpret print_result p  
   | AstRTLabs p ->
-    RTLabsInterpret.interpret p
+    RTLabsInterpret.interpret print_result p
   | AstRTL p ->
-    RTLInterpret.interpret p
+    RTLInterpret.interpret print_result p
   | AstERTL p ->
-    ERTLInterpret.interpret p
+    ERTLInterpret.interpret print_result p
   | AstLTL p ->
-    LTLInterpret.interpret p
+    LTLInterpret.interpret print_result p
   | AstLIN p ->
-    LINInterpret.interpret p
+    LINInterpret.interpret print_result p
   | AstASM p ->
-    ASMInterpret.interpret p
+    ASMInterpret.interpret print_result p