Merge pull request #1570 from iii-i/s390x-brasl-brcl

wtdcode · web-flow · commit 966798fbf6c5 · 2022-03-17T20:57:53.000+01:00
Merged, thanks!
diff --git a/qemu/target/s390x/translate.c b/qemu/target/s390x/translate.c
@@ -1268,7 +1268,7 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c,
                                  bool is_imm, int imm, TCGv_i64 cdest)
 {
     DisasJumpType ret;
-    uint64_t dest = s->base.pc_next + 2 * imm;
+    uint64_t dest = s->base.pc_next + (int64_t)imm * 2;
     TCGLabel *lab;
     TCGContext *tcg_ctx = s->uc->tcg_ctx;
 
@@ -1606,7 +1606,7 @@ static DisasJumpType op_basi(DisasContext *s, DisasOps *o)
 {
     TCGContext *tcg_ctx = s->uc->tcg_ctx;
     pc_to_link_info(tcg_ctx, o->out, s, s->pc_tmp);
-    return help_goto_direct(s, s->base.pc_next + 2 * get_field(s, i2));
+    return help_goto_direct(s, s->base.pc_next + (int64_t)get_field(s, i2) * 2);
 }
 
 static DisasJumpType op_bc(DisasContext *s, DisasOps *o)

Original file line number	Diff line number	Diff line change
`@@ -1268,7 +1268,7 @@ static DisasJumpType help_branch(DisasContext s, DisasCompare c,`
`1268`	`1268`	`bool is_imm, int imm, TCGv_i64 cdest)`
`1269`	`1269`	`{`
`1270`	`1270`	`DisasJumpType ret;`
`1271`		`- uint64_t dest = s->base.pc_next + 2 * imm;`
	`1271`	`+ uint64_t dest = s->base.pc_next + (int64_t)imm * 2;`
`1272`	`1272`	`TCGLabel *lab;`
`1273`	`1273`	`TCGContext *tcg_ctx = s->uc->tcg_ctx;`
`1274`	`1274`
`@@ -1606,7 +1606,7 @@ static DisasJumpType op_basi(DisasContext s, DisasOps o)`
`1606`	`1606`	`{`
`1607`	`1607`	`TCGContext *tcg_ctx = s->uc->tcg_ctx;`
`1608`	`1608`	`pc_to_link_info(tcg_ctx, o->out, s, s->pc_tmp);`
`1609`		`- return help_goto_direct(s, s->base.pc_next + 2 * get_field(s, i2));`
	`1609`	`+ return help_goto_direct(s, s->base.pc_next + (int64_t)get_field(s, i2) * 2);`
`1610`	`1610`	`}`
`1611`	`1611`
`1612`	`1612`	`static DisasJumpType op_bc(DisasContext s, DisasOps o)`