diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-24 23:12:19 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-24 23:12:19 +0000 |
| commit | d0660ed4828f5292bb8605764c2e87b1c6c6f816 (patch) | |
| tree | d7f8e5dd2cfa7ad12c58007fbfd04d3798e00982 | |
| parent | eae6ce523890cf2fa56b11f06f67b19797a0d0ee (diff) | |
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
| -rw-r--r-- | tcg/arm/tcg-target.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 0c430f76f1..a3f4c6d43c 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -109,7 +109,7 @@ int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) break; #ifdef CONFIG_SOFTMMU - /* qemu_ld/st inputs (unless 'X' or 'D') */ + /* qemu_ld/st inputs (unless 'X', 'd' or 'D') */ case 'x': ct->ct |= TCG_CT_REG; 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); 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 */ case 'D': ct->ct |= TCG_CT_REG; @@ -963,8 +971,9 @@ static inline void tcg_out_qemu_ld(TCGContext *s, int cond, data_reg, 0, 0, SHIFT_IMM_LSL(0)); break; case 3: - tcg_out_dat_reg(s, cond, ARITH_MOV, - data_reg, 0, 0, SHIFT_IMM_LSL(0)); + if (data_reg != 0) + tcg_out_dat_reg(s, cond, ARITH_MOV, + data_reg, 0, 0, SHIFT_IMM_LSL(0)); if (data_reg2 != 1) tcg_out_dat_reg(s, cond, ARITH_MOV, data_reg2, 0, 1, SHIFT_IMM_LSL(0)); @@ -1497,7 +1506,7 @@ static const TCGTargetOpDef arm_op_defs[] = { { INDEX_op_qemu_ld16u, { "r", "x", "X" } }, { INDEX_op_qemu_ld16s, { "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_st16, { "x", "x", "X" } }, |