summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Norton2016-09-14 15:33:23 +0100
committerRobert Norton2016-09-14 15:33:51 +0100
commitd5ecaf31c0dfd006776b6f3e5637f0e516bf3422 (patch)
tree9beefdc93e4613feaa8dc2a80cacd1f58cf78ca6 /src
parentc0599e6ea1fc97a8254040a82a9455b3adc46720 (diff)
Switch mips/cheri over to using memory ea/val for writes. Tag is now first byte of value for capability writes. Still need TAGw for now but should kill eventually.
Diffstat (limited to 'src')
-rw-r--r--src/lem_interp/run_with_elf.ml4
-rw-r--r--src/lem_interp/run_with_elf_cheri.ml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lem_interp/run_with_elf.ml b/src/lem_interp/run_with_elf.ml
index 5b27bf1a..20601fec 100644
--- a/src/lem_interp/run_with_elf.ml
+++ b/src/lem_interp/run_with_elf.ml
@@ -689,8 +689,8 @@ let initial_system_state_of_elf_file name =
(Mips.defs,
(Mips_extras.read_memory_functions,
Mips_extras.memory_writes,
- [],
- [],
+ Mips_extras.memory_eas,
+ Mips_extras.memory_vals,
Mips_extras.barrier_functions),
[],
MIPS,
diff --git a/src/lem_interp/run_with_elf_cheri.ml b/src/lem_interp/run_with_elf_cheri.ml
index 5eb560e1..9991c8aa 100644
--- a/src/lem_interp/run_with_elf_cheri.ml
+++ b/src/lem_interp/run_with_elf_cheri.ml
@@ -765,8 +765,8 @@ let initial_system_state_of_elf_file name =
(Cheri.defs,
(Mips_extras.read_memory_functions,
Mips_extras.memory_writes,
- [],
- [],
+ Mips_extras.memory_eas,
+ Mips_extras.memory_vals,
Mips_extras.barrier_functions),
[],
MIPS,