summaryrefslogtreecommitdiff
path: root/src/gen_lib/power_extras.lem
diff options
context:
space:
mode:
authorChristopher Pulte2016-09-23 14:20:29 +0100
committerChristopher Pulte2016-09-23 14:20:29 +0100
commitc4de9dc0425e508fb61165e41c096736c722359c (patch)
treeedad34bd8aae303d588ac687d87b0482df79ee26 /src/gen_lib/power_extras.lem
parentb73a7daa6d2b661659ecf066d25d146cadaec1e8 (diff)
sail-to-lem progress
Diffstat (limited to 'src/gen_lib/power_extras.lem')
-rw-r--r--src/gen_lib/power_extras.lem6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gen_lib/power_extras.lem b/src/gen_lib/power_extras.lem
index b43c6403..e08da230 100644
--- a/src/gen_lib/power_extras.lem
+++ b/src/gen_lib/power_extras.lem
@@ -27,10 +27,10 @@ let MEMr (addr,l) = read_memory (unsigned addr) l
let MEMr_reserve (addr,l) = read_memory (unsigned addr) l
let MEMw_EA (addr,l) = write_writeEA (unsigned addr) l
-let MEMw_EA_conditional (addr,l) = write_writeEA (unsigned addr) l
+let MEMw_EA_cond (addr,l) = write_writeEA (unsigned addr) l
let MEMw (addr,l,value) = write_memory (unsigned addr) l value
-let MEMw_conditional (addr,l,value) = write_memory (unsigned addr) l value >> return true
+let MEMw_conditional (addr,l,value) = write_memory (unsigned addr) l value >> return I
let I_Sync () = return ()
let H_Sync () = return ()
@@ -39,7 +39,7 @@ let EIEIO_Sync () = return ()
let recalculate_dependency () = return ()
-let trap () = exit ()
+let trap () = exit "error"
(* this needs to change, but for that we'd have to make the type checker know about trap
* as an effect *)