Changeset 161 for Deliverables/D4.1

Timestamp:

Oct 7, 2010, 10:35:46 AM (10 years ago)

Author:

mulligan

Message:

Type errors fixed. Add16 with carry implemented.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (1 diff)
• Physical.ml (modified) (1 diff)
• Physical.mli (modified) (1 diff)

Deliverables/D4.1/ASMInterpret.ml

@@ -1291 +1291 @@
                 | false,true ->
                     (* TYPE ERROR! *)
-                    let res,ac,ov,cy = add8_with_c (mk_word status.th0 status.tl0) (vect_of_int 1 `Sixteen) in
+                    let res,ac,ov,cy = add16_with_c (mk_word status.th0 status.tl0) (vect_of_int 1 `Sixteen) false in
                     if ov then
                       let b = set_bit status.tcon 5 true in

Deliverables/D4.1/Physical.ml

@@ -50 +50 @@
 ;;
 
+let add16_with_c (b1 : [`Sixteen] vect) (b2 : [`Sixteen] vect) (c : bit) =
+ let n1 = int_of_vect b1 in
+ let n2 = int_of_vect b2 in
+ let c = int_of_bit c in
+ let res = n1 + n2 + c in
+ let ac = n1 mod 256 + n2 mod 256 + c >= 256 in
+ let c6 = n1 mod 2097152 + n2 mod 2097152 + c >= 2097152 in
+ let res,c = res mod 4194304, res >= 4194304 in
+ let ov = c <> c6 in
+   vect_of_int res `Sixteen,c,ac,ov
+;;
+
 let subb8_with_c (b1 : [`Eight] vect) (b2 : [`Eight] vect) (c : bit) =
  let n1 = int_of_vect b1 in

Deliverables/D4.1/Physical.mli

@@ -22 +22 @@
 val add8_with_c:
  byte -> byte -> bit -> byte * bit * bit * bit
+val add16_with_c:
+ word -> word -> bit -> word * bit * bit * bit
 val dec: byte -> byte (* with roll-over *)
 val inc: byte -> byte (* with roll-over *)