diff options
| author | Julian Brown | 2017-02-07 19:29:59 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-07 19:29:59 +0100 |
| commit | f7478a92dd9ee2276bfaa5b7317140d3f9d6a53b (patch) | |
| tree | f533aa39ca2f33bb53b6135f93f2072069ad9fae /include/disas/bfd.h | |
| parent | target/arm: Add cfgend parameter for ARM CPU selection. (diff) | |
| download | qemu-f7478a92dd9ee2276bfaa5b7317140d3f9d6a53b.tar.gz qemu-f7478a92dd9ee2276bfaa5b7317140d3f9d6a53b.tar.xz qemu-f7478a92dd9ee2276bfaa5b7317140d3f9d6a53b.zip | |
Fix Thumb-1 BE32 execution and disassembly.
Thumb-1 code has some issues in BE32 mode (as currently implemented). In
short, since bytes are swapped within words at load time for BE32
executables, this also swaps pairs of adjacent Thumb-1 instructions.
This patch un-swaps those pairs of instructions again, both for execution,
and for disassembly. (The previous version of the patch always read four
bytes in arm_read_memory_func and then extracted the proper two bytes,
in a probably misguided attempt to match the behaviour of actual hardware
as described by e.g. the ARM9TDMI TRM, section 3.3 "Endian effects for
instruction fetches". It's less complicated to just read the correct
two bytes though.)
Signed-off-by: Julian Brown <julian@codesourcery.com>
Message-id: ca20462a044848000370318a8bd41dd0a4ed273f.1484929304.git.julian@codesourcery.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/disas/bfd.h')
| -rw-r--r-- | include/disas/bfd.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 0435b8c9f9..b01e002b4c 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -295,6 +295,7 @@ typedef struct disassemble_info { The bottom 16 bits are for the internal use of the disassembler. */ unsigned long flags; #define INSN_HAS_RELOC 0x80000000 +#define INSN_ARM_BE32 0x00010000 PTR private_data; /* Function used to get bytes to disassemble. MEMADDR is the @@ -306,6 +307,12 @@ typedef struct disassemble_info { (bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info); + /* A place to stash the real read_memory_func if read_memory_func wants to + do some funky address arithmetic or similar (e.g. for ARM BE32 mode). */ + int (*read_memory_inner_func) + (bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info); + /* Function which should be called if we get an error that we can't recover from. STATUS is the errno value from read_memory_func and MEMADDR is the address that we were trying to read. INFO is a |