Changeset 640 for Deliverables/D2.2/8051/src

Timestamp:

Mar 7, 2011, 11:10:57 AM (10 years ago)

Author:

ayache

Message:

Hex output not too long for mcu anymore. Readable output added.

Location:

Deliverables/D2.2/8051/src

Files:

• ASM/ASMPrinter.ml (modified) (1 diff)
• ASM/Pretty.ml (modified) (2 diffs)
• ASM/Pretty.mli (modified) (1 diff)
• acc.ml (modified) (1 diff)
• clight/clightAnnotator.ml (modified) (2 diffs)
• clight/clightAnnotator.mli (modified) (1 diff)
• cminor/cminorAnnotator.ml (modified) (2 diffs)
• cminor/cminorAnnotator.mli (modified) (1 diff)
• languages.ml (modified) (5 diffs)
• languages.mli (modified) (2 diffs)

Deliverables/D2.2/8051/src/ASM/ASMPrinter.ml

@@ -4 +4 @@
 let print_program p =
   let code_memory = ASMInterpret.load_code_memory p.ASM.code in
-  let intel_hex = IntelHex.pack_exported_code_memory 16 65536 code_memory in
+  let intel_hex = IntelHex.pack_exported_code_memory 16 65535 code_memory in
   IntelHex.string_of_intel_hex_format intel_hex

Deliverables/D2.2/8051/src/ASM/Pretty.ml

@@ -44 +44 @@
     `Label l -> l ^ ":"
   | `Cost l -> l ^ ":"
-  | `Jmp j -> "Jmp " ^ j
-  | `Call j -> "Call " ^ j
+  | `Jmp j -> "ljmp " ^ j
+  | `Call j -> "lcall " ^ j
   | `WithLabel i -> pp_jump i
   | `Begin_fun -> "\n; Begin function"
@@ -99 +99 @@
 
 let print_program p =
-  let f s i = Printf.sprintf "%s%s\n" s (pp_instruction i) in
-  "Org 0\n\n" ^ (List.fold_left f "" p.ASM.pcode) ^ "\nEND\n"
+  let mem = ASMInterpret.load_code_memory p.ASM.code in
+  let f (s, pc) _ =
+    let (inst, new_pc, _) = ASMInterpret.fetch mem pc in
+    (Printf.sprintf "%s%s: %s%s\n"
+       s
+       (string_of_int (BitVectors.int_of_vect pc))
+       (pp_instruction inst)
+       (if BitVectors.WordMap.mem pc p.ASM.cost_labels then
+           " ;; (" ^ (BitVectors.WordMap.find pc p.ASM.cost_labels) ^ ")"
+        else ""),
+     new_pc) in
+  fst (List.fold_left f ("", BitVectors.zero `Sixteen) p.ASM.code)

Deliverables/D2.2/8051/src/ASM/Pretty.mli

@@ -21 +21 @@
 val pp_instruction: [< ASM.labelled_instruction] -> string
 
-val print_program : [< ASM.labelled_instruction] ASM.pretty_program -> string
+val print_program : ASM.program -> string

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

@@ -39 +39 @@
     save final_ast;
     (if Options.annotation_requested () then
-       let (annotated_input_ast, cost_incr) =
+       let (annotated_input_ast, cost_id, cost_incr) =
          Languages.annotate input_ast final_ast in
        save annotated_input_ast;
-       Languages.save_cost_incr output_filename cost_incr);
+       Languages.save_cost output_filename cost_id cost_incr);
     (if Options.is_debug_enabled () then 
       List.iter save intermediate_asts);

Deliverables/D2.2/8051/src/clight/clightAnnotator.ml

@@ -285 +285 @@
   close_out cout
 
-(** [instrument prog cost_map] instruments the program [prog]. *)
+(** [instrument prog cost_map] instruments the program [prog]. First a fresh
+    global variable --- the so-called cost variable --- is added to the program.
+    Then, each cost label in the program is replaced by an increment of the cost
+    variable, following the mapping [cost_map]. The function also returns the
+    name of the cost variable and the name of the cost increment function. *)
 
 let instrument p cost_mapping =
@@ -318 +322 @@
   let res = ClightParser.process tmp_file in
   Misc.SysExt.safe_remove tmp_file ;
-  (res, cost_incr)
+  (res, cost_id, cost_incr)

Deliverables/D2.2/8051/src/clight/clightAnnotator.mli

@@ -5 +5 @@
     global variable --- the so-called cost variable --- is added to the program.
     Then, each cost label in the program is replaced by an increment of the cost
-    variable, following the mapping [cost_map]. The returned string is the name
-    of the cost increment function. *)
+    variable, following the mapping [cost_map]. The function also returns the
+    name of the cost variable and the name of the cost increment function. *)
 
 val instrument : Clight.program -> int CostLabel.Map.t ->
-                 Clight.program * string
+                 Clight.program * string * string
 
 val cost_labels : Clight.program -> CostLabel.Set.t

Deliverables/D2.2/8051/src/cminor/cminorAnnotator.ml

@@ -131 +131 @@
 
 
+(** [instrument prog cost_map] instruments the program [prog]. First a fresh
+    global variable --- the so-called cost variable --- is added to the program.
+    Then, each cost label in the program is replaced by an increment of the cost
+    variable, following the mapping [cost_map]. The function also returns the
+    name of the cost variable and the name of the cost increment function. *)
+
 let instrument p costs_mapping =
   let cost_id = fresh_cost_id "_cost" p in
@@ -140 +146 @@
      Cminor.functs = functs ;
      Cminor.main   = p.Cminor.main },
+   "" (* TODO *),
    "" (* TODO *))
 

Deliverables/D2.2/8051/src/cminor/cminorAnnotator.mli

@@ -5 +5 @@
     global variable --- the so-called cost variable --- is added to the program.
     Then, each cost label in the program is replaced by an increment of the cost
-    variable, following the mapping [cost_map]. The returned string is the name
-    of the cost increment function. *)
+    variable, following the mapping [cost_map]. The function also returns the
+    name of the cost variable and the name of the cost increment function. *)
 
 val instrument : Cminor.program -> int CostLabel.Map.t ->
-                 Cminor.program * string
+                 Cminor.program * string * string
 
 val cost_labels : Cminor.program -> CostLabel.Set.t

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

@@ -47 +47 @@
 
 let extension = function
-  | ASM      -> "s"
-  | Clight   -> "c"
-  | language -> to_string language
+  | ASM      -> ["s" ; "hex"]
+  | Clight   -> ["c"]
+  | language -> [to_string language]
 
 let parse = function
@@ -200 +200 @@
 let instrument costs_mapping = function
   | AstClight p ->
-    let (p', cost_incr) = ClightAnnotator.instrument p costs_mapping in
-    (AstClight p', cost_incr)
+    let (p', cost_id, cost_incr) = ClightAnnotator.instrument p costs_mapping in
+    (AstClight p', cost_id, cost_incr)
   | AstCminor p ->
-    let (p', cost_incr) = CminorAnnotator.instrument p costs_mapping in
-    (AstCminor p', cost_incr)
+    let (p', cost_id, cost_incr) = CminorAnnotator.instrument p costs_mapping in
+    (AstCminor p', cost_id, cost_incr)
   | p -> 
     Error.warning "during instrumentation"
@@ -210 +210 @@
          "Instrumentation is not implemented for source language `%s'."
          (to_string (language_of_ast p)));
-    (p, "")
+    (p, "", "")
 
 let annotate input_ast final = 
@@ -218 +218 @@
 let string_output = function
   | AstClight p -> 
-    ClightPrinter.print_program p
+    [ClightPrinter.print_program p]
   | AstCminor p ->
-    CminorPrinter.print_program p
+    [CminorPrinter.print_program p]
   | AstRTLabs p ->
-    RTLabsPrinter.print_program p
+    [RTLabsPrinter.print_program p]
   | AstRTL p ->
-    RTLPrinter.print_program p
+    [RTLPrinter.print_program p]
   | AstERTL p ->
-    ERTLPrinter.print_program p
+    [ERTLPrinter.print_program p]
   | AstLTL p ->
-    LTLPrinter.print_program p
+    [LTLPrinter.print_program p]
   | AstLIN p ->
-    LINPrinter.print_program p
+    [LINPrinter.print_program p]
   | AstASM p ->
-    ASMPrinter.print_program p
+    [Pretty.print_program p ; ASMPrinter.print_program p]
 
 let save exact_output filename ast =
@@ -240 +240 @@
       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);
-  flush cout;
-  close_out cout
-
-let save_cost_incr filename cost_incr =
+  let ext_filenames =
+    List.map (fun ext -> ext_chopped_filename ^ "." ^ ext)
+      (extension (language_of_ast ast)) in
+  let output_filenames =
+    if exact_output then ext_filenames
+    else List.map Misc.SysExt.alternative ext_filenames in
+  let output_strings = string_output ast in
+  let f filename s =
+    let cout = open_out filename in
+    output_string cout s;
+    flush cout;
+    close_out cout in
+  List.iter2 f output_filenames output_strings
+
+let save_cost filename cost_id cost_incr =
   let cout = open_out (filename ^ ".cerco") in
-  output_string cout cost_incr;
+  output_string cout (cost_id ^ "\n");
+  output_string cout (cost_incr ^ "\n");
   flush cout;
   close_out cout

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

@@ -62 +62 @@
 
 (** [annotate input_ast target_ast] inserts cost annotations into the input AST
-    from the (final) target AST. It also returns the name of the cost increment
-    function *)
-val annotate : ast -> ast -> (ast * string)
+    from the (final) target AST. It also returns the name of the cost variable
+    and the name of the cost increment function. *)
+val annotate : ast -> ast -> (ast * string * string)
 
 (** [interpret print_result ast] runs the program [ast] from the default initial
@@ -80 +80 @@
 val save : bool -> string -> ast -> unit
 
-(** [save_cost_incr filename cost_incr] prints the name of the cost increment
-    function [cost_incr] in the file prefixed by [filename] and extended with
+(** [save_cost_incr filename cost_id cost_incr] prints the name [cost_id] of the
+    cost variable and then the name [cost_incr] of the cost increment function
+    in a seperate line in the file prefixed by [filename] and extended with
     ".cost". If the file already exists, it is overwritten. *)
-val save_cost_incr : string -> string -> unit
+val save_cost : string -> string -> string -> unit
 
 (** [from_string s] parses [s] as an intermediate language name. *)