Revision 99a0949b target-mips/cpu.h

b/target-mips/cpu.h
21 21

  
22 22
struct CPUMIPSState;
23 23

  
24
typedef struct r4k_tlb_t r4k_tlb_t;
25
struct r4k_tlb_t {
24
typedef struct r4k_tlb a_r4k_tlb;
25
struct r4k_tlb {
26 26
    target_ulong VPN;
27 27
    uint32_t PageMask;
28 28
    uint_fast8_t ASID;
......
47 47
    void (*helper_tlbr) (void);
48 48
    union {
49 49
        struct {
50
            r4k_tlb_t tlb[MIPS_TLB_MAX];
50
            a_r4k_tlb tlb[MIPS_TLB_MAX];
51 51
        } r4k;
52 52
    } mmu;
53 53
};
54 54

  
55
typedef union fpr_t fpr_t;
56
union fpr_t {
55
union fpr {
57 56
    float64  fd;   /* ieee double precision */
58 57
    float32  fs[2];/* ieee single precision */
59 58
    uint64_t d;    /* binary double fixed-point */
......
71 70
typedef struct CPUMIPSFPUContext CPUMIPSFPUContext;
72 71
struct CPUMIPSFPUContext {
73 72
    /* Floating point registers */
74
    fpr_t fpr[32];
73
    union fpr fpr[32];
75 74
    float_status fp_status;
76 75
    /* fpu implementation/revision register (fir) */
77 76
    uint32_t fcr0;
......
130 129
#define CP0MVPC1_PCP1	0
131 130
};
132 131

  
133
typedef struct mips_def_t mips_def_t;
132
typedef struct mips_def a_mips_def;
134 133

  
135 134
#define MIPS_SHADOW_SET_MAX 16
136 135
#define MIPS_TC_MAX 5
......
458 457

  
459 458
    CPU_COMMON
460 459

  
461
    const mips_def_t *cpu_model;
460
    const a_mips_def *cpu_model;
462 461
    void *irq[8];
463 462
    struct QEMUTimer *timer; /* Internal timer */
464 463
};
......
475 474
void r4k_helper_tlbr (void);
476 475
void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
477 476

  
478
void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
477
void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
479 478
                          int unused, int size);
480 479

  
481 480
#define cpu_init cpu_mips_init

Also available in: Unified diff