Context Navigation

Changeset 743 for Deliverables/D2.2/8051/src/ASM

Timestamp:

Apr 7, 2011, 11:11:26 AM (10 years ago)

Author:

mulligan

Message:

Removed mess from yesterday.

Location:

Deliverables/D2.2/8051/src/ASM

Files:

-                      r742
+                      r743
 ;;
 let execute1' cycle_count status transform =
+let execute1 status =
   let instr,pc,ticks = fetch status.code_memory status.pc in
   let status = { status with clock = status.clock + ticks; pc = pc } in
 …
   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;;
 (*
 …
 *)
 let rec execute transform f s =
+let rec execute f s =
   let cont =
     try f s; true
     with Halt -> false
   in
   if cont then execute transform f (execute1 s transform)
+  if cont then execute f (execute1 s)
   else s
 ;;
 …
   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: %!" ;
 …
     let trace = ref [] in
     let callback = observe_trace trace in
     let st = execute example_transform callback st in
+    let st = execute callback st in
     let res = result st in
     if print_result then

r742	r743
123	123	trace; it can raise Hold to stop execution. Otherwise
124	124	the processor never halts. *)
125		val execute: (~~int -> (status -> status)) -> (~~status -> unit) -> status -> status
	125	val execute: (status -> unit) -> status -> status
126	126
127	127	val fetch: Physical.WordMap.map -> word -> ASM.instruction * word * int

Note: See TracChangeset for help on using the changeset viewer.