Changeset 118 for Deliverables

Timestamp:

Sep 23, 2010, 11:55:07 AM (10 years ago)

Author:

mulligan

Message:

LCALL reimplemented.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -1085 +1085 @@
        let addr = mk_word (mk_byte (mk_nibble p1 p2 p3 p4) (mk_nibble p5 b1 b2 b3)) pc_lower_byte in
          { status with pc = addr }
+  | `LCALL (`ADDR16 addr) ->
+       let cry, new_pc = half_add status.pc (vect_of_int 3 `Sixteen) in
+       let status = { status with pc = new_pc } in
+       let cry, new_sp = half_add status.sp (vect_of_int 1 `Eight) in
+       let status = { status with sp = new_sp } in
+       let pc_upper_byte, pc_lower_byte = from_byte status.pc in
+       let lower_mem = Byte7Map.add (byte7_of_byte status.sp) pc_upper_byte status.low_internal_ram in
+       let status = { status with low_internal_ram = lower_mem } in
+       let cry, new_sp = half_add status.sp (vect_of_int 1 `Eight) in
+       let status = { status with sp = new_sp } in
+       let lower_mem = Byte7Map.add (byte7_of_byte status.sp) pc_lower_byte status.low_internal_ram in
+       let status = { status with low_internal_ram = lower_mem } in
+         { status with pc = addr }
 (*
- | LCALL (`ADDR16 addr) ->
-     let status = { status with pc = status.pc ++ 3 } in
-     let status = { status with sp = byte_of_int ((int_of_byte status.sp) + 1) } in
-     let (bh, bl) = status.pc in
-     let lower_mem = Byte7Map.add (byte7_of_byte status.sp) bl status.low_internal_ram in
-     let status = { status with low_internal_ram = lower_mem } in
-     let status = { status with sp = byte_of_int ((int_of_byte status.sp) + 1) } in
-     let lower_mem = Byte7Map.add (byte7_of_byte status.sp) bh status.low_internal_ram in
-     let status = { status with low_internal_ram = lower_mem } in
-     let ((p1,p2,p3,p4),(p5,_,_,_)),b = status.pc in
-       { status with pc = addr }
  | AJMP (`ADDR11 (b1,b2,b3,b)) ->
      let status = { status with pc = status.pc ++ 2 } in