diff options
| author | Richard Henderson <rth@twiddle.net> | 2013-07-27 14:09:47 -1000 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-10-01 10:20:33 -0700 |
| commit | d9f4dde4a6d34f14509664edc262016f21be5aac (patch) | |
| tree | 01bb2fb6b53573f2976e8e8b850d23d5bf3f4940 /include/exec | |
| parent | 23bbc25085ceac827e1da9bebead058f436f66a6 (diff) | |
| download | focaccia-qemu-d9f4dde4a6d34f14509664edc262016f21be5aac.tar.gz focaccia-qemu-d9f4dde4a6d34f14509664edc262016f21be5aac.zip | |
tcg-arm: Rearrange slow-path qemu_ld/st
Use the new helper_ret_*_mmu routines. Use a conditional call to arrange for a tail-call from the store path, and to load the return address for the helper for the load path. Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/exec-all.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dc27f33152..8dd15948d8 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -324,21 +324,7 @@ extern uintptr_t tci_tb_ptr; In some implementations, we pass the "logical" return address manually; in others, we must infer the logical return from the true return. */ #if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU) -# if defined(__arm__) -/* We define two insns between the return address and the branch back to - straight-line. Find and decode that branch insn. */ -# define GETRA_LDST(RA) tcg_getra_ldst(RA) -static inline uintptr_t tcg_getra_ldst(uintptr_t ra) -{ - int32_t b; - ra += 8; /* skip the two insns */ - b = *(int32_t *)ra; /* load the branch insn */ - b = (b << 8) >> (8 - 2); /* extract the displacement */ - ra += 8; /* branches are relative to pc+8 */ - ra += b; /* apply the displacement */ - return ra; -} -# elif defined(__aarch64__) +# if defined(__aarch64__) # define GETRA_LDST(RA) tcg_getra_ldst(RA) static inline uintptr_t tcg_getra_ldst(uintptr_t ra) { |