1 files changed, 9 insertions, 8 deletions

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index e7d30d156e..c27738ac47 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -21,8 +21,8 @@ typedef unsigned int            uint_fast16_t;
 
 struct CPUMIPSState;
 
-typedef struct r4k_tlb a_r4k_tlb;
-struct r4k_tlb {
+typedef struct r4k_tlb_t r4k_tlb_t;
+struct r4k_tlb_t {
     target_ulong VPN;
     uint32_t PageMask;
     uint_fast8_t ASID;
@@ -47,12 +47,13 @@ struct CPUMIPSTLBContext {
     void (*helper_tlbr) (void);
     union {
         struct {
-            a_r4k_tlb tlb[MIPS_TLB_MAX];
+            r4k_tlb_t tlb[MIPS_TLB_MAX];
         } r4k;
     } mmu;
 };
 
-union fpr {
+typedef union fpr_t fpr_t;
+union fpr_t {
     float64  fd;   /* ieee double precision */
     float32  fs[2];/* ieee single precision */
     uint64_t d;    /* binary double fixed-point */
@@ -70,7 +71,7 @@ union fpr {
 typedef struct CPUMIPSFPUContext CPUMIPSFPUContext;
 struct CPUMIPSFPUContext {
     /* Floating point registers */
-    union fpr fpr[32];
+    fpr_t fpr[32];
     float_status fp_status;
     /* fpu implementation/revision register (fir) */
     uint32_t fcr0;
@@ -129,7 +130,7 @@ struct CPUMIPSMVPContext {
 #define CP0MVPC1_PCP1	0
 };
 
-typedef struct mips_def a_mips_def;
+typedef struct mips_def_t mips_def_t;
 
 #define MIPS_SHADOW_SET_MAX 16
 #define MIPS_TC_MAX 5
@@ -457,7 +458,7 @@ struct CPUMIPSState {
 
     CPU_COMMON
 
-    const a_mips_def *cpu_model;
+    const mips_def_t *cpu_model;
     void *irq[8];
     struct QEMUTimer *timer; /* Internal timer */
 };
@@ -474,7 +475,7 @@ void r4k_helper_tlbp (void);
 void r4k_helper_tlbr (void);
 void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 
-void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
                           int unused, int size);
 
 #define cpu_init cpu_mips_init