From nobody Fri Nov 7 08:05:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547644150155562.036223252792; Wed, 16 Jan 2019 05:09:10 -0800 (PST) Received: from localhost ([127.0.0.1]:47649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkwM-0005ch-3r for importer@patchew.org; Wed, 16 Jan 2019 08:09:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkuU-0004f7-IX for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjkuT-0002Hc-AD for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:10 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54171 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjkuS-0008Ez-Uz for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:09 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 45E271A1DD0; Wed, 16 Jan 2019 14:06:05 +0100 (CET) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 230921A1E9C; Wed, 16 Jan 2019 14:06:05 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2019 14:05:47 +0100 Message-Id: <1547643949-10776-2-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 1/3] target/mips: Add preprocessor constants for CP0 subregisters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, aurelien@aurel32.net, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Add preprocessor constants for CP0 subregisters. The names of the subregisters were chosen to be in sync with the table of corresponding assembler mnemonics found in the documentation for I6500 and I6400 (release 1.0). Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/cpu.h | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 114 insertions(+) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 48e86d1..294aef0 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -267,6 +267,120 @@ typedef struct mips_def_t mips_def_t; #define CPO_REGISTER_31 31 =20 =20 +/* CP0 Register 00 */ +#define CPO_REG00__INDEX 0 +#define CPO_REG00__VPCONTROL 4 +/* CP0 Register 01 */ +/* CP0 Register 02 */ +#define CPO_REG02__ENTRYLO0 0 +/* CP0 Register 03 */ +#define CPO_REG03__ENTRYLO1 0 +#define CPO_REG03__GLOBALNUM 1 +/* CP0 Register 04 */ +#define CPO_REG04__CONTEXT 0 +#define CPO_REG04__USERLOCAL 2 +#define CPO_REG04__DBGCONTEXTID 4 +#define CPO_REG00__MMID 5 +/* CP0 Register 05 */ +#define CPO_REG05__PAGEMASK 0 +#define CPO_REG05__PAGEGRAIN 1 +/* CP0 Register 06 */ +#define CPO_REG06__WIRED 0 +/* CP0 Register 07 */ +#define CPO_REG07__HWRENA 0 +/* CP0 Register 08 */ +#define CPO_REG08__BADVADDR 0 +#define CPO_REG08__BADINSTR 1 +#define CPO_REG08__BADINSTRP 2 +/* CP0 Register 09 */ +#define CPO_REG09__COUNT 0 +#define CPO_REG09__SAARI 6 +#define CPO_REG09__SAAR 7 +/* CP0 Register 10 */ +#define CPO_REG10__ENTRYHI 0 +#define CPO_REG10__GUESTCTL1 4 +#define CPO_REG10__GUESTCTL2 5 +/* CP0 Register 11 */ +#define CPO_REG11__COMPARE 0 +#define CPO_REG11__GUESTCTL0EXT 4 +/* CP0 Register 12 */ +#define CPO_REG12__STATUS 0 +#define CPO_REG12__INTCTL 1 +#define CPO_REG12__SRSCTL 2 +#define CPO_REG12__GUESTCTL0 6 +#define CPO_REG12__GTOFFSET 7 +/* CP0 Register 13 */ +#define CPO_REG13__CAUSE 0 +/* CP0 Register 14 */ +#define CPO_REG14__EPC 0 +/* CP0 Register 15 */ +#define CPO_REG15__PRID 0 +#define CPO_REG15__EBASE 1 +#define CPO_REG15__CDMMBASE 2 +#define CPO_REG15__CMGCRBASE 3 +/* CP0 Register 16 */ +#define CPO_REG16__CONFIG 0 +#define CPO_REG16__CONFIG1 1 +#define CPO_REG16__CONFIG2 2 +#define CPO_REG16__CONFIG3 3 +#define CPO_REG16__CONFIG4 4 +#define CPO_REG16__CONFIG5 5 +#define CPO_REG00__CONFIG7 7 +/* CP0 Register 17 */ +#define CPO_REG17__LLADDR 0 +#define CPO_REG17__MAAR 1 +#define CPO_REG17__MAARI 2 +/* CP0 Register 18 */ +#define CPO_REG18__WATCHLO0 0 +#define CPO_REG18__WATCHLO1 1 +#define CPO_REG18__WATCHLO2 2 +#define CPO_REG18__WATCHLO3 3 +/* CP0 Register 19 */ +#define CPO_REG19__WATCHHI0 0 +#define CPO_REG19__WATCHHI1 1 +#define CPO_REG19__WATCHHI2 2 +#define CPO_REG19__WATCHHI3 3 +/* CP0 Register 20 */ +#define CPO_REG20__XCONTEXT 0 +/* CP0 Register 21 */ +/* CP0 Register 22 */ +/* CP0 Register 23 */ +#define CPO_REG23__DEBUG 0 +/* CP0 Register 24 */ +#define CPO_REG24__DEPC 0 +/* CP0 Register 25 */ +#define CPO_REG25__PERFCTL0 0 +#define CPO_REG25__PERFCNT0 1 +#define CPO_REG25__PERFCTL1 2 +#define CPO_REG25__PERFCNT1 3 +#define CPO_REG25__PERFCTL2 4 +#define CPO_REG25__PERFCNT2 5 +#define CPO_REG25__PERFCTL3 6 +#define CPO_REG25__PERFCNT3 7 +/* CP0 Register 26 */ +#define CPO_REG00__ERRCTL 0 +/* CP0 Register 27 */ +#define CPO_REG27__CACHERR 0 +/* CP0 Register 28 */ +#define CPO_REG28__ITAGLO 0 +#define CPO_REG28__IDATALO 1 +#define CPO_REG28__DTAGLO 2 +#define CPO_REG28__DDATALO 3 +/* CP0 Register 29 */ +#define CPO_REG29__IDATAHI 1 +#define CPO_REG29__DDATAHI 3 +/* CP0 Register 30 */ +#define CPO_REG30__ERROREPC 0 +/* CP0 Register 31 */ +#define CPO_REG31__DESAVE 0 +#define CPO_REG31__KSCRATCH1 2 +#define CPO_REG31__KSCRATCH2 3 +#define CPO_REG31__KSCRATCH3 4 +#define CPO_REG31__KSCRATCH4 5 +#define CPO_REG31__KSCRATCH5 6 +#define CPO_REG31__KSCRATCH6 7 + + typedef struct TCState TCState; struct TCState { target_ulong gpr[32]; --=20 2.7.4 From nobody Fri Nov 7 08:05:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547644279305936.5951481555571; Wed, 16 Jan 2019 05:11:19 -0800 (PST) Received: from localhost ([127.0.0.1]:48157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkyT-0007Pu-Dx for importer@patchew.org; Wed, 16 Jan 2019 08:11:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkuU-0004f8-IY for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjkuT-0002Ii-IR for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:10 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54186 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjkuT-0008Fd-91 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:09 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 4A8851A2058; Wed, 16 Jan 2019 14:06:05 +0100 (CET) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 2B0701A1F90; Wed, 16 Jan 2019 14:06:05 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2019 14:05:48 +0100 Message-Id: <1547643949-10776-3-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 2/3] target/mips: Add CP0 register MemoryMapID X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, aurelien@aurel32.net, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Add CP0 register MemoryMapID. Only data field is added. The corresponding functionality will be added in future patches. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/cpu.h | 1 + target/mips/machine.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 294aef0..366d914 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -536,6 +536,7 @@ struct CPUMIPSState { */ target_ulong CP0_Context; target_ulong CP0_KScratch[MIPS_KSCRATCH_NUM]; + int32_t CP0_MemoryMapID; /* * CP0 Register 5 */ diff --git a/target/mips/machine.c b/target/mips/machine.c index 111d7c3..1341ab1 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -214,8 +214,8 @@ const VMStateDescription vmstate_tlb =3D { =20 const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", - .version_id =3D 16, - .minimum_version_id =3D 16, + .version_id =3D 17, + .minimum_version_id =3D 17, .post_load =3D cpu_post_load, .fields =3D (VMStateField[]) { /* Active TC */ @@ -253,6 +253,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_UINT64(env.CP0_EntryLo0, MIPSCPU), VMSTATE_UINT64(env.CP0_EntryLo1, MIPSCPU), VMSTATE_UINTTL(env.CP0_Context, MIPSCPU), + VMSTATE_INT32(env.CP0_MemoryMapID, MIPSCPU), VMSTATE_INT32(env.CP0_PageMask, MIPSCPU), VMSTATE_INT32(env.CP0_PageGrain, MIPSCPU), VMSTATE_UINTTL(env.CP0_SegCtl0, MIPSCPU), --=20 2.7.4 From nobody Fri Nov 7 08:05:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547644290983594.4965420756299; Wed, 16 Jan 2019 05:11:30 -0800 (PST) Received: from localhost ([127.0.0.1]:48213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkyf-0007cC-Go for importer@patchew.org; Wed, 16 Jan 2019 08:11:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjkuq-0004ur-08 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjkuT-0002Jn-V5 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:22 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:54220 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjkuS-0008H4-Vh for qemu-devel@nongnu.org; Wed, 16 Jan 2019 08:07:09 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 820AB1A1E9C; Wed, 16 Jan 2019 14:06:05 +0100 (CET) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 3341A1A1FAB; Wed, 16 Jan 2019 14:06:05 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2019 14:05:49 +0100 Message-Id: <1547643949-10776-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1547643949-10776-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 3/3] target/mips: Rename 'rn' to 'register_name' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, aurelien@aurel32.net, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Rename 'rn' to 'register_name' in CP0-related handlers. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/translate.c | 858 ++++++++++++++++++++++++--------------------= ---- 1 file changed, 432 insertions(+), 426 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index b0b926f..ca4e815 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -6474,7 +6474,7 @@ static inline void gen_mtc0_store32 (TCGv arg, target= _ulong off) =20 static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; =20 switch (reg) { case CPO_REGISTER_02: @@ -6482,7 +6482,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA); gen_mfhc0_entrylo(arg, offsetof(CPUMIPSState, CP0_EntryLo0)); - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; default: goto cp0_unimplemented; @@ -6493,7 +6493,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA); gen_mfhc0_entrylo(arg, offsetof(CPUMIPSState, CP0_EntryLo1)); - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; default: goto cp0_unimplemented; @@ -6504,7 +6504,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->saar); gen_helper_mfhc0_saar(arg, cpu_env); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -6515,12 +6515,12 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 0: gen_mfhc0_load64(arg, offsetof(CPUMIPSState, lladdr), ctx->CP0_LLAddr_shift); - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_mfhc0_maar(arg, cpu_env); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; default: goto cp0_unimplemented; @@ -6533,7 +6533,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 4: case 6: gen_mfhc0_load64(arg, offsetof(CPUMIPSState, CP0_TagLo), 0); - rn =3D "TagLo"; + register_name =3D "TagLo"; break; default: goto cp0_unimplemented; @@ -6542,17 +6542,18 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, = int reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("mfhc0", rn, reg, sel); + trace_mips_translate_c0("mfhc0", register_name, reg, sel); return; =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "mfhc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "mfhc0 %s (reg %d sel %d)\n", + register_name, reg, sel); tcg_gen_movi_tl(arg, 0); } =20 static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; uint64_t mask =3D ctx->PAMask >> 36; =20 switch (reg) { @@ -6562,7 +6563,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA); tcg_gen_andi_tl(arg, arg, mask); gen_mthc0_entrylo(arg, offsetof(CPUMIPSState, CP0_EntryLo0)); - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; default: goto cp0_unimplemented; @@ -6574,7 +6575,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA); tcg_gen_andi_tl(arg, arg, mask); gen_mthc0_entrylo(arg, offsetof(CPUMIPSState, CP0_EntryLo1)); - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; default: goto cp0_unimplemented; @@ -6585,7 +6586,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->saar); gen_helper_mthc0_saar(cpu_env, arg); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -6597,12 +6598,12 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, = int reg, int sel) supported); the CP0_LLAddr_rw_bitmask does not seem to be relevant for modern MIPS cores supporting MTHC0, therefore treating MTHC0 to LLAddr as NOP. */ - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_mthc0_maar(cpu_env, arg); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; default: goto cp0_unimplemented; @@ -6616,7 +6617,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 6: tcg_gen_andi_tl(arg, arg, mask); gen_mthc0_store64(arg, offsetof(CPUMIPSState, CP0_TagLo)); - rn =3D "TagLo"; + register_name =3D "TagLo"; break; default: goto cp0_unimplemented; @@ -6625,10 +6626,11 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, = int reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("mthc0", rn, reg, sel); + trace_mips_translate_c0("mthc0", register_name, reg, sel); =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "mthc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "mthc0 %s (reg %d sel %d)\n", + register_name, reg, sel); } =20 static inline void gen_mfc0_unimplemented(DisasContext *ctx, TCGv arg) @@ -6642,7 +6644,7 @@ static inline void gen_mfc0_unimplemented(DisasContex= t *ctx, TCGv arg) =20 static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; =20 if (sel !=3D 0) check_insn(ctx, ISA_MIPS32); @@ -6652,27 +6654,27 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Index)); - rn =3D "Index"; + register_name =3D "Index"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpcontrol(arg, cpu_env); - rn =3D "MVPControl"; + register_name =3D "MVPControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpconf0(arg, cpu_env); - rn =3D "MVPConf0"; + register_name =3D "MVPConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpconf1(arg, cpu_env); - rn =3D "MVPConf1"; + register_name =3D "MVPConf1"; break; case 4: CP0_CHECK(ctx->vp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPControl)); - rn =3D "VPControl"; + register_name =3D "VPControl"; break; default: goto cp0_unimplemented; @@ -6683,42 +6685,42 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 0: CP0_CHECK(!(ctx->insn_flags & ISA_MIPS32R6)); gen_helper_mfc0_random(arg, cpu_env); - rn =3D "Random"; + register_name =3D "Random"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEControl)); - rn =3D "VPEControl"; + register_name =3D "VPEControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEConf0)); - rn =3D "VPEConf0"; + register_name =3D "VPEConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEConf1)); - rn =3D "VPEConf1"; + register_name =3D "VPEConf1"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load64(arg, offsetof(CPUMIPSState, CP0_YQMask)); - rn =3D "YQMask"; + register_name =3D "YQMask"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load64(arg, offsetof(CPUMIPSState, CP0_VPESchedule)); - rn =3D "VPESchedule"; + register_name =3D "VPESchedule"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load64(arg, offsetof(CPUMIPSState, CP0_VPEScheFBack)); - rn =3D "VPEScheFBack"; + register_name =3D "VPEScheFBack"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEOpt)); - rn =3D "VPEOpt"; + register_name =3D "VPEOpt"; break; default: goto cp0_unimplemented; @@ -6741,42 +6743,42 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) gen_move_low32(arg, tmp); tcg_temp_free_i64(tmp); } - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcstatus(arg, cpu_env); - rn =3D "TCStatus"; + register_name =3D "TCStatus"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcbind(arg, cpu_env); - rn =3D "TCBind"; + register_name =3D "TCBind"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcrestart(arg, cpu_env); - rn =3D "TCRestart"; + register_name =3D "TCRestart"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tchalt(arg, cpu_env); - rn =3D "TCHalt"; + register_name =3D "TCHalt"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tccontext(arg, cpu_env); - rn =3D "TCContext"; + register_name =3D "TCContext"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcschedule(arg, cpu_env); - rn =3D "TCSchedule"; + register_name =3D "TCSchedule"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcschefback(arg, cpu_env); - rn =3D "TCScheFBack"; + register_name =3D "TCScheFBack"; break; default: goto cp0_unimplemented; @@ -6799,12 +6801,12 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) gen_move_low32(arg, tmp); tcg_temp_free_i64(tmp); } - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; case 1: CP0_CHECK(ctx->vp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_GlobalNumber)); - rn =3D "GlobalNumber"; + register_name =3D "GlobalNumber"; break; default: goto cp0_unimplemented; @@ -6815,18 +6817,18 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context= )); tcg_gen_ext32s_tl(arg, arg); - rn =3D "Context"; + register_name =3D "Context"; break; case 1: // gen_helper_mfc0_contextconfig(arg); /* SmartMIPS ASE */ - rn =3D "ContextConfig"; + register_name =3D "ContextConfig"; goto cp0_unimplemented; case 2: CP0_CHECK(ctx->ulri); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "UserLocal"; + register_name =3D "UserLocal"; break; default: goto cp0_unimplemented; @@ -6836,45 +6838,45 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PageMask)); - rn =3D "PageMask"; + register_name =3D "PageMask"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PageGrain)); - rn =3D "PageGrain"; + register_name =3D "PageGrain"; break; case 2: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl0= )); tcg_gen_ext32s_tl(arg, arg); - rn =3D "SegCtl0"; + register_name =3D "SegCtl0"; break; case 3: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl1= )); tcg_gen_ext32s_tl(arg, arg); - rn =3D "SegCtl1"; + register_name =3D "SegCtl1"; break; case 4: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl2= )); tcg_gen_ext32s_tl(arg, arg); - rn =3D "SegCtl2"; + register_name =3D "SegCtl2"; break; case 5: check_pw(ctx); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWBase)); - rn =3D "PWBase"; + register_name =3D "PWBase"; break; case 6: check_pw(ctx); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWField)); - rn =3D "PWField"; + register_name =3D "PWField"; break; case 7: check_pw(ctx); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWSize)); - rn =3D "PWSize"; + register_name =3D "PWSize"; break; default: goto cp0_unimplemented; @@ -6884,37 +6886,37 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Wired)); - rn =3D "Wired"; + register_name =3D "Wired"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf0)); - rn =3D "SRSConf0"; + register_name =3D "SRSConf0"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf1)); - rn =3D "SRSConf1"; + register_name =3D "SRSConf1"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf2)); - rn =3D "SRSConf2"; + register_name =3D "SRSConf2"; break; case 4: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf3)); - rn =3D "SRSConf3"; + register_name =3D "SRSConf3"; break; case 5: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf4)); - rn =3D "SRSConf4"; + register_name =3D "SRSConf4"; break; case 6: check_pw(ctx); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWCtl)); - rn =3D "PWCtl"; + register_name =3D "PWCtl"; break; default: goto cp0_unimplemented; @@ -6925,7 +6927,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_HWREna)); - rn =3D "HWREna"; + register_name =3D "HWREna"; break; default: goto cp0_unimplemented; @@ -6936,23 +6938,23 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_BadVAdd= r)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "BadVAddr"; + register_name =3D "BadVAddr"; break; case 1: CP0_CHECK(ctx->bi); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstr)); - rn =3D "BadInstr"; + register_name =3D "BadInstr"; break; case 2: CP0_CHECK(ctx->bp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstrP)); - rn =3D "BadInstrP"; + register_name =3D "BadInstrP"; break; case 3: CP0_CHECK(ctx->bi); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstrX)); tcg_gen_andi_tl(arg, arg, ~0xffff); - rn =3D "BadInstrX"; + register_name =3D "BadInstrX"; break; default: goto cp0_unimplemented; @@ -6974,17 +6976,17 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) ensure we break completely out of translated code. */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Count"; + register_name =3D "Count"; break; case 6: CP0_CHECK(ctx->saar); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SAARI)); - rn =3D "SAARI"; + register_name =3D "SAARI"; break; case 7: CP0_CHECK(ctx->saar); gen_helper_mfc0_saar(arg, cpu_env); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -6995,7 +6997,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EntryHi= )); tcg_gen_ext32s_tl(arg, arg); - rn =3D "EntryHi"; + register_name =3D "EntryHi"; break; default: goto cp0_unimplemented; @@ -7005,7 +7007,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Compare)); - rn =3D "Compare"; + register_name =3D "Compare"; break; /* 6,7 are implementation dependent */ default: @@ -7016,22 +7018,22 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Status)); - rn =3D "Status"; + register_name =3D "Status"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_IntCtl)); - rn =3D "IntCtl"; + register_name =3D "IntCtl"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSCtl)); - rn =3D "SRSCtl"; + register_name =3D "SRSCtl"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSMap)); - rn =3D "SRSMap"; + register_name =3D "SRSMap"; break; default: goto cp0_unimplemented; @@ -7041,7 +7043,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Cause)); - rn =3D "Cause"; + register_name =3D "Cause"; break; default: goto cp0_unimplemented; @@ -7052,7 +7054,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "EPC"; + register_name =3D "EPC"; break; default: goto cp0_unimplemented; @@ -7062,20 +7064,20 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PRid)); - rn =3D "PRid"; + register_name =3D "PRid"; break; case 1: check_insn(ctx, ISA_MIPS32R2); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EBase)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "EBase"; + register_name =3D "EBase"; break; case 3: check_insn(ctx, ISA_MIPS32R2); CP0_CHECK(ctx->cmgcr); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_CMGCRBa= se)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "CMGCRBase"; + register_name =3D "CMGCRBase"; break; default: goto cp0_unimplemented; @@ -7085,36 +7087,36 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config0)); - rn =3D "Config"; + register_name =3D "Config"; break; case 1: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config1)); - rn =3D "Config1"; + register_name =3D "Config1"; break; case 2: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config2)); - rn =3D "Config2"; + register_name =3D "Config2"; break; case 3: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config3)); - rn =3D "Config3"; + register_name =3D "Config3"; break; case 4: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config4)); - rn =3D "Config4"; + register_name =3D "Config4"; break; case 5: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config5)); - rn =3D "Config5"; + register_name =3D "Config5"; break; /* 6,7 are implementation dependent */ case 6: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config6)); - rn =3D "Config6"; + register_name =3D "Config6"; break; case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config7)); - rn =3D "Config7"; + register_name =3D "Config7"; break; default: goto cp0_unimplemented; @@ -7124,17 +7126,17 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mfc0_lladdr(arg, cpu_env); - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_mfc0_maar(arg, cpu_env); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; case 2: CP0_CHECK(ctx->mrp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_MAARI)); - rn =3D "MAARI"; + register_name =3D "MAARI"; break; default: goto cp0_unimplemented; @@ -7152,7 +7154,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_1e0i(mfc0_watchlo, arg, sel); - rn =3D "WatchLo"; + register_name =3D "WatchLo"; break; default: goto cp0_unimplemented; @@ -7170,7 +7172,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_1e0i(mfc0_watchhi, arg, sel); - rn =3D "WatchHi"; + register_name =3D "WatchHi"; break; default: goto cp0_unimplemented; @@ -7183,7 +7185,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) check_insn(ctx, ISA_MIPS3); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_XContex= t)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "XContext"; + register_name =3D "XContext"; break; #endif default: @@ -7196,7 +7198,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Framemask)); - rn =3D "Framemask"; + register_name =3D "Framemask"; break; default: goto cp0_unimplemented; @@ -7204,29 +7206,29 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) break; case CPO_REGISTER_22: tcg_gen_movi_tl(arg, 0); /* unimplemented */ - rn =3D "'Diagnostic"; /* implementation dependent */ + register_name =3D "'Diagnostic"; /* implementation dependent */ break; case CPO_REGISTER_23: switch (sel) { case 0: gen_helper_mfc0_debug(arg, cpu_env); /* EJTAG support */ - rn =3D "Debug"; + register_name =3D "Debug"; break; case 1: // gen_helper_mfc0_tracecontrol(arg); /* PDtrace support */ - rn =3D "TraceControl"; + register_name =3D "TraceControl"; goto cp0_unimplemented; case 2: // gen_helper_mfc0_tracecontrol2(arg); /* PDtrace support */ - rn =3D "TraceControl2"; + register_name =3D "TraceControl2"; goto cp0_unimplemented; case 3: // gen_helper_mfc0_usertracedata(arg); /* PDtrace support */ - rn =3D "UserTraceData"; + register_name =3D "UserTraceData"; goto cp0_unimplemented; case 4: // gen_helper_mfc0_tracebpc(arg); /* PDtrace support */ - rn =3D "TraceBPC"; + register_name =3D "TraceBPC"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -7238,7 +7240,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) /* EJTAG support */ tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "DEPC"; + register_name =3D "DEPC"; break; default: goto cp0_unimplemented; @@ -7248,35 +7250,35 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Performance0)); - rn =3D "Performance0"; + register_name =3D "Performance0"; break; case 1: // gen_helper_mfc0_performance1(arg); - rn =3D "Performance1"; + register_name =3D "Performance1"; goto cp0_unimplemented; case 2: // gen_helper_mfc0_performance2(arg); - rn =3D "Performance2"; + register_name =3D "Performance2"; goto cp0_unimplemented; case 3: // gen_helper_mfc0_performance3(arg); - rn =3D "Performance3"; + register_name =3D "Performance3"; goto cp0_unimplemented; case 4: // gen_helper_mfc0_performance4(arg); - rn =3D "Performance4"; + register_name =3D "Performance4"; goto cp0_unimplemented; case 5: // gen_helper_mfc0_performance5(arg); - rn =3D "Performance5"; + register_name =3D "Performance5"; goto cp0_unimplemented; case 6: // gen_helper_mfc0_performance6(arg); - rn =3D "Performance6"; + register_name =3D "Performance6"; goto cp0_unimplemented; case 7: // gen_helper_mfc0_performance7(arg); - rn =3D "Performance7"; + register_name =3D "Performance7"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -7286,7 +7288,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_ErrCtl)); - rn =3D "ErrCtl"; + register_name =3D "ErrCtl"; break; default: goto cp0_unimplemented; @@ -7299,7 +7301,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 2: case 3: tcg_gen_movi_tl(arg, 0); /* unimplemented */ - rn =3D "CacheErr"; + register_name =3D "CacheErr"; break; default: goto cp0_unimplemented; @@ -7317,14 +7319,14 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) gen_move_low32(arg, tmp); tcg_temp_free_i64(tmp); } - rn =3D "TagLo"; + register_name =3D "TagLo"; break; case 1: case 3: case 5: case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DataLo)); - rn =3D "DataLo"; + register_name =3D "DataLo"; break; default: goto cp0_unimplemented; @@ -7337,14 +7339,14 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 4: case 6: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_TagHi)); - rn =3D "TagHi"; + register_name =3D "TagHi"; break; case 1: case 3: case 5: case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DataHi)); - rn =3D "DataHi"; + register_name =3D "DataHi"; break; default: goto cp0_unimplemented; @@ -7355,7 +7357,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEP= C)); tcg_gen_ext32s_tl(arg, arg); - rn =3D "ErrorEPC"; + register_name =3D "ErrorEPC"; break; default: goto cp0_unimplemented; @@ -7366,7 +7368,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: /* EJTAG support */ gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DESAVE)); - rn =3D "DESAVE"; + register_name =3D "DESAVE"; break; case 2: case 3: @@ -7378,7 +7380,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_KScratch[sel-2])); tcg_gen_ext32s_tl(arg, arg); - rn =3D "KScratch"; + register_name =3D "KScratch"; break; default: goto cp0_unimplemented; @@ -7387,17 +7389,18 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("mfc0", rn, reg, sel); + trace_mips_translate_c0("mfc0", register_name, reg, sel); return; =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "mfc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "mfc0 %s (reg %d sel %d)\n", + register_name, reg, sel); gen_mfc0_unimplemented(ctx, arg); } =20 static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; =20 if (sel !=3D 0) check_insn(ctx, ISA_MIPS32); @@ -7411,27 +7414,27 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_index(cpu_env, arg); - rn =3D "Index"; + register_name =3D "Index"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_mvpcontrol(cpu_env, arg); - rn =3D "MVPControl"; + register_name =3D "MVPControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); /* ignored */ - rn =3D "MVPConf0"; + register_name =3D "MVPConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); /* ignored */ - rn =3D "MVPConf1"; + register_name =3D "MVPConf1"; break; case 4: CP0_CHECK(ctx->vp); /* ignored */ - rn =3D "VPControl"; + register_name =3D "VPControl"; break; default: goto cp0_unimplemented; @@ -7441,44 +7444,44 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "Random"; + register_name =3D "Random"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpecontrol(cpu_env, arg); - rn =3D "VPEControl"; + register_name =3D "VPEControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeconf0(cpu_env, arg); - rn =3D "VPEConf0"; + register_name =3D "VPEConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeconf1(cpu_env, arg); - rn =3D "VPEConf1"; + register_name =3D "VPEConf1"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_yqmask(cpu_env, arg); - rn =3D "YQMask"; + register_name =3D "YQMask"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPESchedule)); - rn =3D "VPESchedule"; + register_name =3D "VPESchedule"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPEScheFBack)); - rn =3D "VPEScheFBack"; + register_name =3D "VPEScheFBack"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeopt(cpu_env, arg); - rn =3D "VPEOpt"; + register_name =3D "VPEOpt"; break; default: goto cp0_unimplemented; @@ -7488,42 +7491,42 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_entrylo0(cpu_env, arg); - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcstatus(cpu_env, arg); - rn =3D "TCStatus"; + register_name =3D "TCStatus"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcbind(cpu_env, arg); - rn =3D "TCBind"; + register_name =3D "TCBind"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcrestart(cpu_env, arg); - rn =3D "TCRestart"; + register_name =3D "TCRestart"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tchalt(cpu_env, arg); - rn =3D "TCHalt"; + register_name =3D "TCHalt"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tccontext(cpu_env, arg); - rn =3D "TCContext"; + register_name =3D "TCContext"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcschedule(cpu_env, arg); - rn =3D "TCSchedule"; + register_name =3D "TCSchedule"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcschefback(cpu_env, arg); - rn =3D "TCScheFBack"; + register_name =3D "TCScheFBack"; break; default: goto cp0_unimplemented; @@ -7533,12 +7536,12 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_entrylo1(cpu_env, arg); - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; case 1: CP0_CHECK(ctx->vp); /* ignored */ - rn =3D "GlobalNumber"; + register_name =3D "GlobalNumber"; break; default: goto cp0_unimplemented; @@ -7548,17 +7551,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_context(cpu_env, arg); - rn =3D "Context"; + register_name =3D "Context"; break; case 1: // gen_helper_mtc0_contextconfig(cpu_env, arg); /* SmartMIPS AS= E */ - rn =3D "ContextConfig"; + register_name =3D "ContextConfig"; goto cp0_unimplemented; case 2: CP0_CHECK(ctx->ulri); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); - rn =3D "UserLocal"; + register_name =3D "UserLocal"; break; default: goto cp0_unimplemented; @@ -7568,43 +7571,43 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_pagemask(cpu_env, arg); - rn =3D "PageMask"; + register_name =3D "PageMask"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_pagegrain(cpu_env, arg); - rn =3D "PageGrain"; + register_name =3D "PageGrain"; ctx->base.is_jmp =3D DISAS_STOP; break; case 2: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl0(cpu_env, arg); - rn =3D "SegCtl0"; + register_name =3D "SegCtl0"; break; case 3: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl1(cpu_env, arg); - rn =3D "SegCtl1"; + register_name =3D "SegCtl1"; break; case 4: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl2(cpu_env, arg); - rn =3D "SegCtl2"; + register_name =3D "SegCtl2"; break; case 5: check_pw(ctx); gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_PWBase)); - rn =3D "PWBase"; + register_name =3D "PWBase"; break; case 6: check_pw(ctx); gen_helper_mtc0_pwfield(cpu_env, arg); - rn =3D "PWField"; + register_name =3D "PWField"; break; case 7: check_pw(ctx); gen_helper_mtc0_pwsize(cpu_env, arg); - rn =3D "PWSize"; + register_name =3D "PWSize"; break; default: goto cp0_unimplemented; @@ -7614,37 +7617,37 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_wired(cpu_env, arg); - rn =3D "Wired"; + register_name =3D "Wired"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf0(cpu_env, arg); - rn =3D "SRSConf0"; + register_name =3D "SRSConf0"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf1(cpu_env, arg); - rn =3D "SRSConf1"; + register_name =3D "SRSConf1"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf2(cpu_env, arg); - rn =3D "SRSConf2"; + register_name =3D "SRSConf2"; break; case 4: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf3(cpu_env, arg); - rn =3D "SRSConf3"; + register_name =3D "SRSConf3"; break; case 5: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf4(cpu_env, arg); - rn =3D "SRSConf4"; + register_name =3D "SRSConf4"; break; case 6: check_pw(ctx); gen_helper_mtc0_pwctl(cpu_env, arg); - rn =3D "PWCtl"; + register_name =3D "PWCtl"; break; default: goto cp0_unimplemented; @@ -7656,7 +7659,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_hwrena(cpu_env, arg); ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "HWREna"; + register_name =3D "HWREna"; break; default: goto cp0_unimplemented; @@ -7666,19 +7669,19 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "BadVAddr"; + register_name =3D "BadVAddr"; break; case 1: /* ignored */ - rn =3D "BadInstr"; + register_name =3D "BadInstr"; break; case 2: /* ignored */ - rn =3D "BadInstrP"; + register_name =3D "BadInstrP"; break; case 3: /* ignored */ - rn =3D "BadInstrX"; + register_name =3D "BadInstrX"; break; default: goto cp0_unimplemented; @@ -7688,17 +7691,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_count(cpu_env, arg); - rn =3D "Count"; + register_name =3D "Count"; break; case 6: CP0_CHECK(ctx->saar); gen_helper_mtc0_saari(cpu_env, arg); - rn =3D "SAARI"; + register_name =3D "SAARI"; break; case 7: CP0_CHECK(ctx->saar); gen_helper_mtc0_saar(cpu_env, arg); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -7708,7 +7711,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_helper_mtc0_entryhi(cpu_env, arg); - rn =3D "EntryHi"; + register_name =3D "EntryHi"; break; default: goto cp0_unimplemented; @@ -7718,7 +7721,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_helper_mtc0_compare(cpu_env, arg); - rn =3D "Compare"; + register_name =3D "Compare"; break; /* 6,7 are implementation dependent */ default: @@ -7733,28 +7736,28 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) /* DISAS_STOP isn't good enough here, hflags may have changed.= */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Status"; + register_name =3D "Status"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_intctl(cpu_env, arg); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "IntCtl"; + register_name =3D "IntCtl"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsctl(cpu_env, arg); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "SRSCtl"; + register_name =3D "SRSCtl"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_SRSMap)); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "SRSMap"; + register_name =3D "SRSMap"; break; default: goto cp0_unimplemented; @@ -7770,7 +7773,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) * translated code to check for pending interrupts. */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Cause"; + register_name =3D "Cause"; break; default: goto cp0_unimplemented; @@ -7780,7 +7783,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC)); - rn =3D "EPC"; + register_name =3D "EPC"; break; default: goto cp0_unimplemented; @@ -7790,12 +7793,12 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "PRid"; + register_name =3D "PRid"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_ebase(cpu_env, arg); - rn =3D "EBase"; + register_name =3D "EBase"; break; default: goto cp0_unimplemented; @@ -7805,48 +7808,48 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_config0(cpu_env, arg); - rn =3D "Config"; + register_name =3D "Config"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 1: /* ignored, read only */ - rn =3D "Config1"; + register_name =3D "Config1"; break; case 2: gen_helper_mtc0_config2(cpu_env, arg); - rn =3D "Config2"; + register_name =3D "Config2"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 3: gen_helper_mtc0_config3(cpu_env, arg); - rn =3D "Config3"; + register_name =3D "Config3"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 4: gen_helper_mtc0_config4(cpu_env, arg); - rn =3D "Config4"; + register_name =3D "Config4"; ctx->base.is_jmp =3D DISAS_STOP; break; case 5: gen_helper_mtc0_config5(cpu_env, arg); - rn =3D "Config5"; + register_name =3D "Config5"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; /* 6,7 are implementation dependent */ case 6: /* ignored */ - rn =3D "Config6"; + register_name =3D "Config6"; break; case 7: /* ignored */ - rn =3D "Config7"; + register_name =3D "Config7"; break; default: - rn =3D "Invalid config selector"; + register_name =3D "Invalid config selector"; goto cp0_unimplemented; } break; @@ -7854,17 +7857,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_lladdr(cpu_env, arg); - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_mtc0_maar(cpu_env, arg); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; case 2: CP0_CHECK(ctx->mrp); gen_helper_mtc0_maari(cpu_env, arg); - rn =3D "MAARI"; + register_name =3D "MAARI"; break; default: goto cp0_unimplemented; @@ -7882,7 +7885,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_0e1i(mtc0_watchlo, arg, sel); - rn =3D "WatchLo"; + register_name =3D "WatchLo"; break; default: goto cp0_unimplemented; @@ -7900,7 +7903,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_0e1i(mtc0_watchhi, arg, sel); - rn =3D "WatchHi"; + register_name =3D "WatchHi"; break; default: goto cp0_unimplemented; @@ -7912,7 +7915,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) #if defined(TARGET_MIPS64) check_insn(ctx, ISA_MIPS3); gen_helper_mtc0_xcontext(cpu_env, arg); - rn =3D "XContext"; + register_name =3D "XContext"; break; #endif default: @@ -7925,7 +7928,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: gen_helper_mtc0_framemask(cpu_env, arg); - rn =3D "Framemask"; + register_name =3D "Framemask"; break; default: goto cp0_unimplemented; @@ -7933,7 +7936,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) break; case CPO_REGISTER_22: /* ignored */ - rn =3D "Diagnostic"; /* implementation dependent */ + register_name =3D "Diagnostic"; /* implementation dependent */ break; case CPO_REGISTER_23: switch (sel) { @@ -7942,17 +7945,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) /* DISAS_STOP isn't good enough here, hflags may have changed.= */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Debug"; + register_name =3D "Debug"; break; case 1: // gen_helper_mtc0_tracecontrol(cpu_env, arg); /* PDtrace suppo= rt */ - rn =3D "TraceControl"; + register_name =3D "TraceControl"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; goto cp0_unimplemented; case 2: // gen_helper_mtc0_tracecontrol2(cpu_env, arg); /* PDtrace supp= ort */ - rn =3D "TraceControl2"; + register_name =3D "TraceControl2"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; goto cp0_unimplemented; @@ -7960,7 +7963,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; // gen_helper_mtc0_usertracedata(cpu_env, arg); /* PDtrace supp= ort */ - rn =3D "UserTraceData"; + register_name =3D "UserTraceData"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; goto cp0_unimplemented; @@ -7968,7 +7971,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) // gen_helper_mtc0_tracebpc(cpu_env, arg); /* PDtrace support */ /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "TraceBPC"; + register_name =3D "TraceBPC"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -7979,7 +7982,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: /* EJTAG support */ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC)); - rn =3D "DEPC"; + register_name =3D "DEPC"; break; default: goto cp0_unimplemented; @@ -7989,35 +7992,35 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) switch (sel) { case 0: gen_helper_mtc0_performance0(cpu_env, arg); - rn =3D "Performance0"; + register_name =3D "Performance0"; break; case 1: // gen_helper_mtc0_performance1(arg); - rn =3D "Performance1"; + register_name =3D "Performance1"; goto cp0_unimplemented; case 2: // gen_helper_mtc0_performance2(arg); - rn =3D "Performance2"; + register_name =3D "Performance2"; goto cp0_unimplemented; case 3: // gen_helper_mtc0_performance3(arg); - rn =3D "Performance3"; + register_name =3D "Performance3"; goto cp0_unimplemented; case 4: // gen_helper_mtc0_performance4(arg); - rn =3D "Performance4"; + register_name =3D "Performance4"; goto cp0_unimplemented; case 5: // gen_helper_mtc0_performance5(arg); - rn =3D "Performance5"; + register_name =3D "Performance5"; goto cp0_unimplemented; case 6: // gen_helper_mtc0_performance6(arg); - rn =3D "Performance6"; + register_name =3D "Performance6"; goto cp0_unimplemented; case 7: // gen_helper_mtc0_performance7(arg); - rn =3D "Performance7"; + register_name =3D "Performance7"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -8028,7 +8031,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: gen_helper_mtc0_errctl(cpu_env, arg); ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "ErrCtl"; + register_name =3D "ErrCtl"; break; default: goto cp0_unimplemented; @@ -8041,7 +8044,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 2: case 3: /* ignored */ - rn =3D "CacheErr"; + register_name =3D "CacheErr"; break; default: goto cp0_unimplemented; @@ -8054,14 +8057,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 4: case 6: gen_helper_mtc0_taglo(cpu_env, arg); - rn =3D "TagLo"; + register_name =3D "TagLo"; break; case 1: case 3: case 5: case 7: gen_helper_mtc0_datalo(cpu_env, arg); - rn =3D "DataLo"; + register_name =3D "DataLo"; break; default: goto cp0_unimplemented; @@ -8074,17 +8077,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) case 4: case 6: gen_helper_mtc0_taghi(cpu_env, arg); - rn =3D "TagHi"; + register_name =3D "TagHi"; break; case 1: case 3: case 5: case 7: gen_helper_mtc0_datahi(cpu_env, arg); - rn =3D "DataHi"; + register_name =3D "DataHi"; break; default: - rn =3D "invalid sel"; + register_name =3D "invalid sel"; goto cp0_unimplemented; } break; @@ -8092,7 +8095,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) switch (sel) { case 0: tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEP= C)); - rn =3D "ErrorEPC"; + register_name =3D "ErrorEPC"; break; default: goto cp0_unimplemented; @@ -8103,7 +8106,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) case 0: /* EJTAG support */ gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_DESAVE)); - rn =3D "DESAVE"; + register_name =3D "DESAVE"; break; case 2: case 3: @@ -8114,7 +8117,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) CP0_CHECK(ctx->kscrexist & (1 << sel)); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_KScratch[sel-2])); - rn =3D "KScratch"; + register_name =3D "KScratch"; break; default: goto cp0_unimplemented; @@ -8123,7 +8126,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("mtc0", rn, reg, sel); + trace_mips_translate_c0("mtc0", register_name, reg, sel); =20 /* For simplicity assume that all writes can cause interrupts. */ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { @@ -8136,13 +8139,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, i= nt reg, int sel) return; =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "mtc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "mtc0 %s (reg %d sel %d)\n", + register_name, reg, sel); } =20 #if defined(TARGET_MIPS64) static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; =20 if (sel !=3D 0) check_insn(ctx, ISA_MIPS64); @@ -8152,27 +8156,27 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Index)); - rn =3D "Index"; + register_name =3D "Index"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpcontrol(arg, cpu_env); - rn =3D "MVPControl"; + register_name =3D "MVPControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpconf0(arg, cpu_env); - rn =3D "MVPConf0"; + register_name =3D "MVPConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_mvpconf1(arg, cpu_env); - rn =3D "MVPConf1"; + register_name =3D "MVPConf1"; break; case 4: CP0_CHECK(ctx->vp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPControl)); - rn =3D "VPControl"; + register_name =3D "VPControl"; break; default: goto cp0_unimplemented; @@ -8183,42 +8187,42 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 0: CP0_CHECK(!(ctx->insn_flags & ISA_MIPS32R6)); gen_helper_mfc0_random(arg, cpu_env); - rn =3D "Random"; + register_name =3D "Random"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEControl)); - rn =3D "VPEControl"; + register_name =3D "VPEControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEConf0)); - rn =3D "VPEConf0"; + register_name =3D "VPEConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEConf1)); - rn =3D "VPEConf1"; + register_name =3D "VPEConf1"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_YQMask)= ); - rn =3D "YQMask"; + register_name =3D "YQMask"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPESche= dule)); - rn =3D "VPESchedule"; + register_name =3D "VPESchedule"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPESche= FBack)); - rn =3D "VPEScheFBack"; + register_name =3D "VPEScheFBack"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_VPEOpt)); - rn =3D "VPEOpt"; + register_name =3D "VPEOpt"; break; default: goto cp0_unimplemented; @@ -8228,42 +8232,42 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EntryLo= 0)); - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcstatus(arg, cpu_env); - rn =3D "TCStatus"; + register_name =3D "TCStatus"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mfc0_tcbind(arg, cpu_env); - rn =3D "TCBind"; + register_name =3D "TCBind"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_dmfc0_tcrestart(arg, cpu_env); - rn =3D "TCRestart"; + register_name =3D "TCRestart"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_dmfc0_tchalt(arg, cpu_env); - rn =3D "TCHalt"; + register_name =3D "TCHalt"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_dmfc0_tccontext(arg, cpu_env); - rn =3D "TCContext"; + register_name =3D "TCContext"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_dmfc0_tcschedule(arg, cpu_env); - rn =3D "TCSchedule"; + register_name =3D "TCSchedule"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_dmfc0_tcschefback(arg, cpu_env); - rn =3D "TCScheFBack"; + register_name =3D "TCScheFBack"; break; default: goto cp0_unimplemented; @@ -8273,12 +8277,12 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EntryLo= 1)); - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; case 1: CP0_CHECK(ctx->vp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_GlobalNumber)); - rn =3D "GlobalNumber"; + register_name =3D "GlobalNumber"; break; default: goto cp0_unimplemented; @@ -8288,17 +8292,17 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context= )); - rn =3D "Context"; + register_name =3D "Context"; break; case 1: // gen_helper_dmfc0_contextconfig(arg); /* SmartMIPS ASE */ - rn =3D "ContextConfig"; + register_name =3D "ContextConfig"; goto cp0_unimplemented; case 2: CP0_CHECK(ctx->ulri); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); - rn =3D "UserLocal"; + register_name =3D "UserLocal"; break; default: goto cp0_unimplemented; @@ -8308,42 +8312,42 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PageMask)); - rn =3D "PageMask"; + register_name =3D "PageMask"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PageGrain)); - rn =3D "PageGrain"; + register_name =3D "PageGrain"; break; case 2: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl0= )); - rn =3D "SegCtl0"; + register_name =3D "SegCtl0"; break; case 3: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl1= )); - rn =3D "SegCtl1"; + register_name =3D "SegCtl1"; break; case 4: CP0_CHECK(ctx->sc); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_SegCtl2= )); - rn =3D "SegCtl2"; + register_name =3D "SegCtl2"; break; case 5: check_pw(ctx); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWBase)= ); - rn =3D "PWBase"; + register_name =3D "PWBase"; break; case 6: check_pw(ctx); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWField= )); - rn =3D "PWField"; + register_name =3D "PWField"; break; case 7: check_pw(ctx); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWSize)= ); - rn =3D "PWSize"; + register_name =3D "PWSize"; break; default: goto cp0_unimplemented; @@ -8353,37 +8357,37 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Wired)); - rn =3D "Wired"; + register_name =3D "Wired"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf0)); - rn =3D "SRSConf0"; + register_name =3D "SRSConf0"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf1)); - rn =3D "SRSConf1"; + register_name =3D "SRSConf1"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf2)); - rn =3D "SRSConf2"; + register_name =3D "SRSConf2"; break; case 4: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf3)); - rn =3D "SRSConf3"; + register_name =3D "SRSConf3"; break; case 5: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSConf4)); - rn =3D "SRSConf4"; + register_name =3D "SRSConf4"; break; case 6: check_pw(ctx); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWCtl)); - rn =3D "PWCtl"; + register_name =3D "PWCtl"; break; default: goto cp0_unimplemented; @@ -8394,7 +8398,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_HWREna)); - rn =3D "HWREna"; + register_name =3D "HWREna"; break; default: goto cp0_unimplemented; @@ -8404,23 +8408,23 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_BadVAdd= r)); - rn =3D "BadVAddr"; + register_name =3D "BadVAddr"; break; case 1: CP0_CHECK(ctx->bi); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstr)); - rn =3D "BadInstr"; + register_name =3D "BadInstr"; break; case 2: CP0_CHECK(ctx->bp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstrP)); - rn =3D "BadInstrP"; + register_name =3D "BadInstrP"; break; case 3: CP0_CHECK(ctx->bi); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_BadInstrX)); tcg_gen_andi_tl(arg, arg, ~0xffff); - rn =3D "BadInstrX"; + register_name =3D "BadInstrX"; break; default: goto cp0_unimplemented; @@ -8442,17 +8446,17 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) ensure we break completely out of translated code. */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Count"; + register_name =3D "Count"; break; case 6: CP0_CHECK(ctx->saar); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SAARI)); - rn =3D "SAARI"; + register_name =3D "SAARI"; break; case 7: CP0_CHECK(ctx->saar); gen_helper_dmfc0_saar(arg, cpu_env); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -8462,7 +8466,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EntryHi= )); - rn =3D "EntryHi"; + register_name =3D "EntryHi"; break; default: goto cp0_unimplemented; @@ -8472,7 +8476,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Compare)); - rn =3D "Compare"; + register_name =3D "Compare"; break; /* 6,7 are implementation dependent */ default: @@ -8483,22 +8487,22 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Status)); - rn =3D "Status"; + register_name =3D "Status"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_IntCtl)); - rn =3D "IntCtl"; + register_name =3D "IntCtl"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSCtl)); - rn =3D "SRSCtl"; + register_name =3D "SRSCtl"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_SRSMap)); - rn =3D "SRSMap"; + register_name =3D "SRSMap"; break; default: goto cp0_unimplemented; @@ -8508,7 +8512,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Cause)); - rn =3D "Cause"; + register_name =3D "Cause"; break; default: goto cp0_unimplemented; @@ -8518,7 +8522,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC)); - rn =3D "EPC"; + register_name =3D "EPC"; break; default: goto cp0_unimplemented; @@ -8528,18 +8532,18 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PRid)); - rn =3D "PRid"; + register_name =3D "PRid"; break; case 1: check_insn(ctx, ISA_MIPS32R2); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EBase)); - rn =3D "EBase"; + register_name =3D "EBase"; break; case 3: check_insn(ctx, ISA_MIPS32R2); CP0_CHECK(ctx->cmgcr); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_CMGCRBa= se)); - rn =3D "CMGCRBase"; + register_name =3D "CMGCRBase"; break; default: goto cp0_unimplemented; @@ -8549,36 +8553,36 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config0)); - rn =3D "Config"; + register_name =3D "Config"; break; case 1: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config1)); - rn =3D "Config1"; + register_name =3D "Config1"; break; case 2: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config2)); - rn =3D "Config2"; + register_name =3D "Config2"; break; case 3: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config3)); - rn =3D "Config3"; + register_name =3D "Config3"; break; case 4: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config4)); - rn =3D "Config4"; + register_name =3D "Config4"; break; case 5: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config5)); - rn =3D "Config5"; + register_name =3D "Config5"; break; /* 6,7 are implementation dependent */ case 6: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config6)); - rn =3D "Config6"; + register_name =3D "Config6"; break; case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Config7)); - rn =3D "Config7"; + register_name =3D "Config7"; break; default: goto cp0_unimplemented; @@ -8588,17 +8592,17 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_dmfc0_lladdr(arg, cpu_env); - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_dmfc0_maar(arg, cpu_env); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; case 2: CP0_CHECK(ctx->mrp); gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_MAARI)); - rn =3D "MAARI"; + register_name =3D "MAARI"; break; default: goto cp0_unimplemented; @@ -8616,7 +8620,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_1e0i(dmfc0_watchlo, arg, sel); - rn =3D "WatchLo"; + register_name =3D "WatchLo"; break; default: goto cp0_unimplemented; @@ -8634,7 +8638,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_1e0i(mfc0_watchhi, arg, sel); - rn =3D "WatchHi"; + register_name =3D "WatchHi"; break; default: goto cp0_unimplemented; @@ -8645,7 +8649,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: check_insn(ctx, ISA_MIPS3); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_XContex= t)); - rn =3D "XContext"; + register_name =3D "XContext"; break; default: goto cp0_unimplemented; @@ -8657,7 +8661,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Framemask)); - rn =3D "Framemask"; + register_name =3D "Framemask"; break; default: goto cp0_unimplemented; @@ -8665,29 +8669,29 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) break; case CPO_REGISTER_22: tcg_gen_movi_tl(arg, 0); /* unimplemented */ - rn =3D "'Diagnostic"; /* implementation dependent */ + register_name =3D "'Diagnostic"; /* implementation dependent */ break; case CPO_REGISTER_23: switch (sel) { case 0: gen_helper_mfc0_debug(arg, cpu_env); /* EJTAG support */ - rn =3D "Debug"; + register_name =3D "Debug"; break; case 1: // gen_helper_dmfc0_tracecontrol(arg, cpu_env); /* PDtrace supp= ort */ - rn =3D "TraceControl"; + register_name =3D "TraceControl"; goto cp0_unimplemented; case 2: // gen_helper_dmfc0_tracecontrol2(arg, cpu_env); /* PDtrace sup= port */ - rn =3D "TraceControl2"; + register_name =3D "TraceControl2"; goto cp0_unimplemented; case 3: // gen_helper_dmfc0_usertracedata(arg, cpu_env); /* PDtrace sup= port */ - rn =3D "UserTraceData"; + register_name =3D "UserTraceData"; goto cp0_unimplemented; case 4: // gen_helper_dmfc0_tracebpc(arg, cpu_env); /* PDtrace support = */ - rn =3D "TraceBPC"; + register_name =3D "TraceBPC"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -8698,7 +8702,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: /* EJTAG support */ tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC)); - rn =3D "DEPC"; + register_name =3D "DEPC"; break; default: goto cp0_unimplemented; @@ -8708,35 +8712,35 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_Performance0)); - rn =3D "Performance0"; + register_name =3D "Performance0"; break; case 1: // gen_helper_dmfc0_performance1(arg); - rn =3D "Performance1"; + register_name =3D "Performance1"; goto cp0_unimplemented; case 2: // gen_helper_dmfc0_performance2(arg); - rn =3D "Performance2"; + register_name =3D "Performance2"; goto cp0_unimplemented; case 3: // gen_helper_dmfc0_performance3(arg); - rn =3D "Performance3"; + register_name =3D "Performance3"; goto cp0_unimplemented; case 4: // gen_helper_dmfc0_performance4(arg); - rn =3D "Performance4"; + register_name =3D "Performance4"; goto cp0_unimplemented; case 5: // gen_helper_dmfc0_performance5(arg); - rn =3D "Performance5"; + register_name =3D "Performance5"; goto cp0_unimplemented; case 6: // gen_helper_dmfc0_performance6(arg); - rn =3D "Performance6"; + register_name =3D "Performance6"; goto cp0_unimplemented; case 7: // gen_helper_dmfc0_performance7(arg); - rn =3D "Performance7"; + register_name =3D "Performance7"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -8746,7 +8750,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_ErrCtl)); - rn =3D "ErrCtl"; + register_name =3D "ErrCtl"; break; default: goto cp0_unimplemented; @@ -8760,7 +8764,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 2: case 3: tcg_gen_movi_tl(arg, 0); /* unimplemented */ - rn =3D "CacheErr"; + register_name =3D "CacheErr"; break; default: goto cp0_unimplemented; @@ -8773,14 +8777,14 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 4: case 6: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_TagLo)); - rn =3D "TagLo"; + register_name =3D "TagLo"; break; case 1: case 3: case 5: case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DataLo)); - rn =3D "DataLo"; + register_name =3D "DataLo"; break; default: goto cp0_unimplemented; @@ -8793,14 +8797,14 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 4: case 6: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_TagHi)); - rn =3D "TagHi"; + register_name =3D "TagHi"; break; case 1: case 3: case 5: case 7: gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DataHi)); - rn =3D "DataHi"; + register_name =3D "DataHi"; break; default: goto cp0_unimplemented; @@ -8810,7 +8814,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEP= C)); - rn =3D "ErrorEPC"; + register_name =3D "ErrorEPC"; break; default: goto cp0_unimplemented; @@ -8821,7 +8825,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: /* EJTAG support */ gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DESAVE)); - rn =3D "DESAVE"; + register_name =3D "DESAVE"; break; case 2: case 3: @@ -8832,7 +8836,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) CP0_CHECK(ctx->kscrexist & (1 << sel)); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_KScratch[sel-2])); - rn =3D "KScratch"; + register_name =3D "KScratch"; break; default: goto cp0_unimplemented; @@ -8841,17 +8845,18 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, = int reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("dmfc0", rn, reg, sel); + trace_mips_translate_c0("dmfc0", register_name, reg, sel); return; =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "dmfc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "dmfc0 %s (reg %d sel %d)\n", + register_name, reg, sel); gen_mfc0_unimplemented(ctx, arg); } =20 static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel) { - const char *rn =3D "invalid"; + const char *register_name =3D "invalid"; =20 if (sel !=3D 0) check_insn(ctx, ISA_MIPS64); @@ -8865,27 +8870,27 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_index(cpu_env, arg); - rn =3D "Index"; + register_name =3D "Index"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_mvpcontrol(cpu_env, arg); - rn =3D "MVPControl"; + register_name =3D "MVPControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); /* ignored */ - rn =3D "MVPConf0"; + register_name =3D "MVPConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); /* ignored */ - rn =3D "MVPConf1"; + register_name =3D "MVPConf1"; break; case 4: CP0_CHECK(ctx->vp); /* ignored */ - rn =3D "VPControl"; + register_name =3D "VPControl"; break; default: goto cp0_unimplemented; @@ -8895,42 +8900,42 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "Random"; + register_name =3D "Random"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpecontrol(cpu_env, arg); - rn =3D "VPEControl"; + register_name =3D "VPEControl"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeconf0(cpu_env, arg); - rn =3D "VPEConf0"; + register_name =3D "VPEConf0"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeconf1(cpu_env, arg); - rn =3D "VPEConf1"; + register_name =3D "VPEConf1"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_yqmask(cpu_env, arg); - rn =3D "YQMask"; + register_name =3D "YQMask"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPESche= dule)); - rn =3D "VPESchedule"; + register_name =3D "VPESchedule"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_VPESche= FBack)); - rn =3D "VPEScheFBack"; + register_name =3D "VPEScheFBack"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_vpeopt(cpu_env, arg); - rn =3D "VPEOpt"; + register_name =3D "VPEOpt"; break; default: goto cp0_unimplemented; @@ -8940,42 +8945,42 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_dmtc0_entrylo0(cpu_env, arg); - rn =3D "EntryLo0"; + register_name =3D "EntryLo0"; break; case 1: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcstatus(cpu_env, arg); - rn =3D "TCStatus"; + register_name =3D "TCStatus"; break; case 2: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcbind(cpu_env, arg); - rn =3D "TCBind"; + register_name =3D "TCBind"; break; case 3: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcrestart(cpu_env, arg); - rn =3D "TCRestart"; + register_name =3D "TCRestart"; break; case 4: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tchalt(cpu_env, arg); - rn =3D "TCHalt"; + register_name =3D "TCHalt"; break; case 5: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tccontext(cpu_env, arg); - rn =3D "TCContext"; + register_name =3D "TCContext"; break; case 6: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcschedule(cpu_env, arg); - rn =3D "TCSchedule"; + register_name =3D "TCSchedule"; break; case 7: CP0_CHECK(ctx->insn_flags & ASE_MT); gen_helper_mtc0_tcschefback(cpu_env, arg); - rn =3D "TCScheFBack"; + register_name =3D "TCScheFBack"; break; default: goto cp0_unimplemented; @@ -8985,12 +8990,12 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_dmtc0_entrylo1(cpu_env, arg); - rn =3D "EntryLo1"; + register_name =3D "EntryLo1"; break; case 1: CP0_CHECK(ctx->vp); /* ignored */ - rn =3D "GlobalNumber"; + register_name =3D "GlobalNumber"; break; default: goto cp0_unimplemented; @@ -9000,17 +9005,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_context(cpu_env, arg); - rn =3D "Context"; + register_name =3D "Context"; break; case 1: // gen_helper_mtc0_contextconfig(cpu_env, arg); /* SmartMIPS ASE= */ - rn =3D "ContextConfig"; + register_name =3D "ContextConfig"; goto cp0_unimplemented; case 2: CP0_CHECK(ctx->ulri); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); - rn =3D "UserLocal"; + register_name =3D "UserLocal"; break; default: goto cp0_unimplemented; @@ -9020,42 +9025,42 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_pagemask(cpu_env, arg); - rn =3D "PageMask"; + register_name =3D "PageMask"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_pagegrain(cpu_env, arg); - rn =3D "PageGrain"; + register_name =3D "PageGrain"; break; case 2: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl0(cpu_env, arg); - rn =3D "SegCtl0"; + register_name =3D "SegCtl0"; break; case 3: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl1(cpu_env, arg); - rn =3D "SegCtl1"; + register_name =3D "SegCtl1"; break; case 4: CP0_CHECK(ctx->sc); gen_helper_mtc0_segctl2(cpu_env, arg); - rn =3D "SegCtl2"; + register_name =3D "SegCtl2"; break; case 5: check_pw(ctx); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWBase)= ); - rn =3D "PWBase"; + register_name =3D "PWBase"; break; case 6: check_pw(ctx); gen_helper_mtc0_pwfield(cpu_env, arg); - rn =3D "PWField"; + register_name =3D "PWField"; break; case 7: check_pw(ctx); gen_helper_mtc0_pwsize(cpu_env, arg); - rn =3D "PWSize"; + register_name =3D "PWSize"; break; default: goto cp0_unimplemented; @@ -9065,37 +9070,37 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_wired(cpu_env, arg); - rn =3D "Wired"; + register_name =3D "Wired"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf0(cpu_env, arg); - rn =3D "SRSConf0"; + register_name =3D "SRSConf0"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf1(cpu_env, arg); - rn =3D "SRSConf1"; + register_name =3D "SRSConf1"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf2(cpu_env, arg); - rn =3D "SRSConf2"; + register_name =3D "SRSConf2"; break; case 4: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf3(cpu_env, arg); - rn =3D "SRSConf3"; + register_name =3D "SRSConf3"; break; case 5: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsconf4(cpu_env, arg); - rn =3D "SRSConf4"; + register_name =3D "SRSConf4"; break; case 6: check_pw(ctx); gen_helper_mtc0_pwctl(cpu_env, arg); - rn =3D "PWCtl"; + register_name =3D "PWCtl"; break; default: goto cp0_unimplemented; @@ -9107,7 +9112,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_hwrena(cpu_env, arg); ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "HWREna"; + register_name =3D "HWREna"; break; default: goto cp0_unimplemented; @@ -9117,19 +9122,19 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "BadVAddr"; + register_name =3D "BadVAddr"; break; case 1: /* ignored */ - rn =3D "BadInstr"; + register_name =3D "BadInstr"; break; case 2: /* ignored */ - rn =3D "BadInstrP"; + register_name =3D "BadInstrP"; break; case 3: /* ignored */ - rn =3D "BadInstrX"; + register_name =3D "BadInstrX"; break; default: goto cp0_unimplemented; @@ -9139,17 +9144,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_count(cpu_env, arg); - rn =3D "Count"; + register_name =3D "Count"; break; case 6: CP0_CHECK(ctx->saar); gen_helper_mtc0_saari(cpu_env, arg); - rn =3D "SAARI"; + register_name =3D "SAARI"; break; case 7: CP0_CHECK(ctx->saar); gen_helper_mtc0_saar(cpu_env, arg); - rn =3D "SAAR"; + register_name =3D "SAAR"; break; default: goto cp0_unimplemented; @@ -9161,7 +9166,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_helper_mtc0_entryhi(cpu_env, arg); - rn =3D "EntryHi"; + register_name =3D "EntryHi"; break; default: goto cp0_unimplemented; @@ -9171,7 +9176,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_helper_mtc0_compare(cpu_env, arg); - rn =3D "Compare"; + register_name =3D "Compare"; break; /* 6,7 are implementation dependent */ default: @@ -9188,28 +9193,28 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) /* DISAS_STOP isn't good enough here, hflags may have changed.= */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Status"; + register_name =3D "Status"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_intctl(cpu_env, arg); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "IntCtl"; + register_name =3D "IntCtl"; break; case 2: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_srsctl(cpu_env, arg); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "SRSCtl"; + register_name =3D "SRSCtl"; break; case 3: check_insn(ctx, ISA_MIPS32R2); gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_SRSMap)); /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "SRSMap"; + register_name =3D "SRSMap"; break; default: goto cp0_unimplemented; @@ -9225,7 +9230,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) * translated code to check for pending interrupts. */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Cause"; + register_name =3D "Cause"; break; default: goto cp0_unimplemented; @@ -9235,7 +9240,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC)); - rn =3D "EPC"; + register_name =3D "EPC"; break; default: goto cp0_unimplemented; @@ -9245,12 +9250,12 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: /* ignored */ - rn =3D "PRid"; + register_name =3D "PRid"; break; case 1: check_insn(ctx, ISA_MIPS32R2); gen_helper_mtc0_ebase(cpu_env, arg); - rn =3D "EBase"; + register_name =3D "EBase"; break; default: goto cp0_unimplemented; @@ -9260,39 +9265,39 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_config0(cpu_env, arg); - rn =3D "Config"; + register_name =3D "Config"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 1: /* ignored, read only */ - rn =3D "Config1"; + register_name =3D "Config1"; break; case 2: gen_helper_mtc0_config2(cpu_env, arg); - rn =3D "Config2"; + register_name =3D "Config2"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 3: gen_helper_mtc0_config3(cpu_env, arg); - rn =3D "Config3"; + register_name =3D "Config3"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; case 4: /* currently ignored */ - rn =3D "Config4"; + register_name =3D "Config4"; break; case 5: gen_helper_mtc0_config5(cpu_env, arg); - rn =3D "Config5"; + register_name =3D "Config5"; /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; break; /* 6,7 are implementation dependent */ default: - rn =3D "Invalid config selector"; + register_name =3D "Invalid config selector"; goto cp0_unimplemented; } break; @@ -9300,17 +9305,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_lladdr(cpu_env, arg); - rn =3D "LLAddr"; + register_name =3D "LLAddr"; break; case 1: CP0_CHECK(ctx->mrp); gen_helper_mtc0_maar(cpu_env, arg); - rn =3D "MAAR"; + register_name =3D "MAAR"; break; case 2: CP0_CHECK(ctx->mrp); gen_helper_mtc0_maari(cpu_env, arg); - rn =3D "MAARI"; + register_name =3D "MAARI"; break; default: goto cp0_unimplemented; @@ -9328,7 +9333,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_0e1i(mtc0_watchlo, arg, sel); - rn =3D "WatchLo"; + register_name =3D "WatchLo"; break; default: goto cp0_unimplemented; @@ -9346,7 +9351,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 7: CP0_CHECK(ctx->CP0_Config1 & (1 << CP0C1_WR)); gen_helper_0e1i(mtc0_watchhi, arg, sel); - rn =3D "WatchHi"; + register_name =3D "WatchHi"; break; default: goto cp0_unimplemented; @@ -9357,7 +9362,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: check_insn(ctx, ISA_MIPS3); gen_helper_mtc0_xcontext(cpu_env, arg); - rn =3D "XContext"; + register_name =3D "XContext"; break; default: goto cp0_unimplemented; @@ -9369,7 +9374,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: gen_helper_mtc0_framemask(cpu_env, arg); - rn =3D "Framemask"; + register_name =3D "Framemask"; break; default: goto cp0_unimplemented; @@ -9377,7 +9382,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) break; case CPO_REGISTER_22: /* ignored */ - rn =3D "Diagnostic"; /* implementation dependent */ + register_name =3D "Diagnostic"; /* implementation dependent */ break; case CPO_REGISTER_23: switch (sel) { @@ -9386,31 +9391,31 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) /* DISAS_STOP isn't good enough here, hflags may have changed.= */ gen_save_pc(ctx->base.pc_next + 4); ctx->base.is_jmp =3D DISAS_EXIT; - rn =3D "Debug"; + register_name =3D "Debug"; break; case 1: // gen_helper_mtc0_tracecontrol(cpu_env, arg); /* PDtrace suppo= rt */ /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "TraceControl"; + register_name =3D "TraceControl"; goto cp0_unimplemented; case 2: // gen_helper_mtc0_tracecontrol2(cpu_env, arg); /* PDtrace supp= ort */ /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "TraceControl2"; + register_name =3D "TraceControl2"; goto cp0_unimplemented; case 3: // gen_helper_mtc0_usertracedata(cpu_env, arg); /* PDtrace supp= ort */ /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "UserTraceData"; + register_name =3D "UserTraceData"; goto cp0_unimplemented; case 4: // gen_helper_mtc0_tracebpc(cpu_env, arg); /* PDtrace support */ /* Stop translation as we may have switched the execution mode= */ ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "TraceBPC"; + register_name =3D "TraceBPC"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -9421,7 +9426,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: /* EJTAG support */ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC)); - rn =3D "DEPC"; + register_name =3D "DEPC"; break; default: goto cp0_unimplemented; @@ -9431,35 +9436,35 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) switch (sel) { case 0: gen_helper_mtc0_performance0(cpu_env, arg); - rn =3D "Performance0"; + register_name =3D "Performance0"; break; case 1: // gen_helper_mtc0_performance1(cpu_env, arg); - rn =3D "Performance1"; + register_name =3D "Performance1"; goto cp0_unimplemented; case 2: // gen_helper_mtc0_performance2(cpu_env, arg); - rn =3D "Performance2"; + register_name =3D "Performance2"; goto cp0_unimplemented; case 3: // gen_helper_mtc0_performance3(cpu_env, arg); - rn =3D "Performance3"; + register_name =3D "Performance3"; goto cp0_unimplemented; case 4: // gen_helper_mtc0_performance4(cpu_env, arg); - rn =3D "Performance4"; + register_name =3D "Performance4"; goto cp0_unimplemented; case 5: // gen_helper_mtc0_performance5(cpu_env, arg); - rn =3D "Performance5"; + register_name =3D "Performance5"; goto cp0_unimplemented; case 6: // gen_helper_mtc0_performance6(cpu_env, arg); - rn =3D "Performance6"; + register_name =3D "Performance6"; goto cp0_unimplemented; case 7: // gen_helper_mtc0_performance7(cpu_env, arg); - rn =3D "Performance7"; + register_name =3D "Performance7"; goto cp0_unimplemented; default: goto cp0_unimplemented; @@ -9470,7 +9475,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: gen_helper_mtc0_errctl(cpu_env, arg); ctx->base.is_jmp =3D DISAS_STOP; - rn =3D "ErrCtl"; + register_name =3D "ErrCtl"; break; default: goto cp0_unimplemented; @@ -9483,7 +9488,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 2: case 3: /* ignored */ - rn =3D "CacheErr"; + register_name =3D "CacheErr"; break; default: goto cp0_unimplemented; @@ -9496,14 +9501,14 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 4: case 6: gen_helper_mtc0_taglo(cpu_env, arg); - rn =3D "TagLo"; + register_name =3D "TagLo"; break; case 1: case 3: case 5: case 7: gen_helper_mtc0_datalo(cpu_env, arg); - rn =3D "DataLo"; + register_name =3D "DataLo"; break; default: goto cp0_unimplemented; @@ -9516,17 +9521,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, = int reg, int sel) case 4: case 6: gen_helper_mtc0_taghi(cpu_env, arg); - rn =3D "TagHi"; + register_name =3D "TagHi"; break; case 1: case 3: case 5: case 7: gen_helper_mtc0_datahi(cpu_env, arg); - rn =3D "DataHi"; + register_name =3D "DataHi"; break; default: - rn =3D "invalid sel"; + register_name =3D "invalid sel"; goto cp0_unimplemented; } break; @@ -9534,7 +9539,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) switch (sel) { case 0: tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEP= C)); - rn =3D "ErrorEPC"; + register_name =3D "ErrorEPC"; break; default: goto cp0_unimplemented; @@ -9545,7 +9550,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) case 0: /* EJTAG support */ gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_DESAVE)); - rn =3D "DESAVE"; + register_name =3D "DESAVE"; break; case 2: case 3: @@ -9556,7 +9561,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) CP0_CHECK(ctx->kscrexist & (1 << sel)); tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_KScratch[sel-2])); - rn =3D "KScratch"; + register_name =3D "KScratch"; break; default: goto cp0_unimplemented; @@ -9565,7 +9570,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) default: goto cp0_unimplemented; } - trace_mips_translate_c0("dmtc0", rn, reg, sel); + trace_mips_translate_c0("dmtc0", register_name, reg, sel); =20 /* For simplicity assume that all writes can cause interrupts. */ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { @@ -9578,7 +9583,8 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) return; =20 cp0_unimplemented: - qemu_log_mask(LOG_UNIMP, "dmtc0 %s (reg %d sel %d)\n", rn, reg, sel); + qemu_log_mask(LOG_UNIMP, "dmtc0 %s (reg %d sel %d)\n", + register_name, reg, sel); } #endif /* TARGET_MIPS64 */ =20 --=20 2.7.4