diff options
| author | Alasdair Armstrong | 2018-01-26 22:53:22 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2018-01-26 22:53:22 +0000 |
| commit | 3ea0add3e9b0e6c5ba9c74d533d7c44874d95beb (patch) | |
| tree | f6211e002678c3a7633a270f7bad978b7bddb3ae /src | |
| parent | 481f492ecc3179f5ea8293dab45c3712871c219e (diff) | |
Fixed loading ARM elf files
Also refactored the hand written ARM prelude and pulled out some common functionality into files in sail/lib
Diffstat (limited to 'src')
| -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 |