lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport qemu/qemu@852f933

Browse Source 
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.
This commit is contained in:
redoste
2024-01-24 23:41:30 +01:00
parent 97beeb6fa1
commit a070ea95af
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qemu/tcg/tcg-op.c
View File

@@ -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);