diff options
| author | Alasdair Armstrong | 2018-01-29 14:32:59 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2018-01-29 14:32:59 +0000 |
| commit | 0258cb243bcd63fe81ff761c12def9f71048e3db (patch) | |
| tree | ea86535c399769bdaa5425d2b1f93a37bd50bcfc /src/elf_loader.ml | |
| parent | b3bca96a2c3ec108606c1fbc6a8ec533d6c0c344 (diff) | |
| parent | 36f086ce2b3506e2a81ef77ad03f3b339b8f0518 (diff) | |
Merge branch 'sail2' of https://bitbucket.org/Peter_Sewell/sail into sail2
Diffstat (limited to 'src/elf_loader.ml')
| -rw-r--r-- | src/elf_loader.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/elf_loader.ml b/src/elf_loader.ml index feacdf3d..83c36821 100644 --- a/src/elf_loader.ml +++ b/src/elf_loader.ml @@ -118,9 +118,9 @@ let load_segment seg = let load_elf name = let segments, e_entry, symbol_map = read name in opt_elf_entry := e_entry; - if List.mem_assoc "tohost" symbol_map then - let (_, _, tohost_addr, _, _) = List.assoc "tohost" symbol_map in - opt_elf_tohost := tohost_addr; + (if List.mem_assoc "tohost" symbol_map then + let (_, _, tohost_addr, _, _) = List.assoc "tohost" symbol_map in + opt_elf_tohost := tohost_addr); List.iter load_segment segments (* The sail model can access this by externing a unit -> int function |