Changeset 198 for Deliverables/D4.1

Timestamp:

Oct 19, 2010, 2:20:10 PM (9 years ago)

Author:

mulligan

Message:

Added more info to status printout. Found weird bug in emulator: cjne
is sometimes interpreted as a jnz instruction.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (3 diffs)
• test.ml (modified) (1 diff)

Deliverables/D4.1/ASMInterpret.ml

@@ -262 +262 @@
   let scn_str = (string_of_int <*> int_of_vect $ status.scon) ^ " (" ^ string_of_vect status.scon ^ ")" in
   let sbf_str = (string_of_int <*> int_of_vect $ status.sbuf) ^ " (" ^ string_of_vect status.sbuf ^ ")" in
+  let tcn_str = (string_of_int <*> int_of_vect $ status.tcon) ^ " (" ^ string_of_vect status.tcon ^ ")" in
+  let tmd_str = (string_of_int <*> int_of_vect $ status.tmod) ^ " (" ^ string_of_vect status.tmod ^ ")" in
   let r0_str  = (string_of_int <*> int_of_vect $ get_register status (false, false, false)) ^ " (" ^ (string_of_vect $ get_register status (false, false, false)) ^ ")" in
   let r1_str  = (string_of_int <*> int_of_vect $ get_register status (false, false, true)) ^ " (" ^ (string_of_vect $ get_register status (false, false, true)) ^ ")" in
@@ -292 +294 @@
     "   SCON: " ^ scn_str ^ "\n"                          ^
     "   SBUF: " ^ sbf_str ^ "\n"                          ^
+    "   TMOD: " ^ tmd_str ^ "\n"                          ^
+    "   TCON: " ^ tcn_str ^ "\n"                          ^
     "   Registers:                                    \n" ^
     "    R0 : " ^ r0_str  ^ "\n"                          ^
@@ -302 +306 @@
     "    R7 : " ^ r7_str  ^ "\n"                          ^
     "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n"
+
 (* timings taken from SIEMENS *)
 

Deliverables/D4.1/test.ml

@@ -12 +12 @@
    let _ = prerr_string (BitVectors.hex_string_of_vect pc) in
    let _ = prerr_endline (": " ^ pp_instruction instr) in
-     match instr with
+    (* match instr with
        `SJMP (`REL b) ->
-          if int_of_vect b = 254 || int_of_vect b = 0 then
+          if int_of_vect b = 254 || int_of_vect b = 0 then*)
             prerr_endline <*> string_of_status $ status
-          else
+(*          else
             ()
-     | _ -> ()
+     | _ -> ()*)
 in
 (* DPM: for debugging! *)