@samitouri / QOSamiQemu / commits / 0ddb30db18

target/riscv: Fix size of excp_uw2

Fix to 64 bits to match size of instruction start words. Signed-off-by: Anton Johansson <anjo@rev.ng> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Acked-by: Alistair Francis <alistair.francis@wdc.com> Message-ID: <20260520125406.28693-11-anjo@rev.ng> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Anton Johansson committed May 20, 2026 at 14:53 UTC 0ddb30db188247e84abb8aca85081ec5769ac09e
2 files changed +2 -2
target/riscv/cpu.h
+1 -1
@@ -259,7 +259,7 @@ struct CPUArchState {
259 /* shadow stack register for zicfiss extension */
260 uint64_t ssp;
261 /* env place holder for extra word 2 during unwind */
262 - target_ulong excp_uw2;
262 + uint64_t excp_uw2;
263 /* sw check code for sw check exception */
264 target_ulong sw_check_code;
265 #ifdef CONFIG_USER_ONLY
target/riscv/translate.c
+1 -1
@@ -231,7 +231,7 @@ static void gen_check_nanbox_s(TCGv_i64 out, TCGv_i64 in)
231 tcg_gen_movcond_i64(TCG_COND_GEU, out, in, t_max, in, t_nan);
232 }
233
234 -static void decode_save_opc(DisasContext *ctx, target_ulong excp_uw2)
234 +static void decode_save_opc(DisasContext *ctx, uint64_t excp_uw2)
235 {
236 assert(!ctx->insn_start_updated);
237 ctx->insn_start_updated = true;