Diff for /qemu/qemu-timer.h between versions and

version, 2018/04/24 17:35:08 version, 2018/04/24 18:24:48
Line 1 Line 1
 #ifndef QEMU_TIMER_H  #ifndef QEMU_TIMER_H
 #define QEMU_TIMER_H  #define QEMU_TIMER_H
   #include "qemu-common.h"
 /* timers */  /* timers */
 typedef struct QEMUClock QEMUClock;  typedef struct QEMUClock QEMUClock;
Line 25  extern QEMUClock *vm_clock; Line 27  extern QEMUClock *vm_clock;
 extern QEMUClock *host_clock;  extern QEMUClock *host_clock;
 int64_t qemu_get_clock(QEMUClock *clock);  int64_t qemu_get_clock(QEMUClock *clock);
   int64_t qemu_get_clock_ns(QEMUClock *clock);
   void qemu_clock_enable(QEMUClock *clock, int enabled);
 QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque);  QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque);
 void qemu_free_timer(QEMUTimer *ts);  void qemu_free_timer(QEMUTimer *ts);
Line 33  void qemu_mod_timer(QEMUTimer *ts, int64 Line 37  void qemu_mod_timer(QEMUTimer *ts, int64
 int qemu_timer_pending(QEMUTimer *ts);  int qemu_timer_pending(QEMUTimer *ts);
 int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time);  int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time);
   void qemu_run_all_timers(void);
   int qemu_alarm_pending(void);
   int64_t qemu_next_deadline(void);
   void configure_alarms(char const *opt);
   void configure_icount(const char *option);
   int qemu_calculate_timeout(void);
   void init_clocks(void);
   int init_timer_alarm(void);
   void quit_timers(void);
 static inline int64_t get_ticks_per_sec(void)  static inline int64_t get_ticks_per_sec(void)
 {  {
     return 1000000000LL;      return 1000000000LL;
 }  }
 void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);  void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
 void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);  void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
Line 56  void ptimer_stop(ptimer_state *s); Line 71  void ptimer_stop(ptimer_state *s);
 void qemu_put_ptimer(QEMUFile *f, ptimer_state *s);  void qemu_put_ptimer(QEMUFile *f, ptimer_state *s);
 void qemu_get_ptimer(QEMUFile *f, ptimer_state *s);  void qemu_get_ptimer(QEMUFile *f, ptimer_state *s);
   /* icount */
   int64_t qemu_icount_round(int64_t count);
   extern int64_t qemu_icount;
   extern int use_icount;
   extern int icount_time_shift;
   extern int64_t qemu_icount_bias;
   int64_t cpu_get_icount(void);
   /* host CPU ticks (if available) */
   #if defined(_ARCH_PPC)
   static inline int64_t cpu_get_real_ticks(void)
       int64_t retval;
   #ifdef _ARCH_PPC64
       /* This reads timebase in one 64bit go and includes Cell workaround from:
       __asm__ __volatile__ ("mftb    %0\n\t"
                             "cmpwi   %0,0\n\t"
                             "beq-    $-8"
                             : "=r" (retval));
       /* http://ozlabs.org/pipermail/linuxppc-dev/1999-October/003889.html */
       unsigned long junk;
       __asm__ __volatile__ ("mfspr   %1,269\n\t"  /* mftbu */
                             "mfspr   %L0,268\n\t" /* mftb */
                             "mfspr   %0,269\n\t"  /* mftbu */
                             "cmpw    %0,%1\n\t"
                             "bne     $-16"
                             : "=r" (retval), "=r" (junk));
       return retval;
   #elif defined(__i386__)
   static inline int64_t cpu_get_real_ticks(void)
       int64_t val;
       asm volatile ("rdtsc" : "=A" (val));
       return val;
   #elif defined(__x86_64__)
   static inline int64_t cpu_get_real_ticks(void)
       uint32_t low,high;
       int64_t val;
       asm volatile("rdtsc" : "=a" (low), "=d" (high));
       val = high;
       val <<= 32;
       val |= low;
       return val;
   #elif defined(__hppa__)
   static inline int64_t cpu_get_real_ticks(void)
       int val;
       asm volatile ("mfctl %%cr16, %0" : "=r"(val));
       return val;
   #elif defined(__ia64)
   static inline int64_t cpu_get_real_ticks(void)
       int64_t val;
       asm volatile ("mov %0 = ar.itc" : "=r"(val) :: "memory");
       return val;
   #elif defined(__s390__)
   static inline int64_t cpu_get_real_ticks(void)
       int64_t val;
       asm volatile("stck 0(%1)" : "=m" (val) : "a" (&val) : "cc");
       return val;
   #elif defined(__sparc_v8plus__) || defined(__sparc_v8plusa__) || defined(__sparc_v9__)
   static inline int64_t cpu_get_real_ticks (void)
   #if defined(_LP64)
       uint64_t        rval;
       asm volatile("rd %%tick,%0" : "=r"(rval));
       return rval;
       union {
           uint64_t i64;
           struct {
               uint32_t high;
               uint32_t low;
           }       i32;
       } rval;
       asm volatile("rd %%tick,%1; srlx %1,32,%0"
                    : "=r"(rval.i32.high), "=r"(rval.i32.low));
       return rval.i64;
   #elif defined(__mips__) && \
       ((defined(__mips_isa_rev) && __mips_isa_rev >= 2) || defined(__linux__))
    * binutils wants to use rdhwr only on mips32r2
    * but as linux kernel emulate it, it's fine
    * to use it.
   #define MIPS_RDHWR(rd, value) {                         \
           __asm__ __volatile__ (".set   push\n\t"         \
                                 ".set mips32r2\n\t"       \
                                 "rdhwr  %0, "rd"\n\t"     \
                                 ".set   pop"              \
                                 : "=r" (value));          \
   static inline int64_t cpu_get_real_ticks(void)
       /* On kernels >= 2.6.25 rdhwr <reg>, $2 and $3 are emulated */
       uint32_t count;
       static uint32_t cyc_per_count = 0;
       if (!cyc_per_count) {
           MIPS_RDHWR("$3", cyc_per_count);
       MIPS_RDHWR("$2", count);
       return (int64_t)(count * cyc_per_count);
   #elif defined(__alpha__)
   static inline int64_t cpu_get_real_ticks(void)
       uint64_t cc;
       uint32_t cur, ofs;
       asm volatile("rpcc %0" : "=r"(cc));
       cur = cc;
       ofs = cc >> 32;
       return cur - ofs;
   /* The host CPU doesn't have an easily accessible cycle counter.
      Just return a monotonically increasing value.  This will be
      totally wrong, but hopefully better than nothing.  */
   static inline int64_t cpu_get_real_ticks (void)
       static int64_t ticks = 0;
       return ticks++;
   #ifdef NEED_CPU_H
   /* Deterministic execution requires that IO only be performed on the last
      instruction of a TB so that interrupts take effect immediately.  */
   static inline int can_do_io(CPUState *env)
       if (!use_icount)
           return 1;
       /* If not executing code then assume we are ok.  */
       if (!env->current_tb)
           return 1;
       return env->can_do_io != 0;
   static inline int64_t profile_getclock(void)
       return cpu_get_real_ticks();
   extern int64_t qemu_time, qemu_time_start;
   extern int64_t tlb_flush_time;
   extern int64_t dev_time;
 #endif  #endif

Removed from v.  
changed lines
  Added in v.