Changeset 101

Timestamp:

Sep 22, 2010, 11:49:45 AM (10 years ago)

Author:

mulligan

Message:

Fixing type errors in execute1.

Location:

Deliverables/D4.1

Files:

• ASM.mli (modified) (1 diff)
• ASMInterpret.ml (modified) (5 diffs)
• ASMInterpret.mli (modified) (1 diff)
• physical.ml (modified) (1 diff)

Deliverables/D4.1/ASM.mli

@@ -1 @@
-open BitVectors;;
-open Physical;;
-
 type ('a,'b) union2 = [ `U1 of 'a | `U2 of 'b ]
 type ('a,'b,'c) union3 = [ `U1 of 'a | `U2 of 'b | `U3 of 'c ]

Deliverables/D4.1/ASMInterpret.ml

@@ -1 @@
-open BitVectors;;
-open ASM;;
-open Physical;;
-
-exception Fetch_exception of string
-exception CodeTooLarge
+exception Fetch_exception of string;;
+exception CodeTooLarge;;
+exception Halt;;
 
 type time = int;;
@@ -666 +663 @@
 
 let assembly l =
- let pc,labels =
+ let pc,labels,costs =
   List.fold_left
-   (fun ((pc,labels) as acc) i ->
+   (fun (pc,labels,costs) i ->
      match i with
-        `Label s -> pc, StringMap.add s pc labels
-      | `Cost _ -> acc
+        `Label s -> pc, StringMap.add s pc labels, costs
+      | `Cost s -> pc, labels, StringMap.add s pc costs
       | `Jmp s 
-      | `Call s -> pc + 3, labels  (*CSC: very stupid: always expand to worst opcode *)
+      | `Call s -> pc + 3, labels, costs  (*CSC: very stupid: always expand to worst opcode *)
       | #instruction as i ->
         let i',pc',_ = fetch (load_code_memory (assembly1 i)) (vect_of_int 0 `Sixteen) in
          assert (i = i');
-         (pc + int_of_vect pc',labels)
-   ) (0,StringMap.empty) l
+         (pc + int_of_vect pc',labels, costs)
+   ) (0,StringMap.empty,StringMap.empty) l
  in
   if pc >= 65536 then
    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 ->
+              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
+          | #instruction as i -> assembly1 i) l)
+*)
 ;;
 
@@ -847 +857 @@
   match instr with
      `ADD (`A,d1) ->
-      let v,c,ac,ov =
-       add8_with_c (get_arg_8 status `A) (get_arg_8 status d1) false
-      in
-       set_flags (set_arg8 status v `A) c (Some ac) ov
+        let v,c,ac,ov =
+          add8_with_c (get_arg_8 status `A) (get_arg_8 status d1) false
+        in
+          set_flags (set_arg8 status v `A) c (Some ac) ov
+   | `ADDC (`A,d1) ->
+        let v,c,ac,ov =
+          add8_with_c (get_arg_8 status `A) (get_arg_8 status d1) (get_cy_flag status)
+        in
+          set_flags (set_arg8 status v `A) c (Some ac) ov
 (*
-   | ADDC (`A,d1) ->
-      let v,c,ac,ov =
-       add8_with_c (get_arg_8 status `A) (get_arg_8 status d1) (carr status)
-      in
-       set_flags (set_arg8 status v `A) c (Some ac) ov
    | SUBB (`A,d1) ->
       let v,c,ac,ov =
@@ -1208 +1218 @@
          status
  | NOP -> status
+*)
+ | _ -> assert false
 ;;
-*) | _ -> assert false
-
-exception Hold;;
 
 let rec execute f s =
@@ -1217 +1226 @@
  let cont =
   try f s; true
-  with Hold -> false
+  with Halt -> false
  in
   if cont then execute f s

Deliverables/D4.1/ASMInterpret.mli

@@ -9 +9 @@
 val load: BitVectors.byte list -> status -> status
 
-exception Hold  (* to be raised to stop execution *)
+exception Halt  (* to be raised to stop execution *)
 
 (* the callback function is used to observe the execution

Deliverables/D4.1/physical.ml

@@ -1 @@
-open BitVectors;;
-
 exception Byte7_conversion