VirtualBox

Changes in / [20:30] in vbox


Ignore:
Location:
/trunk
Files:
158 edited

Legend:

Unmodified
Added
Removed
  • /trunk/Config.kmk

    r20 r30  
    359359else
    360360 VBOX_ASTOOL    = NASM
    361  VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__NASM__ -w+orphan-labels -g
    362  VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__NASM__ -w+orphan-labels -g
     361 VBOX_ASFLAGS   = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT))   -D__NASM__ -w+orphan-labels -g
     362 VBOX_ASFLAGS32 = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT32)) -D__NASM__ -w+orphan-labels -g
    363363 VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__NASM__ -w+orphan-labels -g
    364364endif
     
    813813
    814814#
     815# Special SDK for the problematic NTDLL.LIB.
     816#
     817SDK_VBOX_NTDLL = Requires W2K3DDK
     818SDK_VBOX_NTDLL_LIBS ?= $(PATH_SDK_W2K3DDK_LIB)/ntdll.lib
     819
     820
     821#
    815822# Qt build tools, for Linux we require it to be present on the system
    816823#
     
    10541061TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include \
    10551062        -Wall -Wstrict-prototypes -Wno-trigraphs $(VBOX_GCC_Wno-pointer-sign) \
    1056         $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing -fno-common -msoft-float
     1063        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing -fno-common -msoft-float
    10571064TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mpreferred-stack-boundary=2
    10581065TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -mno-red-zone -mcmodel=kernel -fno-reorder-blocks \
  • /trunk/configure

    r20 r30  
    194194      MACHINE='amd64'
    195195      CPU='k8'
     196
     197      echo ""
     198      echo ""
     199      echo "Warning! Support for AMD64 host systems is work in progress."
     200      echo "         Don't expect it to work or even to build at the moment."
     201      echo ""
     202      echo ""
    196203      ;;
    197204    *)
     
    469476{
    470477  test_header libIDL
    471    
     478
    472479  if which "libIDL-config-2" > /dev/null; then
    473480    libidl_ver=`libIDL-config-2 --version`
     
    848855int main(void)
    849856{
    850   printf("found version %d.%d.%d",  LINUX_VERSION_CODE / 65536, 
     857  printf("found version %d.%d.%d",  LINUX_VERSION_CODE / 65536,
    851858                                   (LINUX_VERSION_CODE % 65536) / 256,
    852859                                    LINUX_VERSION_CODE          % 256);
     
    10661073  cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
    10671074
    1068   if [ "$OS" = "linux" ]; then 
     1075  if [ "$OS" = "linux" ]; then
    10691076    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
    1070   else 
     1077  else
    10711078    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
    10721079  fi
  • /trunk/src/VBox/Devices/Makefile

    r20 r30  
    5959#
    6060VBoxDD_TEMPLATE         = VBOXR3
    61 VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK
     61VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
    6262VBoxDD_SOURCES          = \
    6363        Builtins.cpp \
     
    7878VBoxDD_LIBS.win         = \
    7979        $(PATH_LIB)/VBoxDD2.lib \
    80         $(PATH_SDK_DXSDK_LIB)/dxguid.lib \
    81         $(PATH_SDK_W2K3DDK_LIB)/ntdll.lib
     80        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    8281VBoxDD_LIBS.linux       = \
    8382        $(PATH_BIN)/VBoxDD2.so
  • /trunk/src/VBox/Runtime/Makefile

    r20 r30  
    375375#
    376376VBoxRT_TEMPLATE                = VBOXR3
    377 VBoxRT_SDKS.win                = WINPSDK W2K3DDK
     377VBoxRT_SDKS.win                = WINPSDK W2K3DDK VBOX_NTDLL
    378378VBoxRT_DEFS                    = $(RuntimeR3_DEFS) IN_SUP_R3 IN_SUP_R3
    379379VBoxRT_DEFS.$(BUILD_TYPE)      = $(RuntimeR3_DEFS.$(BUILD_TYPE))
     
    393393VBoxRT_LIBS.darwin             = \
    394394        iconv
    395 VBoxRT_LIBS.win                = \
    396         $(PATH_SDK_W2K3DDK_LIB)/ntdll.lib
    397395VBoxRT_LIBS.os2                = \
    398396        $(PATH_LIB)/VBox-uuid$(VBOX_SUFF_LIB)
  • /trunk/src/VBox/Runtime/testcase/Makefile

    r20 r30  
    167167
    168168ntGetTimerResolution_SOURCES = ntGetTimerResolution.cpp
    169 ntGetTimerResolution_SDKS.win = WINPSDK W2K3DDK
    170 ntGetTimerResolution_LIBS.win = \
    171         $(PATH_SDK_W2K3DDK_LIB)/ntdll.lib
     169ntGetTimerResolution_SDKS.win = WINPSDK W2K3DDK  VBOX_NTDLL
    172170
    173171tstIoCtl_SOURCES = tstIoCtl.cpp
  • /trunk/src/VBox/VMM/CFGM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    3  * \ref pg_vmm "VMM (Virtual Machine Monitor) ->
    4  * \ref pg_cfgm "CFGM (Configuration Manager)":
    5  * Main file
     3 * CFGM - Configuration Manager.
    64 *
    75 * This is the main file of the \ref pg_cfgm "CFGM (Configuration Manager)".
     
    7371#include <iprt/assert.h>
    7472#include <iprt/string.h>
    75 
    76 #include <string.h>
    7773
    7874
     
    14841480            {
    14851481                memcpy(pvCopy, pvBytes, cbBytes);
    1486    
     1482
    14871483                /*
    14881484                 * Create value leaf and set it to string type.
  • /trunk/src/VBox/VMM/CFGMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CFGM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/CPUM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - CPU Monitor(/Manager)
    44 */
     
    591591/**
    592592 * Formats the EFLAGS value into mnemonics.
    593  * 
     593 *
    594594 * @param   pszEFlags   Where to write the mnemonics. (Assumes sufficient buffer space.)
    595595 * @param   efl         The EFLAGS value.
     
    647647static void cpumR3InfoOne(PCPUMCTX pCtx, PCCPUMCTXCORE pCtxCore, PCDBGFINFOHLP pHlp, CPUMDUMPTYPE enmType, const char *pszPrefix)
    648648{
    649     /*                                                                                                                                     
    650      * Format the EFLAGS.                                                                                                                                       
     649    /*
     650     * Format the EFLAGS.
    651651     */
    652652    uint32_t efl = pCtxCore->eflags.u32;
     
    823823    pHlp->pfnPrintf(pHlp, "Host CPUM state: %s\n", pszComment);
    824824
    825     /*                                                                                                                                     
    826      * Format the EFLAGS.                                                                                                                                       
     825    /*
     826     * Format the EFLAGS.
    827827     */
    828828    PCPUMHOSTCTX pCtx = &pVM->cpum.s.Host;
     
    831831#else
    832832    uint64_t efl = pCtx->rflags;
    833 #endif 
     833#endif
    834834    char szEFlags[80];
    835835    cpumR3InfoFormatFlags(&szEFlags[0], efl);
     
    874874        /*pCtx->rax,*/ pCtx->rbx, /*pCtx->rcx,
    875875        pCtx->rdx,*/ pCtx->rsi, pCtx->rdi,
    876         /*pCtx->rip,*/ pCtx->rsp, pCtx->rbp, 
     876        /*pCtx->rip,*/ pCtx->rsp, pCtx->rbp,
    877877        /*pCtx->r8,  pCtx->r9,*/  pCtx->r10,
    878878        pCtx->r11, pCtx->r12, pCtx->r13,
     
    884884        pCtx->dr0, pCtx->dr1, pCtx->dr2,
    885885        pCtx->dr3, pCtx->dr6, pCtx->dr7,
    886         *(uint64_t *)&pCtx->gdtr[2], *(uint16_t *)&pCtx->gdtr[0], *(uint64_t *)&pCtx->idtr[2], *(uint16_t *)&pCtx->idtr[0], 
     886        *(uint64_t *)&pCtx->gdtr[2], *(uint16_t *)&pCtx->gdtr[0], *(uint64_t *)&pCtx->idtr[2], *(uint16_t *)&pCtx->idtr[0],
    887887        pCtx->SysEnter.cs, pCtx->SysEnter.eip, pCtx->SysEnter.esp,
    888888        pCtx->FSbase, pCtx->GSbase, pCtx->efer);
    889 #endif 
     889#endif
    890890}
    891891
  • /trunk/src/VBox/VMM/CPUMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/CPUMStack.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - CPU Monitor(/Manager) - Stack manipulation.
    44 */
  • /trunk/src/VBox/VMM/DBGF.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility.
    44 */
     
    8989#include <iprt/stream.h>
    9090
    91 #include <stdio.h>
    92 
    9391
    9492/*******************************************************************************
     
    108106DECLINLINE(DBGFCMD) dbgfr3SetCmd(PVM pVM, DBGFCMD enmCmd)
    109107{
     108    DBGFCMD rc;
    110109    if (enmCmd == DBGFCMD_NO_COMMAND)
    111110    {
    112111        Log2(("DBGF: Setting command to %d (DBGFCMD_NO_COMMAND)\n", enmCmd));
    113         DBGFCMD rc = (DBGFCMD)ASMAtomicXchgU32((uint32_t volatile *)(void *)&pVM->dbgf.s.enmVMMCmd, enmCmd);
     112        rc = (DBGFCMD)ASMAtomicXchgU32((uint32_t volatile *)(void *)&pVM->dbgf.s.enmVMMCmd, enmCmd);
    114113        VM_FF_CLEAR(pVM, VM_FF_DBGF);
    115         return rc;
    116114    }
    117115    else
     
    119117        Log2(("DBGF: Setting command to %d\n", enmCmd));
    120118        AssertMsg(pVM->dbgf.s.enmVMMCmd == DBGFCMD_NO_COMMAND, ("enmCmd=%d enmVMMCmd=%d\n", enmCmd, pVM->dbgf.s.enmVMMCmd));
    121         DBGFCMD rc = (DBGFCMD)ASMAtomicXchgU32((uint32_t volatile *)(void *)&pVM->dbgf.s.enmVMMCmd, enmCmd);
     119        rc = (DBGFCMD)ASMAtomicXchgU32((uint32_t volatile *)(void *)&pVM->dbgf.s.enmVMMCmd, enmCmd);
    122120        VM_FF_SET(pVM, VM_FF_DBGF);
    123121        VMR3NotifyFF(pVM, false /* didn't notify REM */);
    124         return rc;
    125     }
     122    }
     123    return rc;
    126124}
    127125
     
    235233     * First a message.
    236234     */
    237     fprintf(stderr, "DBGF: No debugger attached, waiting 15 seconds for one to attach (event=%d)\n", enmEvent);
    238     fflush(stderr);
     235    RTStrmPrintf(g_pStdErr, "DBGF: No debugger attached, waiting 15 seconds for one to attach (event=%d)\n", enmEvent);
     236    RTStrmFlush(g_pStdErr);
    239237#ifdef DEBUG_sandervl
    240238    int cWait = 10;
     
    247245        if (pVM->dbgf.s.fAttached)
    248246        {
    249             fprintf(stderr, "Attached!\n");
    250             fflush(stderr);
     247            RTStrmPrintf(g_pStdErr, "Attached!\n");
     248            RTStrmFlush(g_pStdErr);
    251249            return true;
    252250        }
     
    255253        if (!(cWait % 10))
    256254        {
    257             fprintf(stderr, "%d.", cWait / 10);
    258             fflush(stderr);
     255            RTStrmPrintf(g_pStdErr, "%d.", cWait / 10);
     256            RTStrmFlush(g_pStdErr);
    259257        }
    260258        cWait--;
    261259    }
    262260
    263     fprintf(stderr, "Stopping the VM!\n");
    264     fflush(stderr);
     261    RTStrmPrintf(g_pStdErr, "Stopping the VM!\n");
     262    RTStrmFlush(g_pStdErr);
    265263    return false;
    266264}
     
    10681066}
    10691067
    1070 
  • /trunk/src/VBox/VMM/DBGFAddr.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Mixed Address Methods.
    44 */
  • /trunk/src/VBox/VMM/DBGFBp.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Breakpoint Management.
    44 */
     
    3434#include <VBox/log.h>
    3535#include <iprt/assert.h>
    36 
    37 #include <string.h>
     36#include <iprt/string.h>
    3837
    3938
  • /trunk/src/VBox/VMM/DBGFDisas.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Disassembler.
    44 */
  • /trunk/src/VBox/VMM/DBGFInfo.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Info.
    44 */
     
    3434#include <iprt/thread.h>
    3535#include <iprt/assert.h>
     36#include <iprt/string.h>
     37#include <iprt/ctype.h>
    3638#include <VBox/err.h>
    37 
    38 #include <string.h>
    39 #include <ctype.h>
    4039
    4140
  • /trunk/src/VBox/VMM/DBGFInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * DBGF - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/DBGFLog.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Log Manager.
    44 */
  • /trunk/src/VBox/VMM/DBGFStack.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Call Stack Analyser.
    44 */
  • /trunk/src/VBox/VMM/DBGFSym.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM DBGF - Debugger Facility, Symbol Management.
    44 */
     
    4444# include <iprt/avl.h>
    4545# include <iprt/string.h>
    46 # include <string.h>
    47 #endif
    48 
    49 #include <ctype.h>
    50 #include <stdio.h>
     46# include <iprt/ctype.h>
     47#endif
     48
     49#include <stdio.h> /* for fopen(). */ /** @todo use iprt/stream.h! */
    5150#include <stdlib.h>
    5251
  • /trunk/src/VBox/VMM/EM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * EM - Execution Monitor/Manager.
    44 */
  • /trunk/src/VBox/VMM/EMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * EM - Internal header file.
    44 */
     
    4444#define EM_SAVED_STATE_VERSION  2
    4545
    46 /** Enable for tracing in raw mode. 
     46/** Enable for tracing in raw mode.
    4747 * @remark SvL: debugging help primarily for myself. */
    4848#define DEBUG_TRACING_ENABLED
  • /trunk/src/VBox/VMM/HWACCM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM - Intel/AMD VM Hardware Support Manager
    44 */
     
    4848#include "x86context.h"
    4949
    50 #include <string.h>
    51 
    5250
    5351/*******************************************************************************
     
    7977    AssertMsg(RT_OFFSETOF(SVM_VMCB, ctrl.ExitIntInfo) == 0x88, ("ctrl.ExitIntInfo offset = %x\n", RT_OFFSETOF(SVM_VMCB, ctrl.ExitIntInfo)));
    8078    AssertMsg(RT_OFFSETOF(SVM_VMCB, ctrl.TLBCtrl) == 0x58, ("ctrl.TLBCtrl offset = %x\n", RT_OFFSETOF(SVM_VMCB, ctrl.TLBCtrl)));
    81    
     79
    8280    AssertMsg(RT_OFFSETOF(SVM_VMCB, guest) == 0x400, ("guest offset = %x\n", RT_OFFSETOF(SVM_VMCB, guest)));
    8381    AssertMsg(RT_OFFSETOF(SVM_VMCB, guest.u8Reserved4) == 0x4A0, ("guest.u8Reserved4 offset = %x\n", RT_OFFSETOF(SVM_VMCB, guest.u8Reserved4)));
  • /trunk/src/VBox/VMM/HWACCMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/IOM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * IOM - Input / Output Monitor.
    44 */
     
    6666#include <VBox/log.h>
    6767#include <VBox/err.h>
    68 
    69 #include <string.h>
    7068
    7169
  • /trunk/src/VBox/VMM/IOMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * IOM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/MM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager).
    44 */
     
    211211        if (VBOX_SUCCESS(rc))
    212212        {
    213             /* Allocate the first 4 MB chunk, as we'll map ROM ranges there. */
     213            /* Allocate the first chunk, as we'll map ROM ranges there. */
    214214            rc = PGM3PhysGrowRange(pVM, (RTGCPHYS)0);
    215215            if (VBOX_SUCCESS(rc))
  • /trunk/src/VBox/VMM/MMHeap.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Heap.
    44 */
  • /trunk/src/VBox/VMM/MMHyper.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * MM - Memory Monitor(/Manager) - Hypervisor Memory Area.
  • /trunk/src/VBox/VMM/MMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/MMPagePool.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Page Pool.
    44 */
     
    3838# include <iprt/asm.h>
    3939#endif
    40 
    41 #include <string.h>
     40#include <iprt/string.h>
     41
    4242
    4343
  • /trunk/src/VBox/VMM/MMPhys.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Physical Memory.
    44 */
  • /trunk/src/VBox/VMM/PATM/CSAM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CSAM - Guest OS Code Scanning and Analysis Manager
    44 */
     
    4747#include <VBox/log.h>
    4848#include <iprt/assert.h>
     49#include <iprt/string.h>
    4950#include <VBox/dis.h>
    5051#include <VBox/disopcode.h>
    51 #include <string.h>
    5252#include <stdlib.h>
    5353#include <stdio.h>
     
    5959/* Enable to monitor code pages for self-modifying code. */
    6060#define CSAM_MONITOR_CODE_PAGES
    61 /* Enable to monitor all scanned pages 
     61/* Enable to monitor all scanned pages
    6262#define CSAM_MONITOR_CSAM_CODE_PAGES */
    6363
     
    140140    STAM_REG(pVM, &pVM->csam.s.StatNrRemovedPages,   STAMTYPE_COUNTER,   "/CSAM/PageRec/Removed",     STAMUNIT_OCCURENCES,     "The number of removed CSAM page records.");
    141141    STAM_REG(pVM, &pVM->csam.s.StatPageRemoveREMFlush,STAMTYPE_COUNTER,  "/CSAM/PageRec/Removed/REMFlush",     STAMUNIT_OCCURENCES,     "The number of removed CSAM page records that caused a REM flush.");
    142    
     142
    143143    STAM_REG(pVM, &pVM->csam.s.StatNrPatchPages,     STAMTYPE_COUNTER,   "/CSAM/PageRec/Patch",       STAMUNIT_OCCURENCES,     "The number of CSAM patch page records.");
    144144    STAM_REG(pVM, &pVM->csam.s.StatNrUserPages,      STAMTYPE_COUNTER,   "/CSAM/PageRec/Ignore/User", STAMUNIT_OCCURENCES,     "The number of CSAM user page records (ignored).");
     
    165165    STAM_REG(pVM, &pVM->csam.s.StatScanNextFunction,         STAMTYPE_COUNTER, "/CSAM/Function/Scan/Success",  STAMUNIT_OCCURENCES,     "The number of found functions beyond the ret border.");
    166166    STAM_REG(pVM, &pVM->csam.s.StatScanNextFunctionFailed,   STAMTYPE_COUNTER, "/CSAM/Function/Scan/Failed",   STAMUNIT_OCCURENCES,     "The number of refused functions beyond the ret border.");
    167    
     167
    168168    STAM_REG(pVM, &pVM->csam.s.StatTime,             STAMTYPE_PROFILE, "/PROF/CSAM/Scan",             STAMUNIT_TICKS_PER_CALL, "Scanning overhead.");
    169169    STAM_REG(pVM, &pVM->csam.s.StatTimeCheckAddr,    STAMTYPE_PROFILE, "/PROF/CSAM/CheckAddr",        STAMUNIT_TICKS_PER_CALL, "Address check overhead.");
     
    173173    STAM_REG(pVM, &pVM->csam.s.StatFlushDirtyPages,  STAMTYPE_PROFILE, "/PROF/CSAM/FlushDirtyPage",   STAMUNIT_TICKS_PER_CALL, "Dirty page flushing overhead.");
    174174    STAM_REG(pVM, &pVM->csam.s.StatCheckGates,       STAMTYPE_PROFILE, "/PROF/CSAM/CheckGates",       STAMUNIT_TICKS_PER_CALL, "CSAMR3CheckGates overhead.");
    175    
     175
    176176
    177177#ifdef CSAM_ENABLE
     
    608608            size--;
    609609        }
    610         else 
     610        else
    611611            break;
    612612    }
     
    956956                     * lea esi, [esi]
    957957                     * lea esi, [esi+0]
    958                      * Any register is allowed as long as source and destination are identical. 
     958                     * Any register is allowed as long as source and destination are identical.
    959959                     */
    960960                    if (    cpu.param1.flags != USE_REG_GEN32
     
    11701170#ifdef CSAM_ANALYSE_BEYOND_RET
    11711171        /* Remember the address of the instruction following the ret in case the parent instruction was a call. */
    1172         if (    pCacheRec->pCallExitRec 
     1172        if (    pCacheRec->pCallExitRec
    11731173            &&  cpu.pCurInstr->opcode == OP_RETN
    11741174            &&  pCacheRec->pCallExitRec->cInstrAfterRet < CSAM_MAX_CALLEXIT_RET)
     
    12661266                    if (PAGE_ADDRESS(addr) != PAGE_ADDRESS(pJumpTableGC))
    12671267                        break;
    1268                    
     1268
    12691269                    addr = *(RTGCPTR *)(pJumpTableHC + cpu.param1.scale * i);
    12701270
    12711271                    rc2 = PGMGstGetPage(pVM, addr, &fFlags, NULL);
    1272                     if (    rc2 != VINF_SUCCESS 
     1272                    if (    rc2 != VINF_SUCCESS
    12731273                        ||  (fFlags & X86_PTE_US)
    12741274                        || !(fFlags & X86_PTE_P)
     
    17681768    }
    17691769
    1770 #ifdef VBOX_STRICT
     1770#if 0 /* def VBOX_STRICT -> very annoying) */
    17711771    if (pPageRec->page.fMonitorActive)
    17721772    {
     
    21732173    if (iGate + cGates > maxGates)
    21742174        cGates = maxGates - iGate;
    2175    
     2175
    21762176    GCPtrIDT   = GCPtrIDT + iGate * sizeof(VBOXIDTE);
    21772177    iGateEnd   = iGate + cGates;
     
    22082208    for (/*iGate*/; iGate<iGateEnd; iGate++, pGuestIdte++)
    22092209    {
    2210         if (    pVM->csam.s.fGatesChecked 
     2210        if (    pVM->csam.s.fGatesChecked
    22112211            &&  cGates != 1                 /* applies only when we check the entire IDT */
    22122212            &&  pGuestIdte->au64 != pVM->csam.s.aIDT[iGate].au64)
  • /trunk/src/VBox/VMM/PATM/CSAMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CSAM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/PATM/PATM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATM - Dynamic Guest OS Patching Manager
    44 *
     
    189189    STAM_REG(pVM, &pVM->patm.s.StatInt3BlockRun,  STAMTYPE_COUNTER, "/PATM/Patch/Run/Int3",        STAMUNIT_OCCURENCES,     "Number of times an int3 block patch was executed.");
    190190    STAMR3RegisterF(pVM, &pVM->patm.s.pGCStateHC->uPatchCalls, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES, NULL, "/PATM/Patch/Run/Normal");
    191    
     191
    192192    STAM_REG(pVM, &pVM->patm.s.StatInstalledFunctionPatches,   STAMTYPE_COUNTER, "/PATM/Patch/Installed/Function",       STAMUNIT_OCCURENCES,     "Number of installed function duplication patches.");
    193193    STAM_REG(pVM, &pVM->patm.s.StatInstalledTrampoline,   STAMTYPE_COUNTER, "/PATM/Patch/Installed/Trampoline",          STAMUNIT_OCCURENCES,     "Number of installed trampoline patches.");
    194194    STAM_REG(pVM, &pVM->patm.s.StatInstalledJump, STAMTYPE_COUNTER, "/PATM/Patch/Installed/Jump",  STAMUNIT_OCCURENCES,     "Number of installed jump patches.");
    195    
     195
    196196    STAM_REG(pVM, &pVM->patm.s.StatOverwritten,   STAMTYPE_COUNTER, "/PATM/Patch/Overwritten",     STAMUNIT_OCCURENCES,     "Number of overwritten patches.");
    197197    STAM_REG(pVM, &pVM->patm.s.StatFixedConflicts,STAMTYPE_COUNTER, "/PATM/Patch/ConflictFixed",   STAMUNIT_OCCURENCES,     "Number of fixed conflicts.");
     
    220220    STAM_REG(pVM, &pVM->patm.s.StatPatchWriteDetect,  STAMTYPE_PROFILE, "/PATM/Write/Detect",       STAMUNIT_TICKS_PER_CALL, "Profiling of PATMIsWriteToPatchPage");
    221221    STAM_REG(pVM, &pVM->patm.s.StatPatchWriteInterpreted, STAMTYPE_COUNTER, "/PATM/Write/Interpreted/Success", STAMUNIT_OCCURENCES,  "Nr of interpreted patch writes.");
    222     STAM_REG(pVM, &pVM->patm.s.StatPatchWriteInterpretedFailed, STAMTYPE_COUNTER, "/PATM/Write/Interpreted/Failed", STAMUNIT_OCCURENCES,  "Nr of failed interpreted patch writes.");   
     222    STAM_REG(pVM, &pVM->patm.s.StatPatchWriteInterpretedFailed, STAMTYPE_COUNTER, "/PATM/Write/Interpreted/Failed", STAMUNIT_OCCURENCES,  "Nr of failed interpreted patch writes.");
    223223
    224224    STAM_REG(pVM, &pVM->patm.s.StatPatchPageInserted, STAMTYPE_COUNTER, "/PATM/Page/Inserted",      STAMUNIT_OCCURENCES,     "Nr of inserted guest pages that were patched");
     
    238238    STAM_REG(pVM, &pVM->patm.s.StatGenPopf,           STAMTYPE_COUNTER, "/PATM/Gen/Popf" ,        STAMUNIT_OCCURENCES,     "Number of generated popf instructions.");
    239239
    240     STAM_REG(pVM, &pVM->patm.s.StatCheckPendingIRQ,   STAMTYPE_COUNTER, "/PATM/GC/CheckIRQ" ,        STAMUNIT_OCCURENCES,     "Number of traps that ask to check for pending irqs.");   
     240    STAM_REG(pVM, &pVM->patm.s.StatCheckPendingIRQ,   STAMTYPE_COUNTER, "/PATM/GC/CheckIRQ" ,        STAMUNIT_OCCURENCES,     "Number of traps that ask to check for pending irqs.");
    241241#endif /* VBOX_WITH_STATISTICS */
    242242
     
    249249    Log(("PATMStiRecord.size            %d\n", PATMStiRecord.size));
    250250    Log(("PATMCheckIFRecord.size        %d\n", PATMCheckIFRecord.size));
    251    
     251
    252252    return rc;
    253253}
     
    27422742        Log(("PATMR3PatchBlock %VGv -> int 3 callable patch.\n", pPatch->pPrivInstrGC));
    27432743        /* Replace first opcode byte with 'int 3'. */
    2744         rc = patmActivateInt3Patch(pVM, pPatch); 
     2744        rc = patmActivateInt3Patch(pVM, pPatch);
    27452745        if (VBOX_FAILURE(rc))
    27462746            goto failure;
     
    36283628
    36293629/**
    3630  * Activates an int3 patch 
     3630 * Activates an int3 patch
    36313631 *
    36323632 * @returns VBox status code.
     
    36523652
    36533653/**
    3654  * Deactivates an int3 patch 
     3654 * Deactivates an int3 patch
    36553655 *
    36563656 * @returns VBox status code.
     
    40294029    }
    40304030    /* Disallow patching instructions inside ROM code; complete function duplication is allowed though. */
    4031     if (    !(flags & (PATMFL_DUPLICATE_FUNCTION|PATMFL_TRAMPOLINE)) 
     4031    if (    !(flags & (PATMFL_DUPLICATE_FUNCTION|PATMFL_TRAMPOLINE))
    40324032        &&  !PGMPhysIsGCPhysNormal(pVM, GCPhys))
    40334033    {
     
    44034403    if (pGuestToPatchRec)
    44044404    {
    4405         if (    pPatchPage->pLowestAddrGC == 0 
     4405        if (    pPatchPage->pLowestAddrGC == 0
    44064406            ||  pPatchPage->pLowestAddrGC > (RTGCPTR)pGuestToPatchRec->Core.Key)
    44074407        {
     
    44164416                /* Get the closest guest instruction (from above) */
    44174417                pGuestToPatchRec = (PRECGUESTTOPATCH)RTAvlPVGetBestFit(&pPatch->Guest2PatchAddrTree, (AVLPVKEY)(pPage-1), false);
    4418    
     4418
    44194419                if (pGuestToPatchRec)
    44204420                {
     
    44324432    if (pGuestToPatchRec)
    44334433    {
    4434         if (    pPatchPage->pHighestAddrGC == 0 
     4434        if (    pPatchPage->pHighestAddrGC == 0
    44354435            ||  pPatchPage->pHighestAddrGC < (RTGCPTR)pGuestToPatchRec->Core.Key)
    44364436        {
     
    47914791    pPatchRec = (PPATMPATCHREC)RTAvloGCPtrGetBestFit(&pVM->patm.s.PatchLookupTreeHC->PatchTree, pInstrGC, false);
    47924792    // if the patch is enabled and the pointer lies within 5 bytes of this priv instr ptr, then we've got a hit!
    4793     if (    pPatchRec 
    4794         &&  pPatchRec->patch.uState == PATCH_ENABLED 
    4795         &&  pInstrGC >= pPatchRec->patch.pPrivInstrGC 
     4793    if (    pPatchRec
     4794        &&  pPatchRec->patch.uState == PATCH_ENABLED
     4795        &&  pInstrGC >= pPatchRec->patch.pPrivInstrGC
    47964796        &&  pInstrGC < pPatchRec->patch.pPrivInstrGC + pPatchRec->patch.cbPatchJump)
    47974797    {
     
    50875087        if (pPatch->uState == PATCH_DISABLED)
    50885088        {
    5089             if (pPatch->flags & PATMFL_MUST_INSTALL_PATCHJMP)           
     5089            if (pPatch->flags & PATMFL_MUST_INSTALL_PATCHJMP)
    50905090            {
    50915091                Assert(!(pPatch->flags & PATMFL_PATCHED_GUEST_CODE));
     
    57715771
    57725772        if (    rc == VINF_SUCCESS
    5773             &&  (   Cpu.pCurInstr->opcode == OP_PUSHF 
     5773            &&  (   Cpu.pCurInstr->opcode == OP_PUSHF
    57745774                 || Cpu.pCurInstr->opcode == OP_PUSH
    57755775                 || Cpu.pCurInstr->opcode == OP_CALL)
  • /trunk/src/VBox/VMM/PATM/PATMA.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATM macros & definitions (identical to PATMA.mac!!)
    44 */
  • /trunk/src/VBox/VMM/PATM/PATMGuest.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATMGuest - Guest OS Patching Manager (non-generic)
    44 */
     
    4444#include <VBox/log.h>
    4545#include <iprt/assert.h>
     46#include <iprt/string.h>
    4647#include <VBox/dis.h>
    4748#include <VBox/disopcode.h>
    48 #include <string.h>
    4949
    5050/*
  • /trunk/src/VBox/VMM/PATM/PATMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/PATM/PATMPatch.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATMPatch - Dynamic Guest OS Instruction patches
    44 *
     
    4747#include <iprt/assert.h>
    4848#include <iprt/asm.h>
     49#include <iprt/string.h>
    4950#include <VBox/dis.h>
    5051#include <VBox/disopcode.h>
    5152
    52 #include <string.h>
    5353#include <stdlib.h>
    5454#include <stdio.h>
  • /trunk/src/VBox/VMM/PATM/PATMPatch.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATMPatch - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/PATM/PATMSSM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATMSSM - Dynamic Guest OS Patching Manager; Save and load state
    44 *
     
    4949#include <iprt/assert.h>
    5050#include <iprt/asm.h>
     51#include <iprt/string.h>
    5152#include <VBox/dis.h>
    5253#include <VBox/disopcode.h>
    53 #include <string.h>
    5454
    5555#define PATM_SUBTRACT_PTR(a, b) *(uintptr_t *)&(a) = (uintptr_t)(a) - (uintptr_t)(b)
  • /trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context
    44 */
     
    4343#include <VBox/dis.h>
    4444#include <VBox/disopcode.h>
    45 #include <string.h>
     45#include <iprt/string.h>
    4646#include <iprt/asm.h>
    4747
     
    155155    if(fScanned)
    156156        ASMBitSet(pVM->csam.s.CTXSUFF(pPDBitmap)[pgdir], bit);
    157     else 
     157    else
    158158        ASMBitClear(pVM->csam.s.CTXSUFF(pPDBitmap)[pgdir], bit);
    159159
  • /trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATM - The Patch Manager, all contexts.
    44 */
  • /trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context
    44 */
     
    4343#include <VBox/dis.h>
    4444#include <VBox/disopcode.h>
    45 #include <string.h>
     45#include <iprt/string.h>
    4646#include <stdlib.h>
    4747#include <stdio.h>
  • /trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PATM - Dynamic Guest OS Patching Manager - Guest Context
    44 */
     
    4242#include <iprt/assert.h>
    4343#include <iprt/asm.h>
    44 #include <string.h>
     44#include <iprt/string.h>
    4545#include <stdlib.h>
    4646#include <stdio.h>
  • /trunk/src/VBox/VMM/PDM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device Manager.
    44 */
  • /trunk/src/VBox/VMM/PDMCritSect.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM Critical Sections
    44 */
  • /trunk/src/VBox/VMM/PDMDevice.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device and Driver Manager, Device parts.
    44 */
  • /trunk/src/VBox/VMM/PDMDriver.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device and Driver Manager, Driver parts.
    44 */
     
    4242#include <iprt/alloc.h>
    4343#include <iprt/path.h>
    44 
    45 #include <string.h>
    4644
    4745
  • /trunk/src/VBox/VMM/PDMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Internal header file.
    44 */
     
    662662    GCPTRTYPE(struct PDMQUEUE *)    pQueueFlushGC;
    663663
    664     /** TEMPORARY HACKS FOR NETWORK POLLING. 
     664    /** TEMPORARY HACKS FOR NETWORK POLLING.
    665665     * @todo fix NAT and kill this!
    666666     * @{ */
  • /trunk/src/VBox/VMM/PDMLdr.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device Manager, module loader.
    44 */
     
    4646
    4747#include <limits.h>
    48 #include <string.h>
    4948
    5049
     
    9897        rc = PDMR3LoadGC(pVM, NULL, VMMGC_MAIN_MODULE_NAME);
    9998    return rc;
    100 #endif 
     99#endif
    101100}
    102101
     
    675674    AssertMsgFailed(("Couldn't locate module '%s'\n", pszModule));
    676675    return VERR_SYMBOL_NOT_FOUND;
    677 #endif 
     676#endif
    678677}
    679678
  • /trunk/src/VBox/VMM/PDMQueue.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM Queue - Transport data and tasks to EMT and R3.
    44 */
     
    153153         * caused by the critsect queue to be last in the chain).
    154154         * Update, the critical sections are no longer using queues.
    155          */ 
     155         */
    156156        if (!pVM->pdm.s.pQueuesForced)
    157157            pVM->pdm.s.pQueuesForced = pQueue;
  • /trunk/src/VBox/VMM/PGM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Manager and Monitor. (Mixing stuff here, not good?)
    44 */
     
    631631#if 1
    632632    pVM->pgm.s.pInterPaePDPTR64 = (PX86PDPTR)MMR3PageAllocLow(pVM);
    633 #endif 
     633#endif
    634634    pVM->pgm.s.pInterPaePML4    = (PX86PML4)MMR3PageAllocLow(pVM);
    635635    if (    !pVM->pgm.s.pInterPD
     
    711711    pVM->pgm.s.pInterPaePML4->a[0].u = X86_PML4E_P | X86_PML4E_RW | X86_PML4E_US | X86_PML4E_A
    712712                                     | pVM->pgm.s.HCPhysInterPaePDPTR;
    713 #endif 
     713#endif
    714714
    715715
     
    11641164        {
    11651165            pCur->pNextGC = MMHyperHC2GC(pVM, pCur->pNextHC);
    1166             if (pCur->pvHCChunkGC)
    1167                 pCur->pvHCChunkGC = MMHyperHC2GC(pVM, pCur->pvHCChunkHC);
     1166            if (pCur->pavHCChunkGC)
     1167                pCur->pavHCChunkGC = MMHyperHC2GC(pVM, pCur->pavHCChunkHC);
    11681168        }
    11691169    }
     
    13021302            {
    13031303                unsigned iChunk = iPage >> (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
    1304                 if (pRam->pvHCChunkHC[iChunk])
    1305                     ASMMemZero32((char *)pRam->pvHCChunkHC[iChunk] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK), PAGE_SIZE);
     1304                if (pRam->pavHCChunkHC[iChunk])
     1305                    ASMMemZero32((char *)pRam->pavHCChunkHC[iChunk] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK), PAGE_SIZE);
    13061306            }
    13071307            else
     
    13491349#else
    13501350    SSMR3PutUInt(pSSM, pPGM->fMappingsFixed);
    1351 #endif 
     1351#endif
    13521352    SSMR3PutGCPtr(pSSM, pPGM->GCPtrMappingFixed);
    13531353    SSMR3PutU32(pSSM, pPGM->cbMappingFixed);
     
    13971397            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
    13981398            {
    1399                 if (pRam->pvHCChunkHC[iChunk])
     1399                if (pRam->pavHCChunkHC[iChunk])
    14001400                {
    14011401                    SSMR3PutU8(pSSM, 1);    /* chunk present */
    1402                     SSMR3PutMem(pSSM, pRam->pvHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
     1402                    SSMR3PutMem(pSSM, pRam->pavHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
    14031403                }
    14041404                else
     
    14541454    SSMR3GetU32(pSSM,       &u);
    14551455    pPGM->fMappingsFixed = u;
    1456 #endif 
     1456#endif
    14571457    SSMR3GetGCPtr(pSSM,     &pPGM->GCPtrMappingFixed);
    14581458    SSMR3GetU32(pSSM,       &pPGM->cbMappingFixed);
     
    16161616                        return rc;
    16171617
    1618                     Assert(pRam->pvHCChunkHC[iChunk]);
    1619 
    1620                     SSMR3GetMem(pSSM, pRam->pvHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
     1618                    Assert(pRam->pavHCChunkHC[iChunk]);
     1619
     1620                    SSMR3GetMem(pSSM, pRam->pavHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
    16211621                }
    16221622                /* else nothing to do */
  • /trunk/src/VBox/VMM/PGMBth.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager / Monitor, Shadow+Guest Paging Template.
    44 *
  • /trunk/src/VBox/VMM/PGMCache.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - PGM PD Cache Manager
    44 */
  • /trunk/src/VBox/VMM/PGMGst.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager / Monitor, Guest Paging Template.
    44 */
  • /trunk/src/VBox/VMM/PGMHandler.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Manager / Monitor, Access Handlers.
    44 */
  • /trunk/src/VBox/VMM/PGMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Internal header file.
    44 */
     
    478478    uint32_t                            fFlags;
    479479
    480     /** HC virtual lookup ranges for 4 MB chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
    481     GCPTRTYPE(void **)                  pvHCChunkGC; /**< @todo r=bird: ditto */
    482     /** HC virtual lookup ranges for 4 MB chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
    483     HCPTRTYPE(void **)                  pvHCChunkHC; /**< @todo r=bird: rename to papvHCChunkHC */
     480    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
     481    GCPTRTYPE(void **)                  pavHCChunkGC;
     482    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
     483    HCPTRTYPE(void **)                  pavHCChunkHC;
    484484
    485485    /** Start of the HC mapping of the range.
     
    502502/** Return hc ptr corresponding to the ram range and physical offset */
    503503#define PGMRAMRANGE_GETHCPTR(pRam, off) \
    504     (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) ? (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[(off >> PGM_DYNAMIC_CHUNK_SHIFT)] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK))  \
     504    (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) ? (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[(off >> PGM_DYNAMIC_CHUNK_SHIFT)] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK))  \
    505505                                                : (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
    506506
     
    18361836                unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
    18371837                /* Physical chunk in dynamically allocated range not present? */
    1838                 if (RT_UNLIKELY(!CTXSUFF(pRam->pvHCChunk)[idx]))
     1838                if (RT_UNLIKELY(!CTXSUFF(pRam->pavHCChunk)[idx]))
    18391839                {
    18401840#ifdef IN_RING3
     
    18461846                        return rc;
    18471847                }
    1848                 *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
     1848                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
    18491849                return VINF_SUCCESS;
    18501850            }
     
    18811881        unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
    18821882        /* Physical chunk in dynamically allocated range not present? */
    1883         if (RT_UNLIKELY(!CTXSUFF(pRam->pvHCChunk)[idx]))
     1883        if (RT_UNLIKELY(!CTXSUFF(pRam->pavHCChunk)[idx]))
    18841884        {
    18851885#ifdef IN_RING3
     
    18911891                return rc;
    18921892        }
    1893         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
     1893        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
    18941894        return VINF_SUCCESS;
    18951895    }
     
    19401940            {
    19411941                unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
    1942                 *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
     1942                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
    19431943                return VINF_SUCCESS;
    19441944            }
  • /trunk/src/VBox/VMM/PGMMap.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Manager, Guest Context Mappings.
    44 */
     
    334334            if (!pCur)
    335335            {
    336                 LogRel(("PGMR3MappingsFix: Conflicts with intermediate PDE %#x (GCPtrBase=%VGv cb=%#zx). The guest should retry.\n", 
     336                LogRel(("PGMR3MappingsFix: Conflicts with intermediate PDE %#x (GCPtrBase=%VGv cb=%#zx). The guest should retry.\n",
    337337                        iPDNew + i, GCPtrBase, cb));
    338338                return VERR_PGM_MAPPINGS_FIX_CONFLICT;
     
    562562        {
    563563            AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", iPTE, iPDE, uAddress, pPT->a[iPTE].u));
    564             LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", 
     564            LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n",
    565565                    iPTE, iPDE, uAddress, pPT->a[iPTE].u));
    566566            return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
     
    595595        {
    596596            AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", iPTE, iPDE, uAddress, pPTPae->a[iPTE].u));
    597             LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", 
     597            LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n",
    598598                    iPTE, iPDE, uAddress, pPTPae->a[iPTE].u));
    599599            return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */
  • /trunk/src/VBox/VMM/PGMPhys.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * PGM - Page Manager and Monitor, Physical Memory Addressing.
     
    157158        pNew->cb            = cb;
    158159        pNew->fFlags        = fFlags;
    159         pNew->pvHCChunkHC   = NULL;
    160         pNew->pvHCChunkGC   = 0;
     160        pNew->pavHCChunkHC  = NULL;
     161        pNew->pavHCChunkGC  = 0;
    161162
    162163        unsigned iPage = cb >> PAGE_SHIFT;
     
    168169        else if (fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
    169170        {
    170             /* Allocate memory for 4 MB chunk to HC ptr lookup array. */
    171             rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pvHCChunkHC);
     171            /* Allocate memory for chunk to HC ptr lookup array. */
     172            rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pavHCChunkHC);
    172173            AssertMsgReturn(rc == VINF_SUCCESS, ("MMHyperAlloc(,%#x,,,) -> %Vrc\n", cbRam, cb), rc);
    173174
    174             pNew->pvHCChunkGC = MMHyperHC2GC(pVM, pNew->pvHCChunkHC);
    175             Assert(pNew->pvHCChunkGC);
     175            pNew->pavHCChunkGC = MMHyperHC2GC(pVM, pNew->pavHCChunkHC);
     176            Assert(pNew->pavHCChunkGC);
    176177
    177178            /* Physical memory will be allocated on demand. */
     
    277278    }
    278279    off >>= (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
    279     pRam->pvHCChunkHC[off] = pvRam;
     280    pRam->pavHCChunkHC[off] = pvRam;
    280281
    281282    /* Notify the recompiler. */
     
    354355
    355356    STAM_COUNTER_INC(&pVM->pgm.s.StatDynRamGrow);
    356     STAM_COUNTER_ADD(&pVM->pgm.s.StatDynRamTotal, 4);
     357    STAM_COUNTER_ADD(&pVM->pgm.s.StatDynRamTotal, PGM_DYNAMIC_CHUNK_SIZE/(1024*1024));
    357358
    358359    Log(("pgmr3PhysGrowRange: allocate chunk of size 0x%X at %VGp\n", PGM_DYNAMIC_CHUNK_SIZE, GCPhys));
  • /trunk/src/VBox/VMM/PGMPhys.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Manager and Monitor, Physical Memory Addressing.
    44 */
  • /trunk/src/VBox/VMM/PGMPool.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM Shadow Page Pool.
    44 */
  • /trunk/src/VBox/VMM/PGMShw.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager / Monitor, Shadow Paging Template.
    44 */
  • /trunk/src/VBox/VMM/REMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * REM - Internal header file.
     
    109110 * Dynamically allocated guest RAM chunk information
    110111 * HC virt to GC Phys
    111  * 
     112 *
    112113 * A RAM chunk can spawn two chunk regions as we don't align them on chunk boundaries.
    113114 */
  • /trunk/src/VBox/VMM/SELM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SELM - The Selector manager.
    44 */
  • /trunk/src/VBox/VMM/SELMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SELM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/SSM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SSM - Saved State Manager.
    44 */
  • /trunk/src/VBox/VMM/SSMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SSM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/STAM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * STAM - The Statistics Manager.
    44 */
  • /trunk/src/VBox/VMM/STAMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * STAM Internal Header.
    44 */
  • /trunk/src/VBox/VMM/TM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Timeout Manager.
    44 */
  • /trunk/src/VBox/VMM/TMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/TRPM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - The Trap Monitor
    44 */
  • /trunk/src/VBox/VMM/TRPMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/VBoxVMMDeps.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * link dependencies - drag all we want into the link!
    44 */
  • /trunk/src/VBox/VMM/VM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VM - Virtual Machine
    44 */
  • /trunk/src/VBox/VMM/VMEmt.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VM - Virtual Machine, The Emulation Thread.
    44 */
  • /trunk/src/VBox/VMM/VMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/VMM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - The Virtual Machine Monitor Core.
    44 */
     
    232232
    233233    /*
    234      * Allocate continguous pages for switchers and deal with 
     234     * Allocate continguous pages for switchers and deal with
    235235     * conflicts in the intermediate mapping of the code.
    236236     */
     
    244244        {
    245245            /* try more allocations. */
    246             struct 
     246            struct
    247247            {
    248248                void *pvR0;
     
    285285    if (VBOX_SUCCESS(rc))
    286286    {
    287         /* 
    288          * copy the code. 
     287        /*
     288         * copy the code.
    289289         */
    290290        for (unsigned iSwitcher = 0; iSwitcher < ELEMENTS(s_apSwitchers); iSwitcher++)
     
    317317    }
    318318    else
    319         VMSetError(pVM, rc, RT_SRC_POS, 
    320                    N_("Failed to allocate %d bytes of contiguous memory for the world switcher code."), 
     319        VMSetError(pVM, rc, RT_SRC_POS,
     320                   N_("Failed to allocate %d bytes of contiguous memory for the world switcher code."),
    321321                   cbCoreCode);
    322322
     
    476476                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetIRETTrap,            STAMTYPE_COUNTER, "/VMM/GCRet/IRETTrap",            STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_IRET_TRAP returns.");
    477477                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetEmulate,             STAMTYPE_COUNTER, "/VMM/GCRet/Emulate",             STAMUNIT_OCCURENCES, "Number of VINF_EM_EXECUTE_INSTRUCTION returns.");
    478                     STAM_REG(pVM, &pVM->vmm.s.StatGCRetPatchEmulate,        STAMTYPE_COUNTER, "/VMM/GCRet/PatchEmulate",        STAMUNIT_OCCURENCES, "Number of VINF_PATCH_EMULATE_INSTR returns."); 
     478                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetPatchEmulate,        STAMTYPE_COUNTER, "/VMM/GCRet/PatchEmulate",        STAMUNIT_OCCURENCES, "Number of VINF_PATCH_EMULATE_INSTR returns.");
    479479                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetIORead,              STAMTYPE_COUNTER, "/VMM/GCRet/IORead",              STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_READ returns.");
    480480                    STAM_REG(pVM, &pVM->vmm.s.StatGCRetIOWrite,             STAMTYPE_COUNTER, "/VMM/GCRet/IOWrite",             STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_WRITE returns.");
     
    759759        {
    760760            unsigned off = pVM->vmm.s.aoffSwitchers[iSwitcher];
    761             pSwitcher->pfnRelocate(pVM, 
     761            pSwitcher->pfnRelocate(pVM,
    762762                                   pSwitcher,
    763763                                   (uint8_t *)pVM->vmm.s.pvHCCoreCodeR0 + off,
     
    26262626}
    26272627
    2628 #include <stdio.h>
    2629 
    26302628
    26312629/* execute the switch. */
  • /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - CPU Monitor(/Manager) - Gets and Sets.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    3  *
    4  *
     3 * DBGF - Debugger Facility, All Context Code.
    54 */
    65
  • /trunk/src/VBox/VMM/VMMAll/EMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * EM - Execution Monitor(/Manager) - All contexts
    44 */
  • /trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * IOM - Input / Output Monitor - Any Context.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * IOM - Input / Output Monitor - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/MMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Any Context.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Hypervisor Memory Area, All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/MMAllPagePool.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Page Pool.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/MMAllPhys.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM - Memory Monitor(/Manager) - Physical Memory.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM Critical Sections
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM Critical Sections
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM Queue - Transport data and tasks to EMT and R3.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Manager and Monitor - All context code.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Shadow+Guest Paging Template - All context code.
    44 *
     
    20792079            {
    20802080                /** @note We used to sync PGM_SYNC_NR_PAGES pages, which triggered assertions in CSAM, because
    2081                  *        R/W attributes of nearby pages were reset. Not sure how that could happen. Anyway, it 
    2082                  *        makes no sense to prefetch more than one page. 
     2081                 *        R/W attributes of nearby pages were reset. Not sure how that could happen. Anyway, it
     2082                 *        makes no sense to prefetch more than one page.
    20832083                 */
    20842084                rc = PGM_BTH_NAME(SyncPage)(pVM, PdeSrc, GCPtrPage, 1, 0);
  • /trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Guest Paging Template - All context code.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * PGM - Page Manager / Monitor, Access Handlers.
  • /trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * PGM - Page Manager and Monitor - All context code.
  • /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * PGM - Page Manager and Monitor, Physical Memory Addressing.
     
    196197                }
    197198                unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
    198                 *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
     199                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
    199200                return VINF_SUCCESS;
    200201            }
     
    235236            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
    236237            {
    237                 if (CTXSUFF(pRam->pvHCChunk)[iChunk])
    238                 {
    239                     RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
     238                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
     239                {
     240                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
    240241                    if (off < PGM_DYNAMIC_CHUNK_SIZE)
    241242                        return true;
     
    276277            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
    277278            {
    278                 if (CTXSUFF(pRam->pvHCChunk)[iChunk])
    279                 {
    280                     RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
     279                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
     280                {
     281                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
    281282                    if (off < PGM_DYNAMIC_CHUNK_SIZE)
    282283                    {
     
    324325            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
    325326            {
    326                 if (CTXSUFF(pRam->pvHCChunk)[iChunk])
    327                 {
    328                     RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
     327                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
     328                {
     329                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
    329330                    if (off < PGM_DYNAMIC_CHUNK_SIZE)
    330331                    {
     
    458459                        unsigned idx = (iPage >> (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT));
    459460
    460                         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK) + off);
     461                        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK) + off);
    461462                    }
    462463                    else
  • /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM Shadow Page Pool.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Shadow Paging Template - All context code.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/REMAll.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * REM - Recompiled Execution Monitor, all Contexts part.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SELM All contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/TMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Timeout Manager, all contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Timeout Manager, CPU Time, All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/TMAllReal.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Timeout Manager, Real Time, All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TM - Timeout Manager, Virtual Time, All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - Trap Monitor - Any Context.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/VMAll.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VM - Virtual Machine All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM All Contexts.
    44 */
  • /trunk/src/VBox/VMM/VMMCodingGuidelines.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Coding Guidelines.
    44 */
  • /trunk/src/VBox/VMM/VMMDocsRawMode.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * This file contains the documentation of the raw-mode execution.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/CPUMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - Guest Context Code.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/DBGFGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * DBGF - Debugger Facility, GC part.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/IOMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * IOM - Input / Output Monitor - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/MMRamGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MMRamGC - Guest Context Ram access Routines, pair for MMRamGCA.asm.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device and Driver Manager, GC Device parts.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/PGMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PGM - Page Monitor, Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/PGMGCBth.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Shadow+Guest Paging Template - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/PGMGCGst.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Guest Paging Template - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/PGMGCShw.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox - Page Manager, Shadow Paging Template - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/REMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    3  *
     3 * REM - Recompiled Execution Manager, GC Code.
    44 */
    55
  • /trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * SELM - The Selector manager, Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - The Trap Monitor, Guest Context
    44 */
  • /trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - Guest Context Trap Handlers, CPP part
    44 */
  • /trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Guest Context.
    44 */
  • /trunk/src/VBox/VMM/VMMGC/VMMGCDeps.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMMGC Runtime Dependencies.
    44 */
  • /trunk/src/VBox/VMM/VMMInternal.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Internal header file.
    44 */
     
    174174#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
    175175    uint32_t                    u32Padding0; /**< Alignment padding. */
    176 #endif 
     176#endif
    177177
    178178    /** VMM stack, pointer to the top of the stack in HC.
  • /trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * CPUM - Host Context Ring 0.
    44 */
  • /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM - Host Context Ring 0.
    44 */
     
    303303
    304304#ifdef VBOX_STRICT
    305 #include <string.h>
    306305#include <iprt/string.h>
    307306/**
  • /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM SVM - Host Context Ring 0.
    44 */
     
    6868
    6969    /* Program the control fields. Most of them never have to be changed again. */
    70     /* CR0/3/4 reads must be intercepted, our shadow values are not necessarily the same as the guest's. */ 
     70    /* CR0/3/4 reads must be intercepted, our shadow values are not necessarily the same as the guest's. */
    7171    /** @note CR0 & CR4 can be safely read when guest and shadow copies are identical. */
    7272    pVMCB->ctrl.u16InterceptRdCRx = BIT(0) | BIT(3) | BIT(4) | BIT(8);
     
    106106                                    | SVM_CTRL1_INTERCEPT_INVLPGA       /* AMD only */
    107107                                    | SVM_CTRL1_INTERCEPT_SHUTDOWN      /* fatal */
    108                                     | SVM_CTRL1_INTERCEPT_FERR_FREEZE;  /* Legacy FPU FERR handling. */ 
     108                                    | SVM_CTRL1_INTERCEPT_FERR_FREEZE;  /* Legacy FPU FERR handling. */
    109109                                    ;
    110110    pVMCB->ctrl.u32InterceptCtrl2 =   SVM_CTRL2_INTERCEPT_VMRUN         /* required */
     
    622622                                             | SVM_CTRL1_INTERCEPT_INVLPGA       /* AMD only */
    623623                                             | SVM_CTRL1_INTERCEPT_SHUTDOWN      /* fatal */
    624                                              | SVM_CTRL1_INTERCEPT_FERR_FREEZE   /* Legacy FPU FERR handling. */ 
     624                                             | SVM_CTRL1_INTERCEPT_FERR_FREEZE   /* Legacy FPU FERR handling. */
    625625                                             ));
    626626    Assert(pVMCB->ctrl.u32InterceptCtrl2 == ( SVM_CTRL2_INTERCEPT_VMRUN         /* required */
     
    992992            goto ResumeExecution;
    993993        }
    994            
     994
    995995#ifdef VBOX_STRICT
    996996        case X86_XCPT_UD:   /* Unknown opcode exception. */
  • /trunk/src/VBox/VMM/VMMR0/HWSVMR0.h

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM SVM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM VMX - Host Context Ring 0.
    44 */
  • /trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * HWACCM SVM - Internal header file.
    44 */
  • /trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PDM - Pluggable Device and Driver Manager, R0 Device parts.
    44 */
  • /trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * TRPM - The Trap Monitor - HC Ring 0
    44 */
  • /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    23 * VMM - Host Context Ring 0.
  • /trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - World Switchers.
    44 */
  • /trunk/src/VBox/VMM/VMReq.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VM - Virtual Machine
    44 */
     
    746746        {
    747747            uintptr_t *pauArgs = &pReq->u.Internal.aArgs[0];
    748             union 
     748            union
    749749            {
    750750                PFNRT pfn;
  • /trunk/src/VBox/VMM/testcase/tstAnimate.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VBox Animation Testcase / Tool.
    44 */
     
    4242#include <iprt/file.h>
    4343#include <iprt/thread.h>
    44 
    45 #include <string.h>
    46 #include <ctype.h>
     44#include <iprt/ctype.h>
     45
    4746#include <signal.h>
    4847
  • /trunk/src/VBox/VMM/testcase/tstAsmStructs.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Testcase for checking offsets in the assembly structures shared with C/C++.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstCFGM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Testcase for CFGM.
    44 */
     
    3434#include <iprt/runtime.h>
    3535#include <iprt/stream.h>
    36 
    37 #include <string.h>
     36#include <iprt/string.h>
    3837
    3938
  • /trunk/src/VBox/VMM/testcase/tstCompiler.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Testing how the compiler deals with various things.
    44 *
  • /trunk/src/VBox/VMM/testcase/tstHelp.c

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Testcase helpers.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstHelp.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM testcase - Helper stuff.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * MM Hypervisor Heap testcase.
    44 */
     
    3434#include <iprt/assert.h>
    3535#include <iprt/stream.h>
    36 
    37 #include <string.h>
     36#include <iprt/string.h>
    3837
    3938
  • /trunk/src/VBox/VMM/testcase/tstMicro.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Micro Testcase, profiling special CPU operations.
    44 */
     
    3939#include <iprt/string.h>
    4040#include <iprt/semaphore.h>
    41 
    42 #include <stdio.h>
    4341
    4442#include "tstMicro.h"
     
    368366        if (!VBOX_SUCCESS(rc))
    369367        {
    370             printf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
     368            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
    371369            rcRet++;
    372370        }
     
    374372    else
    375373    {
    376         printf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
     374        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
    377375        rcRet++;
    378376    }
  • /trunk/src/VBox/VMM/testcase/tstMicro.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Micro Testcase, profiling special CPU operations.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstMicroGC.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Micro Testcase, profiling special CPU operations - GC Code (hacks).
    44 */
     
    3232#include <VBox/log.h>
    3333#include <iprt/assert.h>
    34 #include <string.h>
     34#include <iprt/string.h>
    3535
    3636
  • /trunk/src/VBox/VMM/testcase/tstProg-1.c

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Test program.
    44 *
  • /trunk/src/VBox/VMM/testcase/tstProg-2.c

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Test program no.2.
    44 *
  • /trunk/src/VBox/VMM/testcase/tstProg-3.c

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Test program #3.
    44 *
  • /trunk/src/VBox/VMM/testcase/tstSSM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Saved State Manager Testcase.
    44 */
     
    3636#include <iprt/string.h>
    3737#include <iprt/time.h>
    38 
    39 #include <string.h>
    4038
    4139
  • /trunk/src/VBox/VMM/testcase/tstVMM-2.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM Testcase - no. 2.
    44 */
     
    3434#include <iprt/semaphore.h>
    3535#include <iprt/thread.h>
    36 
    37 
    38 #include <stdio.h>
    39 #include <string.h>
    40 #include <ctype.h>
     36#include <iprt/string.h>
     37#include <iprt/ctype.h>
     38#include <iprt/stream.h>
     39
     40#include <stdio.h> /** @todo get rid of this. */
    4141
    4242
     
    8989            if (*psz != '/')
    9090            {
    91                 printf("%s(%d): error: key path must start with slash.\n", pArgs->pszFilename, iLine);
     91                RTPrintf("%s(%d): error: key path must start with slash.\n", pArgs->pszFilename, iLine);
    9292                return VERR_GENERAL_FAILURE;
    9393            }
     
    9595            if (!pszEnd)
    9696            {
    97                 printf("%s(%d): error: missing ']'.\n", pArgs->pszFilename, iLine);
     97                RTPrintf("%s(%d): error: missing ']'.\n", pArgs->pszFilename, iLine);
    9898                return VERR_GENERAL_FAILURE;
    9999            }
     
    119119                    {
    120120                        *pszCurEnd = '/';
    121                         printf("%s(%d): error: failed to create node '%s', rc=%d.\n", pArgs->pszFilename, iLine, psz, rc);
     121                        RTPrintf("%s(%d): error: failed to create node '%s', rc=%d.\n", pArgs->pszFilename, iLine, psz, rc);
    122122                        return rc;
    123123                    }
     
    146146                    if (!pszNameEnd)
    147147                    {
    148                         printf("%s(%d): error: unbalanced quote.\n", pArgs->pszFilename, iLine);
     148                        RTPrintf("%s(%d): error: unbalanced quote.\n", pArgs->pszFilename, iLine);
    149149                        return VERR_GENERAL_FAILURE;
    150150                    }
     
    163163                if (!pszNameEnd)
    164164                {
    165                     printf("%s(%d): error: missing '='.\n", pArgs->pszFilename, iLine);
     165                    RTPrintf("%s(%d): error: missing '='.\n", pArgs->pszFilename, iLine);
    166166                    return VERR_GENERAL_FAILURE;
    167167                }
     
    172172                if (!pszNameEnd)
    173173                {
    174                     printf("%s(%d): error: missing '<'.\n", pArgs->pszFilename, iLine);
     174                    RTPrintf("%s(%d): error: missing '<'.\n", pArgs->pszFilename, iLine);
    175175                    return VERR_GENERAL_FAILURE;
    176176                }
     
    178178            if (pszName == pszNameEnd)
    179179            {
    180                 printf("%s(%d): error: empty value name.\n", pArgs->pszFilename, iLine);
     180                RTPrintf("%s(%d): error: empty value name.\n", pArgs->pszFilename, iLine);
    181181                return VERR_GENERAL_FAILURE;
    182182            }
     
    185185            if (!psz)
    186186            {
    187                 printf("%s(%d): error: missing '='.\n", pArgs->pszFilename, iLine);
     187                RTPrintf("%s(%d): error: missing '='.\n", pArgs->pszFilename, iLine);
    188188                return VERR_GENERAL_FAILURE;
    189189            }
     
    204204                    if (!pszValueEnd)
    205205                    {
    206                         printf("%s(%d): error: unbalanced quote in string value.\n", pArgs->pszFilename, iLine);
     206                        RTPrintf("%s(%d): error: unbalanced quote in string value.\n", pArgs->pszFilename, iLine);
    207207                        return VERR_GENERAL_FAILURE;
    208208                    }
     
    217217                if (VBOX_FAILURE(rc))
    218218                {
    219                     printf("%s(%d): error: failed to insert string value named '%s' and with value '%s', rc=%d.\n",
    220                            pArgs->pszFilename, iLine, pszName, psz, rc);
     219                    RTPrintf("%s(%d): error: failed to insert string value named '%s' and with value '%s', rc=%d.\n",
     220                             pArgs->pszFilename, iLine, pszName, psz, rc);
    221221                    return rc;
    222222                }
     
    227227            {
    228228                /* byte string */
    229                 printf("%s(%d): error: byte string is not implemented\n", pArgs->pszFilename, iLine);
     229                RTPrintf("%s(%d): error: byte string is not implemented\n", pArgs->pszFilename, iLine);
    230230                return VERR_GENERAL_FAILURE;
    231231            }
     
    255255                if (isalpha(*psz))
    256256                {
    257                     printf("%s(%d): error: unexpected char(s) after number '%.10s'\n", pArgs->pszFilename, iLine, psz);
     257                    RTPrintf("%s(%d): error: unexpected char(s) after number '%.10s'\n", pArgs->pszFilename, iLine, psz);
    258258                    return VERR_GENERAL_FAILURE;
    259259                }
     
    262262                if (VBOX_FAILURE(rc))
    263263                {
    264                     printf("%s(%d): error: failed to insert integer value named '%s' and with value %#llx, rc=%d.\n",
    265                            pArgs->pszFilename, iLine, pszName, u64, rc);
     264                    RTPrintf("%s(%d): error: failed to insert integer value named '%s' and with value %#llx, rc=%d.\n",
     265                             pArgs->pszFilename, iLine, pszName, u64, rc);
    266266                    return rc;
    267267                }
     
    269269            else
    270270            {
    271                 printf("%s(%d): error: unknown value format.\n", pArgs->pszFilename, iLine);
     271                RTPrintf("%s(%d): error: unknown value format.\n", pArgs->pszFilename, iLine);
    272272                return VERR_GENERAL_FAILURE;
    273273            }
     
    306306                if (Args.pszFilename)
    307307                {
    308                     printf("syntax error: only one config argument!\n");
     308                    RTPrintf("syntax error: only one config argument!\n");
    309309                    return 1;
    310310                }
    311311                if (i + 1 >= argc)
    312312                {
    313                     printf("syntax error: no configuration filename!\n");
     313                    RTPrintf("syntax error: no configuration filename!\n");
    314314                    return 1;
    315315                }
     
    318318                if (!Args.pFile)
    319319                {
    320                     printf("%s: Failed to open '%s' for reading!\n", TESTCASE, Args.pszFilename);
     320                    RTPrintf("%s: Failed to open '%s' for reading!\n", TESTCASE, Args.pszFilename);
    321321                    return 1;
    322322                }
     
    327327                     || (*psz == 'h' && !psz[1]))
    328328            {
    329                 printf("syntax: %s [options]\n"
    330                        "\n"
    331                        "options (prefixed with a dash or two)\n"
    332                        "  config <filename>     Load the flat config file.\n"
    333                        "  help                  This help text.\n", argv[0]);
     329                RTPrintf("syntax: %s [options]\n"
     330                         "\n"
     331                         "options (prefixed with a dash or two)\n"
     332                         "  config <filename>     Load the flat config file.\n"
     333                         "  help                  This help text.\n", argv[0]);
    334334                return 1;
    335335            }
    336336            else
    337337            {
    338                 printf("syntax error: unknown option '%s' in arg %d.\n", psz, i);
     338                RTPrintf("syntax error: unknown option '%s' in arg %d.\n", psz, i);
    339339                return 1;
    340340            }
     
    343343        else
    344344        {
    345             printf("syntax error: Sorry dude, no idea what you're passing to me.\n"
    346                    "              arg %d '%s'\n", i, argv[i]);
     345            RTPrintf("syntax error: Sorry dude, no idea what you're passing to me.\n"
     346                     "              arg %d '%s'\n", i, argv[i]);
    347347            return 1;
    348348        }
     
    370370                if (VBOX_SUCCESS(rc))
    371371                {
    372                     printf(TESTCASE ": info: VMR3PowerOn succeeded. rc=%d\n", rc);
    373                     printf(TESTCASE ": info: main thread is taking a nap...\n");
     372                    RTPrintf(TESTCASE ": info: VMR3PowerOn succeeded. rc=%d\n", rc);
     373                    RTPrintf(TESTCASE ": info: main thread is taking a nap...\n");
    374374                    rc = RTThreadSleep(8*3600*1000); /* 8 hours */
    375                     printf(TESTCASE ": info: main thread is woke up... rc=%d\n", rc);
     375                    RTPrintf(TESTCASE ": info: main thread is woke up... rc=%d\n", rc);
    376376
    377377                    /*
     
    384384                        VMR3ReqFree(pReq);
    385385                        if (VBOX_SUCCESS(rc))
    386                             printf(TESTCASE ": info: Successfully powered off the VM. rc=%d\n", rc);
     386                            RTPrintf(TESTCASE ": info: Successfully powered off the VM. rc=%d\n", rc);
    387387                        else
    388388                        {
    389                             printf(TESTCASE ": error: VMR3PowerOff -> %d\n", rc);
     389                            RTPrintf(TESTCASE ": error: VMR3PowerOff -> %d\n", rc);
    390390                            rcRet++;
    391391                        }
     
    393393                    else
    394394                    {
    395                         printf(TESTCASE ": error: VMR3ReqCall (power off) -> %d\n", rc);
     395                        RTPrintf(TESTCASE ": error: VMR3ReqCall (power off) -> %d\n", rc);
    396396                        rcRet++;
    397397                    }
     
    400400            else
    401401            {
    402                 printf(TESTCASE ": error: VMR3ReqCall (power on) -> %d\n", rc);
     402                RTPrintf(TESTCASE ": error: VMR3ReqCall (power on) -> %d\n", rc);
    403403                rcRet++;
    404404            }
     
    411411        if (!VBOX_SUCCESS(rc))
    412412        {
    413             printf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
     413            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
    414414            rcRet++;
    415415        }
     
    417417    else
    418418    {
    419         printf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
     419        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
    420420        rcRet++;
    421421    }
  • /trunk/src/VBox/VMM/testcase/tstVMM.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM Testcase.
    44 */
     
    3535
    3636
    37 #include <stdio.h>
    38 
    39 
    4037/*******************************************************************************
    4138*   Defined Constants And Macros                                               *
     
    4441
    4542VMMR3DECL(int) VMMDoTest(PVM pVM);
     43
    4644
    4745int main(int argc, char **argv)
     
    7674        if (!VBOX_SUCCESS(rc))
    7775        {
    78             printf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
     76            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
    7977            rcRet++;
    8078        }
     
    8280    else
    8381    {
    84         printf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
     82        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
    8583        rcRet++;
    8684    }
  • /trunk/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * Testcase for the VMMR0JMPBUF operations.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstVMREQ.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM Testcase.
    44 */
  • /trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
     3 * tstVMMStructGC - Generate structure member and size checks from the GC perspective.
    24 *
    3  * tstVMMStructGC - Generate structure member and size checks from the GC
    4  *                  perspective. This is built using the VBOXGC template
    5  *                  but linked into a host ring-3 executable, rather hacky.
     5 * This is built using the VBOXGC template but linked into a host
     6 * ring-3 executable, rather hacky.
    67 */
    78
     
    196197#ifdef VBOX_WITH_PDM_LOCK
    197198    GEN_CHECK_OFF(PDM, CritSect);
    198 #endif 
     199#endif
    199200    GEN_CHECK_OFF(PDM, StatQueuedCritSectLeaves);
    200201
  • /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Context switcher macros & definitions
    44 */
  • /trunk/src/VBox/VMM/x86context.h

    • Property svn:keywords changed from Author Date Id Revision to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * VMM - Context switcher macros & definitions
    44 */
  • /trunk/src/bldprogs/bin2c.c

    • Property svn:keywords set to Id
    r20 r30  
     1/* $Id$ */
    12/** @file
    2  *
    33 * PC-BIOS - Binary 2 C Structure Converter.
    44 */
     
    152152    if (uMask && (cbBin & uMask))
    153153    {
    154         fprintf(stderr, "%s: size=%d - Not aligned!\n", argv[0], cbBin);
     154        fprintf(stderr, "%s: size=%ld - Not aligned!\n", argv[0], (long)cbBin);
    155155        return 1;
    156156    }
    157157    if (cbBin < cbMin || cbBin > cbMax)
    158158    {
    159         fprintf(stderr, "%s: size=%d - Not %d-%db in size!\n",
    160                 argv[0], cbBin, cbMin, cbMax);
     159        fprintf(stderr, "%s: size=%ld - Not %ld-%ldb in size!\n",
     160                argv[0], (long)cbBin, (long)cbMin, (long)cbMax);
    161161        return 1;
    162162    }
     
    194194    if (off != cbBin)
    195195    {
    196         fprintf(stderr, "%s: read error off=%d cbBin=%d\n", argv[0], off, cbBin);
     196        fprintf(stderr, "%s: read error off=%d cbBin=%ld\n", argv[0], off, (long)cbBin);
    197197        goto error;
    198198    }
Note: See TracChangeset for help on using the changeset viewer.

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