Changeset 133 for Deliverables

Timestamp:

Sep 27, 2010, 2:08:51 PM (9 years ago)

Author:

mulligan

Message:

Fixed error in parser for intel hex format entries: entries consist of
lists of *nibbles*, not *bytes*. Changes propagated through rest of
file.

Location:

Deliverables/D4.1

Files:

• IntelHex.ml (modified) (8 diffs)
• IntelHex.mli (modified) (1 diff)

Deliverables/D4.1/IntelHex.ml

@@ -13 +13 @@
 type intel_hex_entry =
 {
-  record_length: byte * byte;
-  record_addr: byte * byte * byte * byte;
+  record_length: nibble * nibble;
+  record_addr: nibble * nibble * nibble * nibble;
   record_type: intel_hex_entry_type;
-  data_field: byte list;
-  data_checksum: byte * byte
+  data_field: nibble list;
+  data_checksum: nibble * nibble
 }
 ;;
@@ -91 +91 @@
          prs_hex_digit >>=
 fun a -> prs_hex_digit >>=
-fun b -> return (vect_of_hex_string (String.make 1 a) `Eight,
-                 vect_of_hex_string (String.make 1 b) `Eight)
+fun b -> return (vect_of_hex_string (String.make 1 a) `Four,
+                 vect_of_hex_string (String.make 1 b) `Four)
 ;;
 
@@ -100 +100 @@
 fun b -> prs_hex_digit >>=
 fun c -> prs_hex_digit >>=
-fun d -> return $ (vect_of_hex_string (String.make 1 a) `Eight,
-                   vect_of_hex_string (String.make 1 b) `Eight,
-                   vect_of_hex_string (String.make 1 c) `Eight,
-                   vect_of_hex_string (String.make 1 d) `Eight)
+fun d -> return $ (vect_of_hex_string (String.make 1 a) `Four,
+                   vect_of_hex_string (String.make 1 b) `Four,
+                   vect_of_hex_string (String.make 1 c) `Four,
+                   vect_of_hex_string (String.make 1 d) `Four)
 ;;
 
@@ -119 +119 @@
 fun a ->
   let a_as_strs = List.map (String.make 1) a in
-  let byte_data = List.map (fun x -> vect_of_hex_string x `Eight) a_as_strs in
+  let byte_data = List.map (fun x -> vect_of_hex_string x `Four) a_as_strs in
     return $ byte_data
 ;;
@@ -126 +126 @@
          prs_hex_digit >>=
 fun a -> prs_hex_digit >>=
-fun b -> return (vect_of_hex_string (String.make 1 a) `Eight,
-                 vect_of_hex_string (String.make 1 b) `Eight)
+fun b -> return (vect_of_hex_string (String.make 1 a) `Four,
+                 vect_of_hex_string (String.make 1 b) `Four)
 ;;
 
@@ -137 +137 @@
 fun d ->
   let (l_u_b, l_l_b) = b in
-  let len = int_of_vect (mk_word l_u_b l_l_b) in
+  let len = int_of_vect (mk_byte l_u_b l_l_b) in
     prs_data (2 * len) >>=
 fun e -> prs_checksum  >>=
@@ -200 +200 @@
         aux (full_add hd bs cry) tl
   in
-    aux (false, (vect_of_int 0 `Eight)) r
+    aux (false, (vect_of_int 0 `Four)) r
 
 let checksum_valid hex_entry =
@@ -208 +208 @@
     let chk_1, chk_2 = hex_entry.data_checksum in
     let _, cs_total = half_add chk_1 chk_2 in
-    let len_1, len_2 = hex_entry.record_length in
+(*    let len_1, len_2 = hex_entry.record_length in
     let _, ln_total = half_add len_1 len_2 in
     let adr_1, adr_2, adr_3, adr_4 = hex_entry.record_addr in
     let _, ad_total1 = half_add adr_1 adr_2 in
-    let _, ad_total2 = half_add adr_3 adr_4 in
+    let _, ad_total2 = half_add adr_3 adr_4 in*)
     let _, dt_total = add_bytes hex_entry.data_field in
-    let _, total = add_bytes [cs_total; ln_total; ad_total1; ad_total2; dt_total] in
-    let total = complement total in
+(*    let _, total = add_bytes [cs_total; ln_total; ad_total1; ad_total2; dt_total] in *)
+    let total = complement dt_total in
       cs_total = total
+
+(* DPM: Debug
+   let Some entry = intel_hex_format_of_string ":00000001FF";;
+   checksum_valid $ List.hd entry;;
+*)

Deliverables/D4.1/IntelHex.mli

@@ -12 +12 @@
 type intel_hex_entry =
 {
-  record_length: byte * byte;
-  record_addr: byte * byte * byte * byte;
+  record_length: nibble * nibble;
+  record_addr: nibble * nibble * nibble * nibble;
   record_type: intel_hex_entry_type;
-  data_field: byte list;
-  data_checksum: byte * byte
+  data_field: nibble list;
+  data_checksum: nibble * nibble
 };;