From d5ecaf31c0dfd006776b6f3e5637f0e516bf3422 Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Wed, 14 Sep 2016 15:33:23 +0100 Subject: 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. --- src/lem_interp/run_with_elf.ml | 4 ++-- src/lem_interp/run_with_elf_cheri.ml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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, -- cgit v1.2.3