Changeset 12989 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Oct 6, 2008 2:15:39 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37424

Message:

VMM + VBox/cdefs.h: consolidated all the XYZ*DECLS of the VMM into VMM*DECL. Removed dead DECL and IN_XYZ* macros.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (15 diffs)
• CSAMInternal.h (modified) (2 diffs)
• PATM.cpp (modified) (34 diffs)
• PATMInternal.h (modified) (7 diffs)
• VMMAll/CSAMAll.cpp (modified) (8 diffs)
• VMMAll/PATMAll.cpp (modified) (15 diffs)
• VMMGC/CSAMGC.cpp (modified) (3 diffs)
• VMMGC/PATMGC.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -109 +109 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMR3DECL(int) CSAMR3Init(PVM pVM)
+VMMR3DECL(int) CSAMR3Init(PVM pVM)
 {
     int rc;
@@ -255 +255 @@
  * @param   offDelta Relocation delta.
  */
-CSAMR3DECL(void) CSAMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
+VMMR3DECL(void) CSAMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
 {
     if (offDelta)
@@ -283 +283 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMR3DECL(int) CSAMR3Term(PVM pVM)
+VMMR3DECL(int) CSAMR3Term(PVM pVM)
 {
     int rc;
@@ -308 +308 @@
  * @param   pVM     The VM which is reset.
  */
-CSAMR3DECL(int) CSAMR3Reset(PVM pVM)
+VMMR3DECL(int) CSAMR3Reset(PVM pVM)
 {
     /* Clear page bitmaps. */
@@ -1521 +1521 @@
  * @param   addr        GC address of the page to flush
  */
-CSAMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTRCPTR addr)
+VMMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTRCPTR addr)
 {
     return csamFlushPage(pVM, addr, true /* remove page record */);
@@ -1533 +1533 @@
  * @param   addr        GC address of the page to flush
  */
-CSAMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTRCPTR addr)
+VMMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTRCPTR addr)
 {
     PCSAMPAGEREC pPageRec;
@@ -1706 +1706 @@
  * @param   enmTag      Monitor tag
  */
-CSAMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
+VMMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
 {
     PCSAMPAGEREC pPageRec = NULL;
@@ -1828 +1828 @@
  * @param   enmTag      Monitor tag
  */
-CSAMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
+VMMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
 {
     pPageAddrGC &= PAGE_BASE_GC_MASK;
@@ -2078 +2078 @@
  * @param   fScanned    Mark as scanned or not
  */
-CSAMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
+VMMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
 {
     PCSAMPAGE pPage = 0;
@@ -2105 +2105 @@
  * @param   pInstrGC    Instruction pointer
  */
-CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, PCPUMCTXCORE pCtxCore, RTRCPTR pInstrGC)
+VMMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, PCPUMCTXCORE pCtxCore, RTRCPTR pInstrGC)
 {
     if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
@@ -2131 +2131 @@
  * @param   pInstrGC    Instruction pointer (0:32 virtual address)
  */
-CSAMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTRCPTR pInstrGC)
+VMMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTRCPTR pInstrGC)
 {
     int rc;
@@ -2236 +2236 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMR3DECL(int) CSAMR3DoPendingAction(PVM pVM)
+VMMR3DECL(int) CSAMR3DoPendingAction(PVM pVM)
 {
     csamR3FlushDirtyPages(pVM);
@@ -2253 +2253 @@
  * @param   cGates      Number of gates to check
  */
-CSAMR3DECL(int) CSAMR3CheckGates(PVM pVM, uint32_t iGate, uint32_t cGates)
+VMMR3DECL(int) CSAMR3CheckGates(PVM pVM, uint32_t iGate, uint32_t cGates)
 {
     uint16_t    cbIDT;
@@ -2473 +2473 @@
  * @param   GCPtrCall   Call address
  */
-CSAMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTRCPTR GCPtrCall)
+VMMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTRCPTR GCPtrCall)
 {
     for (unsigned i=0;i<RT_ELEMENTS(pVM->csam.s.pvCallInstruction);i++)
@@ -2497 +2497 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMR3DECL(int) CSAMR3IsEnabled(PVM pVM)
+VMMR3DECL(int) CSAMR3IsEnabled(PVM pVM)
 {
     return pVM->fCSAMEnabled;

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -29 +29 @@
 #include <VBox/log.h>
 
-#if !defined(IN_CSAM_R3) && !defined(IN_CSAM_R0) && !defined(IN_CSAM_GC)
-# error "Not in CSAM! This is an internal header!"
-#endif
-
-/** Page flags.
+
+
+/** @name Page flags.
  * These are placed in the three bits available for system programs in
  * the page entries.
@@ -282 +280 @@
 
 __BEGIN_DECLS
-CSAMGCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
+VMMRCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
 __END_DECLS
 

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -106 +106 @@
  * @param   pVM         The VM to operate on.
  */
-PATMR3DECL(int) PATMR3Init(PVM pVM)
+VMMR3DECL(int) PATMR3Init(PVM pVM)
 {
     int rc;
@@ -279 +279 @@
  * @param   pVM     The VM handle.
  */
-PATMR3DECL(int) PATMR3InitFinalize(PVM pVM)
+VMMR3DECL(int) PATMR3InitFinalize(PVM pVM)
 {
     /* The GC state, stack and statistics must be read/write for the guest (supervisor only of course). */
@@ -410 +410 @@
  * @param   pVM     The VM.
  */
-PATMR3DECL(void) PATMR3Relocate(PVM pVM)
+VMMR3DECL(void) PATMR3Relocate(PVM pVM)
 {
     RTRCPTR     GCPtrNew = MMHyperHC2GC(pVM, pVM->patm.s.pGCStateHC);
@@ -467 +467 @@
  * @param   pVM         The VM to operate on.
  */
-PATMR3DECL(int) PATMR3Term(PVM pVM)
+VMMR3DECL(int) PATMR3Term(PVM pVM)
 {
     /* Memory was all allocated from the two MM heaps and requires no freeing. */
@@ -480 +480 @@
  * @param   pVM     The VM which is reset.
  */
-PATMR3DECL(int) PATMR3Reset(PVM pVM)
+VMMR3DECL(int) PATMR3Reset(PVM pVM)
 {
     Log(("PATMR3Reset\n"));
@@ -877 +877 @@
  * @param   pcb         Size of the patch memory block
  */
-PATMR3DECL(void *) PATMR3QueryPatchMemHC(PVM pVM, uint32_t *pcb)
+VMMR3DECL(void *) PATMR3QueryPatchMemHC(PVM pVM, uint32_t *pcb)
 {
     if (pcb)
@@ -894 +894 @@
  * @param   pcb         Size of the patch memory block
  */
-PATMR3DECL(RTRCPTR) PATMR3QueryPatchMemGC(PVM pVM, uint32_t *pcb)
+VMMR3DECL(RTRCPTR) PATMR3QueryPatchMemGC(PVM pVM, uint32_t *pcb)
 {
     if (pcb)
@@ -910 +910 @@
  * @param   pVM         The VM to operate on.
  */
-PATMR3DECL(PPATMGCSTATE) PATMR3QueryGCStateHC(PVM pVM)
+VMMR3DECL(PPATMGCSTATE) PATMR3QueryGCStateHC(PVM pVM)
 {
     return pVM->patm.s.pGCStateHC;
@@ -923 +923 @@
  * @param   pAddrGC     Guest context address
  */
-PATMR3DECL(bool) PATMR3IsPatchHCAddr(PVM pVM, R3PTRTYPE(uint8_t *) pAddrHC)
+VMMR3DECL(bool) PATMR3IsPatchHCAddr(PVM pVM, R3PTRTYPE(uint8_t *) pAddrHC)
 {
     return (pAddrHC >= pVM->patm.s.pPatchMemHC && pAddrHC < pVM->patm.s.pPatchMemHC + pVM->patm.s.cbPatchMem) ? true : false;
@@ -936 +936 @@
  * @param   fAllowPatching Allow/disallow patching
  */
-PATMR3DECL(int) PATMR3AllowPatching(PVM pVM, uint32_t fAllowPatching)
+VMMR3DECL(int) PATMR3AllowPatching(PVM pVM, uint32_t fAllowPatching)
 {
     pVM->fPATMEnabled = (fAllowPatching) ? true : false;
@@ -949 +949 @@
  * @param   pAddrGC     GC pointer
  */
-PATMR3DECL(R3PTRTYPE(void *)) PATMR3GCPtrToHCPtr(PVM pVM, RTRCPTR pAddrGC)
+VMMR3DECL(R3PTRTYPE(void *)) PATMR3GCPtrToHCPtr(PVM pVM, RTRCPTR pAddrGC)
 {
     if (pVM->patm.s.pPatchMemGC <= pAddrGC && pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem > pAddrGC)
@@ -964 +964 @@
  * @param   pVM         The VM to operate on.
  */
-PATMR3DECL(int) PATMR3IsEnabled(PVM pVM)
+VMMR3DECL(int) PATMR3IsEnabled(PVM pVM)
 {
     return pVM->fPATMEnabled;
@@ -2241 +2241 @@
  *
  */
-PATMR3DECL(int) PATMR3DetectConflict(PVM pVM, RTRCPTR pInstrGC, RTRCPTR pConflictGC)
+VMMR3DECL(int) PATMR3DetectConflict(PVM pVM, RTRCPTR pInstrGC, RTRCPTR pConflictGC)
 {
     PPATCHINFO pTargetPatch = PATMFindActivePatchByEntrypoint(pVM, pConflictGC, true /* include patch hints */);
@@ -2650 +2650 @@
  *
  */
-PATMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
+VMMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
                                  uint32_t uOpcode, uint32_t uOpSize, PPATMPATCHREC pPatchRec)
 {
@@ -3375 +3375 @@
  *
  */
-PATMR3DECL(int) PATMR3DuplicateFunctionRequest(PVM pVM, PCPUMCTX pCtx)
+VMMR3DECL(int) PATMR3DuplicateFunctionRequest(PVM pVM, PCPUMCTX pCtx)
 {
     RTRCPTR     pBranchTarget, pPage;
@@ -3758 +3758 @@
  *
  */
-PATMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch)
+VMMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch)
 {
     uint8_t ASMInt3 = 0xCC;
@@ -3934 +3934 @@
  * @param   flags       Patch flags
  */
-PATMR3DECL(int) PATMR3AddHint(PVM pVM, RTRCPTR pInstrGC, uint32_t flags)
+VMMR3DECL(int) PATMR3AddHint(PVM pVM, RTRCPTR pInstrGC, uint32_t flags)
 {
     Assert(pInstrGC);
@@ -3953 +3953 @@
  * @note    returns failure if patching is not allowed or possible
  */
-PATMR3DECL(int) PATMR3InstallPatch(PVM pVM, RTRCPTR pInstrGC, uint64_t flags)
+VMMR3DECL(int) PATMR3InstallPatch(PVM pVM, RTRCPTR pInstrGC, uint64_t flags)
 {
     DISCPUSTATE cpu;
@@ -4680 +4680 @@
  *
  */
-PATMR3DECL(int) PATMR3PatchWrite(PVM pVM, RTRCPTR GCPtr, uint32_t cbWrite)
+VMMR3DECL(int) PATMR3PatchWrite(PVM pVM, RTRCPTR GCPtr, uint32_t cbWrite)
 {
     RTRCUINTPTR          pWritePageStart, pWritePageEnd, pPage;
@@ -4854 +4854 @@
 /** @note Currently only called by CSAMR3FlushPage; optimization to avoid having to double check if the physical address has changed
  */
-PATMR3DECL(int) PATMR3FlushPage(PVM pVM, RTRCPTR addr)
+VMMR3DECL(int) PATMR3FlushPage(PVM pVM, RTRCPTR addr)
 {
     addr &= PAGE_BASE_GC_MASK;
@@ -4886 +4886 @@
  * @param   pInstrGC    Guest context pointer to instruction
  */
-PATMR3DECL(bool) PATMR3HasBeenPatched(PVM pVM, RTRCPTR pInstrGC)
+VMMR3DECL(bool) PATMR3HasBeenPatched(PVM pVM, RTRCPTR pInstrGC)
 {
     PPATMPATCHREC pPatchRec;
@@ -4904 +4904 @@
  *
  */
-PATMR3DECL(int) PATMR3QueryOpcode(PVM pVM, RTRCPTR pInstrGC, uint8_t *pByte)
+VMMR3DECL(int) PATMR3QueryOpcode(PVM pVM, RTRCPTR pInstrGC, uint8_t *pByte)
 {
     PPATMPATCHREC pPatchRec;
@@ -4948 +4948 @@
  *
  */
-PATMR3DECL(int) PATMR3DisablePatch(PVM pVM, RTRCPTR pInstrGC)
+VMMR3DECL(int) PATMR3DisablePatch(PVM pVM, RTRCPTR pInstrGC)
 {
     PPATMPATCHREC pPatchRec;
@@ -5202 +5202 @@
  *
  */
-PATMR3DECL(int) PATMR3EnablePatch(PVM pVM, RTRCPTR pInstrGC)
+VMMR3DECL(int) PATMR3EnablePatch(PVM pVM, RTRCPTR pInstrGC)
 {
     PPATMPATCHREC pPatchRec;
@@ -5552 +5552 @@
  * @param   pPatchAddr  Guest context patch address (if true)
  */
-PATMR3DECL(bool) PATMR3IsInsidePatchJump(PVM pVM, RTRCPTR pAddr, PRTGCPTR32 pPatchAddr)
+VMMR3DECL(bool) PATMR3IsInsidePatchJump(PVM pVM, RTRCPTR pAddr, PRTGCPTR32 pPatchAddr)
 {
     RTRCPTR addr;
@@ -5583 +5583 @@
  *
  */
-PATMR3DECL(int) PATMR3RemovePatch(PVM pVM, RTRCPTR pInstrGC)
+VMMR3DECL(int) PATMR3RemovePatch(PVM pVM, RTRCPTR pInstrGC)
 {
     PPATMPATCHREC pPatchRec;
@@ -5609 +5609 @@
  *
  */
-PATMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch)
+VMMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch)
 {
     if (pPatch->pPatchBlockOffset)
@@ -5704 +5704 @@
  *
  */
-PATMR3DECL(RTRCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, RCPTRTYPE(uint8_t*) pInstrGC)
+VMMR3DECL(RTRCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, RCPTRTYPE(uint8_t*) pInstrGC)
 {
     PPATMPATCHREC pPatchRec = (PPATMPATCHREC)RTAvloU32GetBestFit(&pVM->patm.s.PatchLookupTreeHC->PatchTree, pInstrGC, false);
@@ -5723 +5723 @@
  *
  */
-PATMR3DECL(RTRCPTR) PATMR3PatchToGCPtr(PVM pVM, RTRCPTR pPatchGC, PATMTRANSSTATE *pEnmState)
+VMMR3DECL(RTRCPTR) PATMR3PatchToGCPtr(PVM pVM, RTRCPTR pPatchGC, PATMTRANSSTATE *pEnmState)
 {
     PPATMPATCHREC pPatchRec;
@@ -5789 +5789 @@
  * @param   pAddrGC     Guest context address
  */
-PATMR3DECL(RTRCPTR) PATMR3QueryPatchGCPtr(PVM pVM, RTRCPTR pAddrGC)
+VMMR3DECL(RTRCPTR) PATMR3QueryPatchGCPtr(PVM pVM, RTRCPTR pAddrGC)
 {
     PPATMPATCHREC pPatchRec;
@@ -5983 +5983 @@
  * @param   ppNewEip    GC pointer to new instruction
  */
-PATMR3DECL(int) PATMR3HandleTrap(PVM pVM, PCPUMCTX pCtx, RTRCPTR pEip, RTGCPTR *ppNewEip)
+VMMR3DECL(int) PATMR3HandleTrap(PVM pVM, PCPUMCTX pCtx, RTRCPTR pEip, RTGCPTR *ppNewEip)
 {
     PPATMPATCHREC    pPatch = 0;
@@ -6105 +6105 @@
         {
             /* Invalidated patch or first instruction overwritten.
-             * We can ignore the fPIF state in this case. 
+             * We can ignore the fPIF state in this case.
              */
             /* Reset the PATM stack. */
@@ -6113 +6113 @@
 
             pVM->patm.s.pGCStateHC->fPIF = 1;
-            
+
             /* continue at the original instruction */
             *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
@@ -6264 +6264 @@
  * @param   pVM         The VM to operate on.
  */
-PATMR3DECL(int) PATMR3HandleMonitoredPage(PVM pVM)
+VMMR3DECL(int) PATMR3HandleMonitoredPage(PVM pVM)
 {
     RTRCPTR addr = pVM->patm.s.pvFaultMonitor;

trunk/src/VBox/VMM/PATM/PATMInternal.h

@@ -33 +33 @@
 #include <VBox/log.h>
 
-#if !defined(IN_PATM_R3) && !defined(IN_PATM_R0) && !defined(IN_PATM_GC)
-# error "Not in PATM! This is an internal header!"
-#endif
 
 
@@ -639 +636 @@
  *
  */
-PATMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC);
+VMMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC);
 
 
@@ -668 +665 @@
  * @param   fPatchFlags Patch flags
  */
-PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
+VMMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
 
 
@@ -731 +728 @@
  *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
  */
-PATMGCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
+VMMRCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
 
 /**
@@ -758 +755 @@
  *
  */
-PATMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
+VMMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
                                  uint32_t uOpcode, uint32_t uOpSize, PPATMPATCHREC pPatchRec);
 
@@ -775 +772 @@
  *
  */
-PATMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch);
+VMMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch);
 
 /**
@@ -787 +784 @@
  *
  */
-PATMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch);
+VMMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch);
 
 /**

trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

@@ -53 +53 @@
  * @param   pvFault     Fault address
  */
-CSAMDECL(int) CSAMExecFault(PVM pVM, RTRCPTR pvFault)
+VMMDECL(int) CSAMExecFault(PVM pVM, RTRCPTR pvFault)
 {
     if(!CSAMIsEnabled(pVM))
@@ -80 +80 @@
  * @param   pPage       GC page address
  */
-CSAMDECL(bool) CSAMIsPageScanned(PVM pVM, RTRCPTR pPage)
+VMMDECL(bool) CSAMIsPageScanned(PVM pVM, RTRCPTR pPage)
 {
     int pgdir, bit;
@@ -108 +108 @@
  *
  */
-CSAMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
+VMMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
 {
     int pgdir, bit;
@@ -177 +177 @@
  * @param   GCPtr       GC pointer of page
  */
-CSAMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
+VMMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
 {
     if(!CSAMIsEnabled(pVM))
@@ -200 +200 @@
  * @param   GCPtr       GC pointer of page
  */
-CSAMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTRCPTR GCPtr)
+VMMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTRCPTR GCPtr)
 {
     if (pVM->csam.s.cPossibleCodePages < RT_ELEMENTS(pVM->csam.s.pvPossibleCodePage))
@@ -217 +217 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMDECL(int) CSAMEnableScanning(PVM pVM)
+VMMDECL(int) CSAMEnableScanning(PVM pVM)
 {
     pVM->fCSAMEnabled = true;
@@ -229 +229 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMDECL(int) CSAMDisableScanning(PVM pVM)
+VMMDECL(int) CSAMDisableScanning(PVM pVM)
 {
     pVM->fCSAMEnabled = false;
@@ -247 +247 @@
  * @param   GCPtr       GC pointer of page table entry
  */
-CSAMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTRCPTR GCPtr)
+VMMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTRCPTR GCPtr)
 {
     for (uint32_t i=0;i<pVM->csam.s.cDangerousInstr;i++)

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -50 +50 @@
  * @see     pg_raw
  */
-PATMDECL(void) PATMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
+VMMDECL(void) PATMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
 {
     bool fPatchCode = PATMIsPatchGCAddr(pVM, (RTRCPTR)pCtxCore->eip);
@@ -124 +124 @@
  * @see     @ref pg_raw
  */
-PATMDECL(void) PATMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rawRC)
+VMMDECL(void) PATMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rawRC)
 {
     bool fPatchCode = PATMIsPatchGCAddr(pVM, (RTRCPTR)pCtxCore->eip);
@@ -216 +216 @@
  * @param   pCtxCore    The context core.
  */
-PATMDECL(uint32_t) PATMRawGetEFlags(PVM pVM, PCCPUMCTXCORE pCtxCore)
+VMMDECL(uint32_t) PATMRawGetEFlags(PVM pVM, PCCPUMCTXCORE pCtxCore)
 {
     uint32_t efl = pCtxCore->eflags.u32;
@@ -232 +232 @@
  * @param   efl         The new EFLAGS value.
  */
-PATMDECL(void) PATMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t efl)
+VMMDECL(void) PATMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t efl)
 {
     pVM->patm.s.CTXSUFF(pGCState)->uVMFlags = efl & PATM_VIRTUAL_FLAGS_MASK;
@@ -246 +246 @@
  * @param   pAddrGC     Guest context address
  */
-PATMDECL(bool) PATMShouldUseRawMode(PVM pVM, RTRCPTR pAddrGC)
+VMMDECL(bool) PATMShouldUseRawMode(PVM pVM, RTRCPTR pAddrGC)
 {
     return (    PATMIsEnabled(pVM)
@@ -258 +258 @@
  * @param   pVM         The VM to operate on.
  */
-PATMDECL(RCPTRTYPE(PPATMGCSTATE)) PATMQueryGCState(PVM pVM)
+VMMDECL(RCPTRTYPE(PPATMGCSTATE)) PATMQueryGCState(PVM pVM)
 {
     return pVM->patm.s.pGCStateGC;
@@ -270 +270 @@
  * @param   pAddrGC     Guest context address
  */
-PATMDECL(bool) PATMIsPatchGCAddr(PVM pVM, RTRCPTR pAddrGC)
+VMMDECL(bool) PATMIsPatchGCAddr(PVM pVM, RTRCPTR pAddrGC)
 {
     return (PATMIsEnabled(pVM) && pAddrGC >= pVM->patm.s.pPatchMemGC && pAddrGC < (RTRCPTR)((RTRCUINTPTR)pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem)) ? true : false;
@@ -283 +283 @@
  * @param   pCachedData     GC pointer to cached data
  */
-PATMDECL(int) PATMSetMMIOPatchInfo(PVM pVM, RTGCPHYS GCPhys, RTRCPTR pCachedData)
+VMMDECL(int) PATMSetMMIOPatchInfo(PVM pVM, RTGCPHYS GCPhys, RTRCPTR pCachedData)
 {
     pVM->patm.s.mmio.GCPhys = GCPhys;
@@ -299 +299 @@
  * @param   pVM         The VM handle.
  */
-PATMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
+VMMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
 {
     PCPUMCTX pCtx = 0;
@@ -319 +319 @@
  * @param   pCtxCore    CPU context
  */
-PATMDECL(bool) PATMAreInterruptsEnabledByCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
+VMMDECL(bool) PATMAreInterruptsEnabledByCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
 {
     if (PATMIsEnabled(pVM))
@@ -337 +337 @@
  *
  */
-PATMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC)
+VMMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC)
 {
     PPATMPATCHREC pRec;
@@ -361 +361 @@
  * @param   pSize       Original instruction size (out, optional)
  */
-PATMDECL(bool) PATMIsInt3Patch(PVM pVM, RTRCPTR pInstrGC, uint32_t *pOpcode, uint32_t *pSize)
+VMMDECL(bool) PATMIsInt3Patch(PVM pVM, RTRCPTR pInstrGC, uint32_t *pOpcode, uint32_t *pSize)
 {
     PPATMPATCHREC pRec;
@@ -387 +387 @@
  * @param   pCpu        Disassembly context
  */
-PATMDECL(int) PATMSysCall(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
+VMMDECL(int) PATMSysCall(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
     PCPUMCTX pCtx;
@@ -466 +466 @@
  * @param   pRelBranchPatch     Relative duplicated function address
  */
-PATMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTRCUINTPTR pRelBranchPatch)
+VMMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTRCUINTPTR pRelBranchPatch)
 {
     PPATCHJUMPTABLE pJumpTable;
@@ -532 +532 @@
  * @param   fPatchFlags Patch flags
  */
-PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
+VMMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
 {
     const char *pszInstr = NULL;

trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp

@@ -63 +63 @@
  *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
  */
-CSAMGCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
+VMMRCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
 {
     PPATMGCSTATE pPATMGCState;
@@ -79 +79 @@
     Assert(pPATMGCState->fPIF || fPatchCode);
     /** When patch code is executing instructions that must complete, then we must *never* interrupt it. */
-    if (!pPATMGCState->fPIF && fPatchCode)        
+    if (!pPATMGCState->fPIF && fPatchCode)
     {
         Log(("CSAMGCCodePageWriteHandler: fPIF=0 -> stack fault in patch generated code at %VGv!\n", pRegFrame->eip));
@@ -95 +95 @@
 
     uint32_t cpl;
-    
+
     if (pRegFrame->eflags.Bits.u1VM)
         cpl = 3;

trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

@@ -63 +63 @@
  *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
  */
-PATMGCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
+VMMRCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
 {
     pVM->patm.s.pvFaultMonitor = (RTRCPTR)pvFault;
@@ -81 +81 @@
  *
  */
-PATMGCDECL(int) PATMGCHandleWriteToPatchPage(PVM pVM, PCPUMCTXCORE pRegFrame, RTRCPTR GCPtr, uint32_t cbWrite)
+VMMRCDECL(int) PATMGCHandleWriteToPatchPage(PVM pVM, PCPUMCTXCORE pRegFrame, RTRCPTR GCPtr, uint32_t cbWrite)
 {
     RTGCUINTPTR          pWritePageStart, pWritePageEnd;
@@ -155 +155 @@
  * @param   pCtxCore    The relevant core context.
  */
-PATMDECL(int) PATMGCHandleIllegalInstrTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) PATMGCHandleIllegalInstrTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     PPATMPATCHREC pRec;
@@ -286 +286 @@
                 if (VBOX_SUCCESS(rc))
                 {
-                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIret); 
+                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIret);
 
                     /* We are no longer executing PATM code; set PIF again. */
@@ -293 +293 @@
                     /* does not return */
                 }
-                else 
-                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIretFailed); 
+                else
+                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIretFailed);
                 return rc;
             }
@@ -443 +443 @@
  * @param   pCtxCore    The relevant core context.
  */
-PATMDECL(int) PATMHandleInt3PatchTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) PATMHandleInt3PatchTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     PPATMPATCHREC pRec;