Changeset 11309

Timestamp:

08/09/08 01:25:08 (3 months ago)

Author:

vboxsync

Message:

iprt: Retired HCSTRING, replaced by R3STRING.

Files:

• trunk/include/iprt/cdefs.h (modified) (1 diff)
• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (8 diffs)
• trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (16 diffs)

trunk/include/iprt/cdefs.h

@@ -426 +426 @@
-#else
-# define GCSTRING(pR0String)    ("<GC_STRING>")
-#endif
-
-/** @def HCSTRING
- * Macro which in GC will return a dummy string while in HC will return
- * the parameter.
- *
- * This is typically used to wrap description strings in structures shared
- * between HC and GC. The intention is to avoid the \#ifdef IN_GC kludge.
- *
- * @param   pHCString   The HC string. Only referenced in HC.
- * @deprecated Use R3STRING or R0STRING instead.
- */
-#ifdef IN_GC
-# define HCSTRING(pHCString)    ("<HC_STRING>")
-#else
-# define HCSTRING(pHCString)    (pHCString)
-#endif
-

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -539 +539 @@
-        apic_level = get_pci_irq_apic_level(pGlobals, irq_num);
-        Log3(("apic_set_irq: %s: irq_num1=%d level=%d apic_irq=%d apic_level=%d irq_num1=%d\n",
-HC
+R3
-        pBus->CTX_SUFF(pPciHlp)->pfnIoApicSetIrq(pBus->CTX_SUFF(pDevIns), apic_irq, apic_level);
-
@@ -546 +546 @@
-            apic_level = get_pci_irq_apic_level(pGlobals, irq_num);
-            Log3(("apic_set_irq: %s: irq_num1=%d level=%d apic_irq=%d apic_level=%d irq_num1=%d (flop)\n",
-HC
+R3
-            pBus->CTX_SUFF(pPciHlp)->pfnIoApicSetIrq(pBus->CTX_SUFF(pDevIns), apic_irq, apic_level);
-        }
-    } else {
-        Log3(("apic_set_irq: %s: irq_num1=%d level=%d acpi_irq=%d\n",
-HC
+R3
-        pBus->CTX_SUFF(pPciHlp)->pfnIoApicSetIrq(pBus->CTX_SUFF(pDevIns), acpi_irq, level);
-    }
@@ -652 +652 @@
-
-    Log3(("piix3_set_irq: %s: iLevel=%d iIrq=%d pic_irq=%d pic_level=%d\n",
-HC
+R3
-    pBus->CTX_SUFF(pPciHlp)->pfnIsaSetIrq(pBus->CTX_SUFF(pDevIns), pic_irq, pic_level);
-

trunk/src/VBox/VMM/PGMInternal.h

@@ -3770 +3770 @@
-    }
-    Log2(("PHYS2VIRT: Removing %VGp-%VGp %#RX32 %s\n",
-HC
+R3
-    pPhys2Virt->offNextAlias = 0;
-    pPhys2Virt->Core.KeyLast = NIL_RTGCPHYS; /* require reinsert */

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -188 +188 @@
-#include "PGMAllShw.h"
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
-#undef PGM_GST_NAME
-
@@ -938 +938 @@
-    }
-    /* The PDPT was cached or created; hook it up now. */
- 
+
-                | (pGstPml4e->u & ~(X86_PML4E_PG_MASK | X86_PML4E_AVL_MASK | X86_PML4E_PCD | X86_PML4E_PWT));
-
-    const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_AMD64;
-    
+
-    PX86PDPE  pPdpe = &pPdpt->a[iPdPt];
-
@@ -1393 +1393 @@
-
-/**
- 
+
- * without actually flushing the TLB as with PGMFlushTLB.
- *
@@ -1712 +1712 @@
-            if (rc != VERR_PAGE_TABLE_NOT_PRESENT)
-            {
-HC
+R3
-                cErrors++;
-                break;

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -86 +86 @@
-{
-    Log(("PGMHandlerPhysicalRegisterEx: enmType=%d GCPhys=%VGp GCPhysLast=%VGp pfnHandlerR3=%VHv pvUserR3=%VHv pfnHandlerR0=%VHv pvUserR0=%VHv pfnHandlerGC=%VRv pvUserGC=%VRv pszDesc=%s\n",
-HC
+R3
-
-    /*
@@ -294 +294 @@
-    {
-        LogFlow(("PGMHandlerPhysicalDeregister: Removing Range %#VGp-%#VGp %s\n",
-HC
+R3
-
-        /*
@@ -1264 +1264 @@
-    {
-        AssertMsgFailed(("virt handler phys has incorrect key! %VGp %VGv %s\n",
-HC
+R3
-        pState->cErrors++;
-    }
@@ -1272 +1272 @@
-    {
-        AssertMsgFailed(("virt handler phys has incorrect key! %VGp %VGv %s\n",
-HC
+R3
-        pState->cErrors++;
-    }
@@ -1291 +1291 @@
-            {
-                AssertMsgFailed(("virt handler phys out of sync. %VGp GCPhysNew=~0 iPage=%#x %VGv %s\n",
-HC
+R3
-                pState->cErrors++;
-            }
@@ -1301 +1301 @@
-        {
-            AssertMsgFailed(("virt handler phys out of sync. %VGp GCPhysGst=%VGp iPage=%#x %VGv %s\n",
-HC
+R3
-            pState->cErrors++;
-            continue;
@@ -1310 +1310 @@
-        {
-            AssertMsgFailed(("virt handler getting ram flags. GCPhysGst=%VGp iPage=%#x %VGv %s\n",
-HC
+R3
-            pState->cErrors++;
-            continue;
@@ -1318 +1318 @@
-        {
-            AssertMsgFailed(("virt handler state mismatch. HCPhys=%VHp GCPhysGst=%VGp iPage=%#x %VGv state=%d expected>=%d %s\n",
-HC
+R3
-            pState->cErrors++;
-            continue;

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -389 +389 @@
-        TMTIMERSTATE enmState = pTimer->enmState;
-        Log2(("TMTimerDestroy: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
-HC
+R3
-        switch (enmState)
-        {
@@ -395 +395 @@
-                if (!VM_IS_EMT(pTimer->CTXALLSUFF(pVM)))
-                {
-HC
+R3
-                    return VERR_INVALID_PARAMETER;
-                }
@@ -426 +426 @@
-            case TMTIMERSTATE_PENDING_DESTROY:
-            case TMTIMERSTATE_PENDING_STOP_DESTROY:
-HC
+R3
-                return VERR_INVALID_PARAMETER;
-
@@ -457 +457 @@
-             */
-            case TMTIMERSTATE_FREE:
-HC
+R3
-                return VERR_TM_INVALID_STATE;
-            default:
-HC
+R3
-                return VERR_TM_UNKNOWN_STATE;
-        }
-    } while (cRetries-- > 0);
-
-HC
+R3
-    return VERR_INTERNAL_ERROR;
-}
@@ -490 +490 @@
-        TMTIMERSTATE    enmState = pTimer->enmState;
-        Log2(("TMTimerSet: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d u64Expire=%llu\n",
-HC
+R3
-        switch (enmState)
-        {
@@ -566 +566 @@
-            case TMTIMERSTATE_PENDING_STOP_DESTROY:
-            case TMTIMERSTATE_FREE:
-HC
+R3
-                return VERR_TM_INVALID_STATE;
-            default:
-HC
+R3
-                return VERR_TM_UNKNOWN_STATE;
-        }
-    } while (cRetries-- > 0);
-
-HC
+R3
-    STAM_PROFILE_STOP(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerSet), a);
-    return VERR_INTERNAL_ERROR;
@@ -696 +696 @@
-        TMTIMERSTATE    enmState = pTimer->enmState;
-        Log2(("TMTimerStop: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
-HC
+R3
-        switch (enmState)
-        {
@@ -753 +753 @@
-            case TMTIMERSTATE_PENDING_STOP_DESTROY:
-            case TMTIMERSTATE_FREE:
-HC
+R3
-                return VERR_TM_INVALID_STATE;
-            default:
-HC
+R3
-                return VERR_TM_UNKNOWN_STATE;
-        }
-    } while (cRetries-- > 0);
-
-HC
+R3
-    STAM_PROFILE_STOP(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerStop), a);
-    return VERR_INTERNAL_ERROR;
@@ -798 +798 @@
-    }
-    //Log2(("TMTimerGet: returns %llu (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-    return u64;
-}
@@ -1081 +1081 @@
-            case TMTIMERSTATE_PENDING_STOP_SCHEDULE:
-                Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-                return ~(uint64_t)0;
-
@@ -1088 +1088 @@
-            case TMTIMERSTATE_PENDING_SCHEDULE:
-                Log2(("TMTimerGetExpire: returns %llu (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-                return pTimer->u64Expire;
-
@@ -1105 +1105 @@
-            case TMTIMERSTATE_PENDING_STOP_DESTROY:
-            case TMTIMERSTATE_FREE:
-HC
+R3
-                Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-                return ~(uint64_t)0;
-            default:
-HC
+R3
-                return ~(uint64_t)0;
-        }
-    } while (cRetries-- > 0);
-
-HC
+R3
-    Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-    return ~(uint64_t)0;
-}
@@ -1139 +1139 @@
-        case TMTIMERSTATE_PENDING_STOP_SCHEDULE:
-            Log2(("TMTimerIsActive: returns false (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-            return false;
-
@@ -1148 +1148 @@
-        case TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE:
-            Log2(("TMTimerIsActive: returns true (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-            return true;
-
@@ -1157 +1157 @@
-        case TMTIMERSTATE_PENDING_STOP_DESTROY:
-        case TMTIMERSTATE_FREE:
-HC
+R3
-            Log2(("TMTimerIsActive: returns false (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n",
-HC
+R3
-            return false;
-        default:
-HC
+R3
-            return false;
-    }
@@ -1424 +1424 @@
-         */
-        Log2(("tmTimerQueueSchedule: pTimer=%p:{.enmState=%s, .enmClock=%d, .enmType=%d, .pszDesc=%s}\n",
-HC
+R3
-        tmTimerQueueScheduleOne(pQueue, pTimer);
-        Log2(("tmTimerQueueSchedule: new %s\n", tmTimerState(pTimer->enmState)));