xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-28 05:50:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tcg/aarch64: add ext argument to tcg_out_insn_3310

Browse Source 
The new argument lets you pick uxtw or uxtx mode for the offset
register.  For now, all callers pass TCG_TYPE_I64 so that uxtx
is generated.  The bits for uxtx are removed from I3312_TO_I3310.

Reported-by: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1436974021-28978-2-git-send-email-pbonzini@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Paolo Bonzini 2015-07-15 17:27:00 +02:00 committed by Richard Henderson
parent ee8ba9e4d8
commit 6c0f0c0f12
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tcg/aarch64/tcg-target.c
View File

@ -280,7 +280,7 @@ typedef enum {
I3312_LDRSHX = 0x38000000 | LDST_LD_S_X << 22 | MO_16 << 30, I3312_LDRSHX = 0x38000000 | LDST_LD_S_X << 22 | MO_16 << 30,
I3312_LDRSWX = 0x38000000 | LDST_LD_S_X << 22 | MO_32 << 30, I3312_LDRSWX = 0x38000000 | LDST_LD_S_X << 22 | MO_32 << 30,
I3312_TO_I3310 = 0x00206800, I3312_TO_I3310 = 0x00200800,
I3312_TO_I3313 = 0x01000000, I3312_TO_I3313 = 0x01000000,
/* Load/store register pair instructions. */ /* Load/store register pair instructions. */
@ -496,13 +496,14 @@ static void tcg_out_insn_3509(TCGContext *s, AArch64Insn insn, TCGType ext,
} }
static void tcg_out_insn_3310(TCGContext *s, AArch64Insn insn, static void tcg_out_insn_3310(TCGContext *s, AArch64Insn insn,
TCGReg rd, TCGReg base, TCGReg regoff) TCGReg rd, TCGReg base, TCGType ext,
TCGReg regoff)
{ {
/* Note the AArch64Insn constants above are for C3.3.12. Adjust. */ /* Note the AArch64Insn constants above are for C3.3.12. Adjust. */
tcg_out32(s, insn | I3312_TO_I3310 | regoff << 16 | base << 5 | rd); tcg_out32(s, insn | I3312_TO_I3310 | regoff << 16 |
0x4000 | ext << 13 | base << 5 | rd);
} }
static void tcg_out_insn_3312(TCGContext *s, AArch64Insn insn, static void tcg_out_insn_3312(TCGContext *s, AArch64Insn insn,
TCGReg rd, TCGReg rn, intptr_t offset) TCGReg rd, TCGReg rn, intptr_t offset)
{ {
@ -677,7 +678,7 @@ static void tcg_out_ldst(TCGContext *s, AArch64Insn insn,
/* Worst-case scenario, move offset to temp register, use reg offset. */ /* Worst-case scenario, move offset to temp register, use reg offset. */
tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, offset); tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, offset);
tcg_out_ldst_r(s, insn, rd, rn, TCG_REG_TMP); tcg_out_ldst_r(s, insn, rd, rn, TCG_TYPE_I64, TCG_REG_TMP);
} }
static inline void tcg_out_mov(TCGContext *s, static inline void tcg_out_mov(TCGContext *s,
@ -1111,48 +1112,49 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGMemOp memop, TCGType ext,
TCGReg data_r, TCGReg addr_r, TCGReg off_r) TCGReg data_r, TCGReg addr_r, TCGReg off_r)
{ {
const TCGMemOp bswap = memop & MO_BSWAP; const TCGMemOp bswap = memop & MO_BSWAP;
const TCGType otype = TCG_TYPE_I64;
switch (memop & MO_SSIZE) { switch (memop & MO_SSIZE) {
case MO_UB: case MO_UB:
tcg_out_ldst_r(s, I3312_LDRB, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRB, data_r, addr_r, otype, off_r);
break; break;
case MO_SB: case MO_SB:
tcg_out_ldst_r(s, ext ? I3312_LDRSBX : I3312_LDRSBW, tcg_out_ldst_r(s, ext ? I3312_LDRSBX : I3312_LDRSBW,
data_r, addr_r, off_r); data_r, addr_r, otype, off_r);
break; break;
case MO_UW: case MO_UW:
tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, otype, off_r);
if (bswap) { if (bswap) {
tcg_out_rev16(s, data_r, data_r); tcg_out_rev16(s, data_r, data_r);
} }
break; break;
case MO_SW: case MO_SW:
if (bswap) { if (bswap) {
tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, otype, off_r);
tcg_out_rev16(s, data_r, data_r); tcg_out_rev16(s, data_r, data_r);
tcg_out_sxt(s, ext, MO_16, data_r, data_r); tcg_out_sxt(s, ext, MO_16, data_r, data_r);
} else { } else {
tcg_out_ldst_r(s, ext ? I3312_LDRSHX : I3312_LDRSHW, tcg_out_ldst_r(s, (ext ? I3312_LDRSHX : I3312_LDRSHW),
data_r, addr_r, off_r); data_r, addr_r, otype, off_r);
} }
break; break;
case MO_UL: case MO_UL:
tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, otype, off_r);
if (bswap) { if (bswap) {
tcg_out_rev32(s, data_r, data_r); tcg_out_rev32(s, data_r, data_r);
} }
break; break;
case MO_SL: case MO_SL:
if (bswap) { if (bswap) {
tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, otype, off_r);
tcg_out_rev32(s, data_r, data_r); tcg_out_rev32(s, data_r, data_r);
tcg_out_sxt(s, TCG_TYPE_I64, MO_32, data_r, data_r); tcg_out_sxt(s, TCG_TYPE_I64, MO_32, data_r, data_r);
} else { } else {
tcg_out_ldst_r(s, I3312_LDRSWX, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRSWX, data_r, addr_r, otype, off_r);
} }
break; break;
case MO_Q: case MO_Q:
tcg_out_ldst_r(s, I3312_LDRX, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_LDRX, data_r, addr_r, otype, off_r);
if (bswap) { if (bswap) {
tcg_out_rev64(s, data_r, data_r); tcg_out_rev64(s, data_r, data_r);
} }
@ -1166,31 +1168,32 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCGMemOp memop,
TCGReg data_r, TCGReg addr_r, TCGReg off_r) TCGReg data_r, TCGReg addr_r, TCGReg off_r)
{ {
const TCGMemOp bswap = memop & MO_BSWAP; const TCGMemOp bswap = memop & MO_BSWAP;
const TCGType otype = TCG_TYPE_I64;
switch (memop & MO_SIZE) { switch (memop & MO_SIZE) {
case MO_8: case MO_8:
tcg_out_ldst_r(s, I3312_STRB, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_STRB, data_r, addr_r, otype, off_r);
break; break;
case MO_16: case MO_16:
if (bswap && data_r != TCG_REG_XZR) { if (bswap && data_r != TCG_REG_XZR) {
tcg_out_rev16(s, TCG_REG_TMP, data_r); tcg_out_rev16(s, TCG_REG_TMP, data_r);
data_r = TCG_REG_TMP; data_r = TCG_REG_TMP;
} }
tcg_out_ldst_r(s, I3312_STRH, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_STRH, data_r, addr_r, otype, off_r);
break; break;
case MO_32: case MO_32:
if (bswap && data_r != TCG_REG_XZR) { if (bswap && data_r != TCG_REG_XZR) {
tcg_out_rev32(s, TCG_REG_TMP, data_r); tcg_out_rev32(s, TCG_REG_TMP, data_r);
data_r = TCG_REG_TMP; data_r = TCG_REG_TMP;
} }
tcg_out_ldst_r(s, I3312_STRW, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_STRW, data_r, addr_r, otype, off_r);
break; break;
case MO_64: case MO_64:
if (bswap && data_r != TCG_REG_XZR) { if (bswap && data_r != TCG_REG_XZR) {
tcg_out_rev64(s, TCG_REG_TMP, data_r); tcg_out_rev64(s, TCG_REG_TMP, data_r);
data_r = TCG_REG_TMP; data_r = TCG_REG_TMP;
} }
tcg_out_ldst_r(s, I3312_STRX, data_r, addr_r, off_r); tcg_out_ldst_r(s, I3312_STRX, data_r, addr_r, otype, off_r);
break; break;
default: default:
tcg_abort(); tcg_abort();