Revision 3c7b48b7 target-mips/cpu.h

b/target-mips/cpu.h
36 36
    target_ulong PFN[2];
37 37
};
38 38

  
39
#if !defined(CONFIG_USER_ONLY)
39 40
typedef struct CPUMIPSTLBContext CPUMIPSTLBContext;
40 41
struct CPUMIPSTLBContext {
41 42
    uint32_t nb_tlb;
......
51 52
        } r4k;
52 53
    } mmu;
53 54
};
55
#endif
54 56

  
55 57
typedef union fpr_t fpr_t;
56 58
union fpr_t {
......
468 470
    CPU_COMMON
469 471

  
470 472
    CPUMIPSMVPContext *mvp;
473
#if !defined(CONFIG_USER_ONLY)
471 474
    CPUMIPSTLBContext *tlb;
475
#endif
472 476

  
473 477
    const mips_def_t *cpu_model;
474 478
    void *irq[8];
475 479
    struct QEMUTimer *timer; /* Internal timer */
476 480
};
477 481

  
482
#if !defined(CONFIG_USER_ONLY)
478 483
int no_mmu_map_address (CPUMIPSState *env, target_phys_addr_t *physical, int *prot,
479 484
                        target_ulong address, int rw, int access_type);
480 485
int fixed_mmu_map_address (CPUMIPSState *env, target_phys_addr_t *physical, int *prot,
......
485 490
void r4k_helper_tlbwr (void);
486 491
void r4k_helper_tlbp (void);
487 492
void r4k_helper_tlbr (void);
488
void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
489 493

  
490 494
void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
491 495
                          int unused, int size);
496
#endif
497

  
498
void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
492 499

  
493 500
#define cpu_init cpu_mips_init
494 501
#define cpu_exec cpu_mips_exec
......
598 605
                               int mmu_idx, int is_softmmu);
599 606
#define cpu_handle_mmu_fault cpu_mips_handle_mmu_fault
600 607
void do_interrupt (CPUState *env);
608
#if !defined(CONFIG_USER_ONLY)
601 609
void r4k_invalidate_tlb (CPUState *env, int idx, int use_extra);
602 610
target_phys_addr_t cpu_mips_translate_address (CPUState *env, target_ulong address,
603 611
		                               int rw);
612
#endif
604 613

  
605 614
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
606 615
{

Also available in: Unified diff