Changeset 444

Timestamp:

01/13/11 14:19:14 (2 years ago)

Author:

mulligan

Message:

Got Test.native to compile. Added functions for exporting intel hex format records to a file.

Location:

Deliverables/D4.1

Files:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -1746 +1746 @@
       | `PUSH (`DIRECT b) ->
        (* DPM: What happens if we overflow? *)
-        let cry,new_sp = half_add (get_arg_8 status status.sp) (vect_of_int 1 `Eight) in
+        let cry,new_sp = half_add status.sp (vect_of_int 1 `Eight) in
         let status = { status with sp = new_sp } in
         write_at_sp status b

Deliverables/D4.1/IntelHex.ml

@@ -3 +3 @@
 open Util;;
 open Parser;;
+open Printf;;
 
 exception WrongFormat of string
@@ -235 +236 @@
     processed @ end_buffer
 ;;
+
+let file_of_intel_hex path fmt =
+  let str_fmt = string_of_intel_hex_format fmt in
+  let channel = open_out path in
+    fprintf channel "%s\n" str_fmt;
+    close_out channel
+;;

Deliverables/D4.1/IntelHex.mli

@@ -11 +11 @@
 
 val intel_hex_of_file: string -> intel_hex_format
+val file_of_intel_hex: string -> intel_hex_format -> unit
 val process_intel_hex: intel_hex_format -> Physical.WordMap.map
 

Deliverables/D4.1/Test.ml

@@ -2 +2 @@
 open ASMInterpret;;
 open Util;;
+open IntelHex;;
 open Pretty;;
 
@@ -7 +8 @@
 let mem = IntelHex.process_intel_hex hex in
 let status = ASMInterpret.load_mem mem ASMInterpret.initialize in
+let _ = file_of_intel_hex "hex-output-test.hex" (pack_exported_code_memory 64 65536 status.code_memory) in
 let observe status =
  let pc = status.ASMInterpret.pc in