diff options
| author | Robert Norton | 2016-10-25 17:52:33 +0100 |
|---|---|---|
| committer | Robert Norton | 2016-10-25 17:52:33 +0100 |
| commit | d8422ce0db60a954397971d6ed26d83036424a58 (patch) | |
| tree | b75c60ecd41f3073210251e591f3df4c03c65e75 /src | |
| parent | c9d4764211f32657e571bb6c09a7851618629a30 (diff) | |
load all segments into prog_mem regardless of x flag (for running cheri tests all memory is equal
Diffstat (limited to 'src')
| -rw-r--r-- | src/lem_interp/run_with_elf.ml | 4 | ||||
| -rw-r--r-- | src/lem_interp/run_with_elf_cheri.ml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lem_interp/run_with_elf.ml b/src/lem_interp/run_with_elf.ml index b04911f1..9879e353 100644 --- a/src/lem_interp/run_with_elf.ml +++ b/src/lem_interp/run_with_elf.ml @@ -61,9 +61,7 @@ let rec load_memory_segments segments = | segment::segments' -> let (x,w,r) = segment.Elf_interpreted_segment.elf64_segment_flags in begin - (if x - then load_memory_segment segment prog_mem - else load_memory_segment segment data_mem); + load_memory_segment segment prog_mem; load_memory_segments segments' end end diff --git a/src/lem_interp/run_with_elf_cheri.ml b/src/lem_interp/run_with_elf_cheri.ml index 19a62201..be3bff6f 100644 --- a/src/lem_interp/run_with_elf_cheri.ml +++ b/src/lem_interp/run_with_elf_cheri.ml @@ -60,9 +60,7 @@ let rec load_memory_segments segments = | segment::segments' -> let (x,w,r) = segment.Elf_interpreted_segment.elf64_segment_flags in begin - (if x - then load_memory_segment segment prog_mem - else load_memory_segment segment data_mem); + load_memory_segment segment prog_mem; load_memory_segments segments' end end |