Changeset 19821 in vbox for trunk/src/recompiler

Timestamp:

May 19, 2009 1:28:56 PM (16 years ago)

Author:

vboxsync

Message:

TM: TMTimerPoll cleanup.

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (1 diff)
• cpu-exec.c (modified) (1 diff)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -1166 +1166 @@
     { "TMNotifyEndOfExecution",                 (void *)(uintptr_t)&TMNotifyEndOfExecution,         &g_aArgsVMCPU[0],                           RT_ELEMENTS(g_aArgsVMCPU),                             REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "TMNotifyStartOfExecution",               (void *)(uintptr_t)&TMNotifyStartOfExecution,       &g_aArgsVMCPU[0],                           RT_ELEMENTS(g_aArgsVMCPU),                             REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
-    { "TMTimerPoll",                            (void *)(uintptr_t)&TMTimerPoll,                    &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_INT,    sizeof(uint64_t),   NULL },
+    { "TMTimerPollBool",                        (void *)(uintptr_t)&TMTimerPollBool,                &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_VOID,   sizeof(void),       NULL },
     { "TMR3TimerQueuesDo",                      (void *)(uintptr_t)&TMR3TimerQueuesDo,              &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "TRPMAssertTrap",                         (void *)(uintptr_t)&TRPMAssertTrap,                 &g_aArgsTRPMAssertTrap[0],                  RT_ELEMENTS(g_aArgsTRPMAssertTrap),                    REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/cpu-exec.c

@@ -533 +533 @@
                                             | CPU_INTERRUPT_SINGLE_INSTR | CPU_INTERRUPT_SINGLE_INSTR_IN_FLIGHT))
             &&  (   (env->interrupt_request & CPU_INTERRUPT_EXTERNAL_TIMER)
-                 || !TMTimerPoll(env->pVM, env->pVCpu)) ) {
+                 || TMTimerPollBool(env->pVM, env->pVCpu)) ) {
             ASMAtomicAndS32((int32_t volatile *)&env->interrupt_request, ~CPU_INTERRUPT_EXTERNAL_TIMER);
             remR3ProfileStart(STATS_QEMU_RUN_TIMERS);