diff options
| author | Christopher Pulte | 2016-10-26 11:50:03 +0100 |
|---|---|---|
| committer | Christopher Pulte | 2016-10-26 11:50:03 +0100 |
| commit | 587f9dc7c6409d5ef89719fd65fe7bbb8f8d86b7 (patch) | |
| tree | a52083ecfd74edf6075d09a1121ab5b0d7b3f0b7 /src | |
| parent | 1dc7c1c7984d8a5bd2750f88a249f33fdebb498b (diff) | |
| parent | d8422ce0db60a954397971d6ed26d83036424a58 (diff) | |
Merge branch 'master' of https://bitbucket.org/Peter_Sewell/sail
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 |