Changeset 116 for Deliverables

Timestamp:

Sep 23, 2010, 11:10:25 AM (9 years ago)

Author:

mulligan

Message:

RETs done.

File:

• Deliverables/D4.1/ASMInterpret.ml (modified) (1 diff)

Deliverables/D4.1/ASMInterpret.ml

@@ -1051 +1051 @@
          else
            status
+  | `RET ->
+      (* DPM: What happens when we underflow? *)
+      let high_bits = Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram in
+      let new_sp,_,_,_ = subb8_with_c status.sp (vect_of_int 1 `Eight) false in
+      let status = { status with sp = new_sp } in
+      let low_bits = Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram in
+      let new_sp,_,_,_ = subb8_with_c status.sp (vect_of_int 1 `Eight) false in
+      let status = { status with sp = new_sp } in
+        { status with pc = mk_byte high_bits low_bits }
+  | `RETI ->
+      let high_bits = Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram in
+      let new_sp,_,_,_ = subb8_with_c status.sp (vect_of_int 1 `Eight) false in
+      let status = { status with sp = new_sp } in
+      let low_bits = Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram in
+      let new_sp,_,_,_ = subb8_with_c status.sp (vect_of_int 1 `Eight) false in
+      let status = { status with sp = new_sp } in
+        { status with pc = mk_byte high_bits low_bits }
 (*
- | RET ->
-     let high_bits = (Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram) in
-     let new_sp = byte_of_int ((int_of_byte status.sp) - 1) in
-     let status = { status with sp = new_sp } in
-     let low_bits = (Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram) in
-     let new_sp = byte_of_int ((int_of_byte status.sp) - 1) in
-     let status = { status with sp = new_sp } in
-       { status with pc = (high_bits, low_bits) }
- | RETI ->
-     let high_bits = (Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram) in
-     let new_sp = byte_of_int ((int_of_byte status.sp) - 1) in
-     let status = { status with sp = new_sp } in
-     let low_bits = (Byte7Map.find (byte7_of_byte status.sp) status.low_internal_ram) in
-     let new_sp = byte_of_int ((int_of_byte status.sp) - 1) in
-     let status = { status with sp = new_sp } in
-       { status with pc = (high_bits, low_bits) }
  | ACALL (`ADDR11 (b1,b2,b3,b)) ->
      let status = { status with pc = status.pc ++ 2 } in