| Message ID | 441004d25ece7b536825906e0325235bc2614b5d.1714606359.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc PPC exception and BookE MMU clean ups | expand |
On Thu May 2, 2024 at 9:43 AM AEST, BALATON Zoltan wrote: > This type is only used within mmu_common.c. Move its definition from > internal.h to there. This can be squashed with the previous patch unexport the remaining user. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > target/ppc/internal.h | 12 ------------ > target/ppc/mmu_common.c | 11 +++++++++++ > 2 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/target/ppc/internal.h b/target/ppc/internal.h > index 7a99f08dc8..61c2aadd0d 100644 > --- a/target/ppc/internal.h > +++ b/target/ppc/internal.h > @@ -256,8 +256,6 @@ static inline int prot_for_access_type(MMUAccessType access_type) > > /* PowerPC MMU emulation */ > > -typedef struct mmu_ctx_t mmu_ctx_t; > - > bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, > hwaddr *raddrp, int *psizep, int *protp, > int mmu_idx, bool guest_visible); > @@ -265,16 +263,6 @@ bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, > /* Software driven TLB helpers */ > int ppc6xx_tlb_getnum(CPUPPCState *env, target_ulong eaddr, > int way, int is_code); > -/* Context used internally during MMU translations */ > -struct mmu_ctx_t { > - hwaddr raddr; /* Real address */ > - hwaddr eaddr; /* Effective address */ > - int prot; /* Protection bits */ > - hwaddr hash[2]; /* Pagetable hash values */ > - target_ulong ptem; /* Virtual segment ID | API */ > - int key; /* Access key */ > - int nx; /* Non-execute area */ > -}; > > #endif /* !CONFIG_USER_ONLY */ > > diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c > index 4852cb5571..41ef174ab4 100644 > --- a/target/ppc/mmu_common.c > +++ b/target/ppc/mmu_common.c > @@ -35,6 +35,17 @@ > > /* #define DUMP_PAGE_TABLES */ > > +/* Context used internally during MMU translations */ > +typedef struct { > + hwaddr raddr; /* Real address */ > + hwaddr eaddr; /* Effective address */ > + int prot; /* Protection bits */ > + hwaddr hash[2]; /* Pagetable hash values */ > + target_ulong ptem; /* Virtual segment ID | API */ > + int key; /* Access key */ > + int nx; /* Non-execute area */ > +} mmu_ctx_t; > + > void ppc_store_sdr1(CPUPPCState *env, target_ulong value) > { > PowerPCCPU *cpu = env_archcpu(env);
diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 7a99f08dc8..61c2aadd0d 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -256,8 +256,6 @@ static inline int prot_for_access_type(MMUAccessType access_type) /* PowerPC MMU emulation */ -typedef struct mmu_ctx_t mmu_ctx_t; - bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, hwaddr *raddrp, int *psizep, int *protp, int mmu_idx, bool guest_visible); @@ -265,16 +263,6 @@ bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, /* Software driven TLB helpers */ int ppc6xx_tlb_getnum(CPUPPCState *env, target_ulong eaddr, int way, int is_code); -/* Context used internally during MMU translations */ -struct mmu_ctx_t { - hwaddr raddr; /* Real address */ - hwaddr eaddr; /* Effective address */ - int prot; /* Protection bits */ - hwaddr hash[2]; /* Pagetable hash values */ - target_ulong ptem; /* Virtual segment ID | API */ - int key; /* Access key */ - int nx; /* Non-execute area */ -}; #endif /* !CONFIG_USER_ONLY */ diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 4852cb5571..41ef174ab4 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -35,6 +35,17 @@ /* #define DUMP_PAGE_TABLES */ +/* Context used internally during MMU translations */ +typedef struct { + hwaddr raddr; /* Real address */ + hwaddr eaddr; /* Effective address */ + int prot; /* Protection bits */ + hwaddr hash[2]; /* Pagetable hash values */ + target_ulong ptem; /* Virtual segment ID | API */ + int key; /* Access key */ + int nx; /* Non-execute area */ +} mmu_ctx_t; + void ppc_store_sdr1(CPUPPCState *env, target_ulong value) { PowerPCCPU *cpu = env_archcpu(env);
This type is only used within mmu_common.c. Move its definition from internal.h to there. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/internal.h | 12 ------------ target/ppc/mmu_common.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-)