mirror of https://gitee.com/openkylin/qemu.git
Fix 32 bit address overflow
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5019 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
bffe143153
commit
90cbed4656
|
@ -625,8 +625,18 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
|
||||||
/* ld [arg1 + x], arg1 */
|
/* ld [arg1 + x], arg1 */
|
||||||
tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
|
tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
|
||||||
offsetof(CPUTLBEntry, addr_read), HOST_LD_OP);
|
offsetof(CPUTLBEntry, addr_read), HOST_LD_OP);
|
||||||
|
|
||||||
|
#if TARGET_LONG_BITS == 32
|
||||||
|
/* and addr_reg, x, arg0 */
|
||||||
|
tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_I5, 0xffffffff);
|
||||||
|
tcg_out_arith(s, arg0, addr_reg, TCG_REG_I5, ARITH_AND);
|
||||||
|
/* add arg0, arg1, arg0 */
|
||||||
|
tcg_out_arith(s, arg0, arg0, arg1, ARITH_ADD);
|
||||||
|
#else
|
||||||
/* add addr_reg, arg1, arg0 */
|
/* add addr_reg, arg1, arg0 */
|
||||||
tcg_out_arith(s, arg0, addr_reg, arg1, ARITH_ADD);
|
tcg_out_arith(s, arg0, addr_reg, arg1, ARITH_ADD);
|
||||||
|
#endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
arg0 = addr_reg;
|
arg0 = addr_reg;
|
||||||
#endif
|
#endif
|
||||||
|
@ -785,8 +795,17 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,
|
||||||
tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
|
tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
|
||||||
offsetof(CPUTLBEntry, addr_write), HOST_LD_OP);
|
offsetof(CPUTLBEntry, addr_write), HOST_LD_OP);
|
||||||
|
|
||||||
|
#if TARGET_LONG_BITS == 32
|
||||||
|
/* and addr_reg, x, arg0 */
|
||||||
|
tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_I5, 0xffffffff);
|
||||||
|
tcg_out_arith(s, arg0, addr_reg, TCG_REG_I5, ARITH_AND);
|
||||||
|
/* add arg0, arg1, arg0 */
|
||||||
|
tcg_out_arith(s, arg0, arg0, arg1, ARITH_ADD);
|
||||||
|
#else
|
||||||
/* add addr_reg, arg1, arg0 */
|
/* add addr_reg, arg1, arg0 */
|
||||||
tcg_out_arith(s, arg0, addr_reg, arg1, ARITH_ADD);
|
tcg_out_arith(s, arg0, addr_reg, arg1, ARITH_ADD);
|
||||||
|
#endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
arg0 = addr_reg;
|
arg0 = addr_reg;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue