Changeset 44 for Deliverables/D4.1

Timestamp:

Sep 8, 2010, 12:30:28 PM (10 years ago)

Author:

mulligan

Message:

Added pretty printing functions for bits, bytes, words etc.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (3 diffs)
• Pretty.ml (added)
• physical.ml (modified) (2 diffs)
• physical.mli (modified) (1 diff)

Deliverables/D4.1/ASMInterpret.ml

@@ -1 +1 @@
 open Physical;;
 open ASM;;
-
-exception BOO
+open Pretty;;
+
+exception Fetch_exception of string
 
 type time = int;;
@@ -56 +57 @@
   let pc,v = next pc in
    try pc, byte7_of_byte v
-   with FOO2 -> raise BOO in
+   with Byte7_conversion -> raise (Fetch_exception "Cannot convert byte7") in
  let instr = WordMap.find pc pmem in
  let pc = pc ++ 1 in
@@ -353 +354 @@
          XRL(`U2(`DIRECT b1, `DATA b2)), pc, 2
  with
-  Not_found -> raise BOO
+  Not_found -> raise (Fetch_exception "Key not found")
 ;;
 

Deliverables/D4.1/physical.ml

@@ -1 @@
-exception FOO2
+exception Byte7_conversion
 
 type bit = bool
@@ -16 +16 @@
  function
     (false,b2,b3,b4),n -> (b2,b3,b4,n)
-  | _ -> raise FOO2
+  | _ -> raise Byte7_conversion
 
 let int_of_bit b = if b then 0 else 1

Deliverables/D4.1/physical.mli

@@ -1 @@
-exception FOO2
+exception Byte7_conversion
 
 type bit = bool