falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relax a constraint for qemu_ld64 on ARM host. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4567 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-05-24 23:12:19 +00:00
parent eae6ce5238
commit d0660ed482
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tcg/arm/tcg-target.c
View File

@ -109,7 +109,7 @@ int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
break; break;
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
/* qemu_ld/st inputs (unless 'X' or 'D') */ /* qemu_ld/st inputs (unless 'X', 'd' or 'D') */
case 'x': case 'x':
ct->ct |= TCG_CT_REG; ct->ct |= TCG_CT_REG;
tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1); tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1);
@ -117,6 +117,14 @@ int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
tcg_regset_reset_reg(ct->u.regs, TCG_REG_R1); tcg_regset_reset_reg(ct->u.regs, TCG_REG_R1);
break; break;
/* qemu_ld64 data_reg */
case 'd':
ct->ct |= TCG_CT_REG;
tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1);
/* r1 is still needed to load data_reg2, so don't use it. */
tcg_regset_reset_reg(ct->u.regs, TCG_REG_R1);
break;
/* qemu_ld/st64 data_reg2 */ /* qemu_ld/st64 data_reg2 */
case 'D': case 'D':
ct->ct |= TCG_CT_REG; ct->ct |= TCG_CT_REG;
@ -963,6 +971,7 @@ static inline void tcg_out_qemu_ld(TCGContext *s, int cond,
data_reg, 0, 0, SHIFT_IMM_LSL(0)); data_reg, 0, 0, SHIFT_IMM_LSL(0));
break; break;
case 3: case 3:
if (data_reg != 0)
tcg_out_dat_reg(s, cond, ARITH_MOV, tcg_out_dat_reg(s, cond, ARITH_MOV,
data_reg, 0, 0, SHIFT_IMM_LSL(0)); data_reg, 0, 0, SHIFT_IMM_LSL(0));
if (data_reg2 != 1) if (data_reg2 != 1)
@ -1497,7 +1506,7 @@ static const TCGTargetOpDef arm_op_defs[] = {
{ INDEX_op_qemu_ld16u, { "r", "x", "X" } }, { INDEX_op_qemu_ld16u, { "r", "x", "X" } },
{ INDEX_op_qemu_ld16s, { "r", "x", "X" } }, { INDEX_op_qemu_ld16s, { "r", "x", "X" } },
{ INDEX_op_qemu_ld32u, { "r", "x", "X" } }, { INDEX_op_qemu_ld32u, { "r", "x", "X" } },
{ INDEX_op_qemu_ld64, { "x", "r", "x", "X" } }, { INDEX_op_qemu_ld64, { "d", "r", "x", "X" } },
{ INDEX_op_qemu_st8, { "x", "x", "X" } }, { INDEX_op_qemu_st8, { "x", "x", "X" } },
{ INDEX_op_qemu_st16, { "x", "x", "X" } }, { INDEX_op_qemu_st16, { "x", "x", "X" } },