Changeset 91 for Deliverables/D4.1

Timestamp:

Sep 20, 2010, 3:30:27 PM (11 years ago)

Author:

mulligan

Message:

Finished porting/fix type errors in physical.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (2 diffs)
• physical.ml (modified) (3 diffs)
• physical.mli (modified) (2 diffs)

Deliverables/D4.1/ASMInterpret.ml

@@ +1 @@
+open BitVectors;;
 open Physical;;
 
@@ -7 +8 @@
 (* no differentiation between internal and external code memory *)
 type status =
- { code_memory: byte WordMap.t;        (* can be reduced *)
-   low_internal_ram: byte Byte7Map.t;
-   high_internal_ram: byte Byte7Map.t;
-   external_ram: byte WordMap.t;
+ { code_memory: ([`Eight] vect) WordMap.t;        (* can be reduced *)
+   low_internal_ram: ([`Eight] vect) Byte7Map.t;
+   high_internal_ram: ([`Eight] vect) Byte7Map.t;
+   external_ram: ([`Eight] vect) WordMap.t;
 
    pc: word;

Deliverables/D4.1/physical.ml

@@ -8 +8 @@
   Map.Make (struct type t = word let compare = Pervasives.compare end)
 
-let byte7_of_byte =
- function
-    (false,b2,b3,b4),n -> (b2,b3,b4,n)
-  | _ -> raise Byte7_conversion
+let int_of_bit =
+  function
+    false -> 0
+  | true -> 1
+
+let byte7_of_byte b =
+  let bits = to_bits b in
+    match bits with
+      [false;b1;b2;b3;b4;b5;b6;b7] -> mk_byte7 b1 b2 b3 (mk_nibble b4 b5 b6 b7)
+    | _ -> raise Byte7_conversion
 
 let add8_with_c b1 b2 c =
@@ -25 +31 @@
 ;;
 
-let subb8_with_c b1 b2 c =
+let subb8_with_c (b1 : [`Eight] vect) (b2 : [`Eight] vect) (c : bit) =
  let n1 = int_of_vect b1 in
  let n2 = int_of_vect b2 in
- let c = int_of_vect c in
+ let c = int_of_bit c in
  let res = n1 - n2 - c in
  let ac = n1 mod 16 - n2 mod 16 - c < 0 in
@@ -52 +58 @@
 
 let byte7_of_bit b =
-  false,false,false,(false,false,false,b)
+  [false;false;false;false;false;false;b]
 ;;
 
-let byte_of_byte7 (b1,b2,b3,n) =
-        (false,b1,b2,b3),n
+let byte_of_byte7 ([b1;b2;b3]::n) =
+        [false;b1;b2;b3]::n
 ;;

Deliverables/D4.1/physical.mli

@@ -1 @@
-open Bit_vectors
+open BitVectors;;
 
 exception Byte7_conversion
@@ -7 +7 @@
 
 val byte7_of_byte: byte -> byte7
+val int_of_bit: bit -> int
 
 val subb8_with_c:
- byte -> byte -> bit -> byte * bit * bit * bit (* -, c, ac, ov *)
-val dec: byte -> byte (* with roll-over *)
-val inc: byte -> byte (* with roll-over *)
+ byte -> byte -> bit -> ([ `Eight | `Eleven | `Four | `Seven | `Sixteen ] vect) * bit * bit * bit (* -, c, ac, ov *)
+val dec: byte -> ([ `Eight | `Eleven | `Four | `Seven | `Sixteen ] vect) (* with roll-over *)
+val inc: byte -> ([ `Eight | `Eleven | `Four | `Seven | `Sixteen ] vect) (* with roll-over *)