[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 16/26] tcg/arm: Clarify tcg_out_bx for arm4 host
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v7 16/26] tcg/arm: Clarify tcg_out_bx for arm4 host |
Date: |
Fri, 26 May 2017 14:16:28 -0700 |
In theory this would re-enable usage of QEMU on an armv4 host.
Whether this is worthwhile is debatable -- we've been unconditionally
issuing the armv5t BX instruction in the prologue since 2011 without
complaint. Possibly we should simply require an armv6 host.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/arm/tcg-target.inc.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
index e75a6d4..590c57d 100644
--- a/tcg/arm/tcg-target.inc.c
+++ b/tcg/arm/tcg-target.inc.c
@@ -329,11 +329,6 @@ static const uint8_t tcg_cond_to_arm_cond[] = {
[TCG_COND_GTU] = COND_HI,
};
-static inline void tcg_out_bx(TCGContext *s, int cond, int rn)
-{
- tcg_out32(s, (cond << 28) | 0x012fff10 | rn);
-}
-
static inline void tcg_out_b(TCGContext *s, int cond, int32_t offset)
{
tcg_out32(s, (cond << 28) | 0x0a000000 |
@@ -402,6 +397,18 @@ static inline void tcg_out_mov_reg(TCGContext *s, int
cond, int rd, int rm)
}
}
+static inline void tcg_out_bx(TCGContext *s, int cond, TCGReg rn)
+{
+ /* Unless the C portion of QEMU is compiled as thumb, we don't
+ actually need true BX semantics; merely a branch to an address
+ held in a register. */
+ if (use_armv5t_instructions) {
+ tcg_out32(s, (cond << 28) | 0x012fff10 | rn);
+ } else {
+ tcg_out_mov_reg(s, cond, TCG_REG_PC, rn);
+ }
+}
+
static inline void tcg_out_dat_imm(TCGContext *s,
int cond, int opc, int rd, int rn, int im)
{
@@ -977,7 +984,7 @@ static inline void tcg_out_st8(TCGContext *s, int cond,
* with the code buffer limited to 16MB we wouldn't need the long case.
* But we also use it for the tail-call to the qemu_ld/st helpers, which does.
*/
-static inline void tcg_out_goto(TCGContext *s, int cond, tcg_insn_unit *addr)
+static void tcg_out_goto(TCGContext *s, int cond, tcg_insn_unit *addr)
{
intptr_t addri = (intptr_t)addr;
ptrdiff_t disp = tcg_pcrel_diff(s, addr);
@@ -987,15 +994,9 @@ static inline void tcg_out_goto(TCGContext *s, int cond,
tcg_insn_unit *addr)
return;
}
+ assert(use_armv5t_instructions || (addri & 1) == 0);
tcg_out_movi32(s, cond, TCG_REG_TMP, addri);
- if (use_armv5t_instructions) {
- tcg_out_bx(s, cond, TCG_REG_TMP);
- } else {
- if (addri & 1) {
- tcg_abort();
- }
- tcg_out_mov_reg(s, cond, TCG_REG_PC, TCG_REG_TMP);
- }
+ tcg_out_bx(s, cond, TCG_REG_TMP);
}
/* The call case is mostly used for helpers - so it's not unreasonable
--
2.9.4
- [Qemu-devel] [PATCH v7 08/26] target/i386: introduce gen_jr helper to generate lookup_and_goto_ptr, (continued)
- [Qemu-devel] [PATCH v7 08/26] target/i386: introduce gen_jr helper to generate lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 09/26] target/i386: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 10/26] target/i386: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 12/26] tcg/ppc: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 11/26] tb-hash: improve tb_jmp_cache hash function in user mode, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 15/26] tcg/s390: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 14/26] tcg/sparc: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 13/26] tcg/aarch64: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 17/26] tcg/arm: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 19/26] target/s390: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 16/26] tcg/arm: Clarify tcg_out_bx for arm4 host,
Richard Henderson <=
- [Qemu-devel] [PATCH v7 20/26] target/hppa: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 21/26] target/aarch64: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 22/26] target/aarch64: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 23/26] target/mips: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 24/26] target/mips: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 25/26] target/alpha: Implement WTINT inline, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 26/26] target/alpha: Use goto_tb for fallthru between TBs, Richard Henderson, 2017/05/26