summaryrefslogtreecommitdiff
path: root/src/lem_interp/run_interp.ml
diff options
context:
space:
mode:
authorStephen Kell2014-10-08 16:29:17 +0100
committerStephen Kell2014-10-08 16:29:17 +0100
commit0c5cebb6ec19d37915cf236da1d7407ac97b26c3 (patch)
treeaf0c4f29d4c4059d0c9b2ab97ed68d6d55b9ebb7 /src/lem_interp/run_interp.ml
parent5bb5968d91f87d891305b1e53dee7322667f4faf (diff)
parent34f044d2e1b54a931c2fe50ec116310d3adb45d6 (diff)
Merge.
Diffstat (limited to 'src/lem_interp/run_interp.ml')
-rw-r--r--src/lem_interp/run_interp.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lem_interp/run_interp.ml b/src/lem_interp/run_interp.ml
index 37c73d66..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"
@@ -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