Changeset 111 for Deliverables/D4.1

Timestamp:

Sep 22, 2010, 5:19:04 PM (10 years ago)

Author:

mulligan

Message:

MOVC instructions refactored.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -978 +978 @@
   | `MOV(`U5(b1,b2)) -> set_arg1 status (get_arg_1 status b2) b1
   | `MOV(`U6(b1,b2)) -> set_arg1 status (get_arg_1 status b2) b1
-(*
- | MOVC (`A, `A_DPTR) ->
-     let acc_int_val = int_of_byte status.acc in
-     let dptr_int_val = int_of_word (status.dph, status.dpl) in
-     let addr = word_of_int (dptr_int_val + acc_int_val) in
+  | `MOVC (`A, `A_DPTR) ->
+     let big_acc = mk_word (zero `Eight) status.acc in
+     let dptr = mk_word status.dph status.dpl in
+     let cry, addr = half_add dptr big_acc in
      let lookup = WordMap.find addr status.code_memory in
        { status with acc = lookup }
- | MOVC (`A, `A_PC) ->
-     let acc_int_val = int_of_byte status.acc in
-     let new_pc_int_val = (int_of_word status.pc) + 1 in
-     let addr = word_of_int (new_pc_int_val + acc_int_val) in
+  | `MOVC (`A, `A_PC) ->
+     let big_acc = mk_word (zero `Eight) status.acc in
+     (* DPM: Under specified: does the carry from PC incrementation affect the *)
+     (*      addition of the PC with the DPTR? At the moment, no.              *)
+     let cry,inc_pc = half_add status.pc (vect_of_int 1 `Sixteen) in
+     let status = { status with pc = inc_pc } in
+     let cry,addr = half_add inc_pc big_acc in
      let lookup = WordMap.find addr status.code_memory in
-       { status with acc = lookup; pc = word_of_int new_pc_int_val }
+       { status with acc = lookup }
+(*
  (* data transfer *)
 (*