From nobody Tue Nov 18 04:25:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607890830; cv=none; d=zohomail.com; s=zohoarc; b=kyV0t5rinYbh80/+PIjV0AnU9QIg4X9fMAgufPdDitjbhom77OxDpK5nF8+LTjdevNYFlLPABfI8/Q5elWXQfXXBQ1a5hL7w8/McKXMpNcNnBKYU6haeyx3LNqT+tlaP9tB6ja4sFQQKcRNnHXpGFT7jLhxMlHwhampOmA3ab8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607890830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WU7av211Gw3wbADY6XPgoCLNL0Q/6KDqRZlDd72LlCc=; b=D35sDwrEe+0ZGtdfRlc3B1q6uKWaOjsut2S4k4/eS/HpllayfkPSyltUqkMmI0G9V5Mb4yStUnhcx+SqI0lYHJZKgTej9R0Dva+QDVf5sTtDKh/zEHoO9rLyDei3tbVawjkKItqzmpxCKnhJ9P2fhIsILV4zkI2aVYrTH3LT1BE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1607890830606480.56956123668317; Sun, 13 Dec 2020 12:20:30 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id g25so7885504wmh.1 for ; Sun, 13 Dec 2020 12:20:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id 64sm28192537wmd.12.2020.12.13.12.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Dec 2020 12:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WU7av211Gw3wbADY6XPgoCLNL0Q/6KDqRZlDd72LlCc=; b=lg3Plv9yDZIf0oqfQcqIFKuS+fY1twqqoLWJGkP/0s5QmgX9g+AcAhlXe1vIXb4SkU u6+sEEol4i03yQAqE9FQXbu+uJeG4jQ718E7L+3h4cgjvP6xQ1yzqV14WzhsvaDrVG0P XTMhtyIG1mGkUbiZ7EkPa89KKSkfSi4+ZKW1Capz0GuBJr3TBqqMgLU9DJ5WgV3BQGZ+ CdCT70G6GNCe49e0Qzn/arC9q/YMgpkeOdC5fZdvpcze8suLyybPK+ZM84FYfw742Tk0 SrhkkMAjcR233PY95gVChi8+8HwmS3hTg9g4QhMLzpOsJw2UyGpoLsFgG/Ul6Ol8kqE4 8OqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WU7av211Gw3wbADY6XPgoCLNL0Q/6KDqRZlDd72LlCc=; b=U1vtuTm4uR5MTcnDMgs7x77gH5xqJaYbDOXCTLUnj5gKogqPxivLvmlhSQX/wQGRE5 TqVo55LlcJFjl5Q13VeddYQ8IRjd3XYyeVbBZa3MuB1SqrIiVjCgGIN1+Y8ydRrKQROy wb7J3W1D3fYNY2y9nE1KeKezh3h325gFrGUSdwWAp0Xo3J9xrGzYjl+zuPivfng9jAMG Rs+cbLKkGpixO9aedA6Vwu/kuiEf9V2tzyQJ7mYK8TLumUnZGO2we5iWg0IKUrzQjejy W1aKrp/rwGEjrdb83qnU7an2y6HE/DUCZhxLnmHnlL0nCV6xS6y1setKnc5iMSXVfp2Q A8xw== X-Gm-Message-State: AOAM531Pxs+ESBTXe31H8b2AEsYTdLGLdKOzfYNtrY/pVsyRqT5F3462 EVuVtAFq724uWKqUyrDlSrrN/btnJm4= X-Google-Smtp-Source: ABdhPJwGswfU1INeuc5+Xpdh/7IEhKrZYuniVVNcdgaPCtjzp2Ttm7znjOhHTptaP+0DrvPGZdnyxQ== X-Received: by 2002:a1c:2182:: with SMTP id h124mr24378018wmh.25.1607890828851; Sun, 13 Dec 2020 12:20:28 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Aurelien Jarno , Aleksandar Rikalo , kvm@vger.kernel.org, Jiaxun Yang , Huacai Chen , Paul Burton , Richard Henderson Subject: [PULL 08/26] target/mips: Also display exception names in user-mode Date: Sun, 13 Dec 2020 21:19:28 +0100 Message-Id: <20201213201946.236123-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201213201946.236123-1-f4bug@amsat.org> References: <20201213201946.236123-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Currently MIPS exceptions are displayed as string in system-mode emulation, but as number in user-mode. Unify by extracting the current system-mode code as excp_name() and use that in user-mode. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20201119160536.1980329-1-f4bug@amsat.org> --- target/mips/helper.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index 041432489d6..59de58fcbc9 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -978,6 +978,7 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, ta= rget_ulong address, return physical; } } +#endif /* !CONFIG_USER_ONLY */ =20 static const char * const excp_names[EXCP_LAST + 1] =3D { [EXCP_RESET] =3D "reset", @@ -1018,7 +1019,14 @@ static const char * const excp_names[EXCP_LAST + 1] = =3D { [EXCP_MSADIS] =3D "MSA disabled", [EXCP_MSAFPE] =3D "MSA floating point", }; -#endif + +static const char *mips_exception_name(int32_t exception) +{ + if (exception < 0 || exception > EXCP_LAST) { + return "unknown"; + } + return excp_names[exception]; +} =20 target_ulong exception_resume_pc(CPUMIPSState *env) { @@ -1091,19 +1099,13 @@ void mips_cpu_do_interrupt(CPUState *cs) bool update_badinstr =3D 0; target_ulong offset; int cause =3D -1; - const char *name; =20 if (qemu_loglevel_mask(CPU_LOG_INT) && cs->exception_index !=3D EXCP_EXT_INTERRUPT) { - if (cs->exception_index < 0 || cs->exception_index > EXCP_LAST) { - name =3D "unknown"; - } else { - name =3D excp_names[cs->exception_index]; - } - qemu_log("%s enter: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx " %s exception\n", - __func__, env->active_tc.PC, env->CP0_EPC, name); + __func__, env->active_tc.PC, env->CP0_EPC, + mips_exception_name(cs->exception_index)); } if (cs->exception_index =3D=3D EXCP_EXT_INTERRUPT && (env->hflags & MIPS_HFLAG_DM)) { @@ -1490,8 +1492,9 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSStat= e *env, { CPUState *cs =3D env_cpu(env); =20 - qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n", - __func__, exception, error_code); + qemu_log_mask(CPU_LOG_INT, "%s: %d (%s) %d\n", + __func__, exception, mips_exception_name(exception), + error_code); cs->exception_index =3D exception; env->error_code =3D error_code; =20 --=20 2.26.2