Changeset 131 for Deliverables

Timestamp:

Sep 27, 2010, 1:25:06 PM (9 years ago)

Author:

mulligan

Message:

Changes from this morning: checking checksum is correct for a
intel_hex_entry. Also some new useful functions in Util and elsewhere.

Location:

Deliverables/D4.1

Files:

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

Deliverables/D4.1/IntelHex.ml

@@ -78 +78 @@
   | 4 -> ExtendedLinear
   | _ -> assert false
+;;
+
+let int_of_intel_hex_type =
+  function
+    Data -> 0
+  | End -> 1
+  | ExtendedSeg -> 2
+  | ExtendedLinear -> 4
 ;;
 
@@ -183 +191 @@
   in
     aux strs
+
+let add_bytes v  =
+  let r = List.rev v in
+  let rec aux (cry, bs) =
+    function
+      [] -> (cry, bs)
+    | hd::tl ->
+        aux (full_add hd bs cry) tl
+  in
+    aux (false, (vect_of_int 0 `Eight)) r
+
+let checksum_valid hex_entry =
+  if List.length hex_entry.data_field mod 2 <> 0 then
+    false
+  else
+    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 _, 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 _, dt_total = add_bytes hex_entry.data_field in
+    let _, total = add_bytes [cs_total; ln_total; ad_total1; ad_total2; dt_total] in
+      cs_total = total

Deliverables/D4.1/IntelHex.mli

@@ -26 +26 @@
 val vect_of_hex_string: string -> sizes -> sizes vect;;
 val hex_string_of_vect: 'a vect -> string;;
+
+val checksum_valid: intel_hex_entry -> bool;;

Deliverables/D4.1/Util.ml

@@ -3 +3 @@
 
 let (<*>) f g x = f (g x)
+;;
+
+let flip f a b = f b a
 ;;