Changeset 742 for Deliverables/D2.2

Timestamp:

Apr 6, 2011, 11:16:43 AM (9 years ago)

Author:

mulligan

Message:

Added extra debugging feature for Nicolas

Location:

Deliverables/D2.2/8051

Files:

• myocamlbuild_config.ml (modified) (1 diff)
• src/ASM/ASMInterpret.ml (modified) (5 diffs)
• src/ASM/ASMInterpret.mli (modified) (1 diff)

Deliverables/D2.2/8051/myocamlbuild_config.ml

@@ -1 @@
-let parser_lib = "/home/ayache/Downloads/Bol/Deliverables/D2.2/8051/lib"
+let parser_lib = "/home/dpm/Projects/Cerco/Deliverables/D2.2/8051/lib"

Deliverables/D2.2/8051/src/ASM/ASMInterpret.ml

@@ -1649 +1649 @@
 ;;
 
-let execute1 status =
+let execute1' cycle_count status transform =
   let instr,pc,ticks = fetch status.code_memory status.pc in
   let status = { status with clock = status.clock + ticks; pc = pc } in
@@ -1935 +1935 @@
   let status = serial_port_output status out_cont in
   let status = interrupts status in
-  { status with previous_p1_val = get_bit status.p3 4;
-    previous_p3_val = get_bit status.p3 5 }
-;;
+  let status = { status with previous_p1_val = get_bit status.p3 4;
+                   previous_p3_val = get_bit status.p3 5 } in
+  let status = transform cycle_count status in
+    status
+;;
+
+let execute1 status transform = execute1' 0 status transform;;
 
 (*
@@ -1959 +1963 @@
 *)
 
-let rec execute f s =
+let rec execute transform f s =
   let cont =
     try f s; true
     with Halt -> false
   in
-  if cont then execute f (execute1 s)
+  if cont then execute transform f (execute1 s transform)
   else s
 ;;
-
 
 let load_program p =
@@ -1985 +1988 @@
   IntValue.Int8.of_int i
 
+let example_transform cycle_count status =
+  if cycle_count = 3 then
+    { status with dpl = vect_of_int 5 `Eight }
+  else
+    status
+;;
+
 let interpret print_result p =
   if print_result then Printf.printf "8051: %!" ;
@@ -1991 +2001 @@
     let trace = ref [] in
     let callback = observe_trace trace in
-    let st = execute callback st in
+    let st = execute example_transform callback st in
     let res = result st in
     if print_result then

Deliverables/D2.2/8051/src/ASM/ASMInterpret.mli

@@ -123 +123 @@
    trace; it can raise Hold to stop execution. Otherwise
    the processor never halts. *)
-val execute: (status -> unit) -> status -> status
+val execute: (int -> (status -> status)) -> (status -> unit) -> status -> status
 
 val fetch: Physical.WordMap.map -> word -> ASM.instruction * word * int