Changeset 145 for Deliverables/D4.1

Timestamp:

Sep 30, 2010, 2:52:02 PM (10 years ago)

Author:

mulligan

Message:

Bug in LCALL fixed.

Location:

Deliverables/D4.1

Files:

• .ocamlinit (modified) (2 diffs)
• ASMInterpret.ml (modified) (3 diffs)
• test.ml (modified) (2 diffs)

Deliverables/D4.1/.ocamlinit

@@ +1 @@
+#directory "_build";;
 #load "Util.cmo";;
 #load "BitVectors.cmo";;
@@ -4 +5 @@
 #load "Parser.cmo";;
 #load "IntelHex.cmo";;
-#load "ASM.cmo";;
 #load "ASMInterpret.cmo";;
 #load "Pretty.cmo";;

Deliverables/D4.1/ASMInterpret.ml

@@ -4 +4 @@
 open Pretty;;
 open IntelHex;;
+open Util;;
 open Parser;;
 
@@ -943 +944 @@
   else true
 ;;
-
-let ($) f x = f x
 
 let read_at_sp status =
@@ -1200 +1199 @@
        let status = { status with sp = new_sp } in
        let pc_upper_byte, pc_lower_byte = from_word status.pc in
-       let status = write_at_sp status pc_upper_byte in
+       let status = write_at_sp status pc_lower_byte in
        let cry, new_sp = half_add status.sp (vect_of_int 1 `Eight) in
        let status = { status with sp = new_sp } in
-       let status = write_at_sp status pc_lower_byte in
+       let status = write_at_sp status pc_upper_byte in
          { status with pc = addr }
   | `AJMP (`ADDR11 a) ->

Deliverables/D4.1/test.ml

@@ -1 @@
-let hex = IntelHex.intel_hex_of_file Sys.argv.(1) in
+let hex = IntelHex.intel_hex_of_file "Test.hex" in
 let mem = IntelHex.process_intel_hex hex in
 let status = ASMInterpret.load_mem mem ASMInterpret.initialize in
@@ -5 +5 @@
  let pc = status.ASMInterpret.pc in
  let instr,_,_ = ASMInterpret.fetch status.ASMInterpret.code_memory pc in
-  prerr_string (BitVectors.hex_string_of_vect pc) ;
-  prerr_endline (": " ^ Pretty.pp_instruction instr)
+   prerr_string (BitVectors.hex_string_of_vect pc) ;
+   prerr_endline (": " ^ Pretty.pp_instruction instr)
 in
  ASMInterpret.execute observe status