Frontends

Timestamp:

Sep 22, 2008 8:58:39 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: reduce the number of dependencies to iprt/asm.h

Location:

trunk/src/VBox/Frontends

Files:

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

-              r8219
+              r12627
 #include <VBox/log.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
-#include <iprt/asm.h>
 #ifdef VBOX_GUI_DEBUG
 …
+{
 public:
+    inline static uint64_t ticks() {
+        return ASMReadTSC();
+    }
+    static uint64_t ticks();
     inline static uint64_t msecs( uint64_t tcks ) {
         return tcks / ticks_per_msec;

-              r11955
+              r12627
 #if defined (VBOX_GUI_DEBUG)
 uint64_t VMCPUTimer::ticks_per_msec = (uint64_t) -1LL; // declared in VBoxDefs.h
+/* don't make this function inline to not depend on iprt/asm.h in VBoxDefs.h */
+uint64_t VMCPUTimer::ticks()
+{
+        return ASMReadTSC();
+}
 #endif

-              r12286
+              r12627
 #include <VBox/log.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
-#include <iprt/asm.h>
 #ifdef VBOX_GUI_DEBUG
 …
+{
 public:
+    inline static uint64_t ticks() {
+        return ASMReadTSC();
+    }
+    /* don't inline this function to not depend on iprt/asm.h here */
+    static uint64_t ticks();
     inline static uint64_t msecs( uint64_t tcks ) {
         return tcks / ticks_per_msec;

-              r12553
+              r12627
 #if defined (VBOX_GUI_DEBUG)
 uint64_t VMCPUTimer::ticks_per_msec = (uint64_t) -1LL; // declared in VBoxDefs.h
+uint64_t VMCPUTimer::ticks()
+{
+    return ASMReadTSC();
+}
 #endif

Note: See TracChangeset for help on using the changeset viewer.