Changeset 140 for Deliverables/D4.1

Timestamp:

Sep 29, 2010, 12:51:05 PM (10 years ago)

Author:

sacerdot

Message:

More cleanup.

Location:

Deliverables/D4.1

Files:

• BitVectors.ml (modified) (2 diffs)
• BitVectors.mli (modified) (1 diff)
• IntelHex.ml (modified) (1 diff)
• IntelHex.mli (modified) (2 diffs)
• test.ml (modified) (1 diff)

Deliverables/D4.1/BitVectors.ml

@@ -89 +89 @@
     he::tl
 
+(* CSC: can overflow!!! *)
 let int_of_vect v =
   let rec aux pow v =
@@ -140 +141 @@
     
 let zero size = pad (size_lookup size) []
+
+(* CSC: can overflow!!! *)
+let hex_string_of_vect v = Printf.sprintf "%0 2X" (int_of_vect v);;

Deliverables/D4.1/BitVectors.mli

@@ -29 +29 @@
 val int_of_vect: 'a vect -> int
 val vect_of_int: int -> ([< sizes] as 'a) -> 'a vect
+val string_of_bit: bit -> string
 val string_of_vect: 'a vect -> string
-val string_of_bit: bit -> string
+val hex_string_of_vect: 'a vect -> string
+
 
 val (-&-): 'a vect -> 'a vect -> 'a vect

Deliverables/D4.1/IntelHex.ml

@@ -33 +33 @@
     | 'C' -> 12 | 'D' -> 13 | 'E' -> 14
     | 'F' -> 15 | _ -> assert false
-
-let hex_string_of_vect v = Printf.sprintf "%0 2X" (int_of_vect v);;
 
 let intel_hex_entry_type_of_int =

Deliverables/D4.1/IntelHex.mli

@@ -3 +3 @@
 open Parser;;
 
-type intel_hex_entry_type =
-    Data
-  | End
-  | ExtendedSeg
-  | ExtendedLinear
-;;
+type intel_hex_format
 
-type intel_hex_entry =
-{
-  record_length: byte;
-  record_addr: word;
-  record_type: intel_hex_entry_type;
-  data_field: byte list;
-  data_checksum: byte
-}
-;;
-
-type intel_hex_format = intel_hex_entry list;;
-
-val string_of_intel_hex_format: intel_hex_format -> string;;
-val prs_intel_hex_format: intel_hex_format parser;;
-
-val hex_string_of_vect: 'a vect -> string;;
+val string_of_intel_hex_format: intel_hex_format -> string
+val prs_intel_hex_format: intel_hex_format parser
 
 exception WrongFormat of string
@@ -31 +12 @@
 val intel_hex_of_file: string -> intel_hex_format
 val process_intel_hex: intel_hex_format -> Physical.WordMap.map
-
-val checksum_valid: intel_hex_entry -> bool;;

Deliverables/D4.1/test.ml

@@ -6 +6 @@
  let opcode = Physical.WordMap.find pc status.ASMInterpret.code_memory in
  let instr,_,_ = ASMInterpret.fetch status.ASMInterpret.code_memory pc in
-  prerr_string ("pc = " ^ IntelHex.hex_string_of_vect pc) ;
-  prerr_string (" : " ^ IntelHex.hex_string_of_vect opcode);
+  prerr_string ("pc = " ^ BitVectors.hex_string_of_vect pc) ;
+  prerr_string (" : " ^ BitVectors.hex_string_of_vect opcode);
   prerr_endline (" = " ^ Pretty.pp_instruction instr)
 in