| Message ID | 20220627141104.669152-4-matheus.ferst@eldorado.org.br |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix gen_*_exception error codes | expand |
Matheus Ferst <matheus.ferst@eldorado.org.br> writes: > The only PowerPC implementations with these insns were the 460 and 460F, > which had their definitions removed in [1]. > > [1] 7ff26aa6c657 ("target/ppc: Remove unused PPC 460 and 460F definitions") > > Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com> > --- > target/ppc/cpu.h | 6 ++---- > target/ppc/translate.c | 18 ------------------ > 2 files changed, 2 insertions(+), 22 deletions(-) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 6d78078f37..80664446e6 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -2203,8 +2203,6 @@ enum { > PPC_DCR = 0x1000000000000000ULL, > /* DCR extended accesse */ > PPC_DCRX = 0x2000000000000000ULL, > - /* user-mode DCR access, implemented in PowerPC 460 */ > - PPC_DCRUX = 0x4000000000000000ULL, > /* popcntw and popcntd instructions */ > PPC_POPCNTWD = 0x8000000000000000ULL, > > @@ -2228,8 +2226,8 @@ enum { > | PPC_405_MAC | PPC_440_SPEC | PPC_BOOKE \ > | PPC_MFAPIDI | PPC_TLBIVA | PPC_TLBIVAX \ > | PPC_4xx_COMMON | PPC_40x_ICBT | PPC_RFMCI \ > - | PPC_RFDI | PPC_DCR | PPC_DCRX | PPC_DCRUX \ > - | PPC_POPCNTWD | PPC_CILDST) > + | PPC_RFDI | PPC_DCR | PPC_DCRX | PPC_POPCNTWD \ > + | PPC_CILDST) > > /* extended type values */ > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index d7e5670c20..30dd524959 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -5907,22 +5907,6 @@ static void gen_mtdcrx(DisasContext *ctx) > #endif /* defined(CONFIG_USER_ONLY) */ > } > > -/* mfdcrux (PPC 460) : user-mode access to DCR */ > -static void gen_mfdcrux(DisasContext *ctx) > -{ > - gen_helper_load_dcr(cpu_gpr[rD(ctx->opcode)], cpu_env, > - cpu_gpr[rA(ctx->opcode)]); > - /* Note: Rc update flag set leads to undefined state of Rc0 */ > -} > - > -/* mtdcrux (PPC 460) : user-mode access to DCR */ > -static void gen_mtdcrux(DisasContext *ctx) > -{ > - gen_helper_store_dcr(cpu_env, cpu_gpr[rA(ctx->opcode)], > - cpu_gpr[rS(ctx->opcode)]); > - /* Note: Rc update flag set leads to undefined state of Rc0 */ > -} > - > /* dccci */ > static void gen_dccci(DisasContext *ctx) > { > @@ -6958,8 +6942,6 @@ GEN_HANDLER(mfdcr, 0x1F, 0x03, 0x0A, 0x00000001, PPC_DCR), > GEN_HANDLER(mtdcr, 0x1F, 0x03, 0x0E, 0x00000001, PPC_DCR), > GEN_HANDLER(mfdcrx, 0x1F, 0x03, 0x08, 0x00000000, PPC_DCRX), > GEN_HANDLER(mtdcrx, 0x1F, 0x03, 0x0C, 0x00000000, PPC_DCRX), > -GEN_HANDLER(mfdcrux, 0x1F, 0x03, 0x09, 0x00000000, PPC_DCRUX), > -GEN_HANDLER(mtdcrux, 0x1F, 0x03, 0x0D, 0x00000000, PPC_DCRUX), > GEN_HANDLER(dccci, 0x1F, 0x06, 0x0E, 0x03E00001, PPC_4xx_COMMON), > GEN_HANDLER(dcread, 0x1F, 0x06, 0x0F, 0x00000001, PPC_4xx_COMMON), > GEN_HANDLER2(icbt_40x, "icbt", 0x1F, 0x06, 0x08, 0x03E00001, PPC_40x_ICBT),
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 6d78078f37..80664446e6 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2203,8 +2203,6 @@ enum { PPC_DCR = 0x1000000000000000ULL, /* DCR extended accesse */ PPC_DCRX = 0x2000000000000000ULL, - /* user-mode DCR access, implemented in PowerPC 460 */ - PPC_DCRUX = 0x4000000000000000ULL, /* popcntw and popcntd instructions */ PPC_POPCNTWD = 0x8000000000000000ULL, @@ -2228,8 +2226,8 @@ enum { | PPC_405_MAC | PPC_440_SPEC | PPC_BOOKE \ | PPC_MFAPIDI | PPC_TLBIVA | PPC_TLBIVAX \ | PPC_4xx_COMMON | PPC_40x_ICBT | PPC_RFMCI \ - | PPC_RFDI | PPC_DCR | PPC_DCRX | PPC_DCRUX \ - | PPC_POPCNTWD | PPC_CILDST) + | PPC_RFDI | PPC_DCR | PPC_DCRX | PPC_POPCNTWD \ + | PPC_CILDST) /* extended type values */ diff --git a/target/ppc/translate.c b/target/ppc/translate.c index d7e5670c20..30dd524959 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -5907,22 +5907,6 @@ static void gen_mtdcrx(DisasContext *ctx) #endif /* defined(CONFIG_USER_ONLY) */ } -/* mfdcrux (PPC 460) : user-mode access to DCR */ -static void gen_mfdcrux(DisasContext *ctx) -{ - gen_helper_load_dcr(cpu_gpr[rD(ctx->opcode)], cpu_env, - cpu_gpr[rA(ctx->opcode)]); - /* Note: Rc update flag set leads to undefined state of Rc0 */ -} - -/* mtdcrux (PPC 460) : user-mode access to DCR */ -static void gen_mtdcrux(DisasContext *ctx) -{ - gen_helper_store_dcr(cpu_env, cpu_gpr[rA(ctx->opcode)], - cpu_gpr[rS(ctx->opcode)]); - /* Note: Rc update flag set leads to undefined state of Rc0 */ -} - /* dccci */ static void gen_dccci(DisasContext *ctx) { @@ -6958,8 +6942,6 @@ GEN_HANDLER(mfdcr, 0x1F, 0x03, 0x0A, 0x00000001, PPC_DCR), GEN_HANDLER(mtdcr, 0x1F, 0x03, 0x0E, 0x00000001, PPC_DCR), GEN_HANDLER(mfdcrx, 0x1F, 0x03, 0x08, 0x00000000, PPC_DCRX), GEN_HANDLER(mtdcrx, 0x1F, 0x03, 0x0C, 0x00000000, PPC_DCRX), -GEN_HANDLER(mfdcrux, 0x1F, 0x03, 0x09, 0x00000000, PPC_DCRUX), -GEN_HANDLER(mtdcrux, 0x1F, 0x03, 0x0D, 0x00000000, PPC_DCRUX), GEN_HANDLER(dccci, 0x1F, 0x06, 0x0E, 0x03E00001, PPC_4xx_COMMON), GEN_HANDLER(dcread, 0x1F, 0x06, 0x0F, 0x00000001, PPC_4xx_COMMON), GEN_HANDLER2(icbt_40x, "icbt", 0x1F, 0x06, 0x08, 0x03E00001, PPC_40x_ICBT),
The only PowerPC implementations with these insns were the 460 and 460F, which had their definitions removed in [1]. [1] 7ff26aa6c657 ("target/ppc: Remove unused PPC 460 and 460F definitions") Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> --- target/ppc/cpu.h | 6 ++---- target/ppc/translate.c | 18 ------------------ 2 files changed, 2 insertions(+), 22 deletions(-)