VirtualBox

Changeset 18660 in vbox for trunk/include/VBox


Ignore:
Timestamp:
Apr 2, 2009 6:23:45 PM (16 years ago)
Author:
vboxsync
Message:

include/VBox: Clean out the VBOX_WITH_NEW_PHYS_CODE #ifdefs.

Location:
trunk/include/VBox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/mm.h

    r18287 r18660  
    4343 * @{
    4444 */
    45 
    46 #ifndef VBOX_WITH_NEW_PHYS_CODE
    47 /** @name RAM Page Flags
    48  * Since internal ranges have a byte granularity it's possible for a
    49  * page be flagged for several uses. The access virtualization in PGM
    50  * will choose the most restricted one and use EM to emulate access to
    51  * the less restricted areas of the page.
    52  *
    53  * Bits 0-11 only since they are fitted into the offset part of a physical memory address.
    54  * @{
    55  */
    56 /** Reserved - Not RAM, ROM nor MMIO2.
    57  * If this bit is cleared the memory is assumed to be some kind of RAM.
    58  * Normal MMIO may set it but that depends on whether the RAM range was
    59  * created specially for the MMIO or not.
    60  *
    61  * @remarks The current implementation will always reserve backing
    62  *          memory for reserved  ranges to simplify things.
    63  */
    64 #define MM_RAM_FLAGS_RESERVED           RT_BIT(0)
    65 /** ROM - Read Only Memory.
    66  * The page have a HC physical address which contains the BIOS code. All write
    67  * access is trapped and ignored.
    68  *
    69  * HACK: Writable shadow ROM is indicated by both ROM and MMIO2 being
    70  *       set. (We're out of bits.)
    71  */
    72 #define MM_RAM_FLAGS_ROM                RT_BIT(1)
    73 /** MMIO - Memory Mapped I/O.
    74  * All access is trapped and emulated. No physical backing is required, but
    75  * might for various reasons be present.
    76  */
    77 #define MM_RAM_FLAGS_MMIO               RT_BIT(2)
    78 /** MMIO2 - Memory Mapped I/O, variation 2.
    79  * The virtualization is performed using real memory and only catching
    80  * a few accesses for like keeping track for dirty pages.
    81  * @remark Involved in the shadow ROM hack.
    82  */
    83 #define MM_RAM_FLAGS_MMIO2              RT_BIT(3)
    84 
    85 /** Physical backing memory is allocated dynamically. Not set implies a one time static allocation. */
    86 #define MM_RAM_FLAGS_DYNAMIC_ALLOC      RT_BIT(11)
    87 /** @} */
    88 
    89 /** @name MMR3PhysRegisterEx registration type
    90  * @{
    91  */
    92 typedef enum
    93 {
    94     /** Normal physical region (flags specify exact page type) */
    95     MM_PHYS_TYPE_NORMAL               = 0,
    96     /** Allocate part of a dynamically allocated physical region */
    97     MM_PHYS_TYPE_DYNALLOC_CHUNK,
    98 
    99     MM_PHYS_TYPE_32BIT_HACK = 0x7fffffff
    100 } MMPHYSREG;
    101 /** @} */
    102 #endif /* !VBOX_WITH_NEW_PHYS_CODE */
    10345
    10446/**
    … …  
    332274
    333275/** @defgroup grp_mm_phys   Guest Physical Memory Manager
     276 * @todo retire this group, elimintating or moving MMR3PhysGetRamSize to PGMPhys.
    334277 * @ingroup grp_mm_r3
    335278 * @{ */
    336 #ifndef VBOX_WITH_NEW_PHYS_CODE
    337 VMMR3DECL(int)      MMR3PhysRegisterEx(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, MMPHYSREG enmType, const char *pszDesc);
    338 VMMR3DECL(int)      MMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const void *pvBinary, bool fShadow, const char *pszDesc);
    339 VMMR3DECL(int)      MMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange);
    340 VMMR3DECL(int)      MMR3PhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc);
    341 #endif
    342279VMMR3DECL(uint64_t) MMR3PhysGetRamSize(PVM pVM);
    343280/** @} */

  • trunk/include/VBox/param.h

    r18617 r18660  
    6363#define MM_RAM_MIN                  UINT32_C(0x00400000)
    6464/** The maximum guest RAM size in bytes. */
    65 #if HC_ARCH_BITS == 64 && defined(VBOX_WITH_NEW_PHYS_CODE)
     65#if HC_ARCH_BITS == 64
    6666# define MM_RAM_MAX                 UINT64_C(0x400000000)
    6767#else
    … …  
    7171#define MM_RAM_MIN_IN_MB            UINT32_C(4)
    7272/** The maximum guest RAM size in MBs. */
    73 #if HC_ARCH_BITS == 64 && defined(VBOX_WITH_NEW_PHYS_CODE)
     73#if HC_ARCH_BITS == 64
    7474# define MM_RAM_MAX_IN_MB           UINT32_C(16384)
    7575#else

  • trunk/include/VBox/pdmdev.h

    r18645 r18660  
    4141#include <VBox/cfgm.h>
    4242#include <VBox/dbgf.h>
    43 #ifndef VBOX_WITH_NEW_PHYS_CODE
    44 # include <VBox/mm.h>
    45 #endif
    4643#include <VBox/err.h>
    4744#include <VBox/pci.h>

  • trunk/include/VBox/pgm.h

    r18291 r18660  
    386386#endif
    387387VMMDECL(int)        PGMPhysGCPtr2R3Ptr(PVM pVM, RTGCPTR GCPtr, PRTR3PTR pR3Ptr);
    388 #ifdef VBOX_WITH_NEW_PHYS_CODE
    389388VMMDECL(int)        PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
    390389VMMDECL(int)        PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);
    391 #else
    392 VMMDECL(void)       PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
    393 VMMDECL(void)       PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);
    394 #endif
    395390VMMDECL(int)        PGMPhysSimpleReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb);
    396391#ifndef IN_RC /* Only ring 0 & 3. */
    … …  
    475470VMMR3DECL(int)      PGMR3ChangeMode(PVM pVM, PGMMODE enmGuestMode);
    476471
    477 #ifndef VBOX_WITH_NEW_PHYS_CODE
    478 VMMR3DECL(int)      PGM3PhysGrowRange(PVM pVM, PCRTGCPHYS GCPhys);
    479 #endif /* !VBOX_WITH_NEW_PHYS_CODE */
    480472VMMR3DECL(int)      PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc);
    481473VMMR3DECL(int)      PGMR3PhysMMIORegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb,
    … …  
    506498VMMR3DECL(int)      PGMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, PGMROMPROT enmProt);
    507499VMMR3DECL(int)      PGMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc);
    508 #ifndef VBOX_WITH_NEW_PHYS_CODE
    509 VMMR3DECL(int)      PGMR3PhysRegisterChunk(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc);
    510 VMMR3DECL(int)      PGMR3PhysSetFlags(PVM pVM, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, unsigned fMask);
    511 #endif /* !VBOX_WITH_NEW_PHYS_CODE */
    512500VMMDECL(void)       PGMR3PhysSetA20(PVM pVM, bool fEnable);
    513501/** @name PGMR3MapPT flags.

  • trunk/include/VBox/rem.h

    r17538 r18660  
    8484#define REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2  RT_BIT(17)
    8585/** @} */
    86 #ifndef VBOX_WITH_NEW_PHYS_CODE
    87 REMR3DECL(void) REMR3NotifyPhysRamChunkRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, RTHCUINTPTR pvRam, unsigned fFlags);
    88 #endif
    8986REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow);
    9087REMR3DECL(void) REMR3NotifyPhysRamDeregister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb);

  • trunk/include/VBox/vmm.h

    r17422 r18660  
    9494    /** Allocates more handy pages. */
    9595    VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES,
    96 #ifndef VBOX_WITH_NEW_PHYS_CODE
    97     /** Dynamically allocate physical guest RAM. */
    98     VMMCALLHOST_PGM_RAM_GROW_RANGE,
    99 #endif
    10096    /** Replay the REM handler notifications. */
    10197    VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS,
Note: See TracChangeset for help on using the changeset viewer.

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