ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg-aarch64: Convert shift insns to tcg_out_insn 

Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Tested-by: Claudio Fontana <claudio.fontana@huawei.com>
This commit is contained in:
Richard Henderson 2013-08-13 13:49:17 -07:00
parent 50573c66eb
commit df9351e372
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,6 +218,12 @@ typedef enum {
/* Add/subtract shifted register instructions (with a shift). */ /* Add/subtract shifted register instructions (with a shift). */
I3502S_ADD_LSL = I3502_ADD, I3502S_ADD_LSL = I3502_ADD,
/* Data-processing (2 source) instructions. */
I3508_LSLV = 0x1ac02000,
I3508_LSRV = 0x1ac02400,
I3508_ASRV = 0x1ac02800,
I3508_RORV = 0x1ac02c00,
/* Logical shifted register instructions (without a shift). */ /* Logical shifted register instructions (without a shift). */
I3510_AND = 0x0a000000, I3510_AND = 0x0a000000,
I3510_ORR = 0x2a000000, I3510_ORR = 0x2a000000,
@ -225,13 +231,6 @@ typedef enum {
I3510_ANDS = 0x6a000000, I3510_ANDS = 0x6a000000,
} AArch64Insn; } AArch64Insn;
enum aarch64_srr_opc {
SRR_SHL = 0x0,
SRR_SHR = 0x4,
SRR_SAR = 0x8,
SRR_ROR = 0xc
};
static inline enum aarch64_ldst_op_data static inline enum aarch64_ldst_op_data
aarch64_ldst_get_data(TCGOpcode tcg_op) aarch64_ldst_get_data(TCGOpcode tcg_op)
{ {
@ -479,15 +478,6 @@ static inline void tcg_out_mul(TCGContext *s, TCGType ext,
tcg_out32(s, base | rm << 16 | rn << 5 | rd); tcg_out32(s, base | rm << 16 | rn << 5 | rd);
} }
static inline void tcg_out_shiftrot_reg(TCGContext *s,
enum aarch64_srr_opc opc, TCGType ext,
TCGReg rd, TCGReg rn, TCGReg rm)
{
/* using 2-source data processing instructions 0x1ac02000 */
unsigned int base = ext ? 0x9ac02000 : 0x1ac02000;
tcg_out32(s, base | rm << 16 | opc << 8 | rn << 5 | rd);
}
static inline void tcg_out_ubfm(TCGContext *s, TCGType ext, TCGReg rd, static inline void tcg_out_ubfm(TCGContext *s, TCGType ext, TCGReg rd,
TCGReg rn, unsigned int a, unsigned int b) TCGReg rn, unsigned int a, unsigned int b)
{ {
@ -1193,47 +1183,47 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
case INDEX_op_shl_i64: case INDEX_op_shl_i64:
case INDEX_op_shl_i32: case INDEX_op_shl_i32:
if (c2) { /* LSL / UBFM Wd, Wn, (32 - m) */ if (c2) {
tcg_out_shl(s, ext, a0, a1, a2); tcg_out_shl(s, ext, a0, a1, a2);
} else { /* LSL / LSLV */ } else {
tcg_out_shiftrot_reg(s, SRR_SHL, ext, a0, a1, a2); tcg_out_insn(s, 3508, LSLV, ext, a0, a1, a2);
} }
break; break;
case INDEX_op_shr_i64: case INDEX_op_shr_i64:
case INDEX_op_shr_i32: case INDEX_op_shr_i32:
if (c2) { /* LSR / UBFM Wd, Wn, m, 31 */ if (c2) {
tcg_out_shr(s, ext, a0, a1, a2); tcg_out_shr(s, ext, a0, a1, a2);
} else { /* LSR / LSRV */ } else {
tcg_out_shiftrot_reg(s, SRR_SHR, ext, a0, a1, a2); tcg_out_insn(s, 3508, LSRV, ext, a0, a1, a2);
} }
break; break;
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
if (c2) { /* ASR / SBFM Wd, Wn, m, 31 */ if (c2) {
tcg_out_sar(s, ext, a0, a1, a2); tcg_out_sar(s, ext, a0, a1, a2);
} else { /* ASR / ASRV */ } else {
tcg_out_shiftrot_reg(s, SRR_SAR, ext, a0, a1, a2); tcg_out_insn(s, 3508, ASRV, ext, a0, a1, a2);
} }
break; break;
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
if (c2) { /* ROR / EXTR Wd, Wm, Wm, m */ if (c2) {
tcg_out_rotr(s, ext, a0, a1, a2); tcg_out_rotr(s, ext, a0, a1, a2);
} else { /* ROR / RORV */ } else {
tcg_out_shiftrot_reg(s, SRR_ROR, ext, a0, a1, a2); tcg_out_insn(s, 3508, RORV, ext, a0, a1, a2);
} }
break; break;
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
case INDEX_op_rotl_i32: /* same as rotate right by (32 - m) */ case INDEX_op_rotl_i32:
if (c2) { /* ROR / EXTR Wd, Wm, Wm, 32 - m */ if (c2) {
tcg_out_rotl(s, ext, a0, a1, a2); tcg_out_rotl(s, ext, a0, a1, a2);
} else { } else {
tcg_out_insn(s, 3502, SUB, 0, TCG_REG_TMP, TCG_REG_XZR, a2); tcg_out_insn(s, 3502, SUB, 0, TCG_REG_TMP, TCG_REG_XZR, a2);
tcg_out_shiftrot_reg(s, SRR_ROR, ext, a0, a1, TCG_REG_TMP); tcg_out_insn(s, 3508, RORV, ext, a0, a1, TCG_REG_TMP);
} }
break; break;