VirtualBox

Changeset 3020 in vbox for trunk/src


Ignore:
Timestamp:
Jun 4, 2007 12:01:53 PM (18 years ago)
Author:
vboxsync
Message:

Added missing space after ')' in macro invocations so VCC doesn't mess up the precompiler output.

Location:
trunk/src/VBox/VMM/PATM
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r2981 r3020  
    552552 *
    553553 */
    554 static HCPTRTYPE(void *) CSAMGCVirtToHCVirt(PVM pVM, PCSAMP2GLOOKUPREC pCacheRec, GCPTRTYPE(uint8_t *)pGCPtr)
     554static HCPTRTYPE(void *) CSAMGCVirtToHCVirt(PVM pVM, PCSAMP2GLOOKUPREC pCacheRec, GCPTRTYPE(uint8_t *) pGCPtr)
    555555{
    556556    int rc;
    557     HCPTRTYPE(void *)pHCPtr;
     557    HCPTRTYPE(void *) pHCPtr;
    558558
    559559    STAM_PROFILE_START(&pVM->csam.s.StatTimeAddrConv, a);
    … …  
    10761076    int rc = VWRN_CONTINUE_ANALYSIS;
    10771077    uint32_t opsize;
    1078     HCPTRTYPE(uint8_t *)pCurInstrHC = 0;
     1078    HCPTRTYPE(uint8_t *) pCurInstrHC = 0;
    10791079    bool disret;
    10801080

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

    r2981 r3020  
    977977 *
    978978 */
    979 HCPTRTYPE(uint8_t *) PATMGCVirtToHCVirt(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pGCPtr)
     979HCPTRTYPE(uint8_t *) PATMGCVirtToHCVirt(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pGCPtr)
    980980{
    981981    int rc;
    982     HCPTRTYPE(uint8_t *)pHCPtr;
     982    HCPTRTYPE(uint8_t *) pHCPtr;
    983983    uint32_t offset;
    984984
    … …  
    10281028    while (true)
    10291029    {
    1030         GCPTRTYPE(uint8_t *)pInstrGC;
    1031         GCPTRTYPE(uint8_t *)pBranchTargetGC = 0;
     1030        GCPTRTYPE(uint8_t *) pInstrGC;
     1031        GCPTRTYPE(uint8_t *) pBranchTargetGC = 0;
    10321032
    10331033        pRec = (PJUMPREC)RTAvlPVRemoveBestFit(&pPatch->JumpTree, 0, true);
    … …  
    16051605        && (OP_PARM_VTYPE(pCpu->pCurInstr->param1) == OP_PARM_J))
    16061606    {
    1607         GCPTRTYPE(uint8_t *)pTargetGC = PATMResolveBranch(pCpu, pCurInstrGC);
     1607        GCPTRTYPE(uint8_t *) pTargetGC = PATMResolveBranch(pCpu, pCurInstrGC);
    16081608        if (pTargetGC == 0)
    16091609        {
    … …  
    20852085    int rc = VWRN_CONTINUE_ANALYSIS;
    20862086    uint32_t opsize, delta;
    2087     HCPTRTYPE(uint8_t *)pCurInstrHC = 0;
     2087    HCPTRTYPE(uint8_t *) pCurInstrHC = 0;
    20882088    bool disret;
    20892089    char szOutput[256];
    … …  
    22562256    int rc = VWRN_CONTINUE_ANALYSIS;
    22572257    uint32_t opsize;
    2258     HCPTRTYPE(uint8_t *)pCurInstrHC = 0;
     2258    HCPTRTYPE(uint8_t *) pCurInstrHC = 0;
    22592259    bool disret;
    22602260#ifdef LOG_ENABLED
    … …  
    23682368           )
    23692369        {
    2370             GCPTRTYPE(uint8_t *)addr = PATMResolveBranch(&cpu, pCurInstrGC);
     2370            GCPTRTYPE(uint8_t *) addr = PATMResolveBranch(&cpu, pCurInstrGC);
    23712371            if (addr == 0)
    23722372            {
    … …  
    56275627 *
    56285628 */
    5629 PATMR3DECL(RTGCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, GCPTRTYPE(uint8_t*)pInstrGC)
     5629PATMR3DECL(RTGCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, GCPTRTYPE(uint8_t*) pInstrGC)
    56305630{
    56315631    PPATMPATCHREC pPatchRec = (PPATMPATCHREC)RTAvloGCPtrGetBestFit(&pVM->patm.s.PatchLookupTreeHC->PatchTree, pInstrGC, false);

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

    r2981 r3020  
    135135
    136136    uint32_t        uType;
    137     HCPTRTYPE(uint8_t *)pRelocPos;
     137    HCPTRTYPE(uint8_t *) pRelocPos;
    138138    RTGCPTR         pSource;
    139139    RTGCPTR         pDest;
    … …  
    153153    AVLPVNODECORE   Core;
    154154
    155     HCPTRTYPE(uint8_t *)pJumpHC;
    156     GCPTRTYPE(uint8_t *)pTargetGC;
     155    HCPTRTYPE(uint8_t *) pJumpHC;
     156    GCPTRTYPE(uint8_t *) pTargetGC;
    157157    uint32_t            offDispl;
    158158    uint32_t            opcode;
    … …  
    327327    uint32_t           cMaxPatches;
    328328    /** Array of patch pointers for this page. */
    329     HCPTRTYPE(PPATCHINFO *)aPatch;
     329    HCPTRTYPE(PPATCHINFO *) aPatch;
    330330} PATMPATCHPAGE, *PPATMPATCHPAGE;
    331331
    … …  
    527527#ifdef IN_RING3
    528528RTGCPTR patmPatchGCPtr2GuestGCPtr(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pPatchGC);
    529 RTGCPTR patmGuestGCPtrToPatchGCPtr(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t*)pInstrGC);
     529RTGCPTR patmGuestGCPtrToPatchGCPtr(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t*) pInstrGC);
    530530#endif
    531531
    … …  
    616616 *
    617617 */
    618 HCPTRTYPE(uint8_t *) PATMGCVirtToHCVirt(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pGCPtr);
     618HCPTRTYPE(uint8_t *) PATMGCVirtToHCVirt(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pGCPtr);
    619619
    620620
    … …  
    656656 * @param   fPatchFlags Patch flags
    657657 */
    658 PATMDECL(const char *)patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
     658PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
    659659
    660660

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

    r2981 r3020  
    128128
    129129
    130 static uint32_t patmPatchGenCode(PVM pVM, PPATCHINFO pPatch, uint8_t *pPB, PPATCHASMRECORD pAsmRecord, GCPTRTYPE(uint8_t *)pReturnAddrGC, bool fGenJump,
     130static uint32_t patmPatchGenCode(PVM pVM, PPATCHINFO pPatch, uint8_t *pPB, PPATCHASMRECORD pAsmRecord, GCPTRTYPE(uint8_t *) pReturnAddrGC, bool fGenJump,
    131131                                 PPATMCALLINFO pCallInfo = 0)
    132132{
    … …  
    147147            if (*(uint32_t*)&pPB[j] == pAsmRecord->uReloc[i])
    148148            {
    149                 GCPTRTYPE(uint32_t *)dest;
     149                GCPTRTYPE(uint32_t *) dest;
    150150
    151151#ifdef VBOX_STRICT
    … …  
    464464
    465465
    466 int patmPatchGenPopf(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pReturnAddrGC, bool fSizeOverride, bool fGenJumpBack)
     466int patmPatchGenPopf(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pReturnAddrGC, bool fSizeOverride, bool fGenJumpBack)
    467467{
    468468    uint32_t        size;
    … …  
    519519}
    520520
    521 int patmPatchGenLoop(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride)
     521int patmPatchGenLoop(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pTargetGC, uint32_t opcode, bool fSizeOverride)
    522522{
    523523    uint32_t size = 0;
    … …  
    564564}
    565565
    566 int patmPatchGenRelJump(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride)
     566int patmPatchGenRelJump(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pTargetGC, uint32_t opcode, bool fSizeOverride)
    567567{
    568568    uint32_t offset = 0;
    … …  
    15471547 * @param   fClearInhibitIRQs   Clear inhibit irq flag
    15481548 */
    1549 int patmPatchGenJumpToGuest(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pReturnAddrGC, bool fClearInhibitIRQs)
     1549int patmPatchGenJumpToGuest(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pReturnAddrGC, bool fClearInhibitIRQs)
    15501550{
    15511551    int rc = VINF_SUCCESS;
    … …  
    15751575 * Relative jump from patch code to patch code (no fixup required)
    15761576 */
    1577 int patmPatchGenPatchJump(PVM pVM, PPATCHINFO pPatch, RTGCPTR pCurInstrGC, GCPTRTYPE(uint8_t *)pPatchAddrGC, bool fAddLookupRecord)
     1577int patmPatchGenPatchJump(PVM pVM, PPATCHINFO pPatch, RTGCPTR pCurInstrGC, GCPTRTYPE(uint8_t *) pPatchAddrGC, bool fAddLookupRecord)
    15781578{
    15791579    int32_t displ;

  • trunk/src/VBox/VMM/PATM/PATMPatch.h

    r2981 r3020  
    3131int patmPatchGenMovDebug(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu);
    3232int patmPatchGenMovFromSS(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu, RTGCPTR pCurInstrGC);
    33 int patmPatchGenRelJump(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride);
    34 int patmPatchGenLoop(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride);
     33int patmPatchGenRelJump(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pTargetGC, uint32_t opcode, bool fSizeOverride);
     34int patmPatchGenLoop(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pTargetGC, uint32_t opcode, bool fSizeOverride);
    3535int patmPatchGenPushf(PVM pVM, PPATCHINFO pPatch, bool fSizeOverride);
    36 int patmPatchGenPopf(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pReturnAddrGC, bool fSizeOverride, bool fGenJumpBack);
     36int patmPatchGenPopf(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pReturnAddrGC, bool fSizeOverride, bool fGenJumpBack);
    3737int patmPatchGenSti(PVM pVM, PPATCHINFO pPatch, RTGCPTR pCurInstrGC, RTGCPTR pNextInstrGC);
    3838
    … …  
    4747int patmPatchGenRet(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu, GCPTRTYPE(uint8_t *) pCurInstrGC);
    4848
    49 int patmPatchGenPatchJump(PVM pVM, PPATCHINFO pPatch, RTGCPTR pCurInstrGC, GCPTRTYPE(uint8_t *)pPatchAddrGC, bool fAddLookupRecord = true);
     49int patmPatchGenPatchJump(PVM pVM, PPATCHINFO pPatch, RTGCPTR pCurInstrGC, GCPTRTYPE(uint8_t *) pPatchAddrGC, bool fAddLookupRecord = true);
    5050
    5151/**
    … …  
    8989 * @param   fClearInhibitIRQs   Clear inhibit irq flag
    9090 */
    91 int patmPatchGenJumpToGuest(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pReturnAddrGC, bool fClearInhibitIRQs = false);
     91int patmPatchGenJumpToGuest(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *) pReturnAddrGC, bool fClearInhibitIRQs = false);
    9292
    9393/**

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

    r2981 r3020  
    530530 * @param   fPatchFlags Patch flags
    531531 */
    532 PATMDECL(const char *)patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
     532PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
    533533{
    534534    const char *pszInstr = NULL;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette