Changeset 20049 in vbox

Timestamp:

May 26, 2009 5:10:42 PM (16 years ago)

Author:

vboxsync

Message:

DevPit-i8254.cpp: Don't call TMVirtualGet multiple times when reprogramming the timer. Fixes the TM.cpp assertion.

File:

• trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -162 +162 @@
 #ifdef IN_RING3
 PDMBOTHCBDECL(int) pitIOPortSpeakerWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
-static void pit_irq_timer_update(PITChannelState *s, uint64_t current_time);
+static void pit_irq_timer_update(PITChannelState *s, uint64_t current_time, uint64_t now);
 #endif
 __END_DECLS
@@ -287 +287 @@
         if (s->gate < val) {
             /* restart counting on rising edge */
+            Log(("pit_set_gate: restarting mode %d\n", s->mode));
             s->count_load_time = TMTimerGet(pTimer);
-            pit_irq_timer_update(s, s->count_load_time);
+            pit_irq_timer_update(s, s->count_load_time, s->count_load_time);
         }
         break;
@@ -295 +296 @@
         if (s->gate < val) {
             /* restart counting on rising edge */
+            Log(("pit_set_gate: restarting mode %d\n", s->mode));
             s->count_load_time = s->u64ReloadTS = TMTimerGet(pTimer);
-            pit_irq_timer_update(s, s->count_load_time);
+            pit_irq_timer_update(s, s->count_load_time, s->count_load_time);
         }
         /* XXX: disable/enable counting */
@@ -311 +313 @@
     s->count_load_time = s->u64ReloadTS = TMTimerGet(pTimer);
     s->count = val;
-    pit_irq_timer_update(s, s->count_load_time);
+    pit_irq_timer_update(s, s->count_load_time, s->count_load_time);
 
     /* log the new rate (ch 0 only). */
@@ -318 +320 @@
         LogRel(("PIT: mode=%d count=%#x (%u) - %d.%02d Hz (ch=0)\n",
                 s->mode, s->count, s->count, PIT_FREQ / s->count, (PIT_FREQ * 100 / s->count) % 100));
+    else
+        Log(("PIT: mode=%d count=%#x (%u) - %d.%02d Hz (ch=0)\n",
+             s->mode, s->count, s->count, PIT_FREQ / s->count, (PIT_FREQ * 100 / s->count) % 100));
 }
 
@@ -377 +382 @@
     }
     /* convert to timer units */
-    LogFlow(("PIT: next_time=%14RI64 %20RI64 mode=%#x count=%#06x\n", next_time,
+    LogFlow(("PIT: next_time=%'14RU64 %'20RU64 mode=%#x count=%#06x\n", next_time,
              ASMMultU64ByU32DivByU32(next_time, TMTimerGetFreq(pTimer), PIT_FREQ), s->mode, s->count));
     next_time = s->count_load_time + ASMMultU64ByU32DivByU32(next_time, TMTimerGetFreq(pTimer), PIT_FREQ);
@@ -387 +392 @@
 }
 
-static void pit_irq_timer_update(PITChannelState *s, uint64_t current_time)
-{
-    uint64_t now;
+static void pit_irq_timer_update(PITChannelState *s, uint64_t current_time, uint64_t now)
+{
     int64_t expire_time;
     int irq_level;
@@ -405 +409 @@
     if (irq_level)
         PDMDevHlpISASetIrq(pDevIns, s->irq, 0);
-    now = TMTimerGet(pTimer);
-    Log3(("pit_irq_timer_update: %lldns late\n", now - s->u64NextTS));
     if (irq_level)
     {
@@ -415 +417 @@
     if (expire_time != -1)
     {
+        Log3(("pit_irq_timer_update: next=%'RU64 now=%'RU64\n", expire_time, now));
         s->u64NextTS = expire_time;
         TMTimerSet(s->CTX_SUFF(pTimer), s->u64NextTS);
@@ -812 +815 @@
     PITChannelState *s = &pThis->channels[0];
     STAM_PROFILE_ADV_START(&s->CTX_SUFF(pPit)->StatPITHandler, a);
-    pit_irq_timer_update(s, s->next_transition_time);
+    Log(("pitTimer\n"));
+    pit_irq_timer_update(s, s->next_transition_time, TMTimerGet(pTimer));
     STAM_PROFILE_ADV_STOP(&s->CTX_SUFF(pPit)->StatPITHandler, a);
 }