diff options
| author | Anthony Liguori | 2013-07-26 20:04:21 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-26 20:04:21 +0200 |
| commit | f0ef1cf4d6c996d90df6e4a32a82423d180f3e4d (patch) | |
| tree | ceca64dbd292ac8cddb28752a6d6495d138a6c28 /include/exec/exec-all.h | |
| parent | Merge remote-tracking branch 'jliu/or32' into staging (diff) | |
| parent | Merge git://github.com/hw-claudio/qemu-aarch64-queue into tcg-next (diff) | |
| download | qemu-f0ef1cf4d6c996d90df6e4a32a82423d180f3e4d.tar.gz qemu-f0ef1cf4d6c996d90df6e4a32a82423d180f3e4d.tar.xz qemu-f0ef1cf4d6c996d90df6e4a32a82423d180f3e4d.zip | |
Merge remote-tracking branch 'rth/tcg-next' into staging
# By Claudio Fontana (1) and others
# Via Richard Henderson
* rth/tcg-next:
tcg: Remove temp_buf
tcg/aarch64: Implement tlb lookup fast path
tcg/aarch64: implement ldst 12bit scaled uimm offset
Message-id: 1373919944-8521-1-git-send-email-rth@twiddle.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/exec/exec-all.h')
| -rw-r--r-- | include/exec/exec-all.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b2162a4ec4..5920f73c90 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -358,6 +358,20 @@ static inline uintptr_t tcg_getpc_ldst(uintptr_t ra) not the start of the next opcode */ return ra; } +#elif defined(__aarch64__) +# define GETRA() ((uintptr_t)__builtin_return_address(0)) +# define GETPC_LDST() tcg_getpc_ldst(GETRA()) +static inline uintptr_t tcg_getpc_ldst(uintptr_t ra) +{ + int32_t b; + ra += 4; /* skip one instruction */ + b = *(int32_t *)ra; /* load the branch insn */ + b = (b << 6) >> (6 - 2); /* extract the displacement */ + ra += b; /* apply the displacement */ + ra -= 4; /* return a pointer into the current opcode, + not the start of the next opcode */ + return ra; +} # else # error "CONFIG_QEMU_LDST_OPTIMIZATION needs GETPC_LDST() implementation!" # endif |