From a070ea95af91c9d25af9b150d892522fb68e3fae Mon Sep 17 00:00:00 2001 From: redoste Date: Wed, 24 Jan 2024 23:41:30 +0100 Subject: [PATCH] Backport qemu/qemu@852f933 tcg: Fix do_nonatomic_op_* vs signed operations The smin/smax/umin/umax operations require the operands to be properly sign extended. Do not drop the MO_SIGN bit from the load, and additionally extend the val input. --- qemu/tcg/tcg-op.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qemu/tcg/tcg-op.c b/qemu/tcg/tcg-op.c index 37971d5d..86902f03 100644 --- a/qemu/tcg/tcg-op.c +++ b/qemu/tcg/tcg-op.c @@ -3240,8 +3240,9 @@ static void do_nonatomic_op_i32(TCGContext *tcg_ctx, TCGv_i32 ret, TCGv addr, TC memop = tcg_canonicalize_memop(memop, 0, 0); - tcg_gen_qemu_ld_i32(tcg_ctx, t1, addr, idx, memop & ~MO_SIGN); - gen(tcg_ctx, t2, t1, val); + tcg_gen_qemu_ld_i32(tcg_ctx, t1, addr, idx, memop); + tcg_gen_ext_i32(tcg_ctx, t2, val, memop); + gen(tcg_ctx, t2, t1, t2); tcg_gen_qemu_st_i32(tcg_ctx, t2, addr, idx, memop); tcg_gen_ext_i32(tcg_ctx, ret, (new_val ? t2 : t1), memop); @@ -3279,8 +3280,9 @@ static void do_nonatomic_op_i64(TCGContext *tcg_ctx, TCGv_i64 ret, TCGv addr, TC memop = tcg_canonicalize_memop(memop, 1, 0); - tcg_gen_qemu_ld_i64(tcg_ctx, t1, addr, idx, memop & ~MO_SIGN); - gen(tcg_ctx, t2, t1, val); + tcg_gen_qemu_ld_i64(tcg_ctx, t1, addr, idx, memop); + tcg_gen_ext_i64(tcg_ctx, t2, val, memop); + gen(tcg_ctx, t2, t1, t2); tcg_gen_qemu_st_i64(tcg_ctx, t2, addr, idx, memop); tcg_gen_ext_i64(tcg_ctx, ret, (new_val ? t2 : t1), memop);