Changeset 13832

Timestamp:

11/05/08 03:01:12 (2 months ago)

Author:

vboxsync

Message:

IN_GC -> IN_RC.

Files:

• trunk/Config.kmk (modified) (1 diff)
• trunk/include/VBox/cpum.h (modified) (2 diffs)
• trunk/include/VBox/dbgf.h (modified) (1 diff)
• trunk/include/VBox/em.h (modified) (2 diffs)
• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/include/VBox/iom.h (modified) (2 diffs)
• trunk/include/VBox/mm.h (modified) (5 diffs)
• trunk/include/VBox/patm.h (modified) (1 diff)
• trunk/include/VBox/pdmapi.h (modified) (1 diff)
• trunk/include/VBox/pdmins.h (modified) (1 diff)
• trunk/include/VBox/pgm.h (modified) (7 diffs)
• trunk/include/VBox/rem.h (modified) (1 diff)
• trunk/include/VBox/trpm.h (modified) (1 diff)
• trunk/include/VBox/vm.h (modified) (5 diffs)
• trunk/include/VBox/vmapi.h (modified) (4 diffs)
• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/include/VBox/vrdpapi.h (modified) (8 diffs)
• trunk/include/VBox/vrdpusb.h (modified) (1 diff)
• trunk/include/iprt/asmdefs.mac (modified) (3 diffs)
• trunk/include/iprt/cdefs.h (modified) (13 diffs)
• trunk/include/iprt/initterm.h (modified) (1 diff)
• trunk/include/iprt/log.h (modified) (8 diffs)
• trunk/include/iprt/mem.h (modified) (1 diff)
• trunk/include/iprt/runtime.h (modified) (4 diffs)
• trunk/include/iprt/thread.h (modified) (1 diff)
• trunk/include/iprt/time.h (modified) (1 diff)
• trunk/include/iprt/types.h (modified) (4 diffs)
• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (15 diffs)
• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (10 diffs)
• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (2 diffs)
• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (1 diff)
• trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (5 diffs)
• trunk/src/VBox/Disassembler/DisasmInternal.h (modified) (1 diff)
• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (21 diffs)
• trunk/src/VBox/Runtime/common/log/logrel.cpp (modified) (4 diffs)
• trunk/src/VBox/Runtime/common/misc/sanity.h (modified) (3 diffs)
• trunk/src/VBox/Runtime/common/string/strformattype.cpp (modified) (3 diffs)
• trunk/src/VBox/Runtime/common/time/timesupA.asm (modified) (2 diffs)
• trunk/src/VBox/Runtime/common/time/timesupref.cpp (modified) (2 diffs)
• trunk/src/VBox/Runtime/include/internal/time.h (modified) (1 diff)
• trunk/src/VBox/Runtime/testcase/tstLdrObj.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/IOM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/PATM/CSAMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/PATM/PATMInternal.h (modified) (3 diffs)
• trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (16 diffs)
• trunk/src/VBox/VMM/VMMAll/CPUMAllA.asm (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (44 diffs)
• trunk/src/VBox/VMM/VMMAll/EMAllA.asm (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (16 diffs)
• trunk/src/VBox/VMM/VMMAll/MMAll.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (10 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (7 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (16 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (14 diffs)
• trunk/src/VBox/VMM/VMMAll/REMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/VMMAll/VMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMInternal.h (modified) (2 diffs)
• trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -1862 +1862 @@
-TEMPLATE_VBOXGC_ASTOOL              = $(VBOX_ASTOOL)
-TEMPLATE_VBOXGC_ASFLAGS             = $(VBOX_ASFLAGS32)
-G
+R
-TEMPLATE_VBOXGC_SYSSUFF             = .gc
-TEMPLATE_VBOXGC_BLD_TRG_ARCH        = x86

trunk/include/VBox/cpum.h

@@ -975 +975 @@
-#endif /* IN_RING3 */
-
-G
+R
-/** @defgroup grp_cpum_gc    The CPU Monitor(/Manager) API
- * @ingroup grp_cpum
@@ -998 +998 @@
-
-/** @} */
-G
+R
-
-#ifdef IN_RING0

trunk/include/VBox/dbgf.h

@@ -45 +45 @@
- */
-
-G
+R
-/** @addgroup grp_dbgf_gc  The GC DBGF API
- * @ingroup grp_dbgf

trunk/include/VBox/em.h

@@ -202 +202 @@
-
-
-G
+R
-/** @defgroup grp_em_gc     The EM Guest Context API
- * @ingroup grp_em
@@ -215 +215 @@
-VMMRCDECL(uint32_t) EMGCEmulateXAdd(RTRCPTR pu32Param1, uint32_t *pu32Param2, size_t cbSize, uint32_t *pEflags);
-/** @} */
-G
+R
-
-/** @} */

trunk/include/VBox/hwaccm.h

@@ -69 +69 @@
-VMMDECL(bool)   HWACCMHasPendingIrq(PVM pVM);
-
-G
+R
-VMMDECL(int)     HWACCMFlushTLB(PVM pVM);
-VMMDECL(int)     HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);

trunk/include/VBox/iom.h

@@ -217 +217 @@
-VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys);
-
-G
+R
-/** @defgroup grp_iom_gc    The IOM Guest Context API
- * @ingroup grp_iom
@@ -224 +224 @@
-VMMRCDECL(int) IOMGCIOPortHandler(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu);
-/** @} */
-G
+R
-
-

trunk/include/VBox/mm.h

@@ -238 +238 @@
-
-
-G
+R
-VMMDECL(void *)     MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr);
-#else
@@ -268 +268 @@
-#endif
-
-G
+R
-VMMDECL(RTRCPTR)    MMHyperCCToRC(PVM pVM, void *pv);
-#else
@@ -299 +299 @@
-/** @def MMHYPER_RC_ASSERT_RCPTR
- * Asserts that an address is either NULL or inside the hypervisor memory area.
-G
+R
- * @thread  The Emulation Thread.
- */
-G
+R
-# define MMHYPER_RC_ASSERT_RCPTR(pVM, RCPtr)   Assert(MMHyperIsInsideArea((pVM), (RTRCUINTPTR)(RCPtr)) || !(RCPtr))
-#else
@@ -405 +405 @@
-
-
-G
+R
-/** @defgroup grp_mm_gc    The MM Guest Context API
- * @ingroup grp_mm
@@ -419 +419 @@
-
-/** @} */
-G
+R
-
-/** @} */

trunk/include/VBox/patm.h

@@ -292 +292 @@
-#endif
-
-G
+R
-/** @defgroup grp_patm_gc    The Patch Manager API
- * @ingroup grp_patm

trunk/include/VBox/pdmapi.h

@@ -120 +120 @@
-
-
-G
+R
-/** @defgroup grp_pdm_gc    The PDM Guest Context API
- * @ingroup grp_pdm

trunk/include/VBox/pdmins.h

@@ -39 +39 @@
- * Macro for declaring a callback which is static in HC and exported in GC.
- */
-G
+R
-# define PDMBOTHCBDECL(type)    DECLEXPORT(type)
-#else

trunk/include/VBox/pgm.h

@@ -385 +385 @@
-{
-    /** @todo see PGMPhysIsPageMappingLockValid for possibly incorrect assumptions */
-G
+R
-    /** Just a dummy for the time being. */
-    uint32_t    u32Dummy;
@@ -413 +413 @@
-{
-    /** @todo -> complete/change this  */
-G
+R
-    return !!(pLock->u32Dummy);
-#else
@@ -426 +426 @@
-VMMDECL(void)       PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
-VMMDECL(void)       PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);
-G
+R
-VMMDECL(int)        PGMPhysSimpleReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb);
-VMMDECL(int)        PGMPhysSimpleWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb);
@@ -434 +434 @@
-VMMDECL(int)        PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb);
-VMMDECL(int)        PGMPhysSimpleDirtyWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb);
-G
+R
-VMMDECL(int)        PGMPhysInterpretedRead(PVM pVM, PCPUMCTXCORE pCtxCore, void *pvDst, RTGCUINTPTR GCPtrSrc, size_t cb);
-#ifdef VBOX_STRICT
@@ -442 +442 @@
-#endif /* VBOX_STRICT */
-
-G
+R
-VMMDECL(int)        PGMDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv);
-VMMDECL(int)        PGMDynMapGCPageOff(PVM pVM, RTGCPHYS GCPhys, void **ppv);
@@ -450 +450 @@
-
-
-G
+R
-/** @defgroup grp_pgm_gc  The PGM Guest Context API
- * @ingroup grp_pgm
@@ -456 +456 @@
- */
-/** @} */
-G
+R
-
-

trunk/include/VBox/rem.h

@@ -47 +47 @@
-
-
-G
+R
-VMMDECL(int)  REMNotifyInvalidatePage(PVM pVM, RTGCPTR GCPtrPage);
-VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler);
-VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
-VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
-G
+R
-VMMDECL(void) REMFlushTBs(PVM pVM);
-

trunk/include/VBox/trpm.h

@@ -114 +114 @@
-
-
-G
+R
-/** @defgroup grp_trpm_gc    The TRPM Guest Context API
- * @ingroup grp_trpm

trunk/include/VBox/vm.h

@@ -359 +359 @@
- *          code to let threads other than EMT mess around with the VM.
- */
-G
+R
-# define VM_IS_EMT(pVM)                     true
-#elif defined(IN_RING0)
@@ -371 +371 @@
- * Asserts that the current thread IS the emulation thread (EMT).
- */
-G
+R
-# define VM_ASSERT_EMT(pVM)                 Assert(VM_IS_EMT(pVM))
-#elif defined(IN_RING0)
@@ -384 +384 @@
- * Asserts that the current thread IS the emulation thread (EMT) and returns if it isn't.
- */
-G
+R
-# define VM_ASSERT_EMT_RETURN(pVM, rc)      AssertReturn(VM_IS_EMT(pVM), (rc))
-#elif defined(IN_RING0)
@@ -400 +400 @@
- * @todo r=bird: See VMMGetCpuId().
- */
-G
+R
-# define VM_GET_VMCPUID(pVM)                0
-#elif defined(IN_RING0)
@@ -788 +788 @@
-
-
-G
+R
-__BEGIN_DECLS
-

trunk/include/VBox/vmapi.h

@@ -68 +68 @@
- * @param   pvInVM  CC pointer within the VM.
- */
-G
+R
-# define VM_R3_ADDR(pVM, pvInVM)       ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
-#elif defined(IN_RING0)
@@ -85 +85 @@
- * @param   pvInVM  CC pointer within the VM.
- */
-G
+R
-# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
-#elif defined(IN_RING3)
@@ -313 +313 @@
-
-
-G
+R
-/** @defgroup grp_vmm_apis_hc  VM Host Context API
- * @ingroup grp_vm
@@ -425 +425 @@
-
-
-G
+R
-/** @defgroup grp_vmm_apis_gc  VM Guest Context APIs
- * @ingroup grp_vm

trunk/include/VBox/vmm.h

@@ -284 +284 @@
-
-
-G
+R
-/** @defgroup grp_vmm_rc    The VMM Raw-Mode Context API
- * @ingroup grp_vmm

trunk/include/VBox/vrdpapi.h

@@ -38 +38 @@
-# error "There are no VRDP APIs available in Ring-0 Host Context!"
-#endif
-G
+R
-# error "There are no VRDP APIs available Guest Context!"
-#endif
@@ -338 +338 @@
-#define VRDP_USB_XFER_BO    (10)
-#define VRDP_USB_XFER_BU    (11)
- 
+
-
-#define VRDP_USB_REAP_FLAG_CONTINUED (0x0)
@@ -472 +472 @@
-{
-    uint8_t flags;
- 
+
-} VRDPUSBREQNEGOTIATERET_2;
-#pragma pack()
@@ -611 +611 @@
-     * @param hServer     The server instance handle.
-     * @param u32ClientId The client identifier.
- 
+
-     *                    client before disconnecting.
-     *
@@ -747 +747 @@
-} VRDPENTRYPOINTS_1;
-
- 
+
- *  A new entry point VRDPRedirect has been added relative to version 1.
- */
@@ -778 +778 @@
-     * @param hServer     The server instance handle.
-     * @param u32ClientId The client identifier.
- 
+
-     *                    client before disconnecting.
-     *
@@ -1012 +1012 @@
-
-    /* A client is logging in, the application must decide whether
- 
+
-     * when an error code is returned by the callback.
-     *
@@ -1151 +1151 @@
-    DECLR3CALLBACKMEMBER(void, VRDPCallbackVideoModeHint,(void *pvCallback,
-                                                        unsigned cWidth,
- 
+
-                                                        unsigned cBitsPerPixel,
-                                                        unsigned uScreenId));

trunk/include/VBox/vrdpusb.h

@@ -38 +38 @@
-# error "There are no VRDP APIs available in Ring-0 Host Context!"
-#endif
-G
+R
-# error "There are no VRDP APIs available Guest Context!"
-#endif

trunk/include/iprt/asmdefs.mac

@@ -268 +268 @@
-; Defines the host architechture bit count.
-%ifndef HC_ARCH_BITS
-G
+R
-  %define HC_ARCH_BITS ARCH_BITS
- %else
@@ -298 +298 @@
-; Defines the guest architechture bit count.
-%ifndef GC_ARCH_BITS
-G
+R
-  %define GC_ARCH_BITS ARCH_BITS
- %else
@@ -480 +480 @@
-; The size in bytes of a pointer in the current context.
-
-G
+R
- %define RTCCPTR_DEF        RTRCPTR_DEF
- %define RTCCPTR_RES        RTRCPTR_RES

trunk/include/iprt/cdefs.h

@@ -77 +77 @@
-#define IN_RING0
-#define IN_RING3
-
+
+
-#define IN_RT_GC
-#define IN_RT_R0
@@ -142 +143 @@
- */
-
-G
+R
- * Used to indicate that we're compiling code which is running
-Guest
-
-G
-G
-
-G
-G
-G
-G
+the Raw-mode
+
+RC) && !defined(IN_R
+R
+
+R
+R
+R
+R
-#endif
-
@@ -171 +172 @@
- */
-#if !defined(HC_ARCH_BITS) || defined(DOXYGEN_RUNNING)
-G
+R
-#  define HC_ARCH_BITS ARCH_BITS
-# else
@@ -215 +216 @@
- */
-#if !defined(GC_ARCH_BITS) || defined(DOXYGEN_RUNNING)
-G
+R
-#  define GC_ARCH_BITS ARCH_BITS
-# else
@@ -231 +232 @@
- * @remark  For pointers used only in one context use RCPTRTYPE(), R3R0PTRTYPE(), R3PTRTYPE() or R0PTRTYPE().
- */
-G
+R
-# define CTXTYPE(GCType, R3Type, R0Type)  GCType
-#elif defined(IN_RING3)
@@ -292 +293 @@
- * @deprecated Use CTX_SUFF. Do NOT use this for new code.
- */
-G
+R
-# define CTXSUFF(var)       var##GC
-# define OTHERCTXSUFF(var)  var##HC
@@ -308 +309 @@
- * @deprecated Use CTX_SUFF. Do NOT use this for new code.
- */
-G
+R
-# define CTXALLSUFF(var)    var##GC
-#elif defined(IN_RING0)
@@ -325 +326 @@
- * @remark  This will replace CTXALLSUFF and CTXSUFF before long.
- */
-G
+R
-# define CTX_SUFF(var)      var##RC
-#elif defined(IN_RING0)
@@ -367 +368 @@
- * @deprecated use CTX_MID or CTX_MID_Z
- */
-G
+R
-# define CTXMID(first, last)        first##GC##last
-# define OTHERCTXMID(first, last)   first##HC##last
@@ -384 +385 @@
- * @deprecated use CTX_MID or CTX_MID_Z
- */
-G
+R
-# define CTXALLMID(first, last)     first##GC##last
-#elif defined(IN_RING0)
@@ -400 +401 @@
- * @param   last    Surname.
- */
-G
+R
-# define CTX_MID(first, last)       first##RC##last
-#elif defined(IN_RING0)
@@ -466 +467 @@
- * @see R3STRING, R0STRING
- */
-G
+R
-# define RCSTRING(pRCString)    (pRCString)
-#else
@@ -611 +612 @@
- * @param   args    The argument list enclosed in parentheses.
- */
-G
+R
-# define DECLRCCALLBACKMEMBER(type, name, args)  type (RTCALL * name) args
-#else

trunk/include/iprt/initterm.h

@@ -117 +117 @@
-#endif
-
-G
+R
-/**
- * Initializes the raw-mode context runtime library.

trunk/include/iprt/log.h

@@ -148 +148 @@
-
-/** Logger structure. */
-G
+R
-typedef struct RTLOGGERRC RTLOGGER;
-#else
@@ -232 +232 @@
-
-
-G
+R
-/**
- * Logger instance structure.
@@ -1005 +1005 @@
-
-
-G
+R
-/**
- * Sets the default release logger instance.
@@ -1013 +1013 @@
- */
-RTDECL(PRTLOGGER) RTLogRelSetDefaultInstance(PRTLOGGER pLogger);
-G
+R
-
-/**
@@ -1210 +1210 @@
-RTDECL(PRTLOGGER)   RTLogDefaultInstance(void);
-
-G
+R
-/**
- * Sets the default logger instance.
@@ -1218 +1218 @@
- */
-RTDECL(PRTLOGGER) RTLogSetDefaultInstance(PRTLOGGER pLogger);
-G
+R
-
-#ifdef IN_RING0
@@ -1253 +1253 @@
-
-
-G
+R
-/**
- * Creates the default logger instance for a iprt users.
@@ -1411 +1411 @@
- */
-RTDECL(int) RTLogGroupSettings(PRTLOGGER pLogger, const char *pszVar);
-G
+R
-
-/**

trunk/include/iprt/mem.h

@@ -39 +39 @@
-
-
-G
+R
-# error "There are no RTMem APIs available Guest Context!"
-#endif

trunk/include/iprt/runtime.h

@@ -36 +36 @@
-#include <iprt/initterm.h>
-
-G
+R
-# include <iprt/alloc.h>
-#endif
@@ -47 +47 @@
-#include <iprt/dir.h>
-#include <iprt/err.h>
-G
+R
-# include <iprt/file.h>
-# include <iprt/fs.h>
@@ -55 +55 @@
-#include <iprt/log.h>
-#include <iprt/md5.h>
-G
+R
-# include <iprt/mem.h>
-# include <iprt/mp.h>
@@ -66 +66 @@
-#include <iprt/system.h>
-#include <iprt/table.h>
-G
+R
-# include <iprt/thread.h>
-#endif

trunk/include/iprt/thread.h

@@ -35 +35 @@
-#include <iprt/stdarg.h>
-
-G
+R
-# error "There are no threading APIs available Guest Context!"
-#endif

trunk/include/iprt/time.h

@@ -836 +836 @@
-#endif
-
-G
+R
-/**
- * The RC layout of the RTTIMENANOTSDATA structure.

trunk/include/iprt/types.h

@@ -622 +622 @@
-
-/** HC pointer. */
-G
+R
-typedef void *          RTHCPTR;
-#else
@@ -914 +914 @@
- * HC and void pointer in RC.
- */
-G
+R
-typedef void *          RTRCPTR;
-#else
@@ -959 +959 @@
-
-/** Current Context Physical Memory Address.*/
-G
+R
-typedef RTGCPHYS RTCCPHYS;
-#else
@@ -973 +973 @@
- * to the NULL pointer.
- */
-G
+R
-# define NIL_RTCCPHYS   NIL_RTGCPHYS
-#else

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -320 +320 @@
-PDMBOTHCBDECL(int) vgaIOPortReadBIOS(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
-PDMBOTHCBDECL(int) vgaIOPortWriteBIOS(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
-G
+R
-PDMBOTHCBDECL(int) vgaGCLFBAccessHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
-#endif
@@ -685 +685 @@
-        s->sr[s->sr_index] = val & sr_mask[s->sr_index];
-
-G
+R
-        /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
-        if (    s->sr_index == 4 /* mode */
@@ -725 +725 @@
-        s->gr[s->gr_index] = val & gr_mask[s->gr_index];
-
-G
+R
-        /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
-        if (s->gr_index == 6 /* memory map mode */)
@@ -907 +907 @@
-            s->bank_offset = (val << 16);
-
-G
+R
-            /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
-            if (s->fRemappedVGA)
@@ -1149 +1149 @@
-    }
-
-G
+R
-    if (addr >= VGA_MAPPING_SIZE)
-        return VINF_IOM_HC_MMIO_WRITE;
@@ -1184 +1184 @@
-#ifndef VBOX
-        s->latch = ((uint32_t *)s->vram_ptr)[addr];
-G
+R
-        s->latch = ((uint32_t *)s->CTX_SUFF(vram_ptr))[addr];
-G
+R
-
-        if (!(s->gr[5] & 0x08)) {
@@ -1286 +1286 @@
-            s->vram_ptr[addr] = val;
-#else /* VBOX */
-G
+R
-            if (addr >= VGA_MAPPING_SIZE)
-                return VINF_IOM_HC_MMIO_WRITE;
@@ -1337 +1337 @@
-            s->vram_ptr[addr] = val;
-#else /* VBOX */
-G
+R
-            if (addr >= VGA_MAPPING_SIZE)
-                return VINF_IOM_HC_MMIO_WRITE;
@@ -1361 +1361 @@
-        }
-    } else {
-G
+R
-        if (addr * 4 >= VGA_MAPPING_SIZE)
-            return VINF_IOM_HC_MMIO_WRITE;
@@ -2959 +2959 @@
-#endif
-
-G
+R
-
-
@@ -3078 +3078 @@
-    if (cb == 2 || cb == 4)
-    {
-G
+R
-//        /*
-//         * The VBE_DISPI_INDEX_ENABLE memsets the entire frame buffer.
@@ -3320 +3320 @@
-    if (pThis->sr[4] & 0x08) {
-        /* chain 4 mode : simplest access */
-G
+R
-        if (GCPhysAddr + cItems * cbItem >= VGA_MAPPING_SIZE)
-            return VINF_IOM_HC_MMIO_WRITE;
@@ -3343 +3343 @@
-    } else if (pThis->gr[5] & 0x10) {
-        /* odd/even mode (aka text mode mapping) */
-G
+R
-        if (GCPhysAddr * 2 + cItems * cbItem >= VGA_MAPPING_SIZE)
-            return VINF_IOM_HC_MMIO_WRITE;
@@ -3365 +3365 @@
-            }
-    } else {
-G
+R
-        if (GCPhysAddr + cItems * cbItem >= VGA_MAPPING_SIZE)
-            return VINF_IOM_HC_MMIO_WRITE;
@@ -3649 +3649 @@
-
-
-G
+R
-/**
- * #PF Handler for VBE LFB access.

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -185 +185 @@
-
-typedef uint32_t PhysApicId;
- 
+
-#endif
-
@@ -194 +194 @@
-    uint32_t apicbase;
-#ifdef VBOX
- 
+
-    uint32_t   tpr;
-    /* Logical APIC id */
@@ -324 +324 @@
-                         uint8_t delivery_mode, uint8_t vector_num,
-                         uint8_t polarity, uint8_t trigger_mode);
- 
+
-                              int64_t current_time);
-static int apic_get_arb_pri(APICState *s);
@@ -538 +538 @@
-    /* We cannot change if this CPU is BSP or not by writing t