Changeset 103 for Deliverables

Timestamp:

Sep 22, 2010, 2:13:22 PM (9 years ago)

Author:

mulligan

Message:

fixed implementation of assembly, fixed typing error in execute.

File:

• Deliverables/D4.1/ASMInterpret.ml (modified) (2 diffs)

Deliverables/D4.1/ASMInterpret.ml

@@ -680 +680 @@
    raise CodeTooLarge
   else
-    assert false
-(*
-    let instr = ((List.filter (function `Label _ | `Cost _ | `Jmp _ | `Call _ -> false | _ -> true) l) : instruction list) in
       List.flatten (List.map
          (function
             `Label s -> []
           | `Cost s -> []
-          | `Jmp s | `Call s ->
+          | `Jmp s ->
               let pc_offset = StringMap.find s labels in
-              let i,_,_ = fetch (load_code_memory (List.map assembly1 instr)) (vect_of_int pc_offset `Eight) in
-                i
+                assembly1 (`LJMP (`ADDR16 (vect_of_int pc_offset `Sixteen)))
+          | `Call s ->
+              let pc_offset = StringMap.find s labels in
+                assembly1 (`LCALL (`ADDR16 (vect_of_int pc_offset `Sixteen)))
           | #instruction as i -> assembly1 i) l)
-*)
 ;;
 
@@ -803 +801 @@
  function
     `DIRECT addr ->
-      (match addr with
-         (false,r1,r2,r3),n1 ->
+      let (b1, b2) = from_byte addr in
+      (match from_nibble b1 with
+         (false,r1,r2,r3) ->
            { status with low_internal_ram =
-              Byte7Map.add (mk_byte7 r1 r2 r3 n1) v status.low_internal_ram }
-       | (true,r1,r2,r3),n1 ->
+              Byte7Map.add (mk_byte7 r1 r2 r3 b2) v status.low_internal_ram }
+       | (true,r1,r2,r3) ->
            (*CSC: SFR access, TO BE IMPLEMENTED *)
            (* assert false for now. Try to understand what DEC really does *)