Revision 8f4efc55 target-sparc/cpu.h

b/target-sparc/cpu.h
292 292
    uint64_t tte;
293 293
} SparcTLBEntry;
294 294

  
295
struct CPUTimer
296
{
297
    const char *name;
298
    uint32_t    frequency;
299
    uint32_t    disabled;
300
    uint64_t    disabled_mask;
301
    int64_t     clock_offset;
302
    struct QEMUTimer  *qtimer;
303
};
304

  
305
typedef struct CPUTimer CPUTimer;
306

  
307
struct QEMUFile;
308
void cpu_put_timer(struct QEMUFile *f, CPUTimer *s);
309
void cpu_get_timer(struct QEMUFile *f, CPUTimer *s);
310

  
295 311
typedef struct CPUSPARCState {
296 312
    target_ulong gregs[8]; /* general registers */
297 313
    target_ulong *regwptr; /* pointer to current register window */
......
393 409
    uint64_t mgregs[8]; /* mmu general registers */
394 410
    uint64_t fprs;
395 411
    uint64_t tick_cmpr, stick_cmpr;
396
    void *tick, *stick;
412
    CPUTimer *tick, *stick;
397 413
#define TICK_NPT_MASK        0x8000000000000000ULL
398 414
#define TICK_INT_DIS         0x8000000000000000ULL
399 415
    uint64_t gsr;
400 416
    uint32_t gl; // UA2005
401 417
    /* UA 2005 hyperprivileged registers */
402 418
    uint64_t hpstate, htstate[MAXTL_MAX], hintp, htba, hver, hstick_cmpr, ssr;
403
    void *hstick; // UA 2005
419
    CPUTimer *hstick; // UA 2005
404 420
    uint32_t softint;
405 421
#define SOFTINT_TIMER   1
406 422
#define SOFTINT_STIMER  (1 << 16)
......
536 552
#define cpu_signal_handler cpu_sparc_signal_handler
537 553
#define cpu_list sparc_cpu_list
538 554

  
539
#define CPU_SAVE_VERSION 5
555
#define CPU_SAVE_VERSION 6
540 556

  
541 557
/* MMU modes definitions */
542 558
#define MMU_MODE0_SUFFIX _user
......
615 631

  
616 632
#ifdef TARGET_SPARC64
617 633
/* sun4u.c */
618
void cpu_tick_set_count(void *opaque, uint64_t count);
619
uint64_t cpu_tick_get_count(void *opaque);
620
void cpu_tick_set_limit(void *opaque, uint64_t limit);
634
void cpu_tick_set_count(CPUTimer *timer, uint64_t count);
635
uint64_t cpu_tick_get_count(CPUTimer *timer);
636
void cpu_tick_set_limit(CPUTimer *timer, uint64_t limit);
621 637
trap_state* cpu_tsptr(CPUState* env);
622 638
#endif
623 639

  

Also available in: Unified diff