From 072f8a43eb471d8e0425370aabc25fbb8d6a2511 Mon Sep 17 00:00:00 2001
From: Kathy Gray
Date: Sat, 4 Oct 2014 17:39:54 +0100
Subject: clarify Step constructor

---
 src/lem_interp/run_interp.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lem_interp/run_interp.ml')

diff --git a/src/lem_interp/run_interp.ml b/src/lem_interp/run_interp.ml
index 37c73d66..a9c22b6c 100644
--- a/src/lem_interp/run_interp.ml
+++ b/src/lem_interp/run_interp.ml
@@ -291,7 +291,7 @@ let rec perform_action ((reg, mem) as env) = function
      perform_action env (Write_mem (id, n, slice, V_vector(zero_big_int, true, [value])))
  (* extern functions *)
  | Call_extern (name, arg) -> eval_external name arg, env
- | Step _ | Nondet _ | Exit _ -> unit_lit, env
+ | Interp.Step _ | Nondet _ | Exit _ -> unit_lit, env
  | _ -> assert false
 ;;
 
@@ -406,7 +406,7 @@ let run
       | Call_extern (f, arg) ->
           show "call_lib" (sprintf "%s(%s)" f (val_to_string_internal arg)) right (val_to_string_internal return);
           step (),env',s
-      | Step _ ->
+      | Interp.Step _ ->
           assert (return = unit_lit);
           show "breakpoint" "" "" "";
           step ~force:true (),env',s
-- 
cgit v1.2.3


From 8399a028fc78512214075115bcdb29015d211db9 Mon Sep 17 00:00:00 2001
From: Kathy Gray
Date: Tue, 7 Oct 2014 13:53:40 +0100
Subject: Put in type for instruction form for models; remove extra information
 from Bytevectors; add place holder for memory size dependency tracking

---
 src/lem_interp/run_interp.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lem_interp/run_interp.ml')

diff --git a/src/lem_interp/run_interp.ml b/src/lem_interp/run_interp.ml
index a9c22b6c..a54dc6e1 100644
--- a/src/lem_interp/run_interp.ml
+++ b/src/lem_interp/run_interp.ml
@@ -49,7 +49,7 @@ let bitvec_to_string l = "0b" ^ collapse_leading (String.concat "" (List.map (fu
 
 let val_to_string v = match v with
   | Bitvector(bools, _, _) -> "0b" ^ collapse_leading (String.concat "" (List.map (function | true -> "1" | _ -> "0") bools))
-  | Bytevector(words, _, _)->
+  | Bytevector words->
     "0x" ^ (String.concat ""
 	    (List.map (function 
 	      | 10 -> "A"
-- 
cgit v1.2.3