VirtualBox

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


Ignore:
Timestamp:
Oct 6, 2008 2:15:39 AM (16 years ago)
Author:
vboxsync
Message:

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

Location:
trunk/src/VBox/VMM
Files:
111 edited

Legend:

Unmodified
Added
Removed

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

    r12635 r12989  
    9696 * @thread  EMT.
    9797 */
    98 CFGMR3DECL(int) CFGMR3Init(PVM pVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUser)
     98VMMR3DECL(int) CFGMR3Init(PVM pVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUser)
    9999{
    100100    LogFlow(("CFGMR3Init: pfnCFGMConstructor=%p pvUser=%p\n", pfnCFGMConstructor, pvUser));
    … …  
    151151 * @param   pVM             VM handle.
    152152 */
    153 CFGMR3DECL(int) CFGMR3Term(PVM pVM)
     153VMMR3DECL(int) CFGMR3Term(PVM pVM)
    154154{
    155155    CFGMR3RemoveNode(pVM->cfgm.s.pRoot);
    … …  
    165165 * @param   pVM             VM handle.
    166166 */
    167 CFGMR3DECL(PCFGMNODE) CFGMR3GetRoot(PVM pVM)
     167VMMR3DECL(PCFGMNODE) CFGMR3GetRoot(PVM pVM)
    168168{
    169169    return pVM->cfgm.s.pRoot;
    … …  
    180180 * @param   pNode           The node which parent we query.
    181181 */
    182 CFGMR3DECL(PCFGMNODE) CFGMR3GetParent(PCFGMNODE pNode)
     182VMMR3DECL(PCFGMNODE) CFGMR3GetParent(PCFGMNODE pNode)
    183183{
    184184    if (pNode && !pNode->fRestrictedRoot)
    … …  
    197197 * @param   pNode           The node which parent we query.
    198198 */
    199 CFGMR3DECL(PCFGMNODE) CFGMR3GetParentEx(PVM pVM, PCFGMNODE pNode)
     199VMMR3DECL(PCFGMNODE) CFGMR3GetParentEx(PVM pVM, PCFGMNODE pNode)
    200200{
    201201    if (pNode && pNode->pVM == pVM)
    … …  
    214214 *                          It's good style to end this with '/'.
    215215 */
    216 CFGMR3DECL(PCFGMNODE) CFGMR3GetChild(PCFGMNODE pNode, const char *pszPath)
     216VMMR3DECL(PCFGMNODE) CFGMR3GetChild(PCFGMNODE pNode, const char *pszPath)
    217217{
    218218    PCFGMNODE pChild;
    … …  
    234234 * @param   ...             Arguments to pszPathFormat.
    235235 */
    236 CFGMR3DECL(PCFGMNODE) CFGMR3GetChildF(PCFGMNODE pNode, const char *pszPathFormat, ...)
     236VMMR3DECL(PCFGMNODE) CFGMR3GetChildF(PCFGMNODE pNode, const char *pszPathFormat, ...)
    237237{
    238238    va_list Args;
    … …  
    254254 * @param   Args            Arguments to pszPathFormat.
    255255 */
    256 CFGMR3DECL(PCFGMNODE) CFGMR3GetChildFV(PCFGMNODE pNode, const char *pszPathFormat, va_list Args)
     256VMMR3DECL(PCFGMNODE) CFGMR3GetChildFV(PCFGMNODE pNode, const char *pszPathFormat, va_list Args)
    257257{
    258258    char *pszPath;
    … …  
    278278 * @param   pNode           Node to enumerate children for.
    279279 */
    280 CFGMR3DECL(PCFGMNODE) CFGMR3GetFirstChild(PCFGMNODE pNode)
     280VMMR3DECL(PCFGMNODE) CFGMR3GetFirstChild(PCFGMNODE pNode)
    281281{
    282282    return pNode ? pNode->pFirstChild : NULL;
    … …  
    293293 *                          or successive calls to this function.
    294294 */
    295 CFGMR3DECL(PCFGMNODE) CFGMR3GetNextChild(PCFGMNODE pCur)
     295VMMR3DECL(PCFGMNODE) CFGMR3GetNextChild(PCFGMNODE pCur)
    296296{
    297297    return pCur ? pCur->pNext : NULL;
    … …  
    309309 * @param   cchName         Size of the buffer pointed to by pszName (with terminator).
    310310 */
    311 CFGMR3DECL(int) CFGMR3GetName(PCFGMNODE pCur, char *pszName, size_t cchName)
     311VMMR3DECL(int) CFGMR3GetName(PCFGMNODE pCur, char *pszName, size_t cchName)
    312312{
    313313    int rc;
    … …  
    337337 *                          or successive calls to CFGMR3GetNextChild().
    338338 */
    339 CFGMR3DECL(int) CFGMR3GetNameLen(PCFGMNODE pCur)
     339VMMR3DECL(int) CFGMR3GetNameLen(PCFGMNODE pCur)
    340340{
    341341    return pCur ? pCur->cchName + 1 : 0;
    … …  
    352352 *                          a double '\\0'.
    353353 */
    354 CFGMR3DECL(bool) CFGMR3AreChildrenValid(PCFGMNODE pNode, const char *pszzValid)
     354VMMR3DECL(bool) CFGMR3AreChildrenValid(PCFGMNODE pNode, const char *pszzValid)
    355355{
    356356    if (pNode)
    … …  
    392392 * @param   pCur            The node (Key) which values to enumerate.
    393393 */
    394 CFGMR3DECL(PCFGMLEAF) CFGMR3GetFirstValue(PCFGMNODE pCur)
     394VMMR3DECL(PCFGMLEAF) CFGMR3GetFirstValue(PCFGMNODE pCur)
    395395{
    396396    return pCur ? pCur->pFirstLeaf : NULL;
    … …  
    403403 * @param   pCur            The current value as returned by this function or CFGMR3GetFirstValue().
    404404 */
    405 CFGMR3DECL(PCFGMLEAF) CFGMR3GetNextValue(PCFGMLEAF pCur)
     405VMMR3DECL(PCFGMLEAF) CFGMR3GetNextValue(PCFGMLEAF pCur)
    406406{
    407407    return pCur ? pCur->pNext : NULL;
    … …  
    418418 * @param   cchName         Size of the buffer pointed to by pszName (with terminator).
    419419 */
    420 CFGMR3DECL(int) CFGMR3GetValueName(PCFGMLEAF pCur, char *pszName, size_t cchName)
     420VMMR3DECL(int) CFGMR3GetValueName(PCFGMLEAF pCur, char *pszName, size_t cchName)
    421421{
    422422    int rc;
    … …  
    446446 *                          or successive calls to CFGMR3GetNextValue().
    447447 */
    448 CFGMR3DECL(int) CFGMR3GetValueNameLen(PCFGMLEAF pCur)
     448VMMR3DECL(int) CFGMR3GetValueNameLen(PCFGMLEAF pCur)
    449449{
    450450    return pCur ? pCur->cchName + 1 : 0;
    … …  
    459459 *                          or successive calls to CFGMR3GetNextValue().
    460460 */
    461 CFGMR3DECL(CFGMVALUETYPE) CFGMR3GetValueType(PCFGMLEAF pCur)
     461VMMR3DECL(CFGMVALUETYPE) CFGMR3GetValueType(PCFGMLEAF pCur)
    462462{
    463463    Assert(pCur);
    … …  
    475475 *                          a double '\\0'.
    476476 */
    477 CFGMR3DECL(bool) CFGMR3AreValuesValid(PCFGMNODE pNode, const char *pszzValid)
     477VMMR3DECL(bool) CFGMR3AreValuesValid(PCFGMNODE pNode, const char *pszzValid)
    478478{
    479479    if (pNode)
    … …  
    517517 * @param   penmType        Where to store the type.
    518518 */
    519 CFGMR3DECL(int) CFGMR3QueryType(PCFGMNODE pNode, const char *pszName, PCFGMVALUETYPE penmType)
     519VMMR3DECL(int) CFGMR3QueryType(PCFGMNODE pNode, const char *pszName, PCFGMVALUETYPE penmType)
    520520{
    521521    PCFGMLEAF pLeaf;
    … …  
    539539 * @param   pcb             Where to store the value size.
    540540 */
    541 CFGMR3DECL(int) CFGMR3QuerySize(PCFGMNODE pNode, const char *pszName, size_t *pcb)
     541VMMR3DECL(int) CFGMR3QuerySize(PCFGMNODE pNode, const char *pszName, size_t *pcb)
    542542{
    543543    PCFGMLEAF pLeaf;
    … …  
    577577 * @param   pu64            Where to store the integer value.
    578578 */
    579 CFGMR3DECL(int) CFGMR3QueryInteger(PCFGMNODE pNode, const char *pszName, uint64_t *pu64)
     579VMMR3DECL(int) CFGMR3QueryInteger(PCFGMNODE pNode, const char *pszName, uint64_t *pu64)
    580580{
    581581    PCFGMLEAF pLeaf;
    … …  
    601601 * @param   u64Def          The default value.
    602602 */
    603 CFGMR3DECL(int) CFGMR3QueryIntegerDef(PCFGMNODE pNode, const char *pszName, uint64_t *pu64, uint64_t u64Def)
     603VMMR3DECL(int) CFGMR3QueryIntegerDef(PCFGMNODE pNode, const char *pszName, uint64_t *pu64, uint64_t u64Def)
    604604{
    605605    PCFGMLEAF pLeaf;
    … …  
    633633 * @param   cchString       Size of the string buffer. (Includes terminator.)
    634634 */
    635 CFGMR3DECL(int) CFGMR3QueryString(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString)
     635VMMR3DECL(int) CFGMR3QueryString(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString)
    636636{
    637637    PCFGMLEAF pLeaf;
    … …  
    666666 * @param   pszDef          The default value.
    667667 */
    668 CFGMR3DECL(int) CFGMR3QueryStringDef(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString, const char *pszDef)
     668VMMR3DECL(int) CFGMR3QueryStringDef(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString, const char *pszDef)
    669669{
    670670    PCFGMLEAF pLeaf;
    … …  
    713713 * @param   cbData          Size of buffer pvData points too.
    714714 */
    715 CFGMR3DECL(int) CFGMR3QueryBytes(PCFGMNODE pNode, const char *pszName, void *pvData, size_t cbData)
     715VMMR3DECL(int) CFGMR3QueryBytes(PCFGMNODE pNode, const char *pszName, void *pvData, size_t cbData)
    716716{
    717717    PCFGMLEAF pLeaf;
    … …  
    11041104 * @param   pVM         The VM handle.
    11051105 */
    1106 CFGMR3DECL(PCFGMNODE) CFGMR3CreateTree(PVM pVM)
     1106VMMR3DECL(PCFGMNODE) CFGMR3CreateTree(PVM pVM)
    11071107{
    11081108    PCFGMNODE pNew = (PCFGMNODE)MMR3HeapAlloc(pVM, MM_TAG_CFGM, sizeof(*pNew));
    … …  
    11411141 * @param   ppChild     Where to store the address of the new child node. (optional)
    11421142 */
    1143 CFGMR3DECL(int) CFGMR3InsertSubTree(PCFGMNODE pNode, const char *pszName, PCFGMNODE pSubTree, PCFGMNODE *ppChild)
     1143VMMR3DECL(int) CFGMR3InsertSubTree(PCFGMNODE pNode, const char *pszName, PCFGMNODE pSubTree, PCFGMNODE *ppChild)
    11441144{
    11451145    /*
    … …  
    11871187 * @param   ppChild     Where to store the address of the new child node. (optional)
    11881188 */
    1189 CFGMR3DECL(int) CFGMR3InsertNode(PCFGMNODE pNode, const char *pszName, PCFGMNODE *ppChild)
     1189VMMR3DECL(int) CFGMR3InsertNode(PCFGMNODE pNode, const char *pszName, PCFGMNODE *ppChild)
    11901190{
    11911191    int rc;
    … …  
    13251325 * @param   ...             Name format arguments.
    13261326 */
    1327 CFGMR3DECL(int) CFGMR3InsertNodeF(PCFGMNODE pNode, PCFGMNODE *ppChild, const char *pszNameFormat, ...)
     1327VMMR3DECL(int) CFGMR3InsertNodeF(PCFGMNODE pNode, PCFGMNODE *ppChild, const char *pszNameFormat, ...)
    13281328{
    13291329    va_list Args;
    … …  
    13441344 * @param   Args            Name format arguments.
    13451345 */
    1346 CFGMR3DECL(int) CFGMR3InsertNodeFV(PCFGMNODE pNode, PCFGMNODE *ppChild, const char *pszNameFormat, va_list Args)
     1346VMMR3DECL(int) CFGMR3InsertNodeFV(PCFGMNODE pNode, PCFGMNODE *ppChild, const char *pszNameFormat, va_list Args)
    13471347{
    13481348    int     rc;
    … …  
    13661366 * @param   pNode       The node to mark.
    13671367 */
    1368 CFGMR3DECL(void) CFGMR3SetRestrictedRoot(PCFGMNODE pNode)
     1368VMMR3DECL(void) CFGMR3SetRestrictedRoot(PCFGMNODE pNode)
    13691369{
    13701370    if (pNode)
    … …  
    14441444 * @param   pNode       Parent node.
    14451445 */
    1446 CFGMR3DECL(void) CFGMR3RemoveNode(PCFGMNODE pNode)
     1446VMMR3DECL(void) CFGMR3RemoveNode(PCFGMNODE pNode)
    14471447{
    14481448    if (pNode)
    … …  
    15601560 * @param   u64Integer      The value.
    15611561 */
    1562 CFGMR3DECL(int) CFGMR3InsertInteger(PCFGMNODE pNode, const char *pszName, uint64_t u64Integer)
     1562VMMR3DECL(int) CFGMR3InsertInteger(PCFGMNODE pNode, const char *pszName, uint64_t u64Integer)
    15631563{
    15641564    PCFGMLEAF pLeaf;
    … …  
    15811581 * @param   pszString       The value.
    15821582 */
    1583 CFGMR3DECL(int) CFGMR3InsertString(PCFGMNODE pNode, const char *pszName, const char *pszString)
     1583VMMR3DECL(int) CFGMR3InsertString(PCFGMNODE pNode, const char *pszName, const char *pszString)
    15841584{
    15851585    int rc;
    … …  
    16271627 * @param   cbBytes         The value size.
    16281628 */
    1629 CFGMR3DECL(int) CFGMR3InsertBytes(PCFGMNODE pNode, const char *pszName, const void *pvBytes, size_t cbBytes)
     1629VMMR3DECL(int) CFGMR3InsertBytes(PCFGMNODE pNode, const char *pszName, const void *pvBytes, size_t cbBytes)
    16301630{
    16311631    int rc;
    … …  
    16741674 * @param   pszName     Name of the new child node.
    16751675 */
    1676 CFGMR3DECL(int) CFGMR3RemoveValue(PCFGMNODE pNode, const char *pszName)
     1676VMMR3DECL(int) CFGMR3RemoveValue(PCFGMNODE pNode, const char *pszName)
    16771677{
    16781678    PCFGMLEAF pLeaf;
    … …  
    16981698 * @param   pu64            Where to store the integer value.
    16991699 */
    1700 CFGMR3DECL(int) CFGMR3QueryU64(PCFGMNODE pNode, const char *pszName, uint64_t *pu64)
     1700VMMR3DECL(int) CFGMR3QueryU64(PCFGMNODE pNode, const char *pszName, uint64_t *pu64)
    17011701{
    17021702    return CFGMR3QueryInteger(pNode, pszName, pu64);
    … …  
    17131713 * @param   u64Def          The default value.
    17141714 */
    1715 CFGMR3DECL(int) CFGMR3QueryU64Def(PCFGMNODE pNode, const char *pszName, uint64_t *pu64, uint64_t u64Def)
     1715VMMR3DECL(int) CFGMR3QueryU64Def(PCFGMNODE pNode, const char *pszName, uint64_t *pu64, uint64_t u64Def)
    17161716{
    17171717    return CFGMR3QueryIntegerDef(pNode, pszName, pu64, u64Def);
    … …  
    17271727 * @param   pi64            Where to store the value.
    17281728 */
    1729 CFGMR3DECL(int) CFGMR3QueryS64(PCFGMNODE pNode, const char *pszName, int64_t *pi64)
     1729VMMR3DECL(int) CFGMR3QueryS64(PCFGMNODE pNode, const char *pszName, int64_t *pi64)
    17301730{
    17311731    uint64_t u64;
    … …  
    17461746 * @param   i64Def          The default value.
    17471747 */
    1748 CFGMR3DECL(int) CFGMR3QueryS64Def(PCFGMNODE pNode, const char *pszName, int64_t *pi64, int64_t i64Def)
     1748VMMR3DECL(int) CFGMR3QueryS64Def(PCFGMNODE pNode, const char *pszName, int64_t *pi64, int64_t i64Def)
    17491749{
    17501750    uint64_t u64;
    … …  
    17641764 * @param   pu32            Where to store the value.
    17651765 */
    1766 CFGMR3DECL(int) CFGMR3QueryU32(PCFGMNODE pNode, const char *pszName, uint32_t *pu32)
     1766VMMR3DECL(int) CFGMR3QueryU32(PCFGMNODE pNode, const char *pszName, uint32_t *pu32)
    17671767{
    17681768    uint64_t u64;
    … …  
    17881788 * @param   u32Def          The default value.
    17891789 */
    1790 CFGMR3DECL(int) CFGMR3QueryU32Def(PCFGMNODE pNode, const char *pszName, uint32_t *pu32, uint32_t u32Def)
     1790VMMR3DECL(int) CFGMR3QueryU32Def(PCFGMNODE pNode, const char *pszName, uint32_t *pu32, uint32_t u32Def)
    17911791{
    17921792    uint64_t u64;
    … …  
    18111811 * @param   pi32            Where to store the value.
    18121812 */
    1813 CFGMR3DECL(int) CFGMR3QueryS32(PCFGMNODE pNode, const char *pszName, int32_t *pi32)
     1813VMMR3DECL(int) CFGMR3QueryS32(PCFGMNODE pNode, const char *pszName, int32_t *pi32)
    18141814{
    18151815    uint64_t u64;
    … …  
    18361836 * @param   i32Def          The default value.
    18371837 */
    1838 CFGMR3DECL(int) CFGMR3QueryS32Def(PCFGMNODE pNode, const char *pszName, int32_t *pi32, int32_t i32Def)
     1838VMMR3DECL(int) CFGMR3QueryS32Def(PCFGMNODE pNode, const char *pszName, int32_t *pi32, int32_t i32Def)
    18391839{
    18401840    uint64_t u64;
    … …  
    18601860 * @param   pu16            Where to store the value.
    18611861 */
    1862 CFGMR3DECL(int) CFGMR3QueryU16(PCFGMNODE pNode, const char *pszName, uint16_t *pu16)
     1862VMMR3DECL(int) CFGMR3QueryU16(PCFGMNODE pNode, const char *pszName, uint16_t *pu16)
    18631863{
    18641864    uint64_t u64;
    … …  
    18841884 * @param   i16Def          The default value.
    18851885 */
    1886 CFGMR3DECL(int) CFGMR3QueryU16Def(PCFGMNODE pNode, const char *pszName, uint16_t *pu16, uint16_t u16Def)
     1886VMMR3DECL(int) CFGMR3QueryU16Def(PCFGMNODE pNode, const char *pszName, uint16_t *pu16, uint16_t u16Def)
    18871887{
    18881888    uint64_t u64;
    … …  
    19071907 * @param   pi16            Where to store the value.
    19081908 */
    1909 CFGMR3DECL(int) CFGMR3QueryS16(PCFGMNODE pNode, const char *pszName, int16_t *pi16)
     1909VMMR3DECL(int) CFGMR3QueryS16(PCFGMNODE pNode, const char *pszName, int16_t *pi16)
    19101910{
    19111911    uint64_t u64;
    … …  
    19321932 * @param   i16Def          The default value.
    19331933 */
    1934 CFGMR3DECL(int) CFGMR3QueryS16Def(PCFGMNODE pNode, const char *pszName, int16_t *pi16, int16_t i16Def)
     1934VMMR3DECL(int) CFGMR3QueryS16Def(PCFGMNODE pNode, const char *pszName, int16_t *pi16, int16_t i16Def)
    19351935{
    19361936    uint64_t u64;
    … …  
    19561956 * @param   pu8             Where to store the value.
    19571957 */
    1958 CFGMR3DECL(int) CFGMR3QueryU8(PCFGMNODE pNode, const char *pszName, uint8_t *pu8)
     1958VMMR3DECL(int) CFGMR3QueryU8(PCFGMNODE pNode, const char *pszName, uint8_t *pu8)
    19591959{
    19601960    uint64_t u64;
    … …  
    19801980 * @param   u8Def           The default value.
    19811981 */
    1982 CFGMR3DECL(int) CFGMR3QueryU8Def(PCFGMNODE pNode, const char *pszName, uint8_t *pu8, uint8_t u8Def)
     1982VMMR3DECL(int) CFGMR3QueryU8Def(PCFGMNODE pNode, const char *pszName, uint8_t *pu8, uint8_t u8Def)
    19831983{
    19841984    uint64_t u64;
    … …  
    20032003 * @param   pi8             Where to store the value.
    20042004 */
    2005 CFGMR3DECL(int) CFGMR3QueryS8(PCFGMNODE pNode, const char *pszName, int8_t *pi8)
     2005VMMR3DECL(int) CFGMR3QueryS8(PCFGMNODE pNode, const char *pszName, int8_t *pi8)
    20062006{
    20072007    uint64_t u64;
    … …  
    20282028 * @param   i8Def           The default value.
    20292029 */
    2030 CFGMR3DECL(int) CFGMR3QueryS8Def(PCFGMNODE pNode, const char *pszName, int8_t *pi8, int8_t i8Def)
     2030VMMR3DECL(int) CFGMR3QueryS8Def(PCFGMNODE pNode, const char *pszName, int8_t *pi8, int8_t i8Def)
    20312031{
    20322032    uint64_t u64;
    … …  
    20532053 * @remark  This function will interpret any non-zero value as true.
    20542054 */
    2055 CFGMR3DECL(int) CFGMR3QueryBool(PCFGMNODE pNode, const char *pszName, bool *pf)
     2055VMMR3DECL(int) CFGMR3QueryBool(PCFGMNODE pNode, const char *pszName, bool *pf)
    20562056{
    20572057    uint64_t u64;
    … …  
    20732073 * @remark  This function will interpret any non-zero value as true.
    20742074 */
    2075 CFGMR3DECL(int) CFGMR3QueryBoolDef(PCFGMNODE pNode, const char *pszName, bool *pf, bool fDef)
     2075VMMR3DECL(int) CFGMR3QueryBoolDef(PCFGMNODE pNode, const char *pszName, bool *pf, bool fDef)
    20762076{
    20772077    uint64_t u64;
    … …  
    20912091 * @param   pPort           Where to store the value.
    20922092 */
    2093 CFGMR3DECL(int) CFGMR3QueryPort(PCFGMNODE pNode, const char *pszName, PRTIOPORT pPort)
     2093VMMR3DECL(int) CFGMR3QueryPort(PCFGMNODE pNode, const char *pszName, PRTIOPORT pPort)
    20942094{
    20952095    AssertCompileSize(RTIOPORT, 2);
    … …  
    21072107 * @param   PortDef         The default value.
    21082108 */
    2109 CFGMR3DECL(int) CFGMR3QueryPortDef(PCFGMNODE pNode, const char *pszName, PRTIOPORT pPort, RTIOPORT PortDef)
     2109VMMR3DECL(int) CFGMR3QueryPortDef(PCFGMNODE pNode, const char *pszName, PRTIOPORT pPort, RTIOPORT PortDef)
    21102110{
    21112111    AssertCompileSize(RTIOPORT, 2);
    … …  
    21222122 * @param   pu              Where to store the value.
    21232123 */
    2124 CFGMR3DECL(int) CFGMR3QueryUInt(PCFGMNODE pNode, const char *pszName, unsigned int *pu)
     2124VMMR3DECL(int) CFGMR3QueryUInt(PCFGMNODE pNode, const char *pszName, unsigned int *pu)
    21252125{
    21262126    AssertCompileSize(unsigned int, 4);
    … …  
    21382138 * @param   uDef            The default value.
    21392139 */
    2140 CFGMR3DECL(int) CFGMR3QueryUIntDef(PCFGMNODE pNode, const char *pszName, unsigned int *pu, unsigned int uDef)
     2140VMMR3DECL(int) CFGMR3QueryUIntDef(PCFGMNODE pNode, const char *pszName, unsigned int *pu, unsigned int uDef)
    21412141{
    21422142    AssertCompileSize(unsigned int, 4);
    … …  
    21532153 * @param   pi              Where to store the value.
    21542154 */
    2155 CFGMR3DECL(int) CFGMR3QuerySInt(PCFGMNODE pNode, const char *pszName, signed int *pi)
     2155VMMR3DECL(int) CFGMR3QuerySInt(PCFGMNODE pNode, const char *pszName, signed int *pi)
    21562156{
    21572157    AssertCompileSize(signed int, 4);
    … …  
    21692169 * @param   iDef            The default value.
    21702170 */
    2171 CFGMR3DECL(int) CFGMR3QuerySIntDef(PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef)
     2171VMMR3DECL(int) CFGMR3QuerySIntDef(PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef)
    21722172{
    21732173    AssertCompileSize(signed int, 4);
    … …  
    21842184 * @param   ppv             Where to store the value.
    21852185 */
    2186 CFGMR3DECL(int) CFGMR3QueryPtr(PCFGMNODE pNode, const char *pszName, void **ppv)
     2186VMMR3DECL(int) CFGMR3QueryPtr(PCFGMNODE pNode, const char *pszName, void **ppv)
    21872187{
    21882188    uint64_t u64;
    … …  
    22092209 * @param   pvDef           The default value.
    22102210 */
    2211 CFGMR3DECL(int) CFGMR3QueryPtrDef(PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef)
     2211VMMR3DECL(int) CFGMR3QueryPtrDef(PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef)
    22122212{
    22132213    uint64_t u64;
    … …  
    22332233 * @param   pGCPtr          Where to store the value.
    22342234 */
    2235 CFGMR3DECL(int) CFGMR3QueryGCPtr(PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr)
     2235VMMR3DECL(int) CFGMR3QueryGCPtr(PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr)
    22362236{
    22372237    uint64_t u64;
    … …  
    22582258 * @param   GCPtrDef        The default value.
    22592259 */
    2260 CFGMR3DECL(int) CFGMR3QueryGCPtrDef(PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef)
     2260VMMR3DECL(int) CFGMR3QueryGCPtrDef(PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef)
    22612261{
    22622262    uint64_t u64;
    … …  
    22822282 * @param   pGCPtr          Where to store the value.
    22832283 */
    2284 CFGMR3DECL(int) CFGMR3QueryGCPtrU(PCFGMNODE pNode, const char *pszName, PRTGCUINTPTR pGCPtr)
     2284VMMR3DECL(int) CFGMR3QueryGCPtrU(PCFGMNODE pNode, const char *pszName, PRTGCUINTPTR pGCPtr)
    22852285{
    22862286    uint64_t u64;
    … …  
    23072307 * @param   GCPtrDef        The default value.
    23082308 */
    2309 CFGMR3DECL(int) CFGMR3QueryGCPtrUDef(PCFGMNODE pNode, const char *pszName, PRTGCUINTPTR pGCPtr, RTGCUINTPTR GCPtrDef)
     2309VMMR3DECL(int) CFGMR3QueryGCPtrUDef(PCFGMNODE pNode, const char *pszName, PRTGCUINTPTR pGCPtr, RTGCUINTPTR GCPtrDef)
    23102310{
    23112311    uint64_t u64;
    … …  
    23312331 * @param   pGCPtr          Where to store the value.
    23322332 */
    2333 CFGMR3DECL(int) CFGMR3QueryGCPtrS(PCFGMNODE pNode, const char *pszName, PRTGCINTPTR pGCPtr)
     2333VMMR3DECL(int) CFGMR3QueryGCPtrS(PCFGMNODE pNode, const char *pszName, PRTGCINTPTR pGCPtr)
    23342334{
    23352335    uint64_t u64;
    … …  
    23562356 * @param   GCPtrDef        The default value.
    23572357 */
    2358 CFGMR3DECL(int) CFGMR3QueryGCPtrSDef(PCFGMNODE pNode, const char *pszName, PRTGCINTPTR pGCPtr, RTGCINTPTR GCPtrDef)
     2358VMMR3DECL(int) CFGMR3QueryGCPtrSDef(PCFGMNODE pNode, const char *pszName, PRTGCINTPTR pGCPtr, RTGCINTPTR GCPtrDef)
    23592359{
    23602360    uint64_t u64;
    … …  
    23822382 *                          Free this using MMR3HeapFree().
    23832383 */
    2384 CFGMR3DECL(int) CFGMR3QueryStringAlloc(PCFGMNODE pNode, const char *pszName, char **ppszString)
     2384VMMR3DECL(int) CFGMR3QueryStringAlloc(PCFGMNODE pNode, const char *pszName, char **ppszString)
    23852385{
    23862386    size_t cch;
    … …  
    24142414 *                          Free this using MMR3HeapFree().
    24152415 */
    2416 CFGMR3DECL(int) CFGMR3QueryStringAllocDef(PCFGMNODE pNode, const char *pszName, char **ppszString, const char *pszDef)
     2416VMMR3DECL(int) CFGMR3QueryStringAllocDef(PCFGMNODE pNode, const char *pszName, char **ppszString, const char *pszDef)
    24172417{
    24182418    size_t cch;
    … …  
    24462446 * @param   pRoot   The root node of the dump.
    24472447 */
    2448 CFGMR3DECL(void) CFGMR3Dump(PCFGMNODE pRoot)
     2448VMMR3DECL(void) CFGMR3Dump(PCFGMNODE pRoot)
    24492449{
    24502450    LogRel(("************************* CFGM dump *************************\n"));

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

    r12971 r12989  
    108108 * @param   pVM         The VM to operate on.
    109109 */
    110 CPUMR3DECL(int) CPUMR3Init(PVM pVM)
     110VMMR3DECL(int) CPUMR3Init(PVM pVM)
    111111{
    112112    LogFlow(("CPUMR3Init\n"));
    … …  
    600600 * @param   pVM     The VM.
    601601 */
    602 CPUMR3DECL(void) CPUMR3Relocate(PVM pVM)
     602VMMR3DECL(void) CPUMR3Relocate(PVM pVM)
    603603{
    604604    LogFlow(("CPUMR3Relocate\n"));
    … …  
    618618 * @param   ppCtx       Receives the CPUMCTX GC pointer when successful.
    619619 */
    620 CPUMR3DECL(int) CPUMR3QueryGuestCtxGCPtr(PVM pVM, RCPTRTYPE(PCPUMCTX) *ppCtx)
     620VMMR3DECL(int) CPUMR3QueryGuestCtxGCPtr(PVM pVM, RCPTRTYPE(PCPUMCTX) *ppCtx)
    621621{
    622622    LogFlow(("CPUMR3QueryGuestCtxGCPtr\n"));
    … …  
    638638 * @param   pVM         The VM to operate on.
    639639 */
    640 CPUMR3DECL(int) CPUMR3Term(PVM pVM)
     640VMMR3DECL(int) CPUMR3Term(PVM pVM)
    641641{
    642642    /** @todo ? */
    … …  
    651651 * @param   pVM         The VM handle.
    652652 */
    653 CPUMR3DECL(void) CPUMR3Reset(PVM pVM)
     653VMMR3DECL(void) CPUMR3Reset(PVM pVM)
    654654{
    655655    PCPUMCTX pCtx = &pVM->cpum.s.Guest;
    … …  
    21502150 *
    21512151 */
    2152 CPUMR3DECL(int) CPUMR3DisasmInstrCPU(PVM pVM, PCPUMCTX pCtx, RTGCPTR GCPtrPC, PDISCPUSTATE pCpu, const char *pszPrefix)
     2152VMMR3DECL(int) CPUMR3DisasmInstrCPU(PVM pVM, PCPUMCTX pCtx, RTGCPTR GCPtrPC, PDISCPUSTATE pCpu, const char *pszPrefix)
    21532153{
    21542154    CPUMDISASSTATE  State;
    … …  
    22632263 * @deprecated  Use DBGFR3DisasInstrCurrentLog().
    22642264 */
    2265 CPUMR3DECL(void) CPUMR3DisasmInstr(PVM pVM, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix)
     2265VMMR3DECL(void) CPUMR3DisasmInstr(PVM pVM, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix)
    22662266{
    22672267    DISCPUSTATE Cpu;
    … …  
    22822282 * @deprecated  Create new DBGFR3Disas function to do this.
    22832283 */
    2284 CPUMR3DECL(void) CPUMR3DisasmBlock(PVM pVM, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix, int nrInstructions)
     2284VMMR3DECL(void) CPUMR3DisasmBlock(PVM pVM, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix, int nrInstructions)
    22852285{
    22862286    for (int i = 0; i < nrInstructions; i++)
    … …  
    22992299 * @internal
    23002300 */
    2301 CPUMR3DECL(void) CPUMR3SaveEntryCtx(PVM pVM)
     2301VMMR3DECL(void) CPUMR3SaveEntryCtx(PVM pVM)
    23022302{
    23032303    pVM->cpum.s.GuestEntry = pVM->cpum.s.Guest;
    … …  
    23172317 * @param   fAnd    The CR4 AND mask.
    23182318 */
    2319 CPUMR3DECL(int) CPUMR3SetCR4Feature(PVM pVM, RTHCUINTREG fOr, RTHCUINTREG fAnd)
     2319VMMR3DECL(int) CPUMR3SetCR4Feature(PVM pVM, RTHCUINTREG fOr, RTHCUINTREG fAnd)
    23202320{
    23212321    AssertMsgReturn(!(fOr & ~(X86_CR4_TSD)), ("%#x\n", fOr), VERR_INVALID_PARAMETER);

  • trunk/src/VBox/VMM/CPUMInternal.h

    r12659 r12989  
    2727#include <VBox/x86.h>
    2828
    29 
    30 #if !defined(IN_CPUM_R3) && !defined(IN_CPUM_R0) && !defined(IN_CPUM_GC)
    31 # error "Not in CPUM! This is an internal header!"
    32 #endif
    3329
    3430

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

    r12897 r12989  
    3535
    3636
    37 CPUMDECL(void) CPUMPushHyper(PVM pVM, uint32_t u32)
     37VMMDECL(void) CPUMPushHyper(PVM pVM, uint32_t u32)
    3838{
    3939    /* ASSUME always on flat stack within hypervisor memory for now */

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

    r12896 r12989  
    132132 * @param   pVM     VM handle.
    133133 */
    134 DBGFR3DECL(int) DBGFR3Init(PVM pVM)
     134VMMR3DECL(int) DBGFR3Init(PVM pVM)
    135135{
    136136    int rc = dbgfR3InfoInit(pVM);
    … …  
    149149 * @param   pVM     VM Handle.
    150150 */
    151 DBGFR3DECL(int) DBGFR3Term(PVM pVM)
     151VMMR3DECL(int) DBGFR3Term(PVM pVM)
    152152{
    153153    int rc;
    … …  
    218218 * @param   offDelta    Relocation delta relative to old location.
    219219 */
    220 DBGFR3DECL(void) DBGFR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     220VMMR3DECL(void) DBGFR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    221221{
    222222}
    … …  
    281281 * @param   pVM         VM Handle.
    282282 */
    283 DBGFR3DECL(int) DBGFR3VMMForcedAction(PVM pVM)
     283VMMR3DECL(int) DBGFR3VMMForcedAction(PVM pVM)
    284284{
    285285    /*
    … …  
    424424 * @param   enmEvent    The event to send.
    425425 */
    426 DBGFR3DECL(int) DBGFR3Event(PVM pVM, DBGFEVENTTYPE enmEvent)
     426VMMR3DECL(int) DBGFR3Event(PVM pVM, DBGFEVENTTYPE enmEvent)
    427427{
    428428    int rc = dbgfR3EventPrologue(pVM, enmEvent);
    … …  
    451451 * @param   ...         Message arguments.
    452452 */
    453 DBGFR3DECL(int) DBGFR3EventSrc(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszFile, unsigned uLine, const char *pszFunction, const char *pszFormat, ...)
     453VMMR3DECL(int) DBGFR3EventSrc(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszFile, unsigned uLine, const char *pszFunction, const char *pszFormat, ...)
    454454{
    455455    va_list args;
    … …  
    473473 * @param   args        Message arguments.
    474474 */
    475 DBGFR3DECL(int) DBGFR3EventSrcV(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszFile, unsigned uLine, const char *pszFunction, const char *pszFormat, va_list args)
     475VMMR3DECL(int) DBGFR3EventSrcV(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszFile, unsigned uLine, const char *pszFunction, const char *pszFormat, va_list args)
    476476{
    477477    int rc = dbgfR3EventPrologue(pVM, enmEvent);
    … …  
    512512 * @param   pszMsg2     Second assertion message.
    513513 */
    514 DBGFR3DECL(int) DBGFR3EventAssertion(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszMsg1, const char *pszMsg2)
     514VMMR3DECL(int) DBGFR3EventAssertion(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszMsg1, const char *pszMsg2)
    515515{
    516516    int rc = dbgfR3EventPrologue(pVM, enmEvent);
    … …  
    537537 * @param   enmEvent    DBGFEVENT_BREAKPOINT_HYPER or DBGFEVENT_BREAKPOINT.
    538538 */
    539 DBGFR3DECL(int) DBGFR3EventBreakpoint(PVM pVM, DBGFEVENTTYPE enmEvent)
     539VMMR3DECL(int) DBGFR3EventBreakpoint(PVM pVM, DBGFEVENTTYPE enmEvent)
    540540{
    541541    int rc = dbgfR3EventPrologue(pVM, enmEvent);
    … …  
    801801 * @param   pVM     VM Handle.
    802802 */
    803 DBGFR3DECL(int) DBGFR3Attach(PVM pVM)
     803VMMR3DECL(int) DBGFR3Attach(PVM pVM)
    804804{
    805805    /*
    … …  
    868868 * @param   pVM     VM Handle.
    869869 */
    870 DBGFR3DECL(int) DBGFR3Detach(PVM pVM)
     870VMMR3DECL(int) DBGFR3Detach(PVM pVM)
    871871{
    872872    LogFlow(("DBGFR3Detach:\n"));
    … …  
    916916 * @param   ppEvent     Where to store the event pointer.
    917917 */
    918 DBGFR3DECL(int) DBGFR3EventWait(PVM pVM, unsigned cMillies, PCDBGFEVENT *ppEvent)
     918VMMR3DECL(int) DBGFR3EventWait(PVM pVM, unsigned cMillies, PCDBGFEVENT *ppEvent)
    919919{
    920920    /*
    … …  
    948948 * @param   pVM     VM handle.
    949949 */
    950 DBGFR3DECL(int) DBGFR3Halt(PVM pVM)
     950VMMR3DECL(int) DBGFR3Halt(PVM pVM)
    951951{
    952952    /*
    … …  
    975975 * @param   pVM     VM handle.
    976976 */
    977 DBGFR3DECL(bool) DBGFR3IsHalted(PVM pVM)
     977VMMR3DECL(bool) DBGFR3IsHalted(PVM pVM)
    978978{
    979979    AssertReturn(pVM->dbgf.s.fAttached, false);
    … …  
    993993 * @param   pVM     VM handle.
    994994 */
    995 DBGFR3DECL(bool) DBGFR3CanWait(PVM pVM)
     995VMMR3DECL(bool) DBGFR3CanWait(PVM pVM)
    996996{
    997997    AssertReturn(pVM->dbgf.s.fAttached, false);
    … …  
    10081008 * @param   pVM     VM handle.
    10091009 */
    1010 DBGFR3DECL(int) DBGFR3Resume(PVM pVM)
     1010VMMR3DECL(int) DBGFR3Resume(PVM pVM)
    10111011{
    10121012    /*
    … …  
    10361036 * @param   pVM     VM handle.
    10371037 */
    1038 DBGFR3DECL(int) DBGFR3Step(PVM pVM)
     1038VMMR3DECL(int) DBGFR3Step(PVM pVM)
    10391039{
    10401040    /*
    … …  
    10641064 * @thread  EMT
    10651065 */
    1066 DBGFR3DECL(int) DBGFR3PrgStep(PVM pVM)
     1066VMMR3DECL(int) DBGFR3PrgStep(PVM pVM)
    10671067{
    10681068    VM_ASSERT_EMT(pVM);

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

    r12677 r12989  
    5757 * @param   off         The offset part.
    5858 */
    59 DBGFR3DECL(int) DBGFR3AddrFromSelOff(PVM pVM, PDBGFADDRESS pAddress, RTSEL Sel, RTUINTPTR off)
     59VMMR3DECL(int) DBGFR3AddrFromSelOff(PVM pVM, PDBGFADDRESS pAddress, RTSEL Sel, RTUINTPTR off)
    6060{
    6161    pAddress->Sel = Sel;
    … …  
    113113 * @param   FlatPtr     The flat pointer.
    114114 */
    115 DBGFR3DECL(PDBGFADDRESS) DBGFR3AddrFromFlat(PVM pVM, PDBGFADDRESS pAddress, RTGCUINTPTR FlatPtr)
     115VMMR3DECL(PDBGFADDRESS) DBGFR3AddrFromFlat(PVM pVM, PDBGFADDRESS pAddress, RTGCUINTPTR FlatPtr)
    116116{
    117117    pAddress->Sel     = DBGF_SEL_FLAT;
    … …  
    132132 * @param   PhysAddr    The guest physical address.
    133133 */
    134 DBGFR3DECL(void) DBGFR3AddrFromPhys(PVM pVM, PDBGFADDRESS pAddress, RTGCPHYS PhysAddr)
     134VMMR3DECL(void) DBGFR3AddrFromPhys(PVM pVM, PDBGFADDRESS pAddress, RTGCPHYS PhysAddr)
    135135{
    136136    pAddress->Sel     = DBGF_SEL_FLAT;
    … …  
    149149 * @param   pAddress    The address to validate.
    150150 */
    151 DBGFR3DECL(bool) DBGFR3AddrIsValid(PVM pVM, PCDBGFADDRESS pAddress)
     151VMMR3DECL(bool) DBGFR3AddrIsValid(PVM pVM, PCDBGFADDRESS pAddress)
    152152{
    153153    if (!VALID_PTR(pAddress))

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

    r12677 r12989  
    282282 * @thread  Any thread.
    283283 */
    284 DBGFR3DECL(int) DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
     284VMMR3DECL(int) DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
    285285{
    286286    /*
    … …  
    430430 * @thread  Any thread.
    431431 */
    432 DBGFR3DECL(int) DBGFR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable,
     432VMMR3DECL(int) DBGFR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable,
    433433                               uint8_t fType, uint8_t cb, PRTUINT piBp)
    434434{
    … …  
    596596 * @thread  Any thread.
    597597 */
    598 DBGFR3DECL(int) DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
     598VMMR3DECL(int) DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
    599599{
    600600    /*
    … …  
    692692 * @thread  Any thread.
    693693 */
    694 DBGFR3DECL(int) DBGFR3BpClear(PVM pVM, RTUINT iBp)
     694VMMR3DECL(int) DBGFR3BpClear(PVM pVM, RTUINT iBp)
    695695{
    696696    /*
    … …  
    769769 * @thread  Any thread.
    770770 */
    771 DBGFR3DECL(int) DBGFR3BpEnable(PVM pVM, RTUINT iBp)
     771VMMR3DECL(int) DBGFR3BpEnable(PVM pVM, RTUINT iBp)
    772772{
    773773    /*
    … …  
    846846 * @thread  Any thread.
    847847 */
    848 DBGFR3DECL(int) DBGFR3BpDisable(PVM pVM, RTUINT iBp)
     848VMMR3DECL(int) DBGFR3BpDisable(PVM pVM, RTUINT iBp)
    849849{
    850850    /*
    … …  
    922922 * @thread  Any thread but the callback will be called from EMT.
    923923 */
    924 DBGFR3DECL(int) DBGFR3BpEnum(PVM pVM, PFNDBGFBPENUM pfnCallback, void *pvUser)
     924VMMR3DECL(int) DBGFR3BpEnum(PVM pVM, PFNDBGFBPENUM pfnCallback, void *pvUser)
    925925{
    926926    /*

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

    r12677 r12989  
    301301 * @param       pcbInstr        Where to return the size of the instruction.
    302302 */
    303 DBGFR3DECL(int) DBGFR3DisasInstrEx(PVM pVM, RTSEL Sel, RTGCPTR GCPtr, unsigned fFlags, char *pszOutput, uint32_t cchOutput, uint32_t *pcbInstr)
     303VMMR3DECL(int) DBGFR3DisasInstrEx(PVM pVM, RTSEL Sel, RTGCPTR GCPtr, unsigned fFlags, char *pszOutput, uint32_t cchOutput, uint32_t *pcbInstr)
    304304{
    305305    /*
    … …  
    516516 * @param       cchOutput        Size of the output buffer.
    517517 */
    518 DBGFR3DECL(int) DBGFR3DisasInstr(PVM pVM, RTSEL Sel, RTGCPTR GCPtr, char *pszOutput, uint32_t cchOutput)
     518VMMR3DECL(int) DBGFR3DisasInstr(PVM pVM, RTSEL Sel, RTGCPTR GCPtr, char *pszOutput, uint32_t cchOutput)
    519519{
    520520    return DBGFR3DisasInstrEx(pVM, Sel, GCPtr, 0, pszOutput, cchOutput, NULL);
    … …  
    531531 * @param       cchOutput       Size of the output buffer.
    532532 */
    533 DBGFR3DECL(int) DBGFR3DisasInstrCurrent(PVM pVM, char *pszOutput, uint32_t cchOutput)
     533VMMR3DECL(int) DBGFR3DisasInstrCurrent(PVM pVM, char *pszOutput, uint32_t cchOutput)
    534534{
    535535    return DBGFR3DisasInstrEx(pVM, 0, 0, DBGF_DISAS_FLAGS_CURRENT_GUEST, pszOutput, cchOutput, NULL);
    … …  
    545545 * @param       pszPrefix       Short prefix string to the dissassembly string. (optional)
    546546 */
    547 DBGFR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVM pVM, const char *pszPrefix)
     547VMMR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVM pVM, const char *pszPrefix)
    548548{
    549549    char szBuf[256];
    … …  
    571571 * @param       GCPtr           The code address relative to the base of Sel.
    572572 */
    573 DBGFR3DECL(int) DBGFR3DisasInstrLogInternal(PVM pVM, RTSEL Sel, RTGCPTR GCPtr)
     573VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVM pVM, RTSEL Sel, RTGCPTR GCPtr)
    574574{
    575575    char szBuf[256];

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

    r12677 r12989  
    138138 * @returns Pointer to the logger info helper.
    139139 */
    140 DBGFR3DECL(PCDBGFINFOHLP) DBGFR3InfoLogHlp(void)
     140VMMR3DECL(PCDBGFINFOHLP) DBGFR3InfoLogHlp(void)
    141141{
    142142    return &g_dbgfR3InfoLogHlp;
    … …  
    168168 * @returns Pointer to the release logger info helper.
    169169 */
    170 DBGFR3DECL(PCDBGFINFOHLP) DBGFR3InfoLogRelHlp(void)
     170VMMR3DECL(PCDBGFINFOHLP) DBGFR3InfoLogRelHlp(void)
    171171{
    172172    return &g_dbgfR3InfoLogRelHlp;
    … …  
    253253 * @param   pDevIns     The device instance owning the info.
    254254 */
    255 DBGFR3DECL(int) DBGFR3InfoRegisterDevice(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERDEV pfnHandler, PPDMDEVINS pDevIns)
     255VMMR3DECL(int) DBGFR3InfoRegisterDevice(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERDEV pfnHandler, PPDMDEVINS pDevIns)
    256256{
    257257    LogFlow(("DBGFR3InfoRegisterDevice: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p pDevIns=%p\n",
    … …  
    299299 * @param   pDrvIns     The driver instance owning the info.
    300300 */
    301 DBGFR3DECL(int) DBGFR3InfoRegisterDriver(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERDRV pfnHandler, PPDMDRVINS pDrvIns)
     301VMMR3DECL(int) DBGFR3InfoRegisterDriver(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERDRV pfnHandler, PPDMDRVINS pDrvIns)
    302302{
    303303    LogFlow(("DBGFR3InfoRegisterDriver: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p pDrvIns=%p\n",
    … …  
    344344 * @param   pfnHandler  The handler function to be called to display the info.
    345345 */
    346 DBGFR3DECL(int) DBGFR3InfoRegisterInternal(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERINT pfnHandler)
     346VMMR3DECL(int) DBGFR3InfoRegisterInternal(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERINT pfnHandler)
    347347{
    348348    return DBGFR3InfoRegisterInternalEx(pVM, pszName, pszDesc, pfnHandler, 0);
    … …  
    360360 * @param   fFlags      Flags, see the DBGFINFO_FLAGS_*.
    361361 */
    362 DBGFR3DECL(int) DBGFR3InfoRegisterInternalEx(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERINT pfnHandler, uint32_t fFlags)
     362VMMR3DECL(int) DBGFR3InfoRegisterInternalEx(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLERINT pfnHandler, uint32_t fFlags)
    363363{
    364364    LogFlow(("DBGFR3InfoRegisterInternal: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p fFlags=%x\n",
    … …  
    400400 * @param   pvUser      User argument to be passed to the handler.
    401401 */
    402 DBGFR3DECL(int) DBGFR3InfoRegisterExternal(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLEREXT pfnHandler, void *pvUser)
     402VMMR3DECL(int) DBGFR3InfoRegisterExternal(PVM pVM, const char *pszName, const char *pszDesc, PFNDBGFHANDLEREXT pfnHandler, void *pvUser)
    403403{
    404404    LogFlow(("DBGFR3InfoRegisterExternal: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p pvUser=%p\n",
    … …  
    439439 * @param   pszName     The identifier of the info. If NULL all owned by the device.
    440440 */
    441 DBGFR3DECL(int) DBGFR3InfoDeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName)
     441VMMR3DECL(int) DBGFR3InfoDeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName)
    442442{
    443443    LogFlow(("DBGFR3InfoDeregisterDevice: pDevIns=%p pszName=%p:{%s}\n", pDevIns, pszName, pszName));
    … …  
    514514 * @param   pszName     The identifier of the info. If NULL all owned by the driver.
    515515 */
    516 DBGFR3DECL(int) DBGFR3InfoDeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName)
     516VMMR3DECL(int) DBGFR3InfoDeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName)
    517517{
    518518    LogFlow(("DBGFR3InfoDeregisterDriver: pDrvIns=%p pszName=%p:{%s}\n", pDrvIns, pszName, pszName));
    … …  
    638638 * @param   pszName     The identifier of the info. If NULL all owned by the device.
    639639 */
    640 DBGFR3DECL(int) DBGFR3InfoDeregisterInternal(PVM pVM, const char *pszName)
     640VMMR3DECL(int) DBGFR3InfoDeregisterInternal(PVM pVM, const char *pszName)
    641641{
    642642    LogFlow(("DBGFR3InfoDeregisterInternal: pszName=%p:{%s}\n", pszName, pszName));
    … …  
    652652 * @param   pszName     The identifier of the info. If NULL all owned by the device.
    653653 */
    654 DBGFR3DECL(int) DBGFR3InfoDeregisterExternal(PVM pVM, const char *pszName)
     654VMMR3DECL(int) DBGFR3InfoDeregisterExternal(PVM pVM, const char *pszName)
    655655{
    656656    LogFlow(("DBGFR3InfoDeregisterExternal: pszName=%p:{%s}\n", pszName, pszName));
    … …  
    668668 * @param   pHlp        The output helper functions. If NULL the logger will be used.
    669669 */
    670 DBGFR3DECL(int) DBGFR3Info(PVM pVM, const char *pszName, const char *pszArgs, PCDBGFINFOHLP pHlp)
     670VMMR3DECL(int) DBGFR3Info(PVM pVM, const char *pszName, const char *pszArgs, PCDBGFINFOHLP pHlp)
    671671{
    672672    /*
    … …  
    768768 * @param   pvUser          User argument to pass to the callback.
    769769 */
    770 DBGFR3DECL(int) DBGFR3InfoEnum(PVM pVM, PFNDBGFINFOENUM pfnCallback, void *pvUser)
     770VMMR3DECL(int) DBGFR3InfoEnum(PVM pVM, PFNDBGFINFOENUM pfnCallback, void *pvUser)
    771771{
    772772    LogFlow(("DBGFR3InfoLog: pfnCallback=%p pvUser=%p\n", pfnCallback, pvUser));

  • trunk/src/VBox/VMM/DBGFInternal.h

    r12875 r12989  
    3131#include <VBox/dbgf.h>
    3232
    33 
    34 #if !defined(IN_DBGF_R3) && !defined(IN_DBGF_R0) && !defined(IN_DBGF_GC)
    35 # error "Not in DBGF! This is an internal header!"
    36 #endif
    3733
    3834

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

    r12677 r12989  
    4747 * @param   pszGroupSettings    The group settings string. (VBOX_LOG)
    4848 */
    49 DBGFR3DECL(int) DBGFR3LogModifyGroups(PVM pVM, const char *pszGroupSettings)
     49VMMR3DECL(int) DBGFR3LogModifyGroups(PVM pVM, const char *pszGroupSettings)
    5050{
    5151    AssertReturn(VALID_PTR(pVM), VERR_INVALID_POINTER);
    … …  
    8484 * @param   pszFlagSettings     The group settings string. (VBOX_LOG_FLAGS)
    8585 */
    86 DBGFR3DECL(int) DBGFR3LogModifyFlags(PVM pVM, const char *pszFlagSettings)
     86VMMR3DECL(int) DBGFR3LogModifyFlags(PVM pVM, const char *pszFlagSettings)
    8787{
    8888    AssertReturn(VALID_PTR(pVM), VERR_INVALID_POINTER);
    … …  
    121121 * @param   pszDestSettings     The destination settings string. (VBOX_LOG_DEST)
    122122 */
    123 DBGFR3DECL(int) DBGFR3LogModifyDestinations(PVM pVM, const char *pszDestSettings)
     123VMMR3DECL(int) DBGFR3LogModifyDestinations(PVM pVM, const char *pszDestSettings)
    124124{
    125125    AssertReturn(VALID_PTR(pVM), VERR_INVALID_POINTER);

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

    r12677 r12989  
    103103 * @thread  Any thread.
    104104 */
    105 DBGFR3DECL(int) DBGFR3MemScan(PVM pVM, PCDBGFADDRESS pAddress, RTGCUINTPTR cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PDBGFADDRESS pHitAddress)
     105VMMR3DECL(int) DBGFR3MemScan(PVM pVM, PCDBGFADDRESS pAddress, RTGCUINTPTR cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PDBGFADDRESS pHitAddress)
    106106{
    107107    PVMREQ pReq;
    … …  
    161161 * @param   cbRead          The number of bytes to read.
    162162 */
    163 DBGFR3DECL(int) DBGFR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead)
     163VMMR3DECL(int) DBGFR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead)
    164164{
    165165    PVMREQ pReq;
    … …  
    237237 * @param   cchBuf          The size of the buffer.
    238238 */
    239 DBGFR3DECL(int) DBGFR3MemReadString(PVM pVM, PCDBGFADDRESS pAddress, char *pszBuf, size_t cchBuf)
     239VMMR3DECL(int) DBGFR3MemReadString(PVM pVM, PCDBGFADDRESS pAddress, char *pszBuf, size_t cchBuf)
    240240{
    241241    /*

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

    r12898 r12989  
    9090 * @thread  Any.
    9191 */
    92 DBGFR3DECL(int) DBGFR3OSRegister(PVM pVM, PCDBGFOSREG pReg)
     92VMMR3DECL(int) DBGFR3OSRegister(PVM pVM, PCDBGFOSREG pReg)
    9393{
    9494    /*
    … …  
    213213 * @thread  Any.
    214214 */
    215 DBGFR3DECL(int) DBGFR3OSDetect(PVM pVM, char *pszName, size_t cchName)
     215VMMR3DECL(int) DBGFR3OSDetect(PVM pVM, char *pszName, size_t cchName)
    216216{
    217217    AssertPtrNullReturn(pszName, VERR_INVALID_POINTER);
    … …  
    290290 * @thread  Any.
    291291 */
    292 DBGFR3DECL(int) DBGFR3OSQueryNameAndVersion(PVM pVM, char *pszName, size_t cchName, char *pszVersion, size_t cchVersion)
     292VMMR3DECL(int) DBGFR3OSQueryNameAndVersion(PVM pVM, char *pszName, size_t cchName, char *pszVersion, size_t cchVersion)
    293293{
    294294    AssertPtrNullReturn(pszName, VERR_INVALID_POINTER);
    … …  
    349349 * @thread  Any.
    350350 */
    351 DBGFR3DECL(void *) DBGFR3OSQueryInterface(PVM pVM, DBGFOSINTERFACE enmIf)
     351VMMR3DECL(void *) DBGFR3OSQueryInterface(PVM pVM, DBGFOSINTERFACE enmIf)
    352352{
    353353    AssertMsgReturn(enmIf > DBGFOSINTERFACE_INVALID && enmIf < DBGFOSINTERFACE_END, ("%d\n", enmIf), NULL);

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

    r12677 r12989  
    351351 *                      obtain about the stack frame.
    352352 */
    353 DBGFR3DECL(int) DBGFR3StackWalkBeginGuest(PVM pVM, PDBGFSTACKFRAME pFrame)
     353VMMR3DECL(int) DBGFR3StackWalkBeginGuest(PVM pVM, PDBGFSTACKFRAME pFrame)
    354354{
    355355    pFrame->pFirst = NULL;
    … …  
    382382 *                      obtain about the stack frame.
    383383 */
    384 DBGFR3DECL(int) DBGFR3StackWalkBeginHyper(PVM pVM, PDBGFSTACKFRAME pFrame)
     384VMMR3DECL(int) DBGFR3StackWalkBeginHyper(PVM pVM, PDBGFSTACKFRAME pFrame)
    385385{
    386386    pFrame->pFirst = NULL;
    … …  
    406406 * @param   pFrame      Pointer to the current frame on input, content is replaced with the next frame on successful return.
    407407 */
    408 DBGFR3DECL(int) DBGFR3StackWalkNext(PVM pVM, PDBGFSTACKFRAME pFrame)
     408VMMR3DECL(int) DBGFR3StackWalkNext(PVM pVM, PDBGFSTACKFRAME pFrame)
    409409{
    410410    if (pFrame->pNext)
    … …  
    426426 * @param   pFrame      The stackframe as returned by the last stack walk call.
    427427 */
    428 DBGFR3DECL(void) DBGFR3StackWalkEnd(PVM pVM, PDBGFSTACKFRAME pFrame)
     428VMMR3DECL(void) DBGFR3StackWalkEnd(PVM pVM, PDBGFSTACKFRAME pFrame)
    429429{
    430430    if (!pFrame || !pFrame->pFirst)

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

    r12975 r12989  
    533533 *                          Ignored when pszName is NULL.
    534534 */
    535 DBGFR3DECL(int) DBGFR3ModuleLoad(PVM pVM, const char *pszFilename, RTGCUINTPTR AddressDelta, const char *pszName, RTGCUINTPTR ModuleAddress, unsigned cbImage)
     535VMMR3DECL(int) DBGFR3ModuleLoad(PVM pVM, const char *pszFilename, RTGCUINTPTR AddressDelta, const char *pszName, RTGCUINTPTR ModuleAddress, unsigned cbImage)
    536536{
    537537    /*
    … …  
    638638 * @param   pszName         The module name.
    639639 */
    640 DBGFR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage,
     640VMMR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage,
    641641                                      const char *pszFilename, const char *pszName)
    642642{
    … …  
    669669 * @param   pszSymbol       Symbol name.
    670670 */
    671 DBGFR3DECL(int) DBGFR3SymbolAdd(PVM pVM, RTGCUINTPTR ModuleAddress, RTGCUINTPTR SymbolAddress, RTUINT cbSymbol, const char *pszSymbol)
     671VMMR3DECL(int) DBGFR3SymbolAdd(PVM pVM, RTGCUINTPTR ModuleAddress, RTGCUINTPTR SymbolAddress, RTUINT cbSymbol, const char *pszSymbol)
    672672{
    673673    /*
    … …  
    710710 * @param   pSymbol             Where to store the symbol info.
    711711 */
    712 DBGFR3DECL(int) DBGFR3SymbolByAddr(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement, PDBGFSYMBOL pSymbol)
     712VMMR3DECL(int) DBGFR3SymbolByAddr(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement, PDBGFSYMBOL pSymbol)
    713713{
    714714    /*
    … …  
    798798 * @param   pSymbol             Where to store the symbol info.
    799799 */
    800 DBGFR3DECL(int) DBGFR3SymbolByName(PVM pVM, const char *pszSymbol, PDBGFSYMBOL pSymbol)
     800VMMR3DECL(int) DBGFR3SymbolByName(PVM pVM, const char *pszSymbol, PDBGFSYMBOL pSymbol)
    801801{
    802802    /*
    … …  
    872872 * @param   poffDisplacement    Where to store the symbol displacement from Address.
    873873 */
    874 DBGFR3DECL(PDBGFSYMBOL) DBGFR3SymbolByAddrAlloc(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement)
     874VMMR3DECL(PDBGFSYMBOL) DBGFR3SymbolByAddrAlloc(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement)
    875875{
    876876    DBGFSYMBOL Symbol;
    … …  
    890890 * @param   pszSymbol           Symbol name.
    891891 */
    892 DBGFR3DECL(PDBGFSYMBOL) DBGFR3SymbolByNameAlloc(PVM pVM, const char *pszSymbol)
     892VMMR3DECL(PDBGFSYMBOL) DBGFR3SymbolByNameAlloc(PVM pVM, const char *pszSymbol)
    893893{
    894894    DBGFSYMBOL Symbol;
    … …  
    905905 * @param   pSymbol         Pointer to the symbol.
    906906 */
    907 DBGFR3DECL(void) DBGFR3SymbolFree(PDBGFSYMBOL pSymbol)
     907VMMR3DECL(void) DBGFR3SymbolFree(PDBGFSYMBOL pSymbol)
    908908{
    909909    if (pSymbol)
    … …  
    921921 * @param   pLine               Where to store the line info.
    922922 */
    923 DBGFR3DECL(int) DBGFR3LineByAddr(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement, PDBGFLINE pLine)
     923VMMR3DECL(int) DBGFR3LineByAddr(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement, PDBGFLINE pLine)
    924924{
    925925    /*
    … …  
    983983 * @param   poffDisplacement    Where to store the line displacement from Address.
    984984 */
    985 DBGFR3DECL(PDBGFLINE) DBGFR3LineByAddrAlloc(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement)
     985VMMR3DECL(PDBGFLINE) DBGFR3LineByAddrAlloc(PVM pVM, RTGCUINTPTR Address, PRTGCINTPTR poffDisplacement)
    986986{
    987987    DBGFLINE Line;
    … …  
    998998 * @param   pLine           Pointer to the line.
    999999 */
    1000 DBGFR3DECL(void) DBGFR3LineFree(PDBGFLINE pLine)
     1000VMMR3DECL(void) DBGFR3LineFree(PDBGFLINE pLine)
    10011001{
    10021002    if (pLine)

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

    r12831 r12989  
    101101 * @param   pVM         The VM to operate on.
    102102 */
    103 EMR3DECL(int) EMR3Init(PVM pVM)
     103VMMR3DECL(int) EMR3Init(PVM pVM)
    104104{
    105105    LogFlow(("EMR3Init\n"));
    … …  
    371371 * @param   pVM     The VM.
    372372 */
    373 EMR3DECL(void) EMR3Relocate(PVM pVM)
     373VMMR3DECL(void) EMR3Relocate(PVM pVM)
    374374{
    375375    LogFlow(("EMR3Relocate\n"));
    … …  
    384384 * @param   pVM
    385385 */
    386 EMR3DECL(void) EMR3Reset(PVM pVM)
     386VMMR3DECL(void) EMR3Reset(PVM pVM)
    387387{
    388388    LogFlow(("EMR3Reset: \n"));
    … …  
    400400 * @param   pVM         The VM to operate on.
    401401 */
    402 EMR3DECL(int) EMR3Term(PVM pVM)
     402VMMR3DECL(int) EMR3Term(PVM pVM)
    403403{
    404404    AssertMsg(pVM->em.s.offVM, ("bad init order!\n"));
    … …  
    463463 * @thread  The emulation thread.
    464464 */
    465 EMR3DECL(int) EMR3RawSetMode(PVM pVM, EMRAWMODE enmMode)
     465VMMR3DECL(int) EMR3RawSetMode(PVM pVM, EMRAWMODE enmMode)
    466466{
    467467    switch (enmMode)
    … …  
    502502 * @param   rc          VBox status code.
    503503 */
    504 EMR3DECL(void) EMR3FatalError(PVM pVM, int rc)
     504VMMR3DECL(void) EMR3FatalError(PVM pVM, int rc)
    505505{
    506506    longjmp(pVM->em.s.u.FatalLongJump, rc);
    … …  
    515515 * @param   enmState    The state.
    516516 */
    517 EMR3DECL(const char *) EMR3GetStateName(EMSTATE enmState)
     517VMMR3DECL(const char *) EMR3GetStateName(EMSTATE enmState)
    518518{
    519519    switch (enmState)
    … …  
    23572357 * @param   pVM         The VM to operate on.
    23582358 */
    2359 EMR3DECL(int) EMR3CheckRawForcedActions(PVM pVM)
     2359VMMR3DECL(int) EMR3CheckRawForcedActions(PVM pVM)
    23602360{
    23612361    return emR3RawForcedActions(pVM, pVM->em.s.pCtx);
    … …  
    32203220 * @param   pVM         The VM to operate on.
    32213221 */
    3222 EMR3DECL(int) EMR3ExecuteVM(PVM pVM)
     3222VMMR3DECL(int) EMR3ExecuteVM(PVM pVM)
    32233223{
    32243224    LogFlow(("EMR3ExecuteVM: pVM=%p enmVMState=%d  enmState=%d (%s) fForceRAW=%d\n", pVM, pVM->enmVMState,

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

    r12894 r12989  
    6060 * @param   pVM         The VM to operate on.
    6161 */
    62 HWACCMR3DECL(int) HWACCMR3Init(PVM pVM)
     62VMMR3DECL(int) HWACCMR3Init(PVM pVM)
    6363{
    6464    LogFlow(("HWACCMR3Init\n"));
    … …  
    244244 * @param   pVM         The VM handle.
    245245 */
    246 HWACCMR3DECL(int) HWACCMR3InitFinalizeR0(PVM pVM)
     246VMMR3DECL(int) HWACCMR3InitFinalizeR0(PVM pVM)
    247247{
    248248    int rc;
    … …  
    665665 * @param   pVM     The VM.
    666666 */
    667 HWACCMR3DECL(void) HWACCMR3Relocate(PVM pVM)
     667VMMR3DECL(void) HWACCMR3Relocate(PVM pVM)
    668668{
    669669    Log(("HWACCMR3Relocate to %VGv\n", MMHyperGetArea(pVM, 0)));
    … …  
    677677 * @param   pVM         The VM to operate on.
    678678 */
    679 HWACCMR3DECL(bool) HWACCMR3IsAllowed(PVM pVM)
     679VMMR3DECL(bool) HWACCMR3IsAllowed(PVM pVM)
    680680{
    681681    return pVM->hwaccm.s.fAllowed;
    … …  
    691691 * @param   enmShadowMode  New paging mode.
    692692 */
    693 HWACCMR3DECL(void) HWACCMR3PagingModeChanged(PVM pVM, PGMMODE enmShadowMode)
     693VMMR3DECL(void) HWACCMR3PagingModeChanged(PVM pVM, PGMMODE enmShadowMode)
    694694{
    695695    pVM->hwaccm.s.enmShadowMode = enmShadowMode;
    … …  
    705705 * @param   pVM         The VM to operate on.
    706706 */
    707 HWACCMR3DECL(int) HWACCMR3Term(PVM pVM)
     707VMMR3DECL(int) HWACCMR3Term(PVM pVM)
    708708{
    709709    if (pVM->hwaccm.s.vmx.pRealModeTSS)
    … …  
    729729 * @param   pVM     VM handle.
    730730 */
    731 HWACCMR3DECL(void) HWACCMR3Reset(PVM pVM)
     731VMMR3DECL(void) HWACCMR3Reset(PVM pVM)
    732732{
    733733    LogFlow(("HWACCMR3Reset:\n"));
    … …  
    757757 * @param   pCtx        Partial VM execution context
    758758 */
    759 HWACCMR3DECL(bool) HWACCMR3CanExecuteGuest(PVM pVM, PCPUMCTX pCtx)
     759VMMR3DECL(bool) HWACCMR3CanExecuteGuest(PVM pVM, PCPUMCTX pCtx)
    760760{
    761761    Assert(pVM->fHWACCMEnabled);
    … …  
    846846 * @param   pVM         The VM to operate on.
    847847 */
    848 HWACCMR3DECL(bool) HWACCMR3IsActive(PVM pVM)
     848VMMR3DECL(bool) HWACCMR3IsActive(PVM pVM)
    849849{
    850850    return pVM->hwaccm.s.fActive;
    … …  
    857857 * @param   pVM         The VM to operate on.
    858858 */
    859 HWACCMR3DECL(bool) HWACCMR3IsNestedPagingActive(PVM pVM)
     859VMMR3DECL(bool) HWACCMR3IsNestedPagingActive(PVM pVM)
    860860{
    861861    return pVM->hwaccm.s.fNestedPaging;
    … …  
    868868 * @param   pVM         The VM to operate on.
    869869 */
    870 HWACCMR3DECL(bool) HWACCMR3IsEventPending(PVM pVM)
     870VMMR3DECL(bool) HWACCMR3IsEventPending(PVM pVM)
    871871{
    872872    return HWACCMIsEnabled(pVM) && pVM->hwaccm.s.Event.fPending;
    … …  
    880880 * @param   iStatusCode VBox status code
    881881 */
    882 HWACCMR3DECL(void) HWACCMR3CheckError(PVM pVM, int iStatusCode)
     882VMMR3DECL(void) HWACCMR3CheckError(PVM pVM, int iStatusCode)
    883883{
    884884    switch(iStatusCode)

  • trunk/src/VBox/VMM/HWACCMInternal.h

    r12824 r12989  
    497497#ifdef IN_RING0
    498498
    499 HWACCMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu();
     499VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu();
    500500
    501501#ifdef VBOX_STRICT
    502 HWACCMR0DECL(void) HWACCMDumpRegs(PVM pVM, PCPUMCTX pCtx);
    503 HWACCMR0DECL(void) HWACCMR0DumpDescriptor(PX86DESCHC  Desc, RTSEL Sel, const char *pszMsg);
     502VMMR0DECL(void) HWACCMDumpRegs(PVM pVM, PCPUMCTX pCtx);
     503VMMR0DECL(void) HWACCMR0DumpDescriptor(PX86DESCHC  Desc, RTSEL Sel, const char *pszMsg);
    504504#else
    505505#define HWACCMDumpRegs(a, b)                do { } while (0)
    … …  
    508508
    509509/* Dummy callback handlers. */
    510 HWACCMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PHWACCM_CPUINFO pCpu);
    511 HWACCMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, CPUMCTX *pCtx);
    512 HWACCMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    513 HWACCMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    514 HWACCMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM);
    515 HWACCMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM);
    516 HWACCMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM);
    517 HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx);
    518 HWACCMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM);
    519 HWACCMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx);
     510VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PHWACCM_CPUINFO pCpu);
     511VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, CPUMCTX *pCtx);
     512VMMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     513VMMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     514VMMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM);
     515VMMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM);
     516VMMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM);
     517VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx);
     518VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM);
     519VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx);
    520520
    521521#endif /* IN_RING0 */

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

    r12975 r12989  
    139139 * @param   pVM         The VM to operate on.
    140140 */
    141 IOMR3DECL(int) IOMR3Init(PVM pVM)
     141VMMR3DECL(int) IOMR3Init(PVM pVM)
    142142{
    143143    LogFlow(("IOMR3Init:\n"));
    … …  
    250250 * @param   pVM     VM handle.
    251251 */
    252 IOMR3DECL(void) IOMR3Reset(PVM pVM)
     252VMMR3DECL(void) IOMR3Reset(PVM pVM)
    253253{
    254254    iomR3FlushCache(pVM);
    … …  
    266266 * @param   offDelta    Relocation delta relative to old location.
    267267 */
    268 IOMR3DECL(void) IOMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     268VMMR3DECL(void) IOMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    269269{
    270270    LogFlow(("IOMR3Relocate: offDelta=%d\n", offDelta));
    … …  
    364364 * @param   pVM         The VM to operate on.
    365365 */
    366 IOMR3DECL(int) IOMR3Term(PVM pVM)
     366VMMR3DECL(int) IOMR3Term(PVM pVM)
    367367{
    368368    /*
    … …  
    500500 * @param   pszDesc             Pointer to description string. This must not be freed.
    501501 */
    502 IOMR3DECL(int) IOMR3IOPortRegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTHCPTR pvUser,
     502VMMR3DECL(int) IOMR3IOPortRegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTHCPTR pvUser,
    503503                                     R3PTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, R3PTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
    504504                                     R3PTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, R3PTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback, const char *pszDesc)
    … …  
    595595 * @param   pszDesc             Pointer to description string. This must not be freed.
    596596 */
    597 IOMR3DECL(int)  IOMR3IOPortRegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTRCPTR pvUser,
     597VMMR3DECL(int)  IOMR3IOPortRegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTRCPTR pvUser,
    598598                                      RCPTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, RCPTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
    599599                                      RCPTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, RCPTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback, const char *pszDesc)
    … …  
    702702 * @param   pszDesc             Pointer to description string. This must not be freed.
    703703 */
    704 IOMR3DECL(int)  IOMR3IOPortRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTR0PTR pvUser,
     704VMMR3DECL(int)  IOMR3IOPortRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTR0PTR pvUser,
    705705                                      R0PTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, R0PTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
    706706                                      R0PTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, R0PTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback,
    … …  
    809809 *          all the checks you might expect it to do.
    810810 */
    811 IOMR3DECL(int)  IOMR3IOPortDeregister(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts)
     811VMMR3DECL(int)  IOMR3IOPortDeregister(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts)
    812812{
    813813    LogFlow(("IOMR3IOPortDeregister: pDevIns=%p PortStart=%#x cPorts=%#x\n", pDevIns, PortStart, cPorts));
    … …  
    13571357 * @param   pszDesc             Pointer to description string. This must not be freed.
    13581358 */
    1359 IOMR3DECL(int)  IOMR3MMIORegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
     1359VMMR3DECL(int)  IOMR3MMIORegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
    13601360                                    R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R3PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
    13611361                                    R3PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc)
    … …  
    14571457 * @param   pfnFillCallback     Pointer to function which is gonna handle Fill/memset operations.
    14581458 */
    1459 IOMR3DECL(int)  IOMR3MMIORegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
     1459VMMR3DECL(int)  IOMR3MMIORegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
    14601460                                    RCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, RCPTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
    14611461                                    RCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback)
    … …  
    15101510 * @param   pfnFillCallback     Pointer to function which is gonna handle Fill/memset operations.
    15111511 */
    1512 IOMR3DECL(int)  IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
     1512VMMR3DECL(int)  IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
    15131513                                    R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
    15141514                                    R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
    … …  
    15611561 *          all the checks you might expect it to do.
    15621562 */
    1563 IOMR3DECL(int)  IOMR3MMIODeregister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange)
     1563VMMR3DECL(int)  IOMR3MMIODeregister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange)
    15641564{
    15651565    LogFlow(("IOMR3MMIODeregister: pDevIns=%p GCPhysStart=%VGp cbRange=%#x\n", pDevIns, GCPhysStart, cbRange));

  • trunk/src/VBox/VMM/IOMInternal.h

    r12772 r12989  
    3131#include <iprt/avl.h>
    3232
    33 #if !defined(IN_IOM_R3) && !defined(IN_IOM_R0) && !defined(IN_IOM_GC)
    34 # error "Not in IOM! This is an internal header!"
    35 #endif
    3633
    3734
    … …  
    403400__BEGIN_DECLS
    404401
    405 #ifdef IN_IOM_R3
     402#ifdef IN_RING3
    406403PIOMIOPORTSTATS iomR3IOPortStatsCreate(PVM pVM, RTIOPORT Port, const char *pszDesc);
    407 PIOMMMIOSTATS iomR3MMIOStatsCreate(PVM pVM, RTGCPHYS GCPhys, const char *pszDesc);
    408 #endif /* IN_IOM_R3 */
     404PIOMMMIOSTATS   iomR3MMIOStatsCreate(PVM pVM, RTGCPHYS GCPhys, const char *pszDesc);
     405#endif /* IN_RING3 */
    409406
    410407/**
    … …  
    420417 * @param   pvUser      Pointer to the MMIO range entry.
    421418 */
    422 IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
     419VMMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
    423420
    424421#ifdef IN_RING3

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

    r12968 r12989  
    188188 * @param   pUVM    Pointer to the user mode VM structure.
    189189 */
    190 MMR3DECL(int) MMR3InitUVM(PUVM pUVM)
     190VMMR3DECL(int) MMR3InitUVM(PUVM pUVM)
    191191{
    192192    /*
    … …  
    222222 * @param   pVM         The VM to operate on.
    223223 */
    224 MMR3DECL(int) MMR3Init(PVM pVM)
     224VMMR3DECL(int) MMR3Init(PVM pVM)
    225225{
    226226    LogFlow(("MMR3Init\n"));
    … …  
    275275 * @remark  No cleanup necessary since MMR3Term() will be called on failure.
    276276 */
    277 MMR3DECL(int) MMR3InitPaging(PVM pVM)
     277VMMR3DECL(int) MMR3InitPaging(PVM pVM)
    278278{
    279279    LogFlow(("MMR3InitPaging:\n"));
    … …  
    423423 * @param   pVM         The VM to operate on.
    424424 */
    425 MMR3DECL(int) MMR3Term(PVM pVM)
     425VMMR3DECL(int) MMR3Term(PVM pVM)
    426426{
    427427    /*
    … …  
    478478 * @param   pUVM        Pointer to the user mode VM structure.
    479479 */
    480 MMR3DECL(void) MMR3TermUVM(PUVM pUVM)
     480VMMR3DECL(void) MMR3TermUVM(PUVM pUVM)
    481481{
    482482    /*
    … …  
    496496 * @param   pVM             The VM handle.
    497497 */
    498 MMR3DECL(void) MMR3Reset(PVM pVM)
     498VMMR3DECL(void) MMR3Reset(PVM pVM)
    499499{
    500500    mmR3PhysRomReset(pVM);
    … …  
    615615 * @param   cAddBasePages   The number of pages to add.
    616616 */
    617 MMR3DECL(int) MMR3IncreaseBaseReservation(PVM pVM, uint64_t cAddBasePages)
     617VMMR3DECL(int) MMR3IncreaseBaseReservation(PVM pVM, uint64_t cAddBasePages)
    618618{
    619619    uint64_t cOld = pVM->mm.s.cBasePages;
    … …  
    640640 * @param   pszDesc             Some description associated with the reservation.
    641641 */
    642 MMR3DECL(int) MMR3AdjustFixedReservation(PVM pVM, int32_t cDeltaFixedPages, const char *pszDesc)
     642VMMR3DECL(int) MMR3AdjustFixedReservation(PVM pVM, int32_t cDeltaFixedPages, const char *pszDesc)
    643643{
    644644    const uint32_t cOld = pVM->mm.s.cFixedPages;
    … …  
    665665 * @param   cShadowPages    The new page count.
    666666 */
    667 MMR3DECL(int) MMR3UpdateShadowReservation(PVM pVM, uint32_t cShadowPages)
     667VMMR3DECL(int) MMR3UpdateShadowReservation(PVM pVM, uint32_t cShadowPages)
    668668{
    669669    const uint32_t cOld = pVM->mm.s.cShadowPages;
    … …  
    815815 * @todo    Rename to indicate the special usage.
    816816 */
    817 MMR3DECL(int) MMR3HCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys, void **ppv)
     817VMMR3DECL(int) MMR3HCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys, void **ppv)
    818818{
    819819    /*
    … …  
    856856 * @todo    Move to DBGF, it's only selecting which functions to use!
    857857 */
    858 MMR3DECL(int) MMR3ReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)
     858VMMR3DECL(int) MMR3ReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)
    859859{
    860860    if (GCPtr - pVM->mm.s.pvHyperAreaGC < pVM->mm.s.cbHyperArea)
    … …  
    876876 * @todo    Move to DBGF, it's only selecting which functions to use!
    877877 */
    878 MMR3DECL(int) MMR3WriteGCVirt(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
     878VMMR3DECL(int) MMR3WriteGCVirt(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
    879879{
    880880    if (GCPtrDst - pVM->mm.s.pvHyperAreaGC < pVM->mm.s.cbHyperArea)

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

    r12967 r12989  
    138138 * @param   cbSize      Size of the block.
    139139 */
    140 MMR3DECL(void *) MMR3HeapAllocU(PUVM pUVM, MMTAG enmTag, size_t cbSize)
     140VMMR3DECL(void *) MMR3HeapAllocU(PUVM pUVM, MMTAG enmTag, size_t cbSize)
    141141{
    142142    Assert(pUVM->mm.s.pHeap);
    … …  
    162162 * @param   cbSize      Size of the block.
    163163 */
    164 MMR3DECL(void *) MMR3HeapAlloc(PVM pVM, MMTAG enmTag, size_t cbSize)
     164VMMR3DECL(void *) MMR3HeapAlloc(PVM pVM, MMTAG enmTag, size_t cbSize)
    165165{
    166166    return mmR3HeapAlloc(pVM->pUVM->mm.s.pHeap, enmTag, cbSize, false);
    … …  
    179179 * @param   ppv         Where to store the pointer to the allocated memory on success.
    180180 */
    181 MMR3DECL(int) MMR3HeapAllocExU(PUVM pUVM, MMTAG enmTag, size_t cbSize, void **ppv)
     181VMMR3DECL(int) MMR3HeapAllocExU(PUVM pUVM, MMTAG enmTag, size_t cbSize, void **ppv)
    182182{
    183183    Assert(pUVM->mm.s.pHeap);
    … …  
    203203 * @param   ppv         Where to store the pointer to the allocated memory on success.
    204204 */
    205 MMR3DECL(int) MMR3HeapAllocEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv)
     205VMMR3DECL(int) MMR3HeapAllocEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv)
    206206{
    207207    void *pv = mmR3HeapAlloc(pVM->pUVM->mm.s.pHeap, enmTag, cbSize, false);
    … …  
    225225 * @param   cbSize      Size of the block.
    226226 */
    227 MMR3DECL(void *) MMR3HeapAllocZU(PUVM pUVM, MMTAG enmTag, size_t cbSize)
     227VMMR3DECL(void *) MMR3HeapAllocZU(PUVM pUVM, MMTAG enmTag, size_t cbSize)
    228228{
    229229    return mmR3HeapAlloc(pUVM->mm.s.pHeap, enmTag, cbSize, true);
    … …  
    241241 * @param   cbSize      Size of the block.
    242242 */
    243 MMR3DECL(void *) MMR3HeapAllocZ(PVM pVM, MMTAG enmTag, size_t cbSize)
     243VMMR3DECL(void *) MMR3HeapAllocZ(PVM pVM, MMTAG enmTag, size_t cbSize)
    244244{
    245245    return mmR3HeapAlloc(pVM->pUVM->mm.s.pHeap, enmTag, cbSize, true);
    … …  
    258258 * @param   ppv         Where to store the pointer to the allocated memory on success.
    259259 */
    260 MMR3DECL(int) MMR3HeapAllocZExU(PUVM pUVM, MMTAG enmTag, size_t cbSize, void **ppv)
     260VMMR3DECL(int) MMR3HeapAllocZExU(PUVM pUVM, MMTAG enmTag, size_t cbSize, void **ppv)
    261261{
    262262    Assert(pUVM->mm.s.pHeap);
    … …  
    282282 * @param   ppv         Where to store the pointer to the allocated memory on success.
    283283 */
    284 MMR3DECL(int) MMR3HeapAllocZEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv)
     284VMMR3DECL(int) MMR3HeapAllocZEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv)
    285285{
    286286    void *pv = mmR3HeapAlloc(pVM->pUVM->mm.s.pHeap, enmTag, cbSize, true);
    … …  
    440440 * @param   cbNewSize   New block size.
    441441 */
    442 MMR3DECL(void *) MMR3HeapRealloc(void *pv, size_t cbNewSize)
     442VMMR3DECL(void *) MMR3HeapRealloc(void *pv, size_t cbNewSize)
    443443{
    444444    AssertMsg(pv, ("Invalid pointer pv=%p\n", pv));
    … …  
    539539 * @param   psz         The string to duplicate. NULL is allowed.
    540540 */
    541 MMR3DECL(char *) MMR3HeapStrDupU(PUVM pUVM, MMTAG enmTag, const char *psz)
     541VMMR3DECL(char *) MMR3HeapStrDupU(PUVM pUVM, MMTAG enmTag, const char *psz)
    542542{
    543543    if (!psz)
    … …  
    564564 * @param   psz         The string to duplicate. NULL is allowed.
    565565 */
    566 MMR3DECL(char *) MMR3HeapStrDup(PVM pVM, MMTAG enmTag, const char *psz)
     566VMMR3DECL(char *) MMR3HeapStrDup(PVM pVM, MMTAG enmTag, const char *psz)
    567567{
    568568    return MMR3HeapStrDupU(pVM->pUVM, enmTag, psz);
    … …  
    579579 * @param   ...         Format arguments.
    580580 */
    581 MMR3DECL(char *)    MMR3HeapAPrintf(PVM pVM, MMTAG enmTag, const char *pszFormat, ...)
     581VMMR3DECL(char *)    MMR3HeapAPrintf(PVM pVM, MMTAG enmTag, const char *pszFormat, ...)
    582582{
    583583    va_list va;
    … …  
    598598 * @param   ...         Format arguments.
    599599 */
    600 MMR3DECL(char *)    MMR3HeapAPrintfU(PUVM pUVM, MMTAG enmTag, const char *pszFormat, ...)
     600VMMR3DECL(char *)    MMR3HeapAPrintfU(PUVM pUVM, MMTAG enmTag, const char *pszFormat, ...)
    601601{
    602602    va_list va;
    … …  
    617617 * @param   va          Format arguments.
    618618 */
    619 MMR3DECL(char *)    MMR3HeapAPrintfV(PVM pVM, MMTAG enmTag, const char *pszFormat, va_list va)
     619VMMR3DECL(char *)    MMR3HeapAPrintfV(PVM pVM, MMTAG enmTag, const char *pszFormat, va_list va)
    620620{
    621621    return MMR3HeapAPrintfVU(pVM->pUVM, enmTag, pszFormat, va);
    … …  
    632632 * @param   va          Format arguments.
    633633 */
    634 MMR3DECL(char *)    MMR3HeapAPrintfVU(PUVM pUVM, MMTAG enmTag, const char *pszFormat, va_list va)
     634VMMR3DECL(char *)    MMR3HeapAPrintfVU(PUVM pUVM, MMTAG enmTag, const char *pszFormat, va_list va)
    635635{
    636636    /*
    … …  
    655655 * @param   pv          Pointer to the memory block to free.
    656656 */
    657 MMR3DECL(void) MMR3HeapFree(void *pv)
     657VMMR3DECL(void) MMR3HeapFree(void *pv)
    658658{
    659659    /* Ignore NULL pointers. */

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

    r12968 r12989  
    151151 * @returns VBox status.
    152152 */
    153 MMR3DECL(int) MMR3HyperInitFinalize(PVM pVM)
     153VMMR3DECL(int) MMR3HyperInitFinalize(PVM pVM)
    154154{
    155155    LogFlow(("MMR3HyperInitFinalize:\n"));
    … …  
    328328 * @param   pGCPtr      Where to store the GC address.
    329329 */
    330 MMR3DECL(int) MMR3HyperMapHCPhys(PVM pVM, void *pvR3, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
     330VMMR3DECL(int) MMR3HyperMapHCPhys(PVM pVM, void *pvR3, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
    331331{
    332332    LogFlow(("MMR3HyperMapHCPhys: pvR3=%p HCPhys=%RHp cb=%d pszDesc=%p:{%s} pGCPtr=%p\n", pvR3, HCPhys, (int)cb, pszDesc, pszDesc, pGCPtr));
    … …  
    376376 * @param   pGCPtr      Where to store the GC address.
    377377 */
    378 MMR3DECL(int) MMR3HyperMapGCPhys(PVM pVM, RTGCPHYS GCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
     378VMMR3DECL(int) MMR3HyperMapGCPhys(PVM pVM, RTGCPHYS GCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
    379379{
    380380    LogFlow(("MMR3HyperMapGCPhys: GCPhys=%VGp cb=%d pszDesc=%p:{%s} pGCPtr=%p\n", GCPhys, (int)cb, pszDesc, pszDesc, pGCPtr));
    … …  
    447447 * @param   pRCPtr      Where to store the RC address.
    448448 */
    449 MMR3DECL(int) MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
     449VMMR3DECL(int) MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
    450450                                const char *pszDesc, PRTRCPTR pRCPtr)
    451451{
    … …  
    529529 * @param   pGCPtr      Where to store the GC address corresponding to pvR3.
    530530 */
    531 MMR3DECL(int) MMR3HyperMapHCRam(PVM pVM, void *pvR3, size_t cb, bool fFree, const char *pszDesc, PRTGCPTR pGCPtr)
     531VMMR3DECL(int) MMR3HyperMapHCRam(PVM pVM, void *pvR3, size_t cb, bool fFree, const char *pszDesc, PRTGCPTR pGCPtr)
    532532{
    533533    LogFlow(("MMR3HyperMapHCRam: pvR3=%p cb=%d fFree=%d pszDesc=%p:{%s} pGCPtr=%p\n", pvR3, (int)cb, fFree, pszDesc, pszDesc, pGCPtr));
    … …  
    603603 * @param   pGCPtr      Where to store the GC address corresponding to pvR3.
    604604 */
    605 MMR3DECL(int) MMR3HyperMapPages(PVM pVM, void *pvR3, RTR0PTR pvR0, size_t cPages, PCSUPPAGE paPages, const char *pszDesc, PRTGCPTR pGCPtr)
     605VMMR3DECL(int) MMR3HyperMapPages(PVM pVM, void *pvR3, RTR0PTR pvR0, size_t cPages, PCSUPPAGE paPages, const char *pszDesc, PRTGCPTR pGCPtr)
    606606{
    607607    LogFlow(("MMR3HyperMapPages: pvR3=%p pvR0=%p cPages=%zu paPages=%p pszDesc=%p:{%s} pGCPtr=%p\n",
    … …  
    677677 * @param   pGCPtr      Where to store the assigned GC address. Optional.
    678678 */
    679 MMR3DECL(int) MMR3HyperReserve(PVM pVM, unsigned cb, const char *pszDesc, PRTGCPTR pGCPtr)
     679VMMR3DECL(int) MMR3HyperReserve(PVM pVM, unsigned cb, const char *pszDesc, PRTGCPTR pGCPtr)
    680680{
    681681    LogFlow(("MMR3HyperMapHCRam: cb=%d pszDesc=%p:{%s} pGCPtr=%p\n", (int)cb, pszDesc, pszDesc, pGCPtr));
    … …  
    876876 * @remark  This is assumed not to be used at times when serialization is required.
    877877 */
    878 MMDECL(int) MMR3HyperAllocOnceNoRel(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
     878VMMDECL(int) MMR3HyperAllocOnceNoRel(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
    879879{
    880880    AssertMsg(cb >= 8, ("Hey! Do you really mean to allocate less than 8 bytes?! cb=%d\n", cb));
    … …  
    967967 * @param   pvR3        Host context virtual address.
    968968 */
    969 MMR3DECL(RTHCPHYS) MMR3HyperHCVirt2HCPhys(PVM pVM, void *pvR3)
     969VMMR3DECL(RTHCPHYS) MMR3HyperHCVirt2HCPhys(PVM pVM, void *pvR3)
    970970{
    971971    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((uint8_t *)pVM->mm.s.pHyperHeapR3 + pVM->mm.s.offLookupHyper);
    … …  
    10201020 * @param   HCPhys      Host context physical address.
    10211021 */
    1022 MMR3DECL(void *) MMR3HyperHCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys)
     1022VMMR3DECL(void *) MMR3HyperHCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys)
    10231023{
    10241024    void *pv;
    … …  
    10391039 * @param   ppv         Where to store the HC virtual address.
    10401040 */
    1041 MMR3DECL(int)   MMR3HyperHCPhys2HCVirtEx(PVM pVM, RTHCPHYS HCPhys, void **ppv)
     1041VMMR3DECL(int)   MMR3HyperHCPhys2HCVirtEx(PVM pVM, RTHCPHYS HCPhys, void **ppv)
    10421042{
    10431043    /*
    … …  
    10611061 * @remarks For DBGF only.
    10621062 */
    1063 MMR3DECL(int) MMR3HyperReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)
     1063VMMR3DECL(int) MMR3HyperReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)
    10641064{
    10651065    if (GCPtr - pVM->mm.s.pvHyperAreaGC >= pVM->mm.s.cbHyperArea)

  • trunk/src/VBox/VMM/MMInternal.h

    r12968 r12989  
    3030#include <iprt/critsect.h>
    3131
    32 
    33 #if !defined(IN_MM_R3) && !defined(IN_MM_R0) && !defined(IN_MM_GC)
    34 # error "Not in MM! This is an internal header!"
    35 #endif
    3632
    3733
    … …  
    775771 * @thread  The Emulation Thread.
    776772 */
    777 MMDECL(RTHCPHYS) mmPagePoolPtr2Phys(PMMPAGEPOOL pPool, void *pv);
     773VMMDECL(RTHCPHYS) mmPagePoolPtr2Phys(PMMPAGEPOOL pPool, void *pv);
    778774
    779775/**
    … …  
    787783 * @thread  The Emulation Thread.
    788784 */
    789 MMDECL(void *) mmPagePoolPhys2Ptr(PMMPAGEPOOL pPool, RTHCPHYS HCPhys);
     785VMMDECL(void *) mmPagePoolPhys2Ptr(PMMPAGEPOOL pPool, RTHCPHYS HCPhys);
    790786
    791787__END_DECLS

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

    r12967 r12989  
    398398 * @thread  The Emulation Thread.
    399399 */
    400 MMR3DECL(void *) MMR3PageAlloc(PVM pVM)
     400VMMR3DECL(void *) MMR3PageAlloc(PVM pVM)
    401401{
    402402    return mmR3PagePoolAlloc(pVM->mm.s.pPagePoolR3);
    … …  
    416416 * @thread  The Emulation Thread.
    417417 */
    418 MMR3DECL(RTHCPHYS) MMR3PageAllocPhys(PVM pVM)
     418VMMR3DECL(RTHCPHYS) MMR3PageAllocPhys(PVM pVM)
    419419{
    420420    /** @todo optimize this, it's the most common case now. */
    … …  
    434434 * @thread  The Emulation Thread.
    435435 */
    436 MMR3DECL(void) MMR3PageFree(PVM pVM, void *pvPage)
     436VMMR3DECL(void) MMR3PageFree(PVM pVM, void *pvPage)
    437437{
    438438    mmR3PagePoolFree(pVM->mm.s.pPagePoolR3, pvPage);
    … …  
    448448 * @thread  The Emulation Thread.
    449449 */
    450 MMR3DECL(void *) MMR3PageAllocLow(PVM pVM)
     450VMMR3DECL(void *) MMR3PageAllocLow(PVM pVM)
    451451{
    452452    return mmR3PagePoolAlloc(pVM->mm.s.pPagePoolLowR3);
    … …  
    461461 * @thread  The Emulation Thread.
    462462 */
    463 MMR3DECL(void) MMR3PageFreeLow(PVM pVM, void *pvPage)
     463VMMR3DECL(void) MMR3PageFreeLow(PVM pVM, void *pvPage)
    464464{
    465465    mmR3PagePoolFree(pVM->mm.s.pPagePoolLowR3, pvPage);
    … …  
    476476 * @thread  The Emulation Thread.
    477477 */
    478 MMR3DECL(void) MMR3PageFreeByPhys(PVM pVM, RTHCPHYS HCPhysPage)
     478VMMR3DECL(void) MMR3PageFreeByPhys(PVM pVM, RTHCPHYS HCPhysPage)
    479479{
    480480    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolR3, HCPhysPage);
    … …  
    498498 * @thread  The Emulation Thread.
    499499 */
    500 MMR3DECL(void *) MMR3PageDummyHCPtr(PVM pVM)
     500VMMR3DECL(void *) MMR3PageDummyHCPtr(PVM pVM)
    501501{
    502502    VM_ASSERT_EMT(pVM);
    … …  
    522522 * @thread  The Emulation Thread.
    523523 */
    524 MMR3DECL(RTHCPHYS) MMR3PageDummyHCPhys(PVM pVM)
     524VMMR3DECL(RTHCPHYS) MMR3PageDummyHCPhys(PVM pVM)
    525525{
    526526    VM_ASSERT_EMT(pVM);

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

    r12967 r12989  
    5656 * @param   pszDesc     Description of the memory.
    5757 */
    58 MMR3DECL(int) MMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, const char *pszDesc)
     58VMMR3DECL(int) MMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, const char *pszDesc)
    5959{
    6060    return MMR3PhysRegisterEx(pVM, pvRam, GCPhys, cb, fFlags, MM_PHYS_TYPE_NORMAL, pszDesc);
    … …  
    8181 */
    8282/** @todo this function description is not longer up-to-date */
    83 MMR3DECL(int) MMR3PhysRegisterEx(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, MMPHYSREG enmType, const char *pszDesc)
     83VMMR3DECL(int) MMR3PhysRegisterEx(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, MMPHYSREG enmType, const char *pszDesc)
    8484{
    8585    int rc = VINF_SUCCESS;
    … …  
    220220 *          manually from the device yet. At present I doubt we need such features...
    221221 */
    222 MMR3DECL(int) MMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const void *pvBinary,
     222VMMR3DECL(int) MMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const void *pvBinary,
    223223                                  bool fShadow, const char *pszDesc)
    224224{
    … …  
    350350 * @param   pszDesc         Description string.
    351351 */
    352 MMR3DECL(int) MMR3PhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc)
     352VMMR3DECL(int) MMR3PhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc)
    353353{
    354354    /*
    … …  
    414414 * @thread  Any.
    415415 */
    416 MMR3DECL(uint64_t) MMR3PhysGetRamSize(PVM pVM)
     416VMMR3DECL(uint64_t) MMR3PhysGetRamSize(PVM pVM)
    417417{
    418418    return pVM->mm.s.cbRamBase;
    … …  
    460460 *                      This can be NULL (not sure about the BIOS interface yet).
    461461 */
    462 MMR3DECL(int) MMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
     462VMMR3DECL(int) MMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
    463463{
    464464    for (PMMROMRANGE pCur = pVM->mm.s.pRomHead; pCur; pCur = pCur->pNext)

  • trunk/src/VBox/VMM/Makefile.kmk

    r12980 r12989  
    3333
    3434VMMR3_TEMPLATE  = VBOXR3
    35 VMMR3_DEFS      = IN_VMM_R3  IN_PDM_R3  IN_CFGM_R3 IN_IOM_R3  IN_VM_R3   IN_CPUM_R3 IN_SELM_R3 IN_PGM_R3 IN_TRPM_R3 IN_MM_R3 IN_DBG_R3 \
    36                   IN_DBGF_R3 IN_PATM_R3 IN_DIS_R3  IN_STAM_R3 IN_CSAM_R3 IN_EM_R3   IN_TM_R3   IN_SSM_R3 IN_HWACCM_R3 IN_GMM_R3
     35VMMR3_DEFS      = IN_VMM_R3 IN_DIS IN_GMM_R3
     36## @todo eliminate IN_GMM_R3
    3737ifdef VBOX_WITH_IDT_PATCHING
    3838VMMR3_DEFS     += VBOX_WITH_IDT_PATCHING
    … …  
    264264        VMMGC \
    265265        PATM
    266 VMMGC_DEFS      = IN_VMM_GC IN_PDM_GC IN_CFGM_GC IN_IOM_GC IN_MM_GC IN_RT_GC IN_TRPM_GC IN_SELM_GC IN_VM_GC IN_IOM_GC IN_DIS_GC DIS_CORE_ONLY IN_PGM_GC IN_CPUM_GC IN_EM_GC IN_TM_GC IN_PATM_GC IN_CSAM_GC IN_REM_GC IN_DBGF_GC
     266VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY
    267267ifdef VBOX_WITH_IDT_PATCHING
    268268VMMGC_DEFS     += VBOX_WITH_IDT_PATCHING
    … …  
    349349        $(PATH_SUB_CURRENT) \
    350350        PATM
    351 VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_TRPM_R0 IN_CPUM_R0 IN_VM_R0 IN_TM_R0 IN_INTNET_R0 IN_HWACCM_R0 IN_EM_R0 IN_PDM_R0 IN_PGM_R0 IN_DIS_R0 IN_MM_R0 IN_SELM_R0 IN_CSAM_R0 IN_PATM_R0 IN_DBGF_R0 IN_REM_R0 IN_IOM_R0 IN_GVMM_R0 IN_GMM_R0 DIS_CORE_ONLY
     351VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0
     352## @todo eliminate IN_GVMM_R0 IN_GMM_R0
    352353ifdef VBOX_WITH_IDT_PATCHING
    353354VMMR0_DEFS     += VBOX_WITH_IDT_PATCHING

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

    r11792 r12989  
    109109 * @param   pVM         The VM to operate on.
    110110 */
    111 CSAMR3DECL(int) CSAMR3Init(PVM pVM)
     111VMMR3DECL(int) CSAMR3Init(PVM pVM)
    112112{
    113113    int rc;
    … …  
    255255 * @param   offDelta Relocation delta.
    256256 */
    257 CSAMR3DECL(void) CSAMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     257VMMR3DECL(void) CSAMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    258258{
    259259    if (offDelta)
    … …  
    283283 * @param   pVM         The VM to operate on.
    284284 */
    285 CSAMR3DECL(int) CSAMR3Term(PVM pVM)
     285VMMR3DECL(int) CSAMR3Term(PVM pVM)
    286286{
    287287    int rc;
    … …  
    308308 * @param   pVM     The VM which is reset.
    309309 */
    310 CSAMR3DECL(int) CSAMR3Reset(PVM pVM)
     310VMMR3DECL(int) CSAMR3Reset(PVM pVM)
    311311{
    312312    /* Clear page bitmaps. */
    … …  
    15211521 * @param   addr        GC address of the page to flush
    15221522 */
    1523 CSAMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTRCPTR addr)
     1523VMMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTRCPTR addr)
    15241524{
    15251525    return csamFlushPage(pVM, addr, true /* remove page record */);
    … …  
    15331533 * @param   addr        GC address of the page to flush
    15341534 */
    1535 CSAMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTRCPTR addr)
     1535VMMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTRCPTR addr)
    15361536{
    15371537    PCSAMPAGEREC pPageRec;
    … …  
    17061706 * @param   enmTag      Monitor tag
    17071707 */
    1708 CSAMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
     1708VMMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
    17091709{
    17101710    PCSAMPAGEREC pPageRec = NULL;
    … …  
    18281828 * @param   enmTag      Monitor tag
    18291829 */
    1830 CSAMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
     1830VMMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
    18311831{
    18321832    pPageAddrGC &= PAGE_BASE_GC_MASK;
    … …  
    20782078 * @param   fScanned    Mark as scanned or not
    20792079 */
    2080 CSAMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
     2080VMMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
    20812081{
    20822082    PCSAMPAGE pPage = 0;
    … …  
    21052105 * @param   pInstrGC    Instruction pointer
    21062106 */
    2107 CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, PCPUMCTXCORE pCtxCore, RTRCPTR pInstrGC)
     2107VMMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, PCPUMCTXCORE pCtxCore, RTRCPTR pInstrGC)
    21082108{
    21092109    if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
    … …  
    21312131 * @param   pInstrGC    Instruction pointer (0:32 virtual address)
    21322132 */
    2133 CSAMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTRCPTR pInstrGC)
     2133VMMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTRCPTR pInstrGC)
    21342134{
    21352135    int rc;
    … …  
    22362236 * @param   pVM         The VM to operate on.
    22372237 */
    2238 CSAMR3DECL(int) CSAMR3DoPendingAction(PVM pVM)
     2238VMMR3DECL(int) CSAMR3DoPendingAction(PVM pVM)
    22392239{
    22402240    csamR3FlushDirtyPages(pVM);
    … …  
    22532253 * @param   cGates      Number of gates to check
    22542254 */
    2255 CSAMR3DECL(int) CSAMR3CheckGates(PVM pVM, uint32_t iGate, uint32_t cGates)
     2255VMMR3DECL(int) CSAMR3CheckGates(PVM pVM, uint32_t iGate, uint32_t cGates)
    22562256{
    22572257    uint16_t    cbIDT;
    … …  
    24732473 * @param   GCPtrCall   Call address
    24742474 */
    2475 CSAMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTRCPTR GCPtrCall)
     2475VMMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTRCPTR GCPtrCall)
    24762476{
    24772477    for (unsigned i=0;i<RT_ELEMENTS(pVM->csam.s.pvCallInstruction);i++)
    … …  
    24972497 * @param   pVM         The VM to operate on.
    24982498 */
    2499 CSAMR3DECL(int) CSAMR3IsEnabled(PVM pVM)
     2499VMMR3DECL(int) CSAMR3IsEnabled(PVM pVM)
    25002500{
    25012501    return pVM->fCSAMEnabled;

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

    r9344 r12989  
    2929#include <VBox/log.h>
    3030
    31 #if !defined(IN_CSAM_R3) && !defined(IN_CSAM_R0) && !defined(IN_CSAM_GC)
    32 # error "Not in CSAM! This is an internal header!"
    33 #endif
    34 
    35 /** Page flags.
     31
     32
     33/** @name Page flags.
    3634 * These are placed in the three bits available for system programs in
    3735 * the page entries.
    … …  
    282280
    283281__BEGIN_DECLS
    284 CSAMGCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     282VMMRCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    285283__END_DECLS
    286284

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

    r12855 r12989  
    106106 * @param   pVM         The VM to operate on.
    107107 */
    108 PATMR3DECL(int) PATMR3Init(PVM pVM)
     108VMMR3DECL(int) PATMR3Init(PVM pVM)
    109109{
    110110    int rc;
    … …  
    279279 * @param   pVM     The VM handle.
    280280 */
    281 PATMR3DECL(int) PATMR3InitFinalize(PVM pVM)
     281VMMR3DECL(int) PATMR3InitFinalize(PVM pVM)
    282282{
    283283    /* The GC state, stack and statistics must be read/write for the guest (supervisor only of course). */
    … …  
    410410 * @param   pVM     The VM.
    411411 */
    412 PATMR3DECL(void) PATMR3Relocate(PVM pVM)
     412VMMR3DECL(void) PATMR3Relocate(PVM pVM)
    413413{
    414414    RTRCPTR     GCPtrNew = MMHyperHC2GC(pVM, pVM->patm.s.pGCStateHC);
    … …  
    467467 * @param   pVM         The VM to operate on.
    468468 */
    469 PATMR3DECL(int) PATMR3Term(PVM pVM)
     469VMMR3DECL(int) PATMR3Term(PVM pVM)
    470470{
    471471    /* Memory was all allocated from the two MM heaps and requires no freeing. */
    … …  
    480480 * @param   pVM     The VM which is reset.
    481481 */
    482 PATMR3DECL(int) PATMR3Reset(PVM pVM)
     482VMMR3DECL(int) PATMR3Reset(PVM pVM)
    483483{
    484484    Log(("PATMR3Reset\n"));
    … …  
    877877 * @param   pcb         Size of the patch memory block
    878878 */
    879 PATMR3DECL(void *) PATMR3QueryPatchMemHC(PVM pVM, uint32_t *pcb)
     879VMMR3DECL(void *) PATMR3QueryPatchMemHC(PVM pVM, uint32_t *pcb)
    880880{
    881881    if (pcb)
    … …  
    894894 * @param   pcb         Size of the patch memory block
    895895 */
    896 PATMR3DECL(RTRCPTR) PATMR3QueryPatchMemGC(PVM pVM, uint32_t *pcb)
     896VMMR3DECL(RTRCPTR) PATMR3QueryPatchMemGC(PVM pVM, uint32_t *pcb)
    897897{
    898898    if (pcb)
    … …  
    910910 * @param   pVM         The VM to operate on.
    911911 */
    912 PATMR3DECL(PPATMGCSTATE) PATMR3QueryGCStateHC(PVM pVM)
     912VMMR3DECL(PPATMGCSTATE) PATMR3QueryGCStateHC(PVM pVM)
    913913{
    914914    return pVM->patm.s.pGCStateHC;
    … …  
    923923 * @param   pAddrGC     Guest context address
    924924 */
    925 PATMR3DECL(bool) PATMR3IsPatchHCAddr(PVM pVM, R3PTRTYPE(uint8_t *) pAddrHC)
     925VMMR3DECL(bool) PATMR3IsPatchHCAddr(PVM pVM, R3PTRTYPE(uint8_t *) pAddrHC)
    926926{
    927927    return (pAddrHC >= pVM->patm.s.pPatchMemHC && pAddrHC < pVM->patm.s.pPatchMemHC + pVM->patm.s.cbPatchMem) ? true : false;
    … …  
    936936 * @param   fAllowPatching Allow/disallow patching
    937937 */
    938 PATMR3DECL(int) PATMR3AllowPatching(PVM pVM, uint32_t fAllowPatching)
     938VMMR3DECL(int) PATMR3AllowPatching(PVM pVM, uint32_t fAllowPatching)
    939939{
    940940    pVM->fPATMEnabled = (fAllowPatching) ? true : false;
    … …  
    949949 * @param   pAddrGC     GC pointer
    950950 */
    951 PATMR3DECL(R3PTRTYPE(void *)) PATMR3GCPtrToHCPtr(PVM pVM, RTRCPTR pAddrGC)
     951VMMR3DECL(R3PTRTYPE(void *)) PATMR3GCPtrToHCPtr(PVM pVM, RTRCPTR pAddrGC)
    952952{
    953953    if (pVM->patm.s.pPatchMemGC <= pAddrGC && pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem > pAddrGC)
    … …  
    964964 * @param   pVM         The VM to operate on.
    965965 */
    966 PATMR3DECL(int) PATMR3IsEnabled(PVM pVM)
     966VMMR3DECL(int) PATMR3IsEnabled(PVM pVM)
    967967{
    968968    return pVM->fPATMEnabled;
    … …  
    22412241 *
    22422242 */
    2243 PATMR3DECL(int) PATMR3DetectConflict(PVM pVM, RTRCPTR pInstrGC, RTRCPTR pConflictGC)
     2243VMMR3DECL(int) PATMR3DetectConflict(PVM pVM, RTRCPTR pInstrGC, RTRCPTR pConflictGC)
    22442244{
    22452245    PPATCHINFO pTargetPatch = PATMFindActivePatchByEntrypoint(pVM, pConflictGC, true /* include patch hints */);
    … …  
    26502650 *
    26512651 */
    2652 PATMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
     2652VMMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
    26532653                                 uint32_t uOpcode, uint32_t uOpSize, PPATMPATCHREC pPatchRec)
    26542654{
    … …  
    33753375 *
    33763376 */
    3377 PATMR3DECL(int) PATMR3DuplicateFunctionRequest(PVM pVM, PCPUMCTX pCtx)
     3377VMMR3DECL(int) PATMR3DuplicateFunctionRequest(PVM pVM, PCPUMCTX pCtx)
    33783378{
    33793379    RTRCPTR     pBranchTarget, pPage;
    … …  
    37583758 *
    37593759 */
    3760 PATMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch)
     3760VMMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch)
    37613761{
    37623762    uint8_t ASMInt3 = 0xCC;
    … …  
    39343934 * @param   flags       Patch flags
    39353935 */
    3936 PATMR3DECL(int) PATMR3AddHint(PVM pVM, RTRCPTR pInstrGC, uint32_t flags)
     3936VMMR3DECL(int) PATMR3AddHint(PVM pVM, RTRCPTR pInstrGC, uint32_t flags)
    39373937{
    39383938    Assert(pInstrGC);
    … …  
    39533953 * @note    returns failure if patching is not allowed or possible
    39543954 */
    3955 PATMR3DECL(int) PATMR3InstallPatch(PVM pVM, RTRCPTR pInstrGC, uint64_t flags)
     3955VMMR3DECL(int) PATMR3InstallPatch(PVM pVM, RTRCPTR pInstrGC, uint64_t flags)
    39563956{
    39573957    DISCPUSTATE cpu;
    … …  
    46804680 *
    46814681 */
    4682 PATMR3DECL(int) PATMR3PatchWrite(PVM pVM, RTRCPTR GCPtr, uint32_t cbWrite)
     4682VMMR3DECL(int) PATMR3PatchWrite(PVM pVM, RTRCPTR GCPtr, uint32_t cbWrite)
    46834683{
    46844684    RTRCUINTPTR          pWritePageStart, pWritePageEnd, pPage;
    … …  
    48544854/** @note Currently only called by CSAMR3FlushPage; optimization to avoid having to double check if the physical address has changed
    48554855 */
    4856 PATMR3DECL(int) PATMR3FlushPage(PVM pVM, RTRCPTR addr)
     4856VMMR3DECL(int) PATMR3FlushPage(PVM pVM, RTRCPTR addr)
    48574857{
    48584858    addr &= PAGE_BASE_GC_MASK;
    … …  
    48864886 * @param   pInstrGC    Guest context pointer to instruction
    48874887 */
    4888 PATMR3DECL(bool) PATMR3HasBeenPatched(PVM pVM, RTRCPTR pInstrGC)
     4888VMMR3DECL(bool) PATMR3HasBeenPatched(PVM pVM, RTRCPTR pInstrGC)
    48894889{
    48904890    PPATMPATCHREC pPatchRec;
    … …  
    49044904 *
    49054905 */
    4906 PATMR3DECL(int) PATMR3QueryOpcode(PVM pVM, RTRCPTR pInstrGC, uint8_t *pByte)
     4906VMMR3DECL(int) PATMR3QueryOpcode(PVM pVM, RTRCPTR pInstrGC, uint8_t *pByte)
    49074907{
    49084908    PPATMPATCHREC pPatchRec;
    … …  
    49484948 *
    49494949 */
    4950 PATMR3DECL(int) PATMR3DisablePatch(PVM pVM, RTRCPTR pInstrGC)
     4950VMMR3DECL(int) PATMR3DisablePatch(PVM pVM, RTRCPTR pInstrGC)
    49514951{
    49524952    PPATMPATCHREC pPatchRec;
    … …  
    52025202 *
    52035203 */
    5204 PATMR3DECL(int) PATMR3EnablePatch(PVM pVM, RTRCPTR pInstrGC)
     5204VMMR3DECL(int) PATMR3EnablePatch(PVM pVM, RTRCPTR pInstrGC)
    52055205{
    52065206    PPATMPATCHREC pPatchRec;
    … …  
    55525552 * @param   pPatchAddr  Guest context patch address (if true)
    55535553 */
    5554 PATMR3DECL(bool) PATMR3IsInsidePatchJump(PVM pVM, RTRCPTR pAddr, PRTGCPTR32 pPatchAddr)
     5554VMMR3DECL(bool) PATMR3IsInsidePatchJump(PVM pVM, RTRCPTR pAddr, PRTGCPTR32 pPatchAddr)
    55555555{
    55565556    RTRCPTR addr;
    … …  
    55835583 *
    55845584 */
    5585 PATMR3DECL(int) PATMR3RemovePatch(PVM pVM, RTRCPTR pInstrGC)
     5585VMMR3DECL(int) PATMR3RemovePatch(PVM pVM, RTRCPTR pInstrGC)
    55865586{
    55875587    PPATMPATCHREC pPatchRec;
    … …  
    56095609 *
    56105610 */
    5611 PATMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch)
     5611VMMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch)
    56125612{
    56135613    if (pPatch->pPatchBlockOffset)
    … …  
    57045704 *
    57055705 */
    5706 PATMR3DECL(RTRCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, RCPTRTYPE(uint8_t*) pInstrGC)
     5706VMMR3DECL(RTRCPTR) PATMR3GuestGCPtrToPatchGCPtr(PVM pVM, RCPTRTYPE(uint8_t*) pInstrGC)
    57075707{
    57085708    PPATMPATCHREC pPatchRec = (PPATMPATCHREC)RTAvloU32GetBestFit(&pVM->patm.s.PatchLookupTreeHC->PatchTree, pInstrGC, false);
    … …  
    57235723 *
    57245724 */
    5725 PATMR3DECL(RTRCPTR) PATMR3PatchToGCPtr(PVM pVM, RTRCPTR pPatchGC, PATMTRANSSTATE *pEnmState)
     5725VMMR3DECL(RTRCPTR) PATMR3PatchToGCPtr(PVM pVM, RTRCPTR pPatchGC, PATMTRANSSTATE *pEnmState)
    57265726{
    57275727    PPATMPATCHREC pPatchRec;
    … …  
    57895789 * @param   pAddrGC     Guest context address
    57905790 */
    5791 PATMR3DECL(RTRCPTR) PATMR3QueryPatchGCPtr(PVM pVM, RTRCPTR pAddrGC)
     5791VMMR3DECL(RTRCPTR) PATMR3QueryPatchGCPtr(PVM pVM, RTRCPTR pAddrGC)
    57925792{
    57935793    PPATMPATCHREC pPatchRec;
    … …  
    59835983 * @param   ppNewEip    GC pointer to new instruction
    59845984 */
    5985 PATMR3DECL(int) PATMR3HandleTrap(PVM pVM, PCPUMCTX pCtx, RTRCPTR pEip, RTGCPTR *ppNewEip)
     5985VMMR3DECL(int) PATMR3HandleTrap(PVM pVM, PCPUMCTX pCtx, RTRCPTR pEip, RTGCPTR *ppNewEip)
    59865986{
    59875987    PPATMPATCHREC    pPatch = 0;
    … …  
    61056105        {
    61066106            /* Invalidated patch or first instruction overwritten.
    6107              * We can ignore the fPIF state in this case. 
     6107             * We can ignore the fPIF state in this case.
    61086108             */
    61096109            /* Reset the PATM stack. */
    … …  
    61136113
    61146114            pVM->patm.s.pGCStateHC->fPIF = 1;
    6115            
     6115
    61166116            /* continue at the original instruction */
    61176117            *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
    … …  
    62646264 * @param   pVM         The VM to operate on.
    62656265 */
    6266 PATMR3DECL(int) PATMR3HandleMonitoredPage(PVM pVM)
     6266VMMR3DECL(int) PATMR3HandleMonitoredPage(PVM pVM)
    62676267{
    62686268    RTRCPTR addr = pVM->patm.s.pvFaultMonitor;

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

    r12855 r12989  
    3333#include <VBox/log.h>
    3434
    35 #if !defined(IN_PATM_R3) && !defined(IN_PATM_R0) && !defined(IN_PATM_GC)
    36 # error "Not in PATM! This is an internal header!"
    37 #endif
    3835
    3936
    … …  
    639636 *
    640637 */
    641 PATMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC);
     638VMMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC);
    642639
    643640
    … …  
    668665 * @param   fPatchFlags Patch flags
    669666 */
    670 PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
     667VMMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags);
    671668
    672669
    … …  
    731728 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    732729 */
    733 PATMGCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     730VMMRCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    734731
    735732/**
    … …  
    758755 *
    759756 */
    760 PATMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
     757VMMR3DECL(int) PATMR3PatchBlock(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC,
    761758                                 uint32_t uOpcode, uint32_t uOpSize, PPATMPATCHREC pPatchRec);
    762759
    … …  
    775772 *
    776773 */
    777 PATMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch);
     774VMMR3DECL(int) PATMR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch);
    778775
    779776/**
    … …  
    787784 *
    788785 */
    789 PATMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch);
     786VMMR3DECL(int) PATMR3MarkDirtyPatch(PVM pVM, PPATCHINFO pPatch);
    790787
    791788/**

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

    r9344 r12989  
    5353 * @param   pvFault     Fault address
    5454 */
    55 CSAMDECL(int) CSAMExecFault(PVM pVM, RTRCPTR pvFault)
     55VMMDECL(int) CSAMExecFault(PVM pVM, RTRCPTR pvFault)
    5656{
    5757    if(!CSAMIsEnabled(pVM))
    … …  
    8080 * @param   pPage       GC page address
    8181 */
    82 CSAMDECL(bool) CSAMIsPageScanned(PVM pVM, RTRCPTR pPage)
     82VMMDECL(bool) CSAMIsPageScanned(PVM pVM, RTRCPTR pPage)
    8383{
    8484    int pgdir, bit;
    … …  
    108108 *
    109109 */
    110 CSAMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
     110VMMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
    111111{
    112112    int pgdir, bit;
    … …  
    177177 * @param   GCPtr       GC pointer of page
    178178 */
    179 CSAMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
     179VMMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
    180180{
    181181    if(!CSAMIsEnabled(pVM))
    … …  
    200200 * @param   GCPtr       GC pointer of page
    201201 */
    202 CSAMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTRCPTR GCPtr)
     202VMMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTRCPTR GCPtr)
    203203{
    204204    if (pVM->csam.s.cPossibleCodePages < RT_ELEMENTS(pVM->csam.s.pvPossibleCodePage))
    … …  
    217217 * @param   pVM         The VM to operate on.
    218218 */
    219 CSAMDECL(int) CSAMEnableScanning(PVM pVM)
     219VMMDECL(int) CSAMEnableScanning(PVM pVM)
    220220{
    221221    pVM->fCSAMEnabled = true;
    … …  
    229229 * @param   pVM         The VM to operate on.
    230230 */
    231 CSAMDECL(int) CSAMDisableScanning(PVM pVM)
     231VMMDECL(int) CSAMDisableScanning(PVM pVM)
    232232{
    233233    pVM->fCSAMEnabled = false;
    … …  
    247247 * @param   GCPtr       GC pointer of page table entry
    248248 */
    249 CSAMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTRCPTR GCPtr)
     249VMMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTRCPTR GCPtr)
    250250{
    251251    for (uint32_t i=0;i<pVM->csam.s.cDangerousInstr;i++)

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

    r9344 r12989  
    5050 * @see     pg_raw
    5151 */
    52 PATMDECL(void) PATMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
     52VMMDECL(void) PATMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
    5353{
    5454    bool fPatchCode = PATMIsPatchGCAddr(pVM, (RTRCPTR)pCtxCore->eip);
    … …  
    124124 * @see     @ref pg_raw
    125125 */
    126 PATMDECL(void) PATMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rawRC)
     126VMMDECL(void) PATMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rawRC)
    127127{
    128128    bool fPatchCode = PATMIsPatchGCAddr(pVM, (RTRCPTR)pCtxCore->eip);
    … …  
    216216 * @param   pCtxCore    The context core.
    217217 */
    218 PATMDECL(uint32_t) PATMRawGetEFlags(PVM pVM, PCCPUMCTXCORE pCtxCore)
     218VMMDECL(uint32_t) PATMRawGetEFlags(PVM pVM, PCCPUMCTXCORE pCtxCore)
    219219{
    220220    uint32_t efl = pCtxCore->eflags.u32;
    … …  
    232232 * @param   efl         The new EFLAGS value.
    233233 */
    234 PATMDECL(void) PATMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t efl)
     234VMMDECL(void) PATMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t efl)
    235235{
    236236    pVM->patm.s.CTXSUFF(pGCState)->uVMFlags = efl & PATM_VIRTUAL_FLAGS_MASK;
    … …  
    246246 * @param   pAddrGC     Guest context address
    247247 */
    248 PATMDECL(bool) PATMShouldUseRawMode(PVM pVM, RTRCPTR pAddrGC)
     248VMMDECL(bool) PATMShouldUseRawMode(PVM pVM, RTRCPTR pAddrGC)
    249249{
    250250    return (    PATMIsEnabled(pVM)
    … …  
    258258 * @param   pVM         The VM to operate on.
    259259 */
    260 PATMDECL(RCPTRTYPE(PPATMGCSTATE)) PATMQueryGCState(PVM pVM)
     260VMMDECL(RCPTRTYPE(PPATMGCSTATE)) PATMQueryGCState(PVM pVM)
    261261{
    262262    return pVM->patm.s.pGCStateGC;
    … …  
    270270 * @param   pAddrGC     Guest context address
    271271 */
    272 PATMDECL(bool) PATMIsPatchGCAddr(PVM pVM, RTRCPTR pAddrGC)
     272VMMDECL(bool) PATMIsPatchGCAddr(PVM pVM, RTRCPTR pAddrGC)
    273273{
    274274    return (PATMIsEnabled(pVM) && pAddrGC >= pVM->patm.s.pPatchMemGC && pAddrGC < (RTRCPTR)((RTRCUINTPTR)pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem)) ? true : false;
    … …  
    283283 * @param   pCachedData     GC pointer to cached data
    284284 */
    285 PATMDECL(int) PATMSetMMIOPatchInfo(PVM pVM, RTGCPHYS GCPhys, RTRCPTR pCachedData)
     285VMMDECL(int) PATMSetMMIOPatchInfo(PVM pVM, RTGCPHYS GCPhys, RTRCPTR pCachedData)
    286286{
    287287    pVM->patm.s.mmio.GCPhys = GCPhys;
    … …  
    299299 * @param   pVM         The VM handle.
    300300 */
    301 PATMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
     301VMMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
    302302{
    303303    PCPUMCTX pCtx = 0;
    … …  
    319319 * @param   pCtxCore    CPU context
    320320 */
    321 PATMDECL(bool) PATMAreInterruptsEnabledByCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
     321VMMDECL(bool) PATMAreInterruptsEnabledByCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
    322322{
    323323    if (PATMIsEnabled(pVM))
    … …  
    337337 *
    338338 */
    339 PATMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC)
     339VMMDECL(PPATMPATCHREC) PATMQueryFunctionPatch(PVM pVM, RTRCPTR pInstrGC)
    340340{
    341341    PPATMPATCHREC pRec;
    … …  
    361361 * @param   pSize       Original instruction size (out, optional)
    362362 */
    363 PATMDECL(bool) PATMIsInt3Patch(PVM pVM, RTRCPTR pInstrGC, uint32_t *pOpcode, uint32_t *pSize)
     363VMMDECL(bool) PATMIsInt3Patch(PVM pVM, RTRCPTR pInstrGC, uint32_t *pOpcode, uint32_t *pSize)
    364364{
    365365    PPATMPATCHREC pRec;
    … …  
    387387 * @param   pCpu        Disassembly context
    388388 */
    389 PATMDECL(int) PATMSysCall(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     389VMMDECL(int) PATMSysCall(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    390390{
    391391    PCPUMCTX pCtx;
    … …  
    466466 * @param   pRelBranchPatch     Relative duplicated function address
    467467 */
    468 PATMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTRCUINTPTR pRelBranchPatch)
     468VMMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTRCUINTPTR pRelBranchPatch)
    469469{
    470470    PPATCHJUMPTABLE pJumpTable;
    … …  
    532532 * @param   fPatchFlags Patch flags
    533533 */
    534 PATMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
     534VMMDECL(const char *) patmGetInstructionString(uint32_t opcode, uint32_t fPatchFlags)
    535535{
    536536    const char *pszInstr = NULL;

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

    r12305 r12989  
    6363 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    6464 */
    65 CSAMGCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     65VMMRCDECL(int) CSAMGCCodePageWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    6666{
    6767    PPATMGCSTATE pPATMGCState;
    … …  
    7979    Assert(pPATMGCState->fPIF || fPatchCode);
    8080    /** When patch code is executing instructions that must complete, then we must *never* interrupt it. */
    81     if (!pPATMGCState->fPIF && fPatchCode)       
     81    if (!pPATMGCState->fPIF && fPatchCode)
    8282    {
    8383        Log(("CSAMGCCodePageWriteHandler: fPIF=0 -> stack fault in patch generated code at %VGv!\n", pRegFrame->eip));
    … …  
    9595
    9696    uint32_t cpl;
    97    
     97
    9898    if (pRegFrame->eflags.Bits.u1VM)
    9999        cpl = 3;

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

    r12855 r12989  
    6363 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    6464 */
    65 PATMGCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     65VMMRCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    6666{
    6767    pVM->patm.s.pvFaultMonitor = (RTRCPTR)pvFault;
    … …  
    8181 *
    8282 */
    83 PATMGCDECL(int) PATMGCHandleWriteToPatchPage(PVM pVM, PCPUMCTXCORE pRegFrame, RTRCPTR GCPtr, uint32_t cbWrite)
     83VMMRCDECL(int) PATMGCHandleWriteToPatchPage(PVM pVM, PCPUMCTXCORE pRegFrame, RTRCPTR GCPtr, uint32_t cbWrite)
    8484{
    8585    RTGCUINTPTR          pWritePageStart, pWritePageEnd;
    … …  
    155155 * @param   pCtxCore    The relevant core context.
    156156 */
    157 PATMDECL(int) PATMGCHandleIllegalInstrTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
     157VMMDECL(int) PATMGCHandleIllegalInstrTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
    158158{
    159159    PPATMPATCHREC pRec;
    … …  
    286286                if (VBOX_SUCCESS(rc))
    287287                {
    288                     STAM_COUNTER_INC(&pVM->patm.s.StatEmulIret); 
     288                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIret);
    289289
    290290                    /* We are no longer executing PATM code; set PIF again. */
    … …  
    293293                    /* does not return */
    294294                }
    295                 else 
    296                     STAM_COUNTER_INC(&pVM->patm.s.StatEmulIretFailed); 
     295                else
     296                    STAM_COUNTER_INC(&pVM->patm.s.StatEmulIretFailed);
    297297                return rc;
    298298            }
    … …  
    443443 * @param   pCtxCore    The relevant core context.
    444444 */
    445 PATMDECL(int) PATMHandleInt3PatchTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
     445VMMDECL(int) PATMHandleInt3PatchTrap(PVM pVM, PCPUMCTXCORE pRegFrame)
    446446{
    447447    PPATMPATCHREC pRec;

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

    r12988 r12989  
    279279 * @param   pUVM        Pointer to the user mode VM structure.
    280280 */
    281 PDMR3DECL(int) PDMR3InitUVM(PUVM pUVM)
     281VMMR3DECL(int) PDMR3InitUVM(PUVM pUVM)
    282282{
    283283    AssertCompile(sizeof(pUVM->pdm.s) <= sizeof(pUVM->pdm.padding));
    … …  
    294294 * @param   pVM         The VM to operate on.
    295295 */
    296 PDMR3DECL(int) PDMR3Init(PVM pVM)
     296VMMR3DECL(int) PDMR3Init(PVM pVM)
    297297{
    298298    LogFlow(("PDMR3Init\n"));
    … …  
    372372 *          early in the relocation phase.
    373373 */
    374 PDMR3DECL(void) PDMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     374VMMR3DECL(void) PDMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    375375{
    376376    LogFlow(("PDMR3Relocate\n"));
    … …  
    509509 * @param   pVM         The VM to operate on.
    510510 */
    511 PDMR3DECL(int) PDMR3Term(PVM pVM)
     511VMMR3DECL(int) PDMR3Term(PVM pVM)
    512512{
    513513    LogFlow(("PDMR3Term:\n"));
    … …  
    592592 * @param   pUVM        Pointer to the user mode VM structure.
    593593 */
    594 PDMR3DECL(void) PDMR3TermUVM(PUVM pUVM)
     594VMMR3DECL(void) PDMR3TermUVM(PUVM pUVM)
    595595{
    596596    /*
    … …  
    809809 * @param   pVM     VM Handle.
    810810 */
    811 PDMR3DECL(void) PDMR3PowerOn(PVM pVM)
     811VMMR3DECL(void) PDMR3PowerOn(PVM pVM)
    812812{
    813813    LogFlow(("PDMR3PowerOn:\n"));
    … …  
    875875 * @param   pVM     VM Handle.
    876876 */
    877 PDMR3DECL(void) PDMR3Reset(PVM pVM)
     877VMMR3DECL(void) PDMR3Reset(PVM pVM)
    878878{
    879879    LogFlow(("PDMR3Reset:\n"));
    … …  
    941941 * @param   pVM     VM Handle.
    942942 */
    943 PDMR3DECL(void) PDMR3Suspend(PVM pVM)
     943VMMR3DECL(void) PDMR3Suspend(PVM pVM)
    944944{
    945945    LogFlow(("PDMR3Suspend:\n"));
    … …  
    10041004 * @param   pVM     VM Handle.
    10051005 */
    1006 PDMR3DECL(void) PDMR3Resume(PVM pVM)
     1006VMMR3DECL(void) PDMR3Resume(PVM pVM)
    10071007{
    10081008    LogFlow(("PDMR3Resume:\n"));
    … …  
    10671067 * @param   pVM     VM Handle.
    10681068 */
    1069 PDMR3DECL(void) PDMR3PowerOff(PVM pVM)
     1069VMMR3DECL(void) PDMR3PowerOff(PVM pVM)
    10701070{
    10711071    LogFlow(("PDMR3PowerOff:\n"));
    … …  
    11381138 *          device chain is known to be updated.
    11391139 */
    1140 PDMR3DECL(int) PDMR3QueryDevice(PVM pVM, const char *pszDevice, unsigned iInstance, PPDMIBASE *ppBase)
     1140VMMR3DECL(int) PDMR3QueryDevice(PVM pVM, const char *pszDevice, unsigned iInstance, PPDMIBASE *ppBase)
    11411141{
    11421142    LogFlow(("PDMR3DeviceQuery: pszDevice=%p:{%s} iInstance=%u ppBase=%p\n", pszDevice, pszDevice, iInstance, ppBase));
    … …  
    11951195 *          device chain is known to be updated.
    11961196 */
    1197 PDMR3DECL(int) PDMR3QueryDeviceLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
     1197VMMR3DECL(int) PDMR3QueryDeviceLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
    11981198{
    11991199    LogFlow(("PDMR3QueryLun: pszDevice=%p:{%s} iInstance=%u iLun=%u ppBase=%p\n",
    … …  
    12281228 *          device chain is known to be updated.
    12291229 */
    1230 PDMR3DECL(int) PDMR3QueryLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
     1230VMMR3DECL(int) PDMR3QueryLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
    12311231{
    12321232    LogFlow(("PDMR3QueryLun: pszDevice=%p:{%s} iInstance=%u iLun=%u ppBase=%p\n",
    … …  
    12581258 * @param   pVM             VM handle.
    12591259 */
    1260 PDMR3DECL(void) PDMR3DmaRun(PVM pVM)
     1260VMMR3DECL(void) PDMR3DmaRun(PVM pVM)
    12611261{
    12621262    VM_FF_CLEAR(pVM, VM_FF_PDM_DMA);
    … …  
    12751275 * @param   pVM             VM handle.
    12761276 */
    1277 PDMR3DECL(void) PDMR3Poll(PVM pVM)
     1277VMMR3DECL(void) PDMR3Poll(PVM pVM)
    12781278{
    12791279    /* This is temporary hack and shall be removed ASAP! */
    … …  
    13071307 * @param   pVM     The VM handle.
    13081308 */
    1309 PDMR3DECL(int) PDMR3LockCall(PVM pVM)
     1309VMMR3DECL(int) PDMR3LockCall(PVM pVM)
    13101310{
    13111311    return PDMR3CritSectEnterEx(&pVM->pdm.s.CritSect, true /* fHostCall */);
    … …  
    13221322 * @param   cbSize          Size of the heap.
    13231323 */
    1324 PDMR3DECL(int) PDMR3RegisterVMMDevHeap(PVM pVM, RTGCPHYS GCPhys, RTR3PTR pvHeap, unsigned cbSize)
     1324VMMR3DECL(int) PDMR3RegisterVMMDevHeap(PVM pVM, RTGCPHYS GCPhys, RTR3PTR pvHeap, unsigned cbSize)
    13251325{
    13261326    Assert(pVM->pdm.s.pvVMMDevHeap == NULL);
    … …  
    13421342 * @param   GCPhys          The physical address.
    13431343 */
    1344 PDMR3DECL(int) PDMR3UnregisterVMMDevHeap(PVM pVM, RTGCPHYS GCPhys)
     1344VMMR3DECL(int) PDMR3UnregisterVMMDevHeap(PVM pVM, RTGCPHYS GCPhys)
    13451345{
    13461346    Assert(pVM->pdm.s.GCPhysVMMDevHeap == GCPhys);
    … …  
    13631363 * @param   pv              Ring-3 pointer. (out)
    13641364 */
    1365 PDMR3DECL(int) PDMR3VMMDevHeapAlloc(PVM pVM, unsigned cbSize, RTR3PTR *ppv)
     1365VMMR3DECL(int) PDMR3VMMDevHeapAlloc(PVM pVM, unsigned cbSize, RTR3PTR *ppv)
    13661366{
    13671367    AssertReturn(cbSize && cbSize <= pVM->pdm.s.cbVMMDevHeapLeft, VERR_NO_MEMORY);
    … …  
    13831383 * @param   pv              Ring-3 pointer.
    13841384 */
    1385 PDMR3DECL(int) PDMR3VMMDevHeapFree(PVM pVM, RTR3PTR pv)
     1385VMMR3DECL(int) PDMR3VMMDevHeapFree(PVM pVM, RTR3PTR pv)
    13861386{
    13871387    Log(("PDMR3VMMDevHeapFree %VHv\n", pv));

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

    r12983 r12989  
    8484 * @remark  Don't confuse this with PDMR3CritSectDelete.
    8585 */
    86 PDMDECL(int) PDMR3CritSectTerm(PVM pVM)
     86VMMDECL(int) PDMR3CritSectTerm(PVM pVM)
    8787{
    8888    int rc = VINF_SUCCESS;
    … …  
    144144 * @param   pszName         The name of the critical section (for statistics).
    145145 */
    146 PDMR3DECL(int) PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName)
     146VMMR3DECL(int) PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName)
    147147{
    148148#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
    … …  
    262262 * @param   pCritSect           The PDM critical section to destroy.
    263263 */
    264 PDMR3DECL(int) PDMR3CritSectDelete(PPDMCRITSECT pCritSect)
     264VMMR3DECL(int) PDMR3CritSectDelete(PPDMCRITSECT pCritSect)
    265265{
    266266    if (!RTCritSectIsInitialized(&pCritSect->s.Core))
    … …  
    293293 * @param   pVM         The VM handle.
    294294 */
    295 PDMR3DECL(void) PDMR3CritSectFF(PVM pVM)
     295VMMR3DECL(void) PDMR3CritSectFF(PVM pVM)
    296296{
    297297    Assert(pVM->pdm.s.cQueuedCritSectLeaves > 0);
    … …  
    320320 * @param   pCritSect   The critical section.
    321321 */
    322 PDMR3DECL(int) PDMR3CritSectTryEnter(PPDMCRITSECT pCritSect)
     322VMMR3DECL(int) PDMR3CritSectTryEnter(PPDMCRITSECT pCritSect)
    323323{
    324324    return RTCritSectTryEnter(&pCritSect->s.Core);
    … …  
    336336 * @param   EventToSignal     The semapore that should be signalled.
    337337 */
    338 PDMR3DECL(int) PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal)
     338VMMR3DECL(int) PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal)
    339339{
    340340    Assert(EventToSignal != NIL_RTSEMEVENT);

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

    r12984 r12989  
    788788 * @thread  EMT
    789789 */
    790 PDMR3DECL(int) PDMR3DeviceAttach(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
     790VMMR3DECL(int) PDMR3DeviceAttach(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
    791791{
    792792    VM_ASSERT_EMT(pVM);
    … …  
    844844 * @thread  EMT
    845845 */
    846 PDMR3DECL(int) PDMR3DeviceDetach(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun)
     846VMMR3DECL(int) PDMR3DeviceDetach(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun)
    847847{
    848848    VM_ASSERT_EMT(pVM);

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

    r12986 r12989  
    9595 * @param   pfnCallback Driver registration callback
    9696 */
    97 PDMR3DECL(int) PDMR3RegisterDrivers(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnCallback)
     97VMMR3DECL(int) PDMR3RegisterDrivers(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnCallback)
    9898{
    9999    /*

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

    r12975 r12989  
    7979 * @param   pUVM            Pointer to the user mode VM structure.
    8080 */
    81 PDMR3DECL(int) PDMR3LdrLoadVMMR0U(PUVM pUVM)
     81VMMR3DECL(int) PDMR3LdrLoadVMMR0U(PUVM pUVM)
    8282{
    8383    return pdmR3LoadR0U(pUVM, NULL, VMMR0_MAIN_MODULE_NAME);
    … …  
    175175 * @param   offDelta    Relocation delta relative to old location.
    176176 */
    177 PDMR3DECL(void) PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta)
     177VMMR3DECL(void) PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta)
    178178{
    179179    LogFlow(("PDMR3LdrRelocate: offDelta=%VGv\n", offDelta));
    … …  
    408408 * @param   pszName         Module name. Case sensitive and the length is limited!
    409409 */
    410 PDMR3DECL(int) PDMR3LdrLoadRC(PVM pVM, const char *pszFilename, const char *pszName)
     410VMMR3DECL(int) PDMR3LdrLoadRC(PVM pVM, const char *pszFilename, const char *pszName)
    411411{
    412412    /*
    … …  
    619619 * @param   ppvValue        Where to store the symbol value.
    620620 */
    621 PDMR3DECL(int) PDMR3LdrGetSymbolR3(PVM pVM, const char *pszModule, const char *pszSymbol, void **ppvValue)
     621VMMR3DECL(int) PDMR3LdrGetSymbolR3(PVM pVM, const char *pszModule, const char *pszSymbol, void **ppvValue)
    622622{
    623623    /*
    … …  
    667667 * @param   ppvValue        Where to store the symbol value.
    668668 */
    669 PDMR3DECL(int) PDMR3LdrGetSymbolR0(PVM pVM, const char *pszModule, const char *pszSymbol, PRTR0PTR ppvValue)
     669VMMR3DECL(int) PDMR3LdrGetSymbolR0(PVM pVM, const char *pszModule, const char *pszSymbol, PRTR0PTR ppvValue)
    670670{
    671671#ifdef PDMLDR_FAKE_MODE
    … …  
    715715 * @param   ppvValue        Where to store the symbol value.
    716716 */
    717 PDMR3DECL(int) PDMR3LdrGetSymbolR0Lazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTR0PTR ppvValue)
     717VMMR3DECL(int) PDMR3LdrGetSymbolR0Lazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTR0PTR ppvValue)
    718718{
    719719#ifdef PDMLDR_FAKE_MODE
    … …  
    756756 * @param   pRCPtrValue     Where to store the symbol value.
    757757 */
    758 PDMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
     758VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
    759759{
    760760#ifdef PDMLDR_FAKE_MODE
    … …  
    812812 * @param   pRCPtrValue     Where to store the symbol value.
    813813 */
    814 PDMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
     814VMMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
    815815{
    816816#ifdef PDMLDR_FAKE_MODE
    … …  
    10101010 * @param   pNearSym2   The address of pszNearSym2.
    10111011 */
    1012 PDMR3DECL(int) PDMR3LdrQueryRCModFromPC(PVM pVM, RTRCPTR uPC,
     1012VMMR3DECL(int) PDMR3LdrQueryRCModFromPC(PVM pVM, RTRCPTR uPC,
    10131013                                        char *pszModName,  size_t cchModName,  PRTRCPTR pMod,
    10141014                                        char *pszNearSym1, size_t cchNearSym1, PRTRCPTR pNearSym1,
    … …  
    11311131 * @param   pvArg           User argument.
    11321132 */
    1133 PDMR3DECL(int)  PDMR3LdrEnumModules(PVM pVM, PFNPDMR3ENUM pfnCallback, void *pvArg)
     1133VMMR3DECL(int)  PDMR3LdrEnumModules(PVM pVM, PFNPDMR3ENUM pfnCallback, void *pvArg)
    11341134{
    11351135    PPDMMOD pCur;

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

    r12986 r12989  
    190190 * @thread  Emulation thread only.
    191191 */
    192 PDMR3DECL(int) PDMR3QueueCreateDevice(PVM pVM, PPDMDEVINS pDevIns, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
     192VMMR3DECL(int) PDMR3QueueCreateDevice(PVM pVM, PPDMDEVINS pDevIns, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
    193193                                      PFNPDMQUEUEDEV pfnCallback, bool fRZEnabled, PPDMQUEUE *ppQueue)
    194194{
    … …  
    239239 * @thread  Emulation thread only.
    240240 */
    241 PDMR3DECL(int) PDMR3QueueCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
     241VMMR3DECL(int) PDMR3QueueCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
    242242                                      PFNPDMQUEUEDRV pfnCallback, PPDMQUEUE *ppQueue)
    243243{
    … …  
    288288 * @thread  Emulation thread only.
    289289 */
    290 PDMR3DECL(int) PDMR3QueueCreateInternal(PVM pVM, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
     290VMMR3DECL(int) PDMR3QueueCreateInternal(PVM pVM, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval,
    291291                                        PFNPDMQUEUEINT pfnCallback, bool fRZEnabled, PPDMQUEUE *ppQueue)
    292292{
    … …  
    336336 * @thread  Emulation thread only.
    337337 */
    338 PDMR3DECL(int) PDMR3QueueCreateExternal(PVM pVM, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval, PFNPDMQUEUEEXT pfnCallback, void *pvUser, PPDMQUEUE *ppQueue)
     338VMMR3DECL(int) PDMR3QueueCreateExternal(PVM pVM, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval, PFNPDMQUEUEEXT pfnCallback, void *pvUser, PPDMQUEUE *ppQueue)
    339339{
    340340    LogFlow(("PDMR3QueueCreateExternal: cbItem=%d cItems=%d cMilliesInterval=%d pfnCallback=%p\n", cbItem, cItems, cMilliesInterval, pfnCallback));
    … …  
    376376 * @thread  Emulation thread only.
    377377 */
    378 PDMR3DECL(int) PDMR3QueueDestroy(PPDMQUEUE pQueue)
     378VMMR3DECL(int) PDMR3QueueDestroy(PPDMQUEUE pQueue)
    379379{
    380380    LogFlow(("PDMR3QueueDestroy: pQueue=%p\n", pQueue));
    … …  
    462462 * @thread  Emulation thread only.
    463463 */
    464 PDMR3DECL(int) PDMR3QueueDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
     464VMMR3DECL(int) PDMR3QueueDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
    465465{
    466466    LogFlow(("PDMR3QueueDestroyDevice: pDevIns=%p\n", pDevIns));
    … …  
    511511 * @thread  Emulation thread only.
    512512 */
    513 PDMR3DECL(int) PDMR3QueueDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
     513VMMR3DECL(int) PDMR3QueueDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
    514514{
    515515    LogFlow(("PDMR3QueueDestroyDriver: pDrvIns=%p\n", pDrvIns));
    … …  
    612612 * @thread  Emulation thread only.
    613613 */
    614 PDMR3DECL(void) PDMR3QueueFlushAll(PVM pVM)
     614VMMR3DECL(void) PDMR3QueueFlushAll(PVM pVM)
    615615{
    616616    VM_ASSERT_EMT(pVM);
    … …  
    795795 * @param   pQueue  The queue to flush. Only used in Ring-3.
    796796 */
    797 PDMR3DECL(void) PDMR3QueueFlushWorker(PVM pVM, PPDMQUEUE pQueue)
     797VMMR3DECL(void) PDMR3QueueFlushWorker(PVM pVM, PPDMQUEUE pQueue)
    798798{
    799799    Assert(pVM->pdm.s.pQueueFlushR0 || pVM->pdm.s.pQueueFlushRC || pQueue);

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

    r12986 r12989  
    305305 * @param   pszName     See RTThreadCreate.
    306306 */
    307 PDMR3DECL(int) PDMR3ThreadCreate(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADINT pfnThread,
     307VMMR3DECL(int) PDMR3ThreadCreate(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADINT pfnThread,
    308308                                 PFNPDMTHREADWAKEUPINT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
    309309{
    … …  
    336336 * @param   pszName     See RTThreadCreate.
    337337 */
    338 PDMR3DECL(int) PDMR3ThreadCreateExternal(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADEXT pfnThread,
     338VMMR3DECL(int) PDMR3ThreadCreateExternal(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADEXT pfnThread,
    339339                                         PFNPDMTHREADWAKEUPEXT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
    340340{
    … …  
    365365 * @thread  The emulation thread (EMT).
    366366 */
    367 PDMR3DECL(int) PDMR3ThreadDestroy(PPDMTHREAD pThread, int *pRcThread)
     367VMMR3DECL(int) PDMR3ThreadDestroy(PPDMTHREAD pThread, int *pRcThread)
    368368{
    369369    /*
    … …  
    626626 * @param   pThread     The PDM thread.
    627627 */
    628 PDMR3DECL(int) PDMR3ThreadIAmSuspending(PPDMTHREAD pThread)
     628VMMR3DECL(int) PDMR3ThreadIAmSuspending(PPDMTHREAD pThread)
    629629{
    630630    /*
    … …  
    674674 * @param   pThread     The PDM thread.
    675675 */
    676 PDMR3DECL(int) PDMR3ThreadIAmRunning(PPDMTHREAD pThread)
     676VMMR3DECL(int) PDMR3ThreadIAmRunning(PPDMTHREAD pThread)
    677677{
    678678    /*
    … …  
    712712 * @param   cMillies    The number of milliseconds to sleep.
    713713 */
    714 PDMR3DECL(int) PDMR3ThreadSleep(PPDMTHREAD pThread, unsigned cMillies)
     714VMMR3DECL(int) PDMR3ThreadSleep(PPDMTHREAD pThread, unsigned cMillies)
    715715{
    716716    /*
    … …  
    884884 * @param   pThread     The PDM thread.
    885885 */
    886 PDMR3DECL(int) PDMR3ThreadSuspend(PPDMTHREAD pThread)
     886VMMR3DECL(int) PDMR3ThreadSuspend(PPDMTHREAD pThread)
    887887{
    888888    /*
    … …  
    978978 * @param   pThread     The PDM thread.
    979979 */
    980 PDMR3DECL(int) PDMR3ThreadResume(PPDMTHREAD pThread)
     980VMMR3DECL(int) PDMR3ThreadResume(PPDMTHREAD pThread)
    981981{
    982982    /*

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

    r12964 r12989  
    11061106 * @param   pVM     Pointer to VM structure.
    11071107 */
    1108 PGMR3DECL(int) PGMR3Init(PVM pVM)
     1108VMMR3DECL(int) PGMR3Init(PVM pVM)
    11091109{
    11101110    LogFlow(("PGMR3Init:\n"));
    … …  
    17041704 * @param   pVM     VM handle.
    17051705 */
    1706 PGMR3DECL(int) PGMR3InitDynMap(PVM pVM)
     1706VMMR3DECL(int) PGMR3InitDynMap(PVM pVM)
    17071707{
    17081708    RTGCPTR GCPtr;
    … …  
    17451745 * @param   pVM         The VM handle.
    17461746 */
    1747 PGMR3DECL(int) PGMR3InitFinalize(PVM pVM)
     1747VMMR3DECL(int) PGMR3InitFinalize(PVM pVM)
    17481748{
    17491749    /*
    … …  
    18301830 * @param   offDelta    Relocation delta relative to old location.
    18311831 */
    1832 PGMR3DECL(void) PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     1832VMMR3DECL(void) PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    18331833{
    18341834    LogFlow(("PGMR3Relocate\n"));
    … …  
    19931993 * @param   pVM     VM handle.
    19941994 */
    1995 PGMR3DECL(void) PGMR3Reset(PVM pVM)
     1995VMMR3DECL(void) PGMR3Reset(PVM pVM)
    19961996{
    19971997    LogFlow(("PGMR3Reset:\n"));
    … …  
    20802080 * @param   pVM     Pointer to VM structure.
    20812081 */
    2082 PGMR3DECL(int) PGMR3Term(PVM pVM)
     2082VMMR3DECL(int) PGMR3Term(PVM pVM)
    20832083{
    20842084    return PDMR3CritSectDelete(&pVM->pgm.s.CritSect);
    … …  
    25842584 * @param   pVM     The VM handle.
    25852585 */
    2586 PDMR3DECL(int) PGMR3LockCall(PVM pVM)
     2586VMMR3DECL(int) PGMR3LockCall(PVM pVM)
    25872587{
    25882588    int rc = PDMR3CritSectEnterEx(&pVM->pgm.s.CritSect, true /* fHostCall */);
    … …  
    31343134 *                          the current mode.
    31353135 */
    3136 PGMR3DECL(int) PGMR3ChangeMode(PVM pVM, PGMMODE enmGuestMode)
     3136VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PGMMODE enmGuestMode)
    31373137{
    31383138    Log(("PGMR3ChangeMode: Guest mode: %s -> %s\n", PGMGetModeName(pVM->pgm.s.enmGuestMode), PGMGetModeName(enmGuestMode)));
    … …  
    38853885 * @param   PhysSearch  Address to search for.
    38863886 */
    3887 PGMR3DECL(int) PGMR3DumpHierarchyGC(PVM pVM, uint64_t cr3, uint64_t cr4, RTGCPHYS PhysSearch)
     3887VMMR3DECL(int) PGMR3DumpHierarchyGC(PVM pVM, uint64_t cr3, uint64_t cr4, RTGCPHYS PhysSearch)
    38883888{
    38893889    bool fLongMode = false;
    … …  
    39943994 * @param   pHlp        Pointer to the output functions.
    39953995 */
    3996 PGMR3DECL(int) PGMR3DumpHierarchyHC(PVM pVM, uint64_t cr3, uint64_t cr4, bool fLongMode, unsigned cMaxDepth, PCDBGFINFOHLP pHlp)
     3996VMMR3DECL(int) PGMR3DumpHierarchyHC(PVM pVM, uint64_t cr3, uint64_t cr4, bool fLongMode, unsigned cMaxDepth, PCDBGFINFOHLP pHlp)
    39973997{
    39983998    if (!pHlp)
    … …  
    43504350 * @param   pVM     The VM handle.
    43514351 */
    4352 PDMR3DECL(int) PGMR3CheckIntegrity(PVM pVM)
     4352VMMR3DECL(int) PGMR3CheckIntegrity(PVM pVM)
    43534353{
    43544354    AssertReleaseReturn(pVM->pgm.s.offVM, VERR_INTERNAL_ERROR);
    … …  
    43884388 * @param   fEnable     Enable or disable shadow mappings
    43894389 */
    4390 PGMR3DECL(int) PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable)
     4390VMMR3DECL(int) PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable)
    43914391{
    43924392    pVM->pgm.s.fDisableMappings = !fEnable;

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

    r8155 r12989  
    5353 * @param   pGCPhys Where to store the GC physical address on success.
    5454 */
    55 PGMR3DECL(int) PGMR3DbgHCPtr2GCPhys(PVM pVM, RTHCPTR HCPtr, PRTGCPHYS pGCPhys)
     55VMMR3DECL(int) PGMR3DbgHCPtr2GCPhys(PVM pVM, RTHCPTR HCPtr, PRTGCPHYS pGCPhys)
    5656{
    5757#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    106106 * @param   pHCPhys Where to store the HC physical address on success.
    107107 */
    108 PGMR3DECL(int) PGMR3DbgHCPtr2HCPhys(PVM pVM, RTHCPTR HCPtr, PRTHCPHYS pHCPhys)
     108VMMR3DECL(int) PGMR3DbgHCPtr2HCPhys(PVM pVM, RTHCPTR HCPtr, PRTHCPHYS pHCPhys)
    109109{
    110110#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    168168 * @param   pGCPhys Where to store the GC physical address on success.
    169169 */
    170 PGMR3DECL(int) PGMR3DbgHCPhys2GCPhys(PVM pVM, RTHCPHYS HCPhys, PRTGCPHYS pGCPhys)
     170VMMR3DECL(int) PGMR3DbgHCPhys2GCPhys(PVM pVM, RTHCPHYS HCPhys, PRTGCPHYS pGCPhys)
    171171{
    172172    /*
    … …  
    316316 * @param   pGCPhysHit      Where to store the address of the first occurence on success.
    317317 */
    318 PDMR3DECL(int) PGMR3DbgScanPhysical(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PRTGCPHYS pGCPhysHit)
     318VMMR3DECL(int) PGMR3DbgScanPhysical(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PRTGCPHYS pGCPhysHit)
    319319{
    320320    /*
    … …  
    429429 * @param   pGCPtrHit       Where to store the address of the first occurence on success.
    430430 */
    431 PDMR3DECL(int) PGMR3DbgScanVirtual(PVM pVM, RTGCUINTPTR GCPtr, RTGCUINTPTR cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PRTGCUINTPTR pGCPtrHit)
     431VMMR3DECL(int) PGMR3DbgScanVirtual(PVM pVM, RTGCUINTPTR GCPtr, RTGCUINTPTR cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PRTGCUINTPTR pGCPtrHit)
    432432{
    433433    /*

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

    r12975 r12989  
    8383 * @param   pszDesc         Pointer to description string. This must not be freed.
    8484 */
    85 PGMR3DECL(int) PGMR3HandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
     85VMMR3DECL(int) PGMR3HandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
    8686                                            PFNPGMR3PHYSHANDLER pfnHandlerR3, void *pvUserR3,
    8787                                            const char *pszModR0, const char *pszHandlerR0, RTR0PTR pvUserR0,
    … …  
    227227 */
    228228/** @todo rename this function to PGMR3HandlerVirtualRegister */
    229 PGMR3DECL(int) PGMR3HandlerVirtualRegister(PVM pVM, PGMVIRTHANDLERTYPE enmType, RTGCPTR GCPtr, RTGCPTR GCPtrLast,
     229VMMR3DECL(int) PGMR3HandlerVirtualRegister(PVM pVM, PGMVIRTHANDLERTYPE enmType, RTGCPTR GCPtr, RTGCPTR GCPtrLast,
    230230                                           PFNPGMHCVIRTINVALIDATE pfnInvalidateHC,
    231231                                           PFNPGMHCVIRTHANDLER pfnHandlerHC,
    … …  
    277277/** @todo create a template for virtual handlers (see async i/o), we're wasting space
    278278 * duplicating the function pointers now. (Or we will once we add the missing callbacks.) */
    279 PGMDECL(int) PGMHandlerVirtualRegisterEx(PVM pVM, PGMVIRTHANDLERTYPE enmType, RTGCPTR GCPtr, RTGCPTR GCPtrLast,
     279VMMDECL(int) PGMHandlerVirtualRegisterEx(PVM pVM, PGMVIRTHANDLERTYPE enmType, RTGCPTR GCPtr, RTGCPTR GCPtrLast,
    280280                                         PFNPGMHCVIRTINVALIDATE pfnInvalidateHC,
    281281                                         PFNPGMHCVIRTHANDLER pfnHandlerHC, RTGCPTR pfnHandlerGC,
    … …  
    418418 * @remarks Doesn't work with the hypervisor access handler type.
    419419 */
    420 PGMDECL(int) PGMHandlerVirtualChangeInvalidateCallback(PVM pVM, RTGCPTR GCPtr, PFNPGMHCVIRTINVALIDATE pfnInvalidateHC)
     420VMMDECL(int) PGMHandlerVirtualChangeInvalidateCallback(PVM pVM, RTGCPTR GCPtr, PFNPGMHCVIRTINVALIDATE pfnInvalidateHC)
    421421{
    422422    pgmLock(pVM);
    … …  
    442442 * @thread  EMT
    443443 */
    444 PGMDECL(int) PGMHandlerVirtualDeregister(PVM pVM, RTGCPTR GCPtr)
     444VMMDECL(int) PGMHandlerVirtualDeregister(PVM pVM, RTGCPTR GCPtr)
    445445{
    446446    pgmLock(pVM);

  • trunk/src/VBox/VMM/PGMInternal.h

    r12932 r12989  
    4141#include <iprt/critsect.h>
    4242
    43 #if !defined(IN_PGM_R3) && !defined(IN_PGM_R0) && !defined(IN_PGM_GC)
    44 # error "Not in PGM! This is an internal header!"
    45 #endif
    4643
    4744
    … …  
    16991696# define PGM_CTX(a,b)                   a##GC##b
    17001697# define PGM_CTX_STR(a,b)               a "GC" b
    1701 # define PGM_CTX_DECL(type)             PGMGCDECL(type)
     1698# define PGM_CTX_DECL(type)             VMMRCDECL(type)
    17021699#else
    17031700# ifdef IN_RING3
    … …  
    17081705#  define PGM_CTX(a,b)                   a##R0##b
    17091706#  define PGM_CTX_STR(a,b)               a "R0" b
    1710 #  define PGM_CTX_DECL(type)             PGMDECL(type)
     1707#  define PGM_CTX_DECL(type)             VMMDECL(type)
    17111708# endif
    17121709#endif
    … …  
    26362633void            pgmUnlock(PVM pVM);
    26372634
    2638 PGMGCDECL(int)  pgmGCGuestPDWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
    2639 PGMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
     2635VMMRCDECL(int)  pgmGCGuestPDWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
     2636VMMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
    26402637
    26412638int             pgmR3SyncPTResolveConflict(PVM pVM, PPGMMAPPING pMapping, PX86PD pPDSrc, RTGCPTR GCPtrOldMapping);

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

    r12968 r12989  
    5858 * @param   pszDesc         Pointer to description string. This must not be freed.
    5959 */
    60 PGMR3DECL(int) PGMR3MapPT(PVM pVM, RTGCPTR GCPtr, uint32_t cb, PFNPGMRELOCATE pfnRelocate, void *pvUser, const char *pszDesc)
     60VMMR3DECL(int) PGMR3MapPT(PVM pVM, RTGCPTR GCPtr, uint32_t cb, PFNPGMRELOCATE pfnRelocate, void *pvUser, const char *pszDesc)
    6161{
    6262    LogFlow(("PGMR3MapPT: GCPtr=%#x cb=%d pfnRelocate=%p pvUser=%p pszDesc=%s\n", GCPtr, cb, pfnRelocate, pvUser, pszDesc));
    … …  
    216216 * @param   GCPtr   Virtual Address. (Page table aligned!)
    217217 */
    218 PGMR3DECL(int)  PGMR3UnmapPT(PVM pVM, RTGCPTR GCPtr)
     218VMMR3DECL(int)  PGMR3UnmapPT(PVM pVM, RTGCPTR GCPtr)
    219219{
    220220    LogFlow(("PGMR3UnmapPT: GCPtr=%#x\n", GCPtr));
    … …  
    279279 * @param   pcb     Where to store the size.
    280280 */
    281 PGMR3DECL(int) PGMR3MappingsSize(PVM pVM, uint32_t *pcb)
     281VMMR3DECL(int) PGMR3MappingsSize(PVM pVM, uint32_t *pcb)
    282282{
    283283    RTGCUINTPTR cb = 0;
    … …  
    300300 * @param   cb          The size of the range starting at GCPtrBase.
    301301 */
    302 PGMR3DECL(int) PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, uint32_t cb)
     302VMMR3DECL(int) PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, uint32_t cb)
    303303{
    304304    Log(("PGMR3MappingsFix: GCPtrBase=%#x cb=%#x\n", GCPtrBase, cb));
    … …  
    437437 * @param   pVM         The VM.
    438438 */
    439 PGMR3DECL(int) PGMR3MappingsUnfix(PVM pVM)
     439VMMR3DECL(int) PGMR3MappingsUnfix(PVM pVM)
    440440{
    441441    Log(("PGMR3MappingsUnfix: fMappingsFixed=%d\n", pVM->pgm.s.fMappingsFixed));
    … …  
    484484 * @remark  This API shall not be used to anything but mapping the switcher code.
    485485 */
    486 PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages)
     486VMMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages)
    487487{
    488488    LogFlow(("PGMR3MapIntermediate: Addr=%RTptr HCPhys=%VHp cbPages=%#x\n", Addr, HCPhys, cbPages));
    … …  
    10361036 * @param   fRawR0      Whether RawR0 is enabled or not.
    10371037 */
    1038 PGMR3DECL(bool) PGMR3MapHasConflicts(PVM pVM, uint64_t cr3, bool fRawR0) /** @todo how many HasConflict constructs do we really need? */
     1038VMMR3DECL(bool) PGMR3MapHasConflicts(PVM pVM, uint64_t cr3, bool fRawR0) /** @todo how many HasConflict constructs do we really need? */
    10391039{
    10401040    /*
    … …  
    11271127 *          reimplement it in MMR3HyperReadGCVirt.
    11281128 */
    1129 PGMR3DECL(int) PGMR3MapRead(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
     1129VMMR3DECL(int) PGMR3MapRead(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
    11301130{
    11311131/** @todo remove this simplicity hack */

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

    r12967 r12989  
    185185 * @param   pszDesc         The description - not copied, so, don't free or change it.
    186186 */
    187 PGMR3DECL(int) PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc)
     187VMMR3DECL(int) PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc)
    188188{
    189189   /*
    … …  
    406406 * @param   pszDesc         The description of the MMIO region.
    407407 */
    408 PDMR3DECL(int) PGMR3PhysMMIORegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb,
     408VMMR3DECL(int) PGMR3PhysMMIORegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb,
    409409                                     R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
    410410                                     R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
    … …  
    533533 * @param   cb              The size of the MMIO region.
    534534 */
    535 PDMR3DECL(int) PGMR3PhysMMIODeregister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb)
     535VMMR3DECL(int) PGMR3PhysMMIODeregister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb)
    536536{
    537537    VM_ASSERT_EMT(pVM);
    … …  
    646646 * @param   pszDesc         The description.
    647647 */
    648 PDMR3DECL(int) PGMR3PhysMMIO2Register(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cb, uint32_t fFlags, void **ppv, const char *pszDesc)
     648VMMR3DECL(int) PGMR3PhysMMIO2Register(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cb, uint32_t fFlags, void **ppv, const char *pszDesc)
    649649{
    650650    /*
    … …  
    744744 * @param   iRegion         The region. If it's UINT32_MAX it'll be a wildcard match.
    745745 */
    746 PDMR3DECL(int) PGMR3PhysMMIO2Deregister(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion)
     746VMMR3DECL(int) PGMR3PhysMMIO2Deregister(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion)
    747747{
    748748    /*
    … …  
    833833 * @param   pDevIns         The
    834834 */
    835 PDMR3DECL(int) PGMR3PhysMMIO2Map(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys)
     835VMMR3DECL(int) PGMR3PhysMMIO2Map(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys)
    836836{
    837837    /*
    … …  
    947947 * as during registration, of course.
    948948 */
    949 PDMR3DECL(int) PGMR3PhysMMIO2Unmap(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys)
     949VMMR3DECL(int) PGMR3PhysMMIO2Unmap(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys)
    950950{
    951951    /*
    … …  
    10201020 * @param   GCPhys          The address to check.
    10211021 */
    1022 PDMR3DECL(bool) PGMR3PhysMMIO2IsBase(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys)
     1022VMMR3DECL(bool) PGMR3PhysMMIO2IsBase(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys)
    10231023{
    10241024    /*
    … …  
    10571057 * @param   pHCPhys         Where to store the result.
    10581058 */
    1059 PDMR3DECL(int) PGMR3PhysMMIO2GetHCPhys(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, PRTHCPHYS pHCPhys)
     1059VMMR3DECL(int) PGMR3PhysMMIO2GetHCPhys(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, PRTHCPHYS pHCPhys)
    10601060{
    10611061    /*
    … …  
    11061106 *          just not something we expect to be necessary for a while.
    11071107 */
    1108 PGMR3DECL(int) PGMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTGCPHYS cb,
     1108VMMR3DECL(int) PGMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTGCPHYS cb,
    11091109                                    const void *pvBinary, uint32_t fFlags, const char *pszDesc)
    11101110{
    … …  
    15891589 * @param   enmProt     The new ROM protection.
    15901590 */
    1591 PGMR3DECL(int) PGMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, PGMROMPROT enmProt)
     1591VMMR3DECL(int) PGMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, PGMROMPROT enmProt)
    15921592{
    15931593    /*
    … …  
    16781678 * @param   pszDesc         Description string.
    16791679 */
    1680 PGMR3DECL(int) PGMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
     1680VMMR3DECL(int) PGMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
    16811681{
    16821682    /*
    … …  
    18561856 * @param   pszDesc         Description string.
    18571857 */
    1858 PGMR3DECL(int) PGMR3PhysRegisterChunk(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
     1858VMMR3DECL(int) PGMR3PhysRegisterChunk(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
    18591859{
    18601860    NOREF(pszDesc);
    … …  
    19241924 * @param   GCPhys          GC physical address of the RAM range. (page aligned)
    19251925 */
    1926 PGMR3DECL(int) PGM3PhysGrowRange(PVM pVM, PCRTGCPHYS pGCPhys)
     1926VMMR3DECL(int) PGM3PhysGrowRange(PVM pVM, PCRTGCPHYS pGCPhys)
    19271927{
    19281928    RTGCPHYS GCPhys = *pGCPhys;
    … …  
    20512051 * @param   fMask           The and mask for the flags.
    20522052 */
    2053 PGMR3DECL(int) PGMR3PhysSetFlags(PVM pVM, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, unsigned fMask)
     2053VMMR3DECL(int) PGMR3PhysSetFlags(PVM pVM, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, unsigned fMask)
    20542054{
    20552055    Log(("PGMR3PhysSetFlags %08X %x %x %x\n", GCPhys, cb, fFlags, fMask));
    … …  
    21002100 *                      False if the gate should be disabled.
    21012101 */
    2102 PGMDECL(void) PGMR3PhysSetA20(PVM pVM, bool fEnable)
     2102VMMDECL(void) PGMR3PhysSetA20(PVM pVM, bool fEnable)
    21032103{
    21042104    LogFlow(("PGMR3PhysSetA20 %d (was %d)\n", fEnable, pVM->pgm.s.fA20Enabled));
    … …  
    21632163 * @param   pVM         The VM handle.
    21642164 */
    2165 PGMR3DECL(void) PGMR3PhysChunkAgeing(PVM pVM)
     2165VMMR3DECL(void) PGMR3PhysChunkAgeing(PVM pVM)
    21662166{
    21672167    pVM->pgm.s.ChunkR3Map.AgeingCountdown = RT_MIN(pVM->pgm.s.ChunkR3Map.cMax / 4, 1024);
    … …  
    23582358 * @param   idChunk     The chunk to map.
    23592359 */
    2360 PDMR3DECL(int) PGMR3PhysChunkMap(PVM pVM, uint32_t idChunk)
     2360VMMR3DECL(int) PGMR3PhysChunkMap(PVM pVM, uint32_t idChunk)
    23612361{
    23622362    PPGMCHUNKR3MAP pChunk;
    … …  
    23702370 * @param   pVM         The VM handle.
    23712371 */
    2372 PGMR3DECL(void) PGMR3PhysChunkInvalidateTLB(PVM pVM)
     2372VMMR3DECL(void) PGMR3PhysChunkInvalidateTLB(PVM pVM)
    23732373{
    23742374    pgmLock(pVM);
    … …  
    23912391 * @param   pVM         The VM handle.
    23922392 */
    2393 PDMR3DECL(int) PGMR3PhysAllocateHandyPages(PVM pVM)
     2393VMMR3DECL(int) PGMR3PhysAllocateHandyPages(PVM pVM)
    23942394{
    23952395    pgmLock(pVM);

  • trunk/src/VBox/VMM/PGMPhysRWTmpl.h

    r8635 r12989  
    3030 * @param   GCPhys          Physical address start reading from.
    3131 */
    32 PGMDECL(PGMPHYS_DATATYPE) PGMPHYSFN_READNAME(PVM pVM, RTGCPHYS GCPhys)
     32VMMDECL(PGMPHYS_DATATYPE) PGMPHYSFN_READNAME(PVM pVM, RTGCPHYS GCPhys)
    3333{
    3434    uint32_t iCacheIndex;
    … …  
    7272 * @param   val             What to write.
    7373 */
    74 PGMDECL(void) PGMPHYSFN_WRITENAME(PVM pVM, RTGCPHYS GCPhys, PGMPHYS_DATATYPE val)
     74VMMDECL(void) PGMPHYSFN_WRITENAME(PVM pVM, RTGCPHYS GCPhys, PGMPHYS_DATATYPE val)
    7575{
    7676    uint32_t iCacheIndex;

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

    r12975 r12989  
    421421 * @param   pVM     The VM handle.
    422422 */
    423 PDMR3DECL(int) PGMR3PoolGrow(PVM pVM)
     423VMMR3DECL(int) PGMR3PoolGrow(PVM pVM)
    424424{
    425425    PPGMPOOL pPool = pVM->pgm.s.pPoolHC;

  • trunk/src/VBox/VMM/REMInternal.h

    r12653 r12989  
    3333
    3434
    35 #if !defined(IN_REM_R3) && !defined(IN_REM_R0) && !defined(IN_REM_GC)
    36 # error "Not in REM! This is an internal header!"
    37 #endif
    3835
    3936/** @defgroup grp_rem_int   Internals

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

    r11792 r12989  
    9191 * @param   pVM         The VM to operate on.
    9292 */
    93 SELMR3DECL(int) SELMR3Init(PVM pVM)
     93VMMR3DECL(int) SELMR3Init(PVM pVM)
    9494{
    9595    LogFlow(("SELMR3Init\n"));
    … …  
    206206 * @param   pVM     The VM handle.
    207207 */
    208 SELMR3DECL(int) SELMR3InitFinalize(PVM pVM)
     208VMMR3DECL(int) SELMR3InitFinalize(PVM pVM)
    209209{
    210210    /*
    … …  
    347347 * @param   pVM     The VM.
    348348 */
    349 SELMR3DECL(void) SELMR3Relocate(PVM pVM)
     349VMMR3DECL(void) SELMR3Relocate(PVM pVM)
    350350{
    351351    PX86DESC paGdt = pVM->selm.s.paGdtHC;
    … …  
    462462 * @param   pVM       The VM handle
    463463 */
    464 SELMR3DECL(void) SELMR3PagingModeChanged(PVM pVM)
     464VMMR3DECL(void) SELMR3PagingModeChanged(PVM pVM)
    465465{
    466466    pVM->selm.s.Tss.cr3       = PGMGetHyperCR3(pVM);
    … …  
    478478 * @param   pVM         The VM to operate on.
    479479 */
    480 SELMR3DECL(int) SELMR3Term(PVM pVM)
     480VMMR3DECL(int) SELMR3Term(PVM pVM)
    481481{
    482482    return 0;
    … …  
    492492 * @param   pVM     VM handle.
    493493 */
    494 SELMR3DECL(void) SELMR3Reset(PVM pVM)
     494VMMR3DECL(void) SELMR3Reset(PVM pVM)
    495495{
    496496    LogFlow(("SELMR3Reset:\n"));
    … …  
    551551 * @param   pVM         The VM to operate on.
    552552 */
    553 SELMR3DECL(void) SELMR3DisableMonitoring(PVM pVM)
     553VMMR3DECL(void) SELMR3DisableMonitoring(PVM pVM)
    554554{
    555555    /*
    … …  
    756756 * @param   pVM         The VM to operate on.
    757757 */
    758 SELMR3DECL(int) SELMR3UpdateFromCPUM(PVM pVM)
     758VMMR3DECL(int) SELMR3UpdateFromCPUM(PVM pVM)
    759759{
    760760    int rc = VINF_SUCCESS;
    … …  
    13851385 * @param   pVM         The VM to operate on.
    13861386 */
    1387 SELMR3DECL(int) SELMR3SyncTSS(PVM pVM)
     1387VMMR3DECL(int) SELMR3SyncTSS(PVM pVM)
    13881388{
    13891389    int rc;
    … …  
    15551555 * @param   pVM         The VM Handle.
    15561556 */
    1557 SELMR3DECL(int) SELMR3DebugCheck(PVM pVM)
     1557VMMR3DECL(int) SELMR3DebugCheck(PVM pVM)
    15581558{
    15591559#ifdef VBOX_STRICT
    … …  
    16911691 * @param   pVM     VM Handle.
    16921692 */
    1693 SELMR3DECL(bool) SELMR3CheckTSS(PVM pVM)
     1693VMMR3DECL(bool) SELMR3CheckTSS(PVM pVM)
    16941694{
    16951695#ifdef VBOX_STRICT
    … …  
    17831783 * @param   pcbLimit  Where to store LDT limit.
    17841784 */
    1785 SELMDECL(int) SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit)
     1785VMMDECL(int) SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit)
    17861786{
    17871787    /* Get guest GDTR. */
    … …  
    19271927 * @param   pSelInfo    Where to store the information.
    19281928 */
    1929 SELMR3DECL(int) SELMR3GetSelectorInfo(PVM pVM, RTSEL Sel, PSELMSELINFO pSelInfo)
     1929VMMR3DECL(int) SELMR3GetSelectorInfo(PVM pVM, RTSEL Sel, PSELMSELINFO pSelInfo)
    19301930{
    19311931    Assert(pSelInfo);
    … …  
    20522052 * @param   pSelInfo    Where to store the information.
    20532053 */
    2054 SELMR3DECL(int) SELMR3GetShadowSelectorInfo(PVM pVM, RTSEL Sel, PSELMSELINFO pSelInfo)
     2054VMMR3DECL(int) SELMR3GetShadowSelectorInfo(PVM pVM, RTSEL Sel, PSELMSELINFO pSelInfo)
    20552055{
    20562056    Assert(pSelInfo);
    … …  
    21962196 * @param   pszMsg  Message to prepend the log entry with.
    21972197 */
    2198 SELMR3DECL(void) SELMR3DumpDescriptor(X86DESC  Desc, RTSEL Sel, const char *pszMsg)
     2198VMMR3DECL(void) SELMR3DumpDescriptor(X86DESC  Desc, RTSEL Sel, const char *pszMsg)
    21992199{
    22002200    char szOutput[128];
    … …  
    23572357 * @param   pVM     VM handle.
    23582358 */
    2359 SELMR3DECL(void) SELMR3DumpHyperGDT(PVM pVM)
     2359VMMR3DECL(void) SELMR3DumpHyperGDT(PVM pVM)
    23602360{
    23612361    DBGFR3Info(pVM, "gdt", NULL, NULL);
    … …  
    23672367 * @param   pVM     VM handle.
    23682368 */
    2369 SELMR3DECL(void) SELMR3DumpHyperLDT(PVM pVM)
     2369VMMR3DECL(void) SELMR3DumpHyperLDT(PVM pVM)
    23702370{
    23712371    DBGFR3Info(pVM, "ldt", NULL, NULL);
    … …  
    23772377 * @param   pVM     VM handle.
    23782378 */
    2379 SELMR3DECL(void) SELMR3DumpGuestGDT(PVM pVM)
     2379VMMR3DECL(void) SELMR3DumpGuestGDT(PVM pVM)
    23802380{
    23812381    DBGFR3Info(pVM, "gdtguest", NULL, NULL);
    … …  
    23872387 * @param   pVM     VM handle.
    23882388 */
    2389 SELMR3DECL(void) SELMR3DumpGuestLDT(PVM pVM)
     2389VMMR3DECL(void) SELMR3DumpGuestLDT(PVM pVM)
    23902390{
    23912391    DBGFR3Info(pVM, "ldtguest", NULL, NULL);

  • trunk/src/VBox/VMM/SELMInternal.h

    r10087 r12989  
    2929
    3030
    31 #if !defined(IN_SELM_R3) && !defined(IN_SELM_R0) && !defined(IN_SELM_GC)
    32 # error "Not in SELM! This is an internal header!"
    33 #endif
    3431
    3532/** @defgroup grp_selm_int   Internals
    … …  
    178175__BEGIN_DECLS
    179176
    180 SELMGCDECL(int) selmgcGuestGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    181 SELMGCDECL(int) selmgcGuestLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    182 SELMGCDECL(int) selmgcGuestTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     177VMMRCDECL(int) selmgcGuestGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     178VMMRCDECL(int) selmgcGuestLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     179VMMRCDECL(int) selmgcGuestTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    183180
    184 SELMGCDECL(int) selmgcShadowGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    185 SELMGCDECL(int) selmgcShadowLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    186 SELMGCDECL(int) selmgcShadowTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     181VMMRCDECL(int) selmgcShadowGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     182VMMRCDECL(int) selmgcShadowLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     183VMMRCDECL(int) selmgcShadowTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    187184
    188185__END_DECLS

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

    r12441 r12989  
    417417 * @param   pfnLoadDone     Done load callback, optional.
    418418 */
    419 SSMR3DECL(int) SSMR3Register(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
     419VMMR3DECL(int) SSMR3Register(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
    420420    PFNSSMDEVSAVEPREP pfnSavePrep, PFNSSMDEVSAVEEXEC pfnSaveExec, PFNSSMDEVSAVEDONE pfnSaveDone,
    421421    PFNSSMDEVLOADPREP pfnLoadPrep, PFNSSMDEVLOADEXEC pfnLoadExec, PFNSSMDEVLOADDONE pfnLoadDone)
    … …  
    457457 * @param   pfnLoadDone     Done load callback, optional.
    458458 */
    459 SSMR3DECL(int) SSMR3RegisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
     459VMMR3DECL(int) SSMR3RegisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
    460460    PFNSSMDRVSAVEPREP pfnSavePrep, PFNSSMDRVSAVEEXEC pfnSaveExec, PFNSSMDRVSAVEDONE pfnSaveDone,
    461461    PFNSSMDRVLOADPREP pfnLoadPrep, PFNSSMDRVLOADEXEC pfnLoadExec, PFNSSMDRVLOADDONE pfnLoadDone)
    … …  
    496496 * @param   pfnLoadDone     Done load callback, optional.
    497497 */
    498 SSMR3DECL(int) SSMR3RegisterInternal(PVM pVM, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
     498VMMR3DECL(int) SSMR3RegisterInternal(PVM pVM, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
    499499    PFNSSMINTSAVEPREP pfnSavePrep, PFNSSMINTSAVEEXEC pfnSaveExec, PFNSSMINTSAVEDONE pfnSaveDone,
    500500    PFNSSMINTLOADPREP pfnLoadPrep, PFNSSMINTLOADEXEC pfnLoadExec, PFNSSMINTLOADDONE pfnLoadDone)
    … …  
    535535 * @param   pvUser          User argument.
    536536 */
    537 SSMR3DECL(int) SSMR3RegisterExternal(PVM pVM, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
     537VMMR3DECL(int) SSMR3RegisterExternal(PVM pVM, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
    538538    PFNSSMEXTSAVEPREP pfnSavePrep, PFNSSMEXTSAVEEXEC pfnSaveExec, PFNSSMEXTSAVEDONE pfnSaveDone,
    539539    PFNSSMEXTLOADPREP pfnLoadPrep, PFNSSMEXTLOADEXEC pfnLoadExec, PFNSSMEXTLOADDONE pfnLoadDone, void *pvUser)
    … …  
    568568 * @remark  Only for dynmaic data units and dynamic unloaded modules.
    569569 */
    570 SSMR3DECL(int) SSMR3Deregister(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t u32Instance)
     570VMMR3DECL(int) SSMR3Deregister(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t u32Instance)
    571571{
    572572    /*
    … …  
    642642 * @remark  Only for dynmaic data units and dynamic unloaded modules.
    643643 */
    644 SSMR3DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t u32Instance)
     644VMMR3DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t u32Instance)
    645645{
    646646    /*
    … …  
    767767 * @remark  Only for dynmaic data units.
    768768 */
    769 SSMR3DECL(int) SSMR3DeregisterInternal(PVM pVM, const char *pszName)
     769VMMR3DECL(int) SSMR3DeregisterInternal(PVM pVM, const char *pszName)
    770770{
    771771    return ssmR3DeregisterByNameAndType(pVM, pszName, SSMUNITTYPE_INTERNAL);
    … …  
    781781 * @remark  Only for dynmaic data units.
    782782 */
    783 SSMR3DECL(int) SSMR3DeregisterExternal(PVM pVM, const char *pszName)
     783VMMR3DECL(int) SSMR3DeregisterExternal(PVM pVM, const char *pszName)
    784784{
    785785    return ssmR3DeregisterByNameAndType(pVM, pszName, SSMUNITTYPE_EXTERNAL);
    … …  
    879879 * @param   pvUser          User argument for the progress callback.
    880880 */
    881 SSMR3DECL(int) SSMR3Save(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser)
     881VMMR3DECL(int) SSMR3Save(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser)
    882882{
    883883    LogFlow(("SSMR3Save: pszFilename=%p:{%s} enmAfter=%d pfnProgress=%p pvUser=%p\n", pszFilename, pszFilename, enmAfter, pfnProgress, pvUser));
    … …  
    13631363 * @param   pvUser          User argument for the progress callback.
    13641364 */
    1365 SSMR3DECL(int) SSMR3Load(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser)
     1365VMMR3DECL(int) SSMR3Load(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser)
    13661366{
    13671367    LogFlow(("SSMR3Load: pszFilename=%p:{%s} enmAfter=%d pfnProgress=%p pvUser=%p\n", pszFilename, pszFilename, enmAfter, pfnProgress, pvUser));
    … …  
    17521752 * @param   pszFilename     The path to the file to validate.
    17531753 */
    1754 SSMR3DECL(int) SSMR3ValidateFile(const char *pszFilename)
     1754VMMR3DECL(int) SSMR3ValidateFile(const char *pszFilename)
    17551755{
    17561756    LogFlow(("SSMR3ValidateFile: pszFilename=%p:{%s}\n", pszFilename, pszFilename));
    … …  
    17821782 * @param   ppSSM           Where to store the SSM handle.
    17831783 */
    1784 SSMR3DECL(int) SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM)
     1784VMMR3DECL(int) SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM)
    17851785{
    17861786    LogFlow(("SSMR3Open: pszFilename=%p:{%s} fFlags=%#x ppSSM=%p\n", pszFilename, pszFilename, fFlags, ppSSM));
    … …  
    18481848 * @param   pSSM            The SSM handle returned by SSMR3Open().
    18491849 */
    1850 SSMR3DECL(int) SSMR3Close(PSSMHANDLE pSSM)
     1850VMMR3DECL(int) SSMR3Close(PSSMHANDLE pSSM)
    18511851{
    18521852    LogFlow(("SSMR3Close: pSSM=%p\n", pSSM));
    … …  
    18821882 * @param   piVersion       Where to store the version number. (Optional)
    18831883 */
    1884 SSMR3DECL(int) SSMR3Seek(PSSMHANDLE pSSM, const char *pszUnit, uint32_t iInstance, uint32_t *piVersion)
     1884VMMR3DECL(int) SSMR3Seek(PSSMHANDLE pSSM, const char *pszUnit, uint32_t iInstance, uint32_t *piVersion)
    18851885{
    18861886    LogFlow(("SSMR3Seek: pSSM=%p pszUnit=%p:{%s} iInstance=%RU32 piVersion=%p\n",
    … …  
    20992099 *                          The array must be terminated by a SSMFIELD_ENTRY_TERM().
    21002100 */
    2101 SSMR3DECL(int) SSMR3PutStruct(PSSMHANDLE pSSM, const void *pvStruct, PCSSMFIELD paFields)
     2101VMMR3DECL(int) SSMR3PutStruct(PSSMHANDLE pSSM, const void *pvStruct, PCSSMFIELD paFields)
    21022102{
    21032103    /* begin marker. */
    … …  
    21282128 * @param   fBool           Item to save.
    21292129 */
    2130 SSMR3DECL(int) SSMR3PutBool(PSSMHANDLE pSSM, bool fBool)
     2130VMMR3DECL(int) SSMR3PutBool(PSSMHANDLE pSSM, bool fBool)
    21312131{
    21322132    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    21462146 * @param   u8              Item to save.
    21472147 */
    2148 SSMR3DECL(int) SSMR3PutU8(PSSMHANDLE pSSM, uint8_t u8)
     2148VMMR3DECL(int) SSMR3PutU8(PSSMHANDLE pSSM, uint8_t u8)
    21492149{
    21502150    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    21612161 * @param   i8              Item to save.
    21622162 */
    2163 SSMR3DECL(int) SSMR3PutS8(PSSMHANDLE pSSM, int8_t i8)
     2163VMMR3DECL(int) SSMR3PutS8(PSSMHANDLE pSSM, int8_t i8)
    21642164{
    21652165    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    21762176 * @param   u16             Item to save.
    21772177 */
    2178 SSMR3DECL(int) SSMR3PutU16(PSSMHANDLE pSSM, uint16_t u16)
     2178VMMR3DECL(int) SSMR3PutU16(PSSMHANDLE pSSM, uint16_t u16)
    21792179{
    21802180    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    21912191 * @param   i16             Item to save.
    21922192 */
    2193 SSMR3DECL(int) SSMR3PutS16(PSSMHANDLE pSSM, int16_t i16)
     2193VMMR3DECL(int) SSMR3PutS16(PSSMHANDLE pSSM, int16_t i16)
    21942194{
    21952195    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22062206 * @param   u32             Item to save.
    22072207 */
    2208 SSMR3DECL(int) SSMR3PutU32(PSSMHANDLE pSSM, uint32_t u32)
     2208VMMR3DECL(int) SSMR3PutU32(PSSMHANDLE pSSM, uint32_t u32)
    22092209{
    22102210    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22212221 * @param   i32             Item to save.
    22222222 */
    2223 SSMR3DECL(int) SSMR3PutS32(PSSMHANDLE pSSM, int32_t i32)
     2223VMMR3DECL(int) SSMR3PutS32(PSSMHANDLE pSSM, int32_t i32)
    22242224{
    22252225    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22362236 * @param   u64             Item to save.
    22372237 */
    2238 SSMR3DECL(int) SSMR3PutU64(PSSMHANDLE pSSM, uint64_t u64)
     2238VMMR3DECL(int) SSMR3PutU64(PSSMHANDLE pSSM, uint64_t u64)
    22392239{
    22402240    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22512251 * @param   i64             Item to save.
    22522252 */
    2253 SSMR3DECL(int) SSMR3PutS64(PSSMHANDLE pSSM, int64_t i64)
     2253VMMR3DECL(int) SSMR3PutS64(PSSMHANDLE pSSM, int64_t i64)
    22542254{
    22552255    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22662266 * @param   u128            Item to save.
    22672267 */
    2268 SSMR3DECL(int) SSMR3PutU128(PSSMHANDLE pSSM, uint128_t u128)
     2268VMMR3DECL(int) SSMR3PutU128(PSSMHANDLE pSSM, uint128_t u128)
    22692269{
    22702270    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22812281 * @param   i128            Item to save.
    22822282 */
    2283 SSMR3DECL(int) SSMR3PutS128(PSSMHANDLE pSSM, int128_t i128)
     2283VMMR3DECL(int) SSMR3PutS128(PSSMHANDLE pSSM, int128_t i128)
    22842284{
    22852285    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    22962296 * @param   u               Item to save.
    22972297 */
    2298 SSMR3DECL(int) SSMR3PutUInt(PSSMHANDLE pSSM, RTUINT u)
     2298VMMR3DECL(int) SSMR3PutUInt(PSSMHANDLE pSSM, RTUINT u)
    22992299{
    23002300    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23122312 * @param   i               Item to save.
    23132313 */
    2314 SSMR3DECL(int) SSMR3PutSInt(PSSMHANDLE pSSM, RTINT i)
     2314VMMR3DECL(int) SSMR3PutSInt(PSSMHANDLE pSSM, RTINT i)
    23152315{
    23162316    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23282328 * @param   u               Item to save.
    23292329 */
    2330 SSMR3DECL(int) SSMR3PutGCUInt(PSSMHANDLE pSSM, RTGCUINT u)
     2330VMMR3DECL(int) SSMR3PutGCUInt(PSSMHANDLE pSSM, RTGCUINT u)
    23312331{
    23322332    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23442344 * @param   i               Item to save.
    23452345 */
    2346 SSMR3DECL(int) SSMR3PutGCSInt(PSSMHANDLE pSSM, RTGCINT i)
     2346VMMR3DECL(int) SSMR3PutGCSInt(PSSMHANDLE pSSM, RTGCINT i)
    23472347{
    23482348    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23602360 * @param   GCPhys          The item to save
    23612361 */
    2362 SSMR3DECL(int) SSMR3PutGCPhys32(PSSMHANDLE pSSM, RTGCPHYS32 GCPhys)
     2362VMMR3DECL(int) SSMR3PutGCPhys32(PSSMHANDLE pSSM, RTGCPHYS32 GCPhys)
    23632363{
    23642364    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23762376 * @param   GCPhys          The item to save
    23772377 */
    2378 SSMR3DECL(int) SSMR3PutGCPhys64(PSSMHANDLE pSSM, RTGCPHYS64 GCPhys)
     2378VMMR3DECL(int) SSMR3PutGCPhys64(PSSMHANDLE pSSM, RTGCPHYS64 GCPhys)
    23792379{
    23802380    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    23922392 * @param   GCPhys          The item to save
    23932393 */
    2394 SSMR3DECL(int) SSMR3PutGCPhys(PSSMHANDLE pSSM, RTGCPHYS GCPhys)
     2394VMMR3DECL(int) SSMR3PutGCPhys(PSSMHANDLE pSSM, RTGCPHYS GCPhys)
    23952395{
    23962396    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24082408 * @param   GCPtr           The item to save.
    24092409 */
    2410 SSMR3DECL(int) SSMR3PutGCPtr(PSSMHANDLE pSSM, RTGCPTR GCPtr)
     2410VMMR3DECL(int) SSMR3PutGCPtr(PSSMHANDLE pSSM, RTGCPTR GCPtr)
    24112411{
    24122412    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24242424 * @param   RCPtr           The item to save.
    24252425 */
    2426 SSMR3DECL(int) SSMR3PutRCPtr(PSSMHANDLE pSSM, RTRCPTR RCPtr)
     2426VMMR3DECL(int) SSMR3PutRCPtr(PSSMHANDLE pSSM, RTRCPTR RCPtr)
    24272427{
    24282428    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24402440 * @param   GCPtr           The item to save.
    24412441 */
    2442 SSMR3DECL(int) SSMR3PutGCUIntPtr(PSSMHANDLE pSSM, RTGCUINTPTR GCPtr)
     2442VMMR3DECL(int) SSMR3PutGCUIntPtr(PSSMHANDLE pSSM, RTGCUINTPTR GCPtr)
    24432443{
    24442444    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24562456 * @param   u               Item to save.
    24572457 */
    2458 SSMR3DECL(int) SSMR3PutHCUInt(PSSMHANDLE pSSM, RTHCUINT u)
     2458VMMR3DECL(int) SSMR3PutHCUInt(PSSMHANDLE pSSM, RTHCUINT u)
    24592459{
    24602460    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24722472 * @param   i               Item to save.
    24732473 */
    2474 SSMR3DECL(int) SSMR3PutHCSInt(PSSMHANDLE pSSM, RTHCINT i)
     2474VMMR3DECL(int) SSMR3PutHCSInt(PSSMHANDLE pSSM, RTHCINT i)
    24752475{
    24762476    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    24882488 * @param   IOPort          The item to save.
    24892489 */
    2490 SSMR3DECL(int) SSMR3PutIOPort(PSSMHANDLE pSSM, RTIOPORT IOPort)
     2490VMMR3DECL(int) SSMR3PutIOPort(PSSMHANDLE pSSM, RTIOPORT IOPort)
    24912491{
    24922492    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    25042504 * @param   Sel             The item to save.
    25052505 */
    2506 SSMR3DECL(int) SSMR3PutSel(PSSMHANDLE pSSM, RTSEL Sel)
     2506VMMR3DECL(int) SSMR3PutSel(PSSMHANDLE pSSM, RTSEL Sel)
    25072507{
    25082508    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    25212521 * @param   cb              Size of the item.
    25222522 */
    2523 SSMR3DECL(int) SSMR3PutMem(PSSMHANDLE pSSM, const void *pv, size_t cb)
     2523VMMR3DECL(int) SSMR3PutMem(PSSMHANDLE pSSM, const void *pv, size_t cb)
    25242524{
    25252525    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    25362536 * @param   psz             Item to save.
    25372537 */
    2538 SSMR3DECL(int) SSMR3PutStrZ(PSSMHANDLE pSSM, const char *psz)
     2538VMMR3DECL(int) SSMR3PutStrZ(PSSMHANDLE pSSM, const char *psz)
    25392539{
    25402540    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
    … …  
    26582658 *                          The array must be terminated by a SSMFIELD_ENTRY_TERM().
    26592659 */
    2660 SSMR3DECL(int) SSMR3GetStruct(PSSMHANDLE pSSM, void *pvStruct, PCSSMFIELD paFields)
     2660VMMR3DECL(int) SSMR3GetStruct(PSSMHANDLE pSSM, void *pvStruct, PCSSMFIELD paFields)
    26612661{
    26622662    /* begin marker. */
    … …  
    26952695 * @param   pfBool          Where to store the item.
    26962696 */
    2697 SSMR3DECL(int) SSMR3GetBool(PSSMHANDLE pSSM, bool *pfBool)
     2697VMMR3DECL(int) SSMR3GetBool(PSSMHANDLE pSSM, bool *pfBool)
    26982698{
    26992699    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27192719 * @param   pu8             Where to store the item.
    27202720 */
    2721 SSMR3DECL(int) SSMR3GetU8(PSSMHANDLE pSSM, uint8_t *pu8)
     2721VMMR3DECL(int) SSMR3GetU8(PSSMHANDLE pSSM, uint8_t *pu8)
    27222722{
    27232723    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27342734 * @param   pi8             Where to store the item.
    27352735 */
    2736 SSMR3DECL(int) SSMR3GetS8(PSSMHANDLE pSSM, int8_t *pi8)
     2736VMMR3DECL(int) SSMR3GetS8(PSSMHANDLE pSSM, int8_t *pi8)
    27372737{
    27382738    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27492749 * @param   pu16            Where to store the item.
    27502750 */
    2751 SSMR3DECL(int) SSMR3GetU16(PSSMHANDLE pSSM, uint16_t *pu16)
     2751VMMR3DECL(int) SSMR3GetU16(PSSMHANDLE pSSM, uint16_t *pu16)
    27522752{
    27532753    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27642764 * @param   pi16            Where to store the item.
    27652765 */
    2766 SSMR3DECL(int) SSMR3GetS16(PSSMHANDLE pSSM, int16_t *pi16)
     2766VMMR3DECL(int) SSMR3GetS16(PSSMHANDLE pSSM, int16_t *pi16)
    27672767{
    27682768    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27792779 * @param   pu32            Where to store the item.
    27802780 */
    2781 SSMR3DECL(int) SSMR3GetU32(PSSMHANDLE pSSM, uint32_t *pu32)
     2781VMMR3DECL(int) SSMR3GetU32(PSSMHANDLE pSSM, uint32_t *pu32)
    27822782{
    27832783    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    27942794 * @param   pi32            Where to store the item.
    27952795 */
    2796 SSMR3DECL(int) SSMR3GetS32(PSSMHANDLE pSSM, int32_t *pi32)
     2796VMMR3DECL(int) SSMR3GetS32(PSSMHANDLE pSSM, int32_t *pi32)
    27972797{
    27982798    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28092809 * @param   pu64            Where to store the item.
    28102810 */
    2811 SSMR3DECL(int) SSMR3GetU64(PSSMHANDLE pSSM, uint64_t *pu64)
     2811VMMR3DECL(int) SSMR3GetU64(PSSMHANDLE pSSM, uint64_t *pu64)
    28122812{
    28132813    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28242824 * @param   pi64            Where to store the item.
    28252825 */
    2826 SSMR3DECL(int) SSMR3GetS64(PSSMHANDLE pSSM, int64_t *pi64)
     2826VMMR3DECL(int) SSMR3GetS64(PSSMHANDLE pSSM, int64_t *pi64)
    28272827{
    28282828    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28392839 * @param   pu128           Where to store the item.
    28402840 */
    2841 SSMR3DECL(int) SSMR3GetU128(PSSMHANDLE pSSM, uint128_t *pu128)
     2841VMMR3DECL(int) SSMR3GetU128(PSSMHANDLE pSSM, uint128_t *pu128)
    28422842{
    28432843    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28552855 * @param   pi128           Where to store the item.
    28562856 */
    2857 SSMR3DECL(int) SSMR3GetS128(PSSMHANDLE pSSM, int128_t *pi128)
     2857VMMR3DECL(int) SSMR3GetS128(PSSMHANDLE pSSM, int128_t *pi128)
    28582858{
    28592859    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28712871 * @param   pu              Where to store the integer.
    28722872 */
    2873 SSMR3DECL(int) SSMR3GetUInt(PSSMHANDLE pSSM, PRTUINT pu)
     2873VMMR3DECL(int) SSMR3GetUInt(PSSMHANDLE pSSM, PRTUINT pu)
    28742874{
    28752875    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    28872887 * @param   pi              Where to store the integer.
    28882888 */
    2889 SSMR3DECL(int) SSMR3GetSInt(PSSMHANDLE pSSM, PRTINT pi)
     2889VMMR3DECL(int) SSMR3GetSInt(PSSMHANDLE pSSM, PRTINT pi)
    28902890{
    28912891    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    29032903 * @param   pu              Where to store the integer.
    29042904 */
    2905 SSMR3DECL(int) SSMR3GetGCUInt(PSSMHANDLE pSSM, PRTGCUINT pu)
     2905VMMR3DECL(int) SSMR3GetGCUInt(PSSMHANDLE pSSM, PRTGCUINT pu)
    29062906{
    29072907    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
    … …  
    29312931 * @param   pi              Where to store the integer.
    29322932 */
    2933 SSMR3DECL(int) SSMR3GetGCSInt(PSSMHANDLE pSSM, PRTGCINT pi)
     2933VMMR3DECL(int) SSMR3GetGCSInt(PSSMHANDLE pSSM, PRTGCINT pi)
    29342934{
    29352935    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
    … …  
    29592959 * @param   pGCPhys         Where to store the GC physical address.
    29602960 */
    2961 SSMR3DECL(int) SSMR3GetGCPhys32(PSSMHANDLE pSSM, PRTGCPHYS32 pGCPhys)
     2961VMMR3DECL(int) SSMR3GetGCPhys32(PSSMHANDLE pSSM, PRTGCPHYS32 pGCPhys)
    29622962{
    29632963    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    29752975 * @param   pGCPhys         Where to store the GC physical address.
    29762976 */
    2977 SSMR3DECL(int) SSMR3GetGCPhys64(PSSMHANDLE pSSM, PRTGCPHYS64 pGCPhys)
     2977VMMR3DECL(int) SSMR3GetGCPhys64(PSSMHANDLE pSSM, PRTGCPHYS64 pGCPhys)
    29782978{
    29792979    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    29912991 * @param   pGCPhys         Where to store the GC physical address.
    29922992 */
    2993 SSMR3DECL(int) SSMR3GetGCPhys(PSSMHANDLE pSSM, PRTGCPHYS pGCPhys)
     2993VMMR3DECL(int) SSMR3GetGCPhys(PSSMHANDLE pSSM, PRTGCPHYS pGCPhys)
    29942994{
    29952995    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    30153015 * @param   cbGCPtr         Size of RTGCPTR
    30163016 */
    3017 SSMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr)
     3017VMMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr)
    30183018{
    30193019    Assert(cbGCPtr == sizeof(RTGCPTR32) || cbGCPtr == sizeof(RTGCPTR64));
    … …  
    30303030 * @param   pGCPtr          Where to store the GC virtual address.
    30313031 */
    3032 SSMR3DECL(int) SSMR3GetGCPtr(PSSMHANDLE pSSM, PRTGCPTR pGCPtr)
     3032VMMR3DECL(int) SSMR3GetGCPtr(PSSMHANDLE pSSM, PRTGCPTR pGCPtr)
    30333033{
    30343034    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
    … …  
    30573057 * @param   pRCPtr          Where to store the RC virtual address.
    30583058 */
    3059 SSMR3DECL(int) SSMR3GetRCPtr(PSSMHANDLE pSSM, PRTRCPTR pRCPtr)
     3059VMMR3DECL(int) SSMR3GetRCPtr(PSSMHANDLE pSSM, PRTRCPTR pRCPtr)
    30603060{
    30613061    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    30733073 * @param   pGCPtr          Where to store the GC virtual address.
    30743074 */
    3075 SSMR3DECL(int) SSMR3GetGCUIntPtr(PSSMHANDLE pSSM, PRTGCUINTPTR pGCPtr)
     3075VMMR3DECL(int) SSMR3GetGCUIntPtr(PSSMHANDLE pSSM, PRTGCUINTPTR pGCPtr)
    30763076{
    30773077    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
    … …  
    31013101 * @param   pIOPort         Where to store the I/O port address.
    31023102 */
    3103 SSMR3DECL(int) SSMR3GetIOPort(PSSMHANDLE pSSM, PRTIOPORT pIOPort)
     3103VMMR3DECL(int) SSMR3GetIOPort(PSSMHANDLE pSSM, PRTIOPORT pIOPort)
    31043104{
    31053105    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    31173117 * @param   pSel            Where to store the selector.
    31183118 */
    3119 SSMR3DECL(int) SSMR3GetSel(PSSMHANDLE pSSM, PRTSEL pSel)
     3119VMMR3DECL(int) SSMR3GetSel(PSSMHANDLE pSSM, PRTSEL pSel)
    31203120{
    31213121    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    31343134 * @param   cb              Size of the item.
    31353135 */
    3136 SSMR3DECL(int) SSMR3GetMem(PSSMHANDLE pSSM, void *pv, size_t cb)
     3136VMMR3DECL(int) SSMR3GetMem(PSSMHANDLE pSSM, void *pv, size_t cb)
    31373137{
    31383138    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    31513151 * @param   cbMax           Max size of the item (including '\\0').
    31523152 */
    3153 SSMR3DECL(int) SSMR3GetStrZ(PSSMHANDLE pSSM, char *psz, size_t cbMax)
     3153VMMR3DECL(int) SSMR3GetStrZ(PSSMHANDLE pSSM, char *psz, size_t cbMax)
    31543154{
    31553155    return SSMR3GetStrZEx(pSSM, psz, cbMax, NULL);
    … …  
    31663166 * @param   pcbStr          The length of the loaded string excluding the '\\0'. (optional)
    31673167 */
    3168 SSMR3DECL(int) SSMR3GetStrZEx(PSSMHANDLE pSSM, char *psz, size_t cbMax, size_t *pcbStr)
     3168VMMR3DECL(int) SSMR3GetStrZEx(PSSMHANDLE pSSM, char *psz, size_t cbMax, size_t *pcbStr)
    31693169{
    31703170    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
    … …  
    32033203 * @param   pSSM            SSM operation handle.
    32043204 */
    3205 SSMR3DECL(int) SSMR3HandleGetStatus(PSSMHANDLE pSSM)
     3205VMMR3DECL(int) SSMR3HandleGetStatus(PSSMHANDLE pSSM)
    32063206{
    32073207    return pSSM->rc;
    … …  
    32193219 * @param   iStatus         Failure status code. This MUST be a VERR_*.
    32203220 */
    3221 SSMR3DECL(int) SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus)
     3221VMMR3DECL(int) SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus)
    32223222{
    32233223    if (VBOX_FAILURE(iStatus))
    … …  
    32383238 * @param   pSSM            SSM operation handle.
    32393239 */
    3240 SSMR3DECL(SSMAFTER) SSMR3HandleGetAfter(PSSMHANDLE pSSM)
     3240VMMR3DECL(SSMAFTER) SSMR3HandleGetAfter(PSSMHANDLE pSSM)
    32413241{
    32423242    return pSSM->enmAfter;

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

    r12818 r12989  
    193193 * @param   pVM         The VM to operate on.
    194194 */
    195 STAMR3DECL(int) STAMR3InitUVM(PUVM pUVM)
     195VMMR3DECL(int) STAMR3InitUVM(PUVM pUVM)
    196196{
    197197    LogFlow(("STAMR3Init\n"));
    … …  
    236236 * @param   pUVM        Pointer to the user mode VM structure.
    237237 */
    238 STAMR3DECL(void) STAMR3TermUVM(PUVM pUVM)
     238VMMR3DECL(void) STAMR3TermUVM(PUVM pUVM)
    239239{
    240240    /*
    … …  
    278278 * @param   pszDesc     Sample description.
    279279 */
    280 STAMR3DECL(int)  STAMR3RegisterU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, const char *pszName, STAMUNIT enmUnit, const char *pszDesc)
     280VMMR3DECL(int)  STAMR3RegisterU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, const char *pszName, STAMUNIT enmUnit, const char *pszDesc)
    281281{
    282282    AssertReturn(enmType != STAMTYPE_CALLBACK, VERR_INVALID_PARAMETER);
    … …  
    307307 * @param   pszDesc     Sample description.
    308308 */
    309 STAMR3DECL(int)  STAMR3Register(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, const char *pszName, STAMUNIT enmUnit, const char *pszDesc)
     309VMMR3DECL(int)  STAMR3Register(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, const char *pszName, STAMUNIT enmUnit, const char *pszDesc)
    310310{
    311311    AssertReturn(enmType != STAMTYPE_CALLBACK, VERR_INVALID_PARAMETER);
    … …  
    328328 * @param   ...         Arguments to the format string.
    329329 */
    330 STAMR3DECL(int)  STAMR3RegisterFU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    331                                   const char *pszDesc, const char *pszName, ...)
     330VMMR3DECL(int)  STAMR3RegisterFU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     331                                 const char *pszDesc, const char *pszName, ...)
    332332{
    333333    va_list args;
    … …  
    353353 * @param   ...         Arguments to the format string.
    354354 */
    355 STAMR3DECL(int)  STAMR3RegisterF(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    356                                  const char *pszDesc, const char *pszName, ...)
     355VMMR3DECL(int)  STAMR3RegisterF(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     356                                const char *pszDesc, const char *pszName, ...)
    357357{
    358358    va_list args;
    … …  
    378378 * @param   args        Arguments to the format string.
    379379 */
    380 STAMR3DECL(int)  STAMR3RegisterVU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    381                                   const char *pszDesc, const char *pszName, va_list args)
     380VMMR3DECL(int)  STAMR3RegisterVU(PUVM pUVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     381                                 const char *pszDesc, const char *pszName, va_list args)
    382382{
    383383    AssertReturn(enmType != STAMTYPE_CALLBACK, VERR_INVALID_PARAMETER);
    … …  
    408408 * @param   args        Arguments to the format string.
    409409 */
    410 STAMR3DECL(int)  STAMR3RegisterV(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    411                                  const char *pszDesc, const char *pszName, va_list args)
     410VMMR3DECL(int)  STAMR3RegisterV(PVM pVM, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     411                                const char *pszDesc, const char *pszName, va_list args)
    412412{
    413413    return STAMR3RegisterVU(pVM->pUVM, pvSample, enmType, enmVisibility, enmUnit, pszDesc, pszName, args);
    … …  
    431431 * @remark  There is currently no device or driver variant of this API. Add one if it should become necessary!
    432432 */
    433 STAMR3DECL(int)  STAMR3RegisterCallback(PVM pVM, void *pvSample, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    434                                         PFNSTAMR3CALLBACKRESET pfnReset, PFNSTAMR3CALLBACKPRINT pfnPrint,
    435                                         const char *pszDesc, const char *pszName, ...)
     433VMMR3DECL(int)  STAMR3RegisterCallback(PVM pVM, void *pvSample, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     434                                       PFNSTAMR3CALLBACKRESET pfnReset, PFNSTAMR3CALLBACKPRINT pfnPrint,
     435                                       const char *pszDesc, const char *pszName, ...)
    436436{
    437437    va_list args;
    … …  
    458458 * @remark  There is currently no device or driver variant of this API. Add one if it should become necessary!
    459459 */
    460 STAMR3DECL(int)  STAMR3RegisterCallbackV(PVM pVM, void *pvSample, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
    461                                          PFNSTAMR3CALLBACKRESET pfnReset, PFNSTAMR3CALLBACKPRINT pfnPrint,
    462                                          const char *pszDesc, const char *pszName, va_list args)
     460VMMR3DECL(int)  STAMR3RegisterCallbackV(PVM pVM, void *pvSample, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
     461                                        PFNSTAMR3CALLBACKRESET pfnReset, PFNSTAMR3CALLBACKPRINT pfnPrint,
     462                                        const char *pszDesc, const char *pszName, va_list args)
    463463{
    464464    char *pszFormattedName;
    … …  
    616616 * @param   pvSample    Pointer to the sample registered with STAMR3Register().
    617617 */
    618 STAMR3DECL(int)  STAMR3DeregisterU(PUVM pUVM, void *pvSample)
     618VMMR3DECL(int)  STAMR3DeregisterU(PUVM pUVM, void *pvSample)
    619619{
    620620    STAM_LOCK_WR(pUVM);
    … …  
    662662 * @param   pvSample    Pointer to the sample registered with STAMR3Register().
    663663 */
    664 STAMR3DECL(int)  STAMR3Deregister(PVM pVM, void *pvSample)
     664VMMR3DECL(int)  STAMR3Deregister(PVM pVM, void *pvSample)
    665665{
    666666    return STAMR3DeregisterU(pVM->pUVM, pvSample);
    … …  
    678678 * @remarks Don't confuse this with the other 'XYZR3Reset' methods, it's not called at VM reset.
    679679 */
    680 STAMR3DECL(int)  STAMR3ResetU(PUVM pUVM, const char *pszPat)
     680VMMR3DECL(int)  STAMR3ResetU(PUVM pUVM, const char *pszPat)
    681681{
    682682    int rc = VINF_SUCCESS;
    … …  
    755755 * @remarks Don't confuse this with the other 'XYZR3Reset' methods, it's not called at VM reset.
    756756 */
    757 STAMR3DECL(int)  STAMR3Reset(PVM pVM, const char *pszPat)
     757VMMR3DECL(int)  STAMR3Reset(PVM pVM, const char *pszPat)
    758758{
    759759    return STAMR3ResetU(pVM->pUVM, pszPat);
    … …  
    852852 * @param   pcchSnapshot    Where to store the size of the snapshot data. (Excluding the trailing '\0')
    853853 */
    854 STAMR3DECL(int) STAMR3SnapshotU(PUVM pUVM, const char *pszPat, char **ppszSnapshot, size_t *pcchSnapshot, bool fWithDesc)
     854VMMR3DECL(int) STAMR3SnapshotU(PUVM pUVM, const char *pszPat, char **ppszSnapshot, size_t *pcchSnapshot, bool fWithDesc)
    855855{
    856856    STAMR3SNAPSHOTONE State = { NULL, NULL, NULL, pUVM->pVM, 0, VINF_SUCCESS, fWithDesc };
    … …  
    905905 * @param   pcchSnapshot    Where to store the size of the snapshot data. (Excluding the trailing '\0')
    906906 */
    907 STAMR3DECL(int) STAMR3Snapshot(PVM pVM, const char *pszPat, char **ppszSnapshot, size_t *pcchSnapshot, bool fWithDesc)
     907VMMR3DECL(int) STAMR3Snapshot(PVM pVM, const char *pszPat, char **ppszSnapshot, size_t *pcchSnapshot, bool fWithDesc)
    908908{
    909909    return STAMR3SnapshotU(pVM->pUVM, pszPat, ppszSnapshot, pcchSnapshot, fWithDesc);
    … …  
    11471147 *                          NULL is allowed.
    11481148 */
    1149 STAMR3DECL(int)  STAMR3SnapshotFreeU(PUVM pUVM, char *pszSnapshot)
     1149VMMR3DECL(int)  STAMR3SnapshotFreeU(PUVM pUVM, char *pszSnapshot)
    11501150{
    11511151    if (!pszSnapshot)
    … …  
    11631163 *                          NULL is allowed.
    11641164 */
    1165 STAMR3DECL(int)  STAMR3SnapshotFree(PVM pVM, char *pszSnapshot)
     1165VMMR3DECL(int)  STAMR3SnapshotFree(PVM pVM, char *pszSnapshot)
    11661166{
    11671167    return STAMR3SnapshotFreeU(pVM->pUVM, pszSnapshot);
    … …  
    11771177 *                          If NULL all samples are written to the log.
    11781178 */
    1179 STAMR3DECL(int)  STAMR3DumpU(PUVM pUVM, const char *pszPat)
     1179VMMR3DECL(int)  STAMR3DumpU(PUVM pUVM, const char *pszPat)
    11801180{
    11811181    STAMR3PRINTONEARGS Args;
    … …  
    11991199 *                          If NULL all samples are written to the log.
    12001200 */
    1201 STAMR3DECL(int)  STAMR3Dump(PVM pVM, const char *pszPat)
     1201VMMR3DECL(int)  STAMR3Dump(PVM pVM, const char *pszPat)
    12021202{
    12031203    return STAMR3DumpU(pVM->pUVM, pszPat);
    … …  
    12301230 *                          If NULL all samples are written to the log.
    12311231 */
    1232 STAMR3DECL(int)  STAMR3DumpToReleaseLogU(PUVM pUVM, const char *pszPat)
     1232VMMR3DECL(int)  STAMR3DumpToReleaseLogU(PUVM pUVM, const char *pszPat)
    12331233{
    12341234    STAMR3PRINTONEARGS Args;
    … …  
    12521252 *                          If NULL all samples are written to the log.
    12531253 */
    1254 STAMR3DECL(int)  STAMR3DumpToReleaseLog(PVM pVM, const char *pszPat)
     1254VMMR3DECL(int)  STAMR3DumpToReleaseLog(PVM pVM, const char *pszPat)
    12551255{
    12561256    return STAMR3DumpToReleaseLogU(pVM->pUVM, pszPat);
    … …  
    12831283 *                          If NULL all samples are reset.
    12841284 */
    1285 STAMR3DECL(int)  STAMR3PrintU(PUVM pUVM, const char *pszPat)
     1285VMMR3DECL(int)  STAMR3PrintU(PUVM pUVM, const char *pszPat)
    12861286{
    12871287    STAMR3PRINTONEARGS Args;
    … …  
    13051305 *                          If NULL all samples are reset.
    13061306 */
    1307 STAMR3DECL(int)  STAMR3Print(PVM pVM, const char *pszPat)
     1307VMMR3DECL(int)  STAMR3Print(PVM pVM, const char *pszPat)
    13081308{
    13091309    return STAMR3PrintU(pVM->pUVM, pszPat);
    … …  
    14531453 * @param   pvUser      The pvUser argument of the callback function.
    14541454 */
    1455 STAMR3DECL(int) STAMR3EnumU(PUVM pUVM, const char *pszPat, PFNSTAMR3ENUM pfnEnum, void *pvUser)
     1455VMMR3DECL(int) STAMR3EnumU(PUVM pUVM, const char *pszPat, PFNSTAMR3ENUM pfnEnum, void *pvUser)
    14561456{
    14571457    STAMR3ENUMONEARGS Args;
    … …  
    14771477 * @param   pvUser      The pvUser argument of the callback function.
    14781478 */
    1479 STAMR3DECL(int) STAMR3Enum(PVM pVM, const char *pszPat, PFNSTAMR3ENUM pfnEnum, void *pvUser)
     1479VMMR3DECL(int) STAMR3Enum(PVM pVM, const char *pszPat, PFNSTAMR3ENUM pfnEnum, void *pvUser)
    14801480{
    14811481    return STAMR3EnumU(pVM->pUVM, pszPat, pfnEnum, pvUser);
    … …  
    18061806 * @param   enmUnit     The unit.
    18071807 */
    1808 STAMR3DECL(const char *) STAMR3GetUnit(STAMUNIT enmUnit)
     1808VMMR3DECL(const char *) STAMR3GetUnit(STAMUNIT enmUnit)
    18091809{
    18101810    switch (enmUnit)

  • trunk/src/VBox/VMM/STAMInternal.h

    r8155 r12989  
    2929#include <iprt/semaphore.h>
    3030
    31 #if !defined(IN_STAM_R3) && !defined(IN_STAM_R0) && !defined(IN_STAM_GC)
    32 # error "Not in STAM! This is an internal header!"
    33 #endif
    3431
    3532

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

    r12975 r12989  
    174174 * @param   pVM         The VM to operate on.
    175175 */
    176 TMR3DECL(int) TMR3Init(PVM pVM)
     176VMMR3DECL(int) TMR3Init(PVM pVM)
    177177{
    178178    LogFlow(("TMR3Init:\n"));
    … …  
    730730 * @param   pVM         The VM to operate on.
    731731 */
    732 TMR3DECL(int) TMR3InitFinalize(PVM pVM)
     732VMMR3DECL(int) TMR3InitFinalize(PVM pVM)
    733733{
    734734    int rc;
    … …  
    778778 * @param   offDelta    Relocation delta relative to old location.
    779779 */
    780 TMR3DECL(void) TMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     780VMMR3DECL(void) TMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    781781{
    782782    int rc;
    … …  
    826826 * @param   pVM         The VM to operate on.
    827827 */
    828 TMR3DECL(int) TMR3Term(PVM pVM)
     828VMMR3DECL(int) TMR3Term(PVM pVM)
    829829{
    830830    AssertMsg(pVM->tm.s.offVM, ("bad init order!\n"));
    … …  
    849849 * @param   pVM     VM handle.
    850850 */
    851 TMR3DECL(void) TMR3Reset(PVM pVM)
     851VMMR3DECL(void) TMR3Reset(PVM pVM)
    852852{
    853853    LogFlow(("TMR3Reset:\n"));
    … …  
    898898 * @remark  This has to work before TMR3Relocate() is called.
    899899 */
    900 TMR3DECL(int) TMR3GetImportGC(PVM pVM, const char *pszSymbol, PRTGCPTR pGCPtrValue)
     900VMMR3DECL(int) TMR3GetImportGC(PVM pVM, const char *pszSymbol, PRTGCPTR pGCPtrValue)
    901901{
    902902    if (!strcmp(pszSymbol, "g_pSUPGlobalInfoPage"))
    … …  
    11091109 * @param   ppTimer         Where to store the timer on success.
    11101110 */
    1111 TMR3DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, const char *pszDesc, PPTMTIMERR3 ppTimer)
     1111VMMR3DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, const char *pszDesc, PPTMTIMERR3 ppTimer)
    11121112{
    11131113    /*
    … …  
    11391139 * @param   ppTimer         Where to store the timer on success.
    11401140 */
    1141 TMR3DECL(int) TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, const char *pszDesc, PPTMTIMERR3 ppTimer)
     1141VMMR3DECL(int) TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, const char *pszDesc, PPTMTIMERR3 ppTimer)
    11421142{
    11431143    /*
    … …  
    11691169 * @param   ppTimer         Where to store the timer on success.
    11701170 */
    1171 TMR3DECL(int) TMR3TimerCreateInternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMERINT pfnCallback, void *pvUser, const char *pszDesc, PPTMTIMERR3 ppTimer)
     1171VMMR3DECL(int) TMR3TimerCreateInternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMERINT pfnCallback, void *pvUser, const char *pszDesc, PPTMTIMERR3 ppTimer)
    11721172{
    11731173    /*
    … …  
    12001200 *                          until the timer is fully destroyed (i.e. a bit after TMTimerDestroy()).
    12011201 */
    1202 TMR3DECL(PTMTIMERR3) TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc)
     1202VMMR3DECL(PTMTIMERR3) TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc)
    12031203{
    12041204    /*
    … …  
    12271227 * @param   pDevIns         Device which timers should be destroyed.
    12281228 */
    1229 TMR3DECL(int) TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
     1229VMMR3DECL(int) TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
    12301230{
    12311231    LogFlow(("TMR3TimerDestroyDevice: pDevIns=%p\n", pDevIns));
    … …  
    12571257 * @param   pDrvIns         Driver which timers should be destroyed.
    12581258 */
    1259 TMR3DECL(int) TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
     1259VMMR3DECL(int) TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
    12601260{
    12611261    LogFlow(("TMR3TimerDestroyDriver: pDrvIns=%p\n", pDrvIns));
    … …  
    13721372 * @param   pVM             The VM to run the timers for.
    13731373 */
    1374 TMR3DECL(void) TMR3TimerQueuesDo(PVM pVM)
     1374VMMR3DECL(void) TMR3TimerQueuesDo(PVM pVM)
    13751375{
    13761376    STAM_PROFILE_START(&pVM->tm.s.StatDoQueues, a);
    … …  
    17811781 * @param   pSSM            Save State Manager handle.
    17821782 */
    1783 TMR3DECL(int) TMR3TimerSave(PTMTIMERR3 pTimer, PSSMHANDLE pSSM)
     1783VMMR3DECL(int) TMR3TimerSave(PTMTIMERR3 pTimer, PSSMHANDLE pSSM)
    17841784{
    17851785    LogFlow(("TMR3TimerSave: pTimer=%p:{enmState=%s, .pszDesc={%s}} pSSM=%p\n", pTimer, tmTimerState(pTimer->enmState), pTimer->pszDesc, pSSM));
    … …  
    18231823 * @param   pSSM            Save State Manager handle.
    18241824 */
    1825 TMR3DECL(int) TMR3TimerLoad(PTMTIMERR3 pTimer, PSSMHANDLE pSSM)
     1825VMMR3DECL(int) TMR3TimerLoad(PTMTIMERR3 pTimer, PSSMHANDLE pSSM)
    18261826{
    18271827    Assert(pTimer); Assert(pSSM); VM_ASSERT_EMT(pTimer->pVMR3);
    … …  
    18851885 * @param   pTime           Where to store the time.
    18861886 */
    1887 TMR3DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime)
     1887VMMR3DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime)
    18881888{
    18891889    RTTimeNow(pTime);

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

    r12975 r12989  
    422422 * @param   pVM         The VM to operate on.
    423423 */
    424 TRPMR3DECL(int) TRPMR3Init(PVM pVM)
     424VMMR3DECL(int) TRPMR3Init(PVM pVM)
    425425{
    426426    LogFlow(("TRPMR3Init\n"));
    … …  
    542542 * @param   offDelta    Relocation delta relative to old location.
    543543 */
    544 TRPMR3DECL(void) TRPMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     544VMMR3DECL(void) TRPMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    545545{
    546546    LogFlow(("TRPMR3Relocate\n"));
    … …  
    664664 * @param   pVM         The VM to operate on.
    665665 */
    666 TRPMR3DECL(int) TRPMR3Term(PVM pVM)
     666VMMR3DECL(int) TRPMR3Term(PVM pVM)
    667667{
    668668    NOREF(pVM);
    … …  
    679679 * @param   pVM     VM handle.
    680680 */
    681 TRPMR3DECL(void) TRPMR3Reset(PVM pVM)
     681VMMR3DECL(void) TRPMR3Reset(PVM pVM)
    682682{
    683683    /*
    … …  
    876876 * @param   pVM         The VM handle.
    877877 */
    878 TRPMR3DECL(int) TRPMR3SyncIDT(PVM pVM)
     878VMMR3DECL(int) TRPMR3SyncIDT(PVM pVM)
    879879{
    880880    STAM_PROFILE_START(&pVM->trpm.s.StatSyncIDT, a);
    … …  
    983983 * @param   pVM         The VM to operate on.
    984984 */
    985 TRPMR3DECL(void) TRPMR3DisableMonitoring(PVM pVM)
     985VMMR3DECL(void) TRPMR3DisableMonitoring(PVM pVM)
    986986{
    987987    /*
    … …  
    10481048 * @param   iTrap       Trap/interrupt gate number.
    10491049 */
    1050 TRPMR3DECL(int) trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap)
     1050VMMR3DECL(int) trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap)
    10511051{
    10521052    /** @todo cleanup trpmR3ClearPassThroughHandler()! */
    … …  
    11071107 * @param   GCPtr       GC address to check.
    11081108 */
    1109 TRPMR3DECL(uint32_t) TRPMR3QueryGateByHandler(PVM pVM, RTRCPTR GCPtr)
     1109VMMR3DECL(uint32_t) TRPMR3QueryGateByHandler(PVM pVM, RTRCPTR GCPtr)
    11101110{
    11111111    for (uint32_t iTrap = 0; iTrap < RT_ELEMENTS(pVM->trpm.s.aGuestTrapHandler); iTrap++)
    … …  
    11351135 * @param   iTrap       Interrupt/trap number.
    11361136 */
    1137 TRPMR3DECL(RTRCPTR) TRPMR3GetGuestTrapHandler(PVM pVM, unsigned iTrap)
     1137VMMR3DECL(RTRCPTR) TRPMR3GetGuestTrapHandler(PVM pVM, unsigned iTrap)
    11381138{
    11391139    AssertReturn(iTrap < RT_ELEMENTS(pVM->trpm.s.aIdt), TRPM_INVALID_HANDLER);
    … …  
    11521152 * @param   pHandler    GC handler pointer
    11531153 */
    1154 TRPMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTRCPTR pHandler)
     1154VMMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTRCPTR pHandler)
    11551155{
    11561156    /*
    … …  
    12691269 * @param   GCPtr       GC address to check.
    12701270 */
    1271 TRPMR3DECL(bool) TRPMR3IsGateHandler(PVM pVM, RTRCPTR GCPtr)
     1271VMMR3DECL(bool) TRPMR3IsGateHandler(PVM pVM, RTRCPTR GCPtr)
    12721272{
    12731273    /*
    … …  
    13381338 * @param   enmEvent    Trpm event type
    13391339 */
    1340 TRPMR3DECL(int) TRPMR3InjectEvent(PVM pVM, TRPMEVENT enmEvent)
     1340VMMR3DECL(int) TRPMR3InjectEvent(PVM pVM, TRPMEVENT enmEvent)
    13411341{
    13421342    PCPUMCTX pCtx;

  • trunk/src/VBox/VMM/TRPMInternal.h

    r9288 r12989  
    2929
    3030
    31 #if !defined(IN_TRPM_R3) && !defined(IN_TRPM_R0) && !defined(IN_TRPM_GC)
    32 # error "Not in TRPM! This is an internal header!"
    33 #endif
    3431
    3532/* Enable to allow trap forwarding in GC. */
    … …  
    196193typedef TRPM *PTRPM;
    197194
    198 TRPMGCDECL(int) trpmgcGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    199 TRPMGCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     195VMMRCDECL(int) trpmgcGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
     196VMMRCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange);
    200197
    201198/**
    … …  
    206203 * @param   iTrap       Interrupt/trap number.
    207204 */
    208 TRPMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap);
     205VMMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap);
    209206
    210207
    … …  
    218215 * @param   iTrap       Trap/interrupt gate number.
    219216 */
    220 TRPMR3DECL(int) trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap);
     217VMMR3DECL(int) trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap);
    221218
    222219#endif

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

    r12579 r12989  
    130130 * @returns VBox status code.
    131131 */
    132 VMR3DECL(int)   VMR3GlobalInit(void)
     132VMMR3DECL(int)   VMR3GlobalInit(void)
    133133{
    134134    /*
    … …  
    164164 * @param   ppVM                Where to store the 'handle' of the created VM.
    165165 */
    166 VMR3DECL(int)   VMR3Create(PFNVMATERROR pfnVMAtError, void *pvUserVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM, PVM *ppVM)
     166VMMR3DECL(int)   VMR3Create(PFNVMATERROR pfnVMAtError, void *pvUserVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM, PVM *ppVM)
    167167{
    168168    LogFlow(("VMR3Create: pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p\n", pfnVMAtError, pvUserVM, pfnCFGMConstructor, pvUserCFGM, ppVM));
    … …  
    789789 * @param   offDelta    Relocation delta relative to old location.
    790790 */
    791 VMR3DECL(void)   VMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     791VMMR3DECL(void)   VMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
    792792{
    793793    LogFlow(("VMR3Relocate: offDelta=%VGv\n", offDelta));
    … …  
    826826 * @vmstateto   Running
    827827 */
    828 VMR3DECL(int)   VMR3PowerOn(PVM pVM)
     828VMMR3DECL(int)   VMR3PowerOn(PVM pVM)
    829829{
    830830    LogFlow(("VMR3PowerOn: pVM=%p\n", pVM));
    … …  
    896896 * @vmstateto   Suspended
    897897 */
    898 VMR3DECL(int) VMR3Suspend(PVM pVM)
     898VMMR3DECL(int) VMR3Suspend(PVM pVM)
    899899{
    900900    LogFlow(("VMR3Suspend: pVM=%p\n", pVM));
    … …  
    935935 * @vmstateto   Suspended
    936936 */
    937 VMR3DECL(int) VMR3SuspendNoSave(PVM pVM)
     937VMMR3DECL(int) VMR3SuspendNoSave(PVM pVM)
    938938{
    939939    pVM->vm.s.fPreventSaveState = true;
    … …  
    983983 * @vmstateto   Running
    984984 */
    985 VMR3DECL(int)   VMR3Resume(PVM pVM)
     985VMMR3DECL(int)   VMR3Resume(PVM pVM)
    986986{
    987987    LogFlow(("VMR3Resume: pVM=%p\n", pVM));
    … …  
    10591059 * @vmstateto   Unchanged state.
    10601060 */
    1061 VMR3DECL(int) VMR3Save(PVM pVM, const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
     1061VMMR3DECL(int) VMR3Save(PVM pVM, const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
    10621062{
    10631063    LogFlow(("VMR3Save: pVM=%p pszFilename=%p:{%s} pfnProgress=%p pvUser=%p\n", pVM, pszFilename, pszFilename, pfnProgress, pvUser));
    … …  
    11541154 * @vmstateto   Suspended
    11551155 */
    1156 VMR3DECL(int)   VMR3Load(PVM pVM, const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
     1156VMMR3DECL(int)   VMR3Load(PVM pVM, const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
    11571157{
    11581158    LogFlow(("VMR3Load: pVM=%p pszFilename=%p:{%s} pfnProgress=%p pvUser=%p\n", pVM, pszFilename, pszFilename, pfnProgress, pvUser));
    … …  
    12481248 * @vmstateto   Off
    12491249 */
    1250 VMR3DECL(int)   VMR3PowerOff(PVM pVM)
     1250VMMR3DECL(int)   VMR3PowerOff(PVM pVM)
    12511251{
    12521252    LogFlow(("VMR3PowerOff: pVM=%p\n", pVM));
    … …  
    13791379 * @vmstateto   N/A
    13801380 */
    1381 VMR3DECL(int)   VMR3Destroy(PVM pVM)
     1381VMMR3DECL(int)   VMR3Destroy(PVM pVM)
    13821382{
    13831383    LogFlow(("VMR3Destroy: pVM=%p\n", pVM));
    … …  
    16781678 *                      Use NULL to start the enumeration.
    16791679 */
    1680 VMR3DECL(PVM)   VMR3EnumVMs(PVM pVMPrev)
     1680VMMR3DECL(PVM)   VMR3EnumVMs(PVM pVMPrev)
    16811681{
    16821682    /*
    … …  
    17001700 * @param   pvUser          User argument.
    17011701 */
    1702 VMR3DECL(int)   VMR3AtDtorRegister(PFNVMATDTOR pfnAtDtor, void *pvUser)
     1702VMMR3DECL(int)   VMR3AtDtorRegister(PFNVMATDTOR pfnAtDtor, void *pvUser)
    17031703{
    17041704    /*
    … …  
    17451745 * @param   pfnAtDtor       Pointer to callback.
    17461746 */
    1747 VMR3DECL(int)   VMR3AtDtorDeregister(PFNVMATDTOR pfnAtDtor)
     1747VMMR3DECL(int)   VMR3AtDtorDeregister(PFNVMATDTOR pfnAtDtor)
    17481748{
    17491749    /*
    … …  
    18001800 * @param   pVM     VM to reset.
    18011801 */
    1802 VMR3DECL(int)   VMR3Reset(PVM pVM)
     1802VMMR3DECL(int)   VMR3Reset(PVM pVM)
    18031803{
    18041804    int rc = VINF_SUCCESS;
    … …  
    19841984 * @param   pszDesc         Description (optional).
    19851985 */
    1986 VMR3DECL(int)   VMR3AtResetRegister(PVM pVM, PPDMDEVINS pDevInst, PFNVMATRESET pfnCallback, void *pvUser, const char *pszDesc)
     1986VMMR3DECL(int)   VMR3AtResetRegister(PVM pVM, PPDMDEVINS pDevInst, PFNVMATRESET pfnCallback, void *pvUser, const char *pszDesc)
    19871987{
    19881988    /*
    … …  
    20232023 * @param   pszDesc         Description (optional).
    20242024 */
    2025 VMR3DECL(int)   VMR3AtResetRegisterInternal(PVM pVM, PFNVMATRESETINT pfnCallback, void *pvUser, const char *pszDesc)
     2025VMMR3DECL(int)   VMR3AtResetRegisterInternal(PVM pVM, PFNVMATRESETINT pfnCallback, void *pvUser, const char *pszDesc)
    20262026{
    20272027    /*
    … …  
    20612061 * @param   pszDesc         Description (optional).
    20622062 */
    2063 VMR3DECL(int)   VMR3AtResetRegisterExternal(PVM pVM, PFNVMATRESETEXT pfnCallback, void *pvUser, const char *pszDesc)
     2063VMMR3DECL(int)   VMR3AtResetRegisterExternal(PVM pVM, PFNVMATRESETEXT pfnCallback, void *pvUser, const char *pszDesc)
    20642064{
    20652065    /*
    … …  
    21342134 * @param   pfnCallback     Callback function.
    21352135 */
    2136 VMR3DECL(int)   VMR3AtResetDeregister(PVM pVM, PPDMDEVINS pDevInst, PFNVMATRESET pfnCallback)
     2136VMMR3DECL(int)   VMR3AtResetDeregister(PVM pVM, PPDMDEVINS pDevInst, PFNVMATRESET pfnCallback)
    21372137{
    21382138    int         rc = VERR_VM_ATRESET_NOT_FOUND;
    … …  
    21672167 * @param   pfnCallback     Callback function.
    21682168 */
    2169 VMR3DECL(int)   VMR3AtResetDeregisterInternal(PVM pVM, PFNVMATRESETINT pfnCallback)
     2169VMMR3DECL(int)   VMR3AtResetDeregisterInternal(PVM pVM, PFNVMATRESETINT pfnCallback)
    21702170{
    21712171    int         rc = VERR_VM_ATRESET_NOT_FOUND;
    … …  
    21992199 * @param   pfnCallback     Callback function.
    22002200 */
    2201 VMR3DECL(int)   VMR3AtResetDeregisterExternal(PVM pVM, PFNVMATRESETEXT pfnCallback)
     2201VMMR3DECL(int)   VMR3AtResetDeregisterExternal(PVM pVM, PFNVMATRESETEXT pfnCallback)
    22022202{
    22032203    int         rc = VERR_VM_ATRESET_NOT_FOUND;
    … …  
    22312231 * @thread  Any
    22322232 */
    2233 VMR3DECL(VMSTATE) VMR3GetState(PVM pVM)
     2233VMMR3DECL(VMSTATE) VMR3GetState(PVM pVM)
    22342234{
    22352235    return pVM->enmVMState;
    … …  
    22432243 * @param   enmState        The state.
    22442244 */
    2245 VMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState)
     2245VMMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState)
    22462246{
    22472247    switch (enmState)
    … …  
    23222322 * @thread  Any.
    23232323 */
    2324 VMR3DECL(int)   VMR3AtStateRegister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser)
     2324VMMR3DECL(int)   VMR3AtStateRegister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser)
    23252325{
    23262326    LogFlow(("VMR3AtStateRegister: pfnAtState=%p pvUser=%p\n", pfnAtState, pvUser));
    … …  
    23912391 * @thread  Any.
    23922392 */
    2393 VMR3DECL(int)   VMR3AtStateDeregister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser)
     2393VMMR3DECL(int)   VMR3AtStateDeregister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser)
    23942394{
    23952395    LogFlow(("VMR3AtStateDeregister: pfnAtState=%p pvUser=%p\n", pfnAtState, pvUser));
    … …  
    24862486 * @thread  Any.
    24872487 */
    2488 VMR3DECL(int)   VMR3AtErrorRegister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser)
     2488VMMR3DECL(int)   VMR3AtErrorRegister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser)
    24892489{
    24902490    return VMR3AtErrorRegisterU(pVM->pUVM, pfnAtError, pvUser);
    … …  
    25012501 * @thread  Any.
    25022502 */
    2503 VMR3DECL(int)   VMR3AtErrorRegisterU(PUVM pUVM, PFNVMATERROR pfnAtError, void *pvUser)
     2503VMMR3DECL(int)   VMR3AtErrorRegisterU(PUVM pUVM, PFNVMATERROR pfnAtError, void *pvUser)
    25042504{
    25052505    LogFlow(("VMR3AtErrorRegister: pfnAtError=%p pvUser=%p\n", pfnAtError, pvUser));
    … …  
    25622562 * @thread  Any.
    25632563 */
    2564 VMR3DECL(int)   VMR3AtErrorDeregister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser)
     2564VMMR3DECL(int)   VMR3AtErrorDeregister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser)
    25652565{
    25662566    LogFlow(("VMR3AtErrorDeregister: pfnAtError=%p pvUser=%p\n", pfnAtError, pvUser));
    … …  
    26672667 * @thread  EMT.
    26682668 */
    2669 VMR3DECL(void) VMR3SetErrorWorker(PVM pVM)
     2669VMMR3DECL(void) VMR3SetErrorWorker(PVM pVM)
    26702670{
    26712671    VM_ASSERT_EMT(pVM);
    … …  
    27782778 * @thread  Any.
    27792779 */
    2780 VMR3DECL(int)   VMR3AtRuntimeErrorRegister(PVM pVM, PFNVMATRUNTIMEERROR pfnAtRuntimeError, void *pvUser)
     2780VMMR3DECL(int)   VMR3AtRuntimeErrorRegister(PVM pVM, PFNVMATRUNTIMEERROR pfnAtRuntimeError, void *pvUser)
    27812781{
    27822782    LogFlow(("VMR3AtRuntimeErrorRegister: pfnAtRuntimeError=%p pvUser=%p\n", pfnAtRuntimeError, pvUser));
    … …  
    28472847 * @thread  Any.
    28482848 */
    2849 VMR3DECL(int)   VMR3AtRuntimeErrorDeregister(PVM pVM, PFNVMATRUNTIMEERROR pfnAtRuntimeError, void *pvUser)
     2849VMMR3DECL(int)   VMR3AtRuntimeErrorDeregister(PVM pVM, PFNVMATRUNTIMEERROR pfnAtRuntimeError, void *pvUser)
    28502850{
    28512851    LogFlow(("VMR3AtRuntimeErrorDeregister: pfnAtRuntimeError=%p pvUser=%p\n", pfnAtRuntimeError, pvUser));
    … …  
    29542954 * @thread  EMT.
    29552955 */
    2956 VMR3DECL(void) VMR3SetRuntimeErrorWorker(PVM pVM)
     2956VMMR3DECL(void) VMR3SetRuntimeErrorWorker(PVM pVM)
    29572957{
    29582958    VM_ASSERT_EMT(pVM);

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

    r12549 r12989  
    225225 * @param   pVM             VM handle.
    226226 */
    227 VMR3DECL(int) VMR3WaitForResume(PVM pVM)
     227VMMR3DECL(int) VMR3WaitForResume(PVM pVM)
    228228{
    229229    /*
    … …  
    952952 *                          generic REMR3NotifyFF() method is called.
    953953 */
    954 VMR3DECL(void) VMR3NotifyFF(PVM pVM, bool fNotifiedREM)
     954VMMR3DECL(void) VMR3NotifyFF(PVM pVM, bool fNotifiedREM)
    955955{
    956956    LogFlow(("VMR3NotifyFF:\n"));
    … …  
    970970 *                          generic REMR3NotifyFF() method is called.
    971971 */
    972 VMR3DECL(void) VMR3NotifyFFU(PUVM pUVM, bool fNotifiedREM)
     972VMMR3DECL(void) VMR3NotifyFFU(PUVM pUVM, bool fNotifiedREM)
    973973{
    974974    LogFlow(("VMR3NotifyFF:\n"));
    … …  
    987987 * @thread  The emulation thread.
    988988 */
    989 VMR3DECL(int) VMR3WaitHalted(PVM pVM, bool fIgnoreInterrupts)
     989VMMR3DECL(int) VMR3WaitHalted(PVM pVM, bool fIgnoreInterrupts)
    990990{
    991991    LogFlow(("VMR3WaitHalted: fIgnoreInterrupts=%d\n", fIgnoreInterrupts));
    … …  
    10591059 * @thread  The emulation thread.
    10601060 */
    1061 VMR3DECL(int) VMR3WaitU(PUVM pUVM)
     1061VMMR3DECL(int) VMR3WaitU(PUVM pUVM)
    10621062{
    10631063    LogFlow(("VMR3WaitU:\n"));

  • trunk/src/VBox/VMM/VMInternal.h

    r8155 r12989  
    2727#include <setjmp.h>
    2828
    29 #if !defined(IN_VM_R3) && !defined(IN_VM_R0) && !defined(IN_VM_GC)
    30 # error "Not in VM! This is an internal header!"
    31 #endif
    3229
    3330

  • trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

    r12972 r12989  
    5555 *                      to go back to the default context core.
    5656 */
    57 CPUMDECL(void) CPUMHyperSetCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
     57VMMDECL(void) CPUMHyperSetCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
    5858{
    5959    LogFlow(("CPUMHyperSetCtxCore: %p/%p/%p -> %p\n", pVM->cpum.s.CTX_SUFF(pHyperCore), pCtxCore));
    … …  
    8080 * @param   pVM         Handle to the virtual machine.
    8181 */
    82 CPUMDECL(PCCPUMCTXCORE) CPUMGetHyperCtxCore(PVM pVM)
     82VMMDECL(PCCPUMCTXCORE) CPUMGetHyperCtxCore(PVM pVM)
    8383{
    8484    return pVM->cpum.s.CTX_SUFF(pHyperCore);
    … …  
    9898 *              and esp. setting the hypervisor registers.
    9999 */
    100 CPUMDECL(int) CPUMQueryHyperCtxPtr(PVM pVM, PCPUMCTX *ppCtx)
     100VMMDECL(int) CPUMQueryHyperCtxPtr(PVM pVM, PCPUMCTX *ppCtx)
    101101{
    102102    *ppCtx = &pVM->cpum.s.Hyper;
    … …  
    105105
    106106
    107 CPUMDECL(void) CPUMSetHyperGDTR(PVM pVM, uint32_t addr, uint16_t limit)
     107VMMDECL(void) CPUMSetHyperGDTR(PVM pVM, uint32_t addr, uint16_t limit)
    108108{
    109109    pVM->cpum.s.Hyper.gdtr.cbGdt = limit;
    … …  
    113113
    114114
    115 CPUMDECL(void) CPUMSetHyperIDTR(PVM pVM, uint32_t addr, uint16_t limit)
     115VMMDECL(void) CPUMSetHyperIDTR(PVM pVM, uint32_t addr, uint16_t limit)
    116116{
    117117    pVM->cpum.s.Hyper.idtr.cbIdt = limit;
    … …  
    121121
    122122
    123 CPUMDECL(void) CPUMSetHyperCR3(PVM pVM, uint32_t cr3)
     123VMMDECL(void) CPUMSetHyperCR3(PVM pVM, uint32_t cr3)
    124124{
    125125    pVM->cpum.s.Hyper.cr3 = cr3;
    … …  
    127127
    128128
    129 CPUMDECL(void) CPUMSetHyperCS(PVM pVM, RTSEL SelCS)
     129VMMDECL(void) CPUMSetHyperCS(PVM pVM, RTSEL SelCS)
    130130{
    131131    pVM->cpum.s.CTX_SUFF(pHyperCore)->cs = SelCS;
    … …  
    133133
    134134
    135 CPUMDECL(void) CPUMSetHyperDS(PVM pVM, RTSEL SelDS)
     135VMMDECL(void) CPUMSetHyperDS(PVM pVM, RTSEL SelDS)
    136136{
    137137    pVM->cpum.s.CTX_SUFF(pHyperCore)->ds = SelDS;
    … …  
    139139
    140140
    141 CPUMDECL(void) CPUMSetHyperES(PVM pVM, RTSEL SelES)
     141VMMDECL(void) CPUMSetHyperES(PVM pVM, RTSEL SelES)
    142142{
    143143    pVM->cpum.s.CTX_SUFF(pHyperCore)->es = SelES;
    … …  
    145145
    146146
    147 CPUMDECL(void) CPUMSetHyperFS(PVM pVM, RTSEL SelFS)
     147VMMDECL(void) CPUMSetHyperFS(PVM pVM, RTSEL SelFS)
    148148{
    149149    pVM->cpum.s.CTX_SUFF(pHyperCore)->fs = SelFS;
    … …  
    151151
    152152
    153 CPUMDECL(void) CPUMSetHyperGS(PVM pVM, RTSEL SelGS)
     153VMMDECL(void) CPUMSetHyperGS(PVM pVM, RTSEL SelGS)
    154154{
    155155    pVM->cpum.s.CTX_SUFF(pHyperCore)->gs = SelGS;
    … …  
    157157
    158158
    159 CPUMDECL(void) CPUMSetHyperSS(PVM pVM, RTSEL SelSS)
     159VMMDECL(void) CPUMSetHyperSS(PVM pVM, RTSEL SelSS)
    160160{
    161161    pVM->cpum.s.CTX_SUFF(pHyperCore)->ss = SelSS;
    … …  
    163163
    164164
    165 CPUMDECL(void) CPUMSetHyperESP(PVM pVM, uint32_t u32ESP)
     165VMMDECL(void) CPUMSetHyperESP(PVM pVM, uint32_t u32ESP)
    166166{
    167167    pVM->cpum.s.CTX_SUFF(pHyperCore)->esp = u32ESP;
    … …  
    169169
    170170
    171 CPUMDECL(int) CPUMSetHyperEFlags(PVM pVM, uint32_t Efl)
     171VMMDECL(int) CPUMSetHyperEFlags(PVM pVM, uint32_t Efl)
    172172{
    173173    pVM->cpum.s.CTX_SUFF(pHyperCore)->eflags.u32 = Efl;
    … …  
    176176
    177177
    178 CPUMDECL(void) CPUMSetHyperEIP(PVM pVM, uint32_t u32EIP)
     178VMMDECL(void) CPUMSetHyperEIP(PVM pVM, uint32_t u32EIP)
    179179{
    180180    pVM->cpum.s.CTX_SUFF(pHyperCore)->eip = u32EIP;
    … …  
    182182
    183183
    184 CPUMDECL(void) CPUMSetHyperTR(PVM pVM, RTSEL SelTR)
     184VMMDECL(void) CPUMSetHyperTR(PVM pVM, RTSEL SelTR)
    185185{
    186186    pVM->cpum.s.Hyper.tr = SelTR;
    … …  
    188188
    189189
    190 CPUMDECL(void) CPUMSetHyperLDTR(PVM pVM, RTSEL SelLDTR)
     190VMMDECL(void) CPUMSetHyperLDTR(PVM pVM, RTSEL SelLDTR)
    191191{
    192192    pVM->cpum.s.Hyper.ldtr = SelLDTR;
    … …  
    194194
    195195
    196 CPUMDECL(void) CPUMSetHyperDR0(PVM pVM, RTGCUINTREG uDr0)
     196VMMDECL(void) CPUMSetHyperDR0(PVM pVM, RTGCUINTREG uDr0)
    197197{
    198198    pVM->cpum.s.Hyper.dr[0] = uDr0;
    … …  
    201201
    202202
    203 CPUMDECL(void) CPUMSetHyperDR1(PVM pVM, RTGCUINTREG uDr1)
     203VMMDECL(void) CPUMSetHyperDR1(PVM pVM, RTGCUINTREG uDr1)
    204204{
    205205    pVM->cpum.s.Hyper.dr[1] = uDr1;
    … …  
    208208
    209209
    210 CPUMDECL(void) CPUMSetHyperDR2(PVM pVM, RTGCUINTREG uDr2)
     210VMMDECL(void) CPUMSetHyperDR2(PVM pVM, RTGCUINTREG uDr2)
    211211{
    212212    pVM->cpum.s.Hyper.dr[2] = uDr2;
    … …  
    215215
    216216
    217 CPUMDECL(void) CPUMSetHyperDR3(PVM pVM, RTGCUINTREG uDr3)
     217VMMDECL(void) CPUMSetHyperDR3(PVM pVM, RTGCUINTREG uDr3)
    218218{
    219219    pVM->cpum.s.Hyper.dr[3] = uDr3;
    … …  
    222222
    223223
    224 CPUMDECL(void) CPUMSetHyperDR6(PVM pVM, RTGCUINTREG uDr6)
     224VMMDECL(void) CPUMSetHyperDR6(PVM pVM, RTGCUINTREG uDr6)
    225225{
    226226    pVM->cpum.s.Hyper.dr[6] = uDr6;
    … …  
    229229
    230230
    231 CPUMDECL(void) CPUMSetHyperDR7(PVM pVM, RTGCUINTREG uDr7)
     231VMMDECL(void) CPUMSetHyperDR7(PVM pVM, RTGCUINTREG uDr7)
    232232{
    233233    pVM->cpum.s.Hyper.dr[7] = uDr7;
    … …  
    236236
    237237
    238 CPUMDECL(RTSEL) CPUMGetHyperCS(PVM pVM)
     238VMMDECL(RTSEL) CPUMGetHyperCS(PVM pVM)
    239239{
    240240    return pVM->cpum.s.CTX_SUFF(pHyperCore)->cs;
    … …  
    242242
    243243
    244 CPUMDECL(RTSEL) CPUMGetHyperDS(PVM pVM)
     244VMMDECL(RTSEL) CPUMGetHyperDS(PVM pVM)
    245245{
    246246    return pVM->cpum.s.CTX_SUFF(pHyperCore)->ds;
    … …  
    248248
    249249
    250 CPUMDECL(RTSEL) CPUMGetHyperES(PVM pVM)
     250VMMDECL(RTSEL) CPUMGetHyperES(PVM pVM)
    251251{
    252252    return pVM->cpum.s.CTX_SUFF(pHyperCore)->es;
    … …  
    254254
    255255
    256 CPUMDECL(RTSEL) CPUMGetHyperFS(PVM pVM)
     256VMMDECL(RTSEL) CPUMGetHyperFS(PVM pVM)
    257257{
    258258    return pVM->cpum.s.CTX_SUFF(pHyperCore)->fs;
    … …  
    260260
    261261
    262 CPUMDECL(RTSEL) CPUMGetHyperGS(PVM pVM)
     262VMMDECL(RTSEL) CPUMGetHyperGS(PVM pVM)
    263263{
    264264    return pVM->cpum.s.CTX_SUFF(pHyperCore)->gs;
    … …  
    266266
    267267
    268 CPUMDECL(RTSEL) CPUMGetHyperSS(PVM pVM)
     268VMMDECL(RTSEL) CPUMGetHyperSS(PVM pVM)
    269269{
    270270    return pVM->cpum.s.CTX_SUFF(pHyperCore)->ss;
    … …  
    272272
    273273
    274 CPUMDECL(uint32_t) CPUMGetHyperEAX(PVM pVM)
     274VMMDECL(uint32_t) CPUMGetHyperEAX(PVM pVM)
    275275{
    276276    return pVM->cpum.s.CTX_SUFF(pHyperCore)->eax;
    … …  
    278278
    279279
    280 CPUMDECL(uint32_t) CPUMGetHyperEBX(PVM pVM)
     280VMMDECL(uint32_t) CPUMGetHyperEBX(PVM pVM)
    281281{
    282282    return pVM->cpum.s.CTX_SUFF(pHyperCore)->ebx;
    … …  
    284284
    285285
    286 CPUMDECL(uint32_t) CPUMGetHyperECX(PVM pVM)
     286VMMDECL(uint32_t) CPUMGetHyperECX(PVM pVM)
    287287{
    288288    return pVM->cpum.s.CTX_SUFF(pHyperCore)->ecx;
    … …  
    290290
    291291
    292 CPUMDECL(uint32_t) CPUMGetHyperEDX(PVM pVM)
     292VMMDECL(uint32_t) CPUMGetHyperEDX(PVM pVM)
    293293{
    294294    return pVM->cpum.s.CTX_SUFF(pHyperCore)->edx;
    … …  
    296296
    297297
    298 CPUMDECL(uint32_t) CPUMGetHyperESI(PVM pVM)
     298VMMDECL(uint32_t) CPUMGetHyperESI(PVM pVM)
    299299{
    300300    return pVM->cpum.s.CTX_SUFF(pHyperCore)->esi;
    … …  
    302302
    303303
    304 CPUMDECL(uint32_t) CPUMGetHyperEDI(PVM pVM)
     304VMMDECL(uint32_t) CPUMGetHyperEDI(PVM pVM)
    305305{
    306306    return pVM->cpum.s.CTX_SUFF(pHyperCore)->edi;
    … …  
    308308
    309309
    310 CPUMDECL(uint32_t) CPUMGetHyperEBP(PVM pVM)
     310VMMDECL(uint32_t) CPUMGetHyperEBP(PVM pVM)
    311311{
    312312    return pVM->cpum.s.CTX_SUFF(pHyperCore)->ebp;
    … …  
    314314
    315315
    316 CPUMDECL(uint32_t) CPUMGetHyperESP(PVM pVM)
     316VMMDECL(uint32_t) CPUMGetHyperESP(PVM pVM)
    317317{
    318318    return pVM->cpum.s.CTX_SUFF(pHyperCore)->esp;
    … …  
    320320
    321321
    322 CPUMDECL(uint32_t) CPUMGetHyperEFlags(PVM pVM)
     322VMMDECL(uint32_t) CPUMGetHyperEFlags(PVM pVM)
    323323{
    324324    return pVM->cpum.s.CTX_SUFF(pHyperCore)->eflags.u32;
    … …  
    326326
    327327
    328 CPUMDECL(uint32_t) CPUMGetHyperEIP(PVM pVM)
     328VMMDECL(uint32_t) CPUMGetHyperEIP(PVM pVM)
    329329{
    330330    return pVM->cpum.s.CTX_SUFF(pHyperCore)->eip;
    … …  
    332332
    333333
    334 CPUMDECL(uint64_t) CPUMGetHyperRIP(PVM pVM)
     334VMMDECL(uint64_t) CPUMGetHyperRIP(PVM pVM)
    335335{
    336336    return pVM->cpum.s.CTX_SUFF(pHyperCore)->rip;
    … …  
    338338
    339339
    340 CPUMDECL(uint32_t) CPUMGetHyperIDTR(PVM pVM, uint16_t *pcbLimit)
     340VMMDECL(uint32_t) CPUMGetHyperIDTR(PVM pVM, uint16_t *pcbLimit)
    341341{
    342342    if (pcbLimit)
    … …  
    346346
    347347
    348 CPUMDECL(uint32_t) CPUMGetHyperGDTR(PVM pVM, uint16_t *pcbLimit)
     348VMMDECL(uint32_t) CPUMGetHyperGDTR(PVM pVM, uint16_t *pcbLimit)
    349349{
    350350    if (pcbLimit)
    … …  
    354354
    355355
    356 CPUMDECL(RTSEL) CPUMGetHyperLDTR(PVM pVM)
     356VMMDECL(RTSEL) CPUMGetHyperLDTR(PVM pVM)
    357357{
    358358    return pVM->cpum.s.Hyper.ldtr;
    … …  
    360360
    361361
    362 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR0(PVM pVM)
     362VMMDECL(RTGCUINTREG) CPUMGetHyperDR0(PVM pVM)
    363363{
    364364    return pVM->cpum.s.Hyper.dr[0];
    … …  
    366366
    367367
    368 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR1(PVM pVM)
     368VMMDECL(RTGCUINTREG) CPUMGetHyperDR1(PVM pVM)
    369369{
    370370    return pVM->cpum.s.Hyper.dr[1];
    … …  
    372372
    373373
    374 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR2(PVM pVM)
     374VMMDECL(RTGCUINTREG) CPUMGetHyperDR2(PVM pVM)
    375375{
    376376    return pVM->cpum.s.Hyper.dr[2];
    … …  
    378378
    379379
    380 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR3(PVM pVM)
     380VMMDECL(RTGCUINTREG) CPUMGetHyperDR3(PVM pVM)
    381381{
    382382    return pVM->cpum.s.Hyper.dr[3];
    … …  
    384384
    385385
    386 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR6(PVM pVM)
     386VMMDECL(RTGCUINTREG) CPUMGetHyperDR6(PVM pVM)
    387387{
    388388    return pVM->cpum.s.Hyper.dr[6];
    … …  
    390390
    391391
    392 CPUMDECL(RTGCUINTREG) CPUMGetHyperDR7(PVM pVM)
     392VMMDECL(RTGCUINTREG) CPUMGetHyperDR7(PVM pVM)
    393393{
    394394    return pVM->cpum.s.Hyper.dr[7];
    … …  
    402402 * @param   pVM         Handle to the virtual machine.
    403403 */
    404 CPUMDECL(PCCPUMCTXCORE) CPUMGetGuestCtxCore(PVM pVM)
     404VMMDECL(PCCPUMCTXCORE) CPUMGetGuestCtxCore(PVM pVM)
    405405{
    406406    return CPUMCTX2CORE(&pVM->cpum.s.Guest);
    … …  
    414414 * @param   pCtxCore    The new context core values.
    415415 */
    416 CPUMDECL(void) CPUMSetGuestCtxCore(PVM pVM, PCCPUMCTXCORE pCtxCore)
     416VMMDECL(void) CPUMSetGuestCtxCore(PVM pVM, PCCPUMCTXCORE pCtxCore)
    417417{
    418418    /** @todo #1410 requires selectors to be checked. (huh? 1410?) */
    … …  
    456456 * @param   ppCtx       Receives the CPUMCTX pointer when successful.
    457457 */
    458 CPUMDECL(int) CPUMQueryGuestCtxPtr(PVM pVM, PCPUMCTX *ppCtx)
     458VMMDECL(int) CPUMQueryGuestCtxPtr(PVM pVM, PCPUMCTX *ppCtx)
    459459{
    460460    *ppCtx = &pVM->cpum.s.Guest;
    … …  
    463463
    464464
    465 CPUMDECL(int) CPUMSetGuestGDTR(PVM pVM, uint32_t addr, uint16_t limit)
     465VMMDECL(int) CPUMSetGuestGDTR(PVM pVM, uint32_t addr, uint16_t limit)
    466466{
    467467    pVM->cpum.s.Guest.gdtr.cbGdt = limit;
    … …  
    471471}
    472472
    473 CPUMDECL(int) CPUMSetGuestIDTR(PVM pVM, uint32_t addr, uint16_t limit)
     473VMMDECL(int) CPUMSetGuestIDTR(PVM pVM, uint32_t addr, uint16_t limit)
    474474{
    475475    pVM->cpum.s.Guest.idtr.cbIdt = limit;
    … …  
    479479}
    480480
    481 CPUMDECL(int) CPUMSetGuestTR(PVM pVM, uint16_t tr)
     481VMMDECL(int) CPUMSetGuestTR(PVM pVM, uint16_t tr)
    482482{
    483483    pVM->cpum.s.Guest.tr = tr;
    … …  
    486486}
    487487
    488 CPUMDECL(int) CPUMSetGuestLDTR(PVM pVM, uint16_t ldtr)
     488VMMDECL(int) CPUMSetGuestLDTR(PVM pVM, uint16_t ldtr)
    489489{
    490490    pVM->cpum.s.Guest.ldtr = ldtr;
    … …  
    505505 * @param   cr0     The new CR0 value.
    506506 */
    507 CPUMDECL(int) CPUMSetGuestCR0(PVM pVM, uint64_t cr0)
     507VMMDECL(int) CPUMSetGuestCR0(PVM pVM, uint64_t cr0)
    508508{
    509509#ifdef IN_GC
    … …  
    572572
    573573
    574 CPUMDECL(int) CPUMSetGuestCR2(PVM pVM, uint64_t cr2)
     574VMMDECL(int) CPUMSetGuestCR2(PVM pVM, uint64_t cr2)
    575575{
    576576    pVM->cpum.s.Guest.cr2 = cr2;
    … …  
    579579
    580580
    581 CPUMDECL(int) CPUMSetGuestCR3(PVM pVM, uint64_t cr3)
     581VMMDECL(int) CPUMSetGuestCR3(PVM pVM, uint64_t cr3)
    582582{
    583583    pVM->cpum.s.Guest.cr3 = cr3;
    … …  
    587587
    588588
    589 CPUMDECL(int) CPUMSetGuestCR4(PVM pVM, uint64_t cr4)
     589VMMDECL(int) CPUMSetGuestCR4(PVM pVM, uint64_t cr4)
    590590{
    591591    if (    (cr4                   & (X86_CR4_PGE | X86_CR4_PAE | X86_CR4_PSE))
    … …  
    600600
    601601
    602 CPUMDECL(int) CPUMSetGuestEFlags(PVM pVM, uint32_t eflags)
     602VMMDECL(int) CPUMSetGuestEFlags(PVM pVM, uint32_t eflags)
    603603{
    604604    pVM->cpum.s.Guest.eflags.u32 = eflags;
    … …  
    607607
    608608
    609 CPUMDECL(int) CPUMSetGuestEIP(PVM pVM, uint32_t eip)
     609VMMDECL(int) CPUMSetGuestEIP(PVM pVM, uint32_t eip)
    610610{
    611611    pVM->cpum.s.Guest.eip = eip;
    … …  
    614614
    615615
    616 CPUMDECL(int) CPUMSetGuestEAX(PVM pVM, uint32_t eax)
     616VMMDECL(int) CPUMSetGuestEAX(PVM pVM, uint32_t eax)
    617617{
    618618    pVM->cpum.s.Guest.eax = eax;
    … …  
    621621
    622622
    623 CPUMDECL(int) CPUMSetGuestEBX(PVM pVM, uint32_t ebx)
     623VMMDECL(int) CPUMSetGuestEBX(PVM pVM, uint32_t ebx)
    624624{
    625625    pVM->cpum.s.Guest.ebx = ebx;
    … …  
    628628
    629629
    630 CPUMDECL(int) CPUMSetGuestECX(PVM pVM, uint32_t ecx)
     630VMMDECL(int) CPUMSetGuestECX(PVM pVM, uint32_t ecx)
    631631{
    632632    pVM->cpum.s.Guest.ecx = ecx;
    … …  
    635635
    636636
    637 CPUMDECL(int) CPUMSetGuestEDX(PVM pVM, uint32_t edx)
     637VMMDECL(int) CPUMSetGuestEDX(PVM pVM, uint32_t edx)
    638638{
    639639    pVM->cpum.s.Guest.edx = edx;
    … …  
    642642
    643643
    644 CPUMDECL(int) CPUMSetGuestESP(PVM pVM, uint32_t esp)
     644VMMDECL(int) CPUMSetGuestESP(PVM pVM, uint32_t esp)
    645645{
    646646    pVM->cpum.s.Guest.esp = esp;
    … …  
    649649
    650650
    651 CPUMDECL(int) CPUMSetGuestEBP(PVM pVM, uint32_t ebp)
     651VMMDECL(int) CPUMSetGuestEBP(PVM pVM, uint32_t ebp)
    652652{
    653653    pVM->cpum.s.Guest.ebp = ebp;
    … …  
    656656
    657657
    658 CPUMDECL(int) CPUMSetGuestESI(PVM pVM, uint32_t esi)
     658VMMDECL(int) CPUMSetGuestESI(PVM pVM, uint32_t esi)
    659659{
    660660    pVM->cpum.s.Guest.esi = esi;
    … …  
    663663
    664664
    665 CPUMDECL(int) CPUMSetGuestEDI(PVM pVM, uint32_t edi)
     665VMMDECL(int) CPUMSetGuestEDI(PVM pVM, uint32_t edi)
    666666{
    667667    pVM->cpum.s.Guest.edi = edi;
    … …  
    670670
    671671
    672 CPUMDECL(int) CPUMSetGuestSS(PVM pVM, uint16_t ss)
     672VMMDECL(int) CPUMSetGuestSS(PVM pVM, uint16_t ss)
    673673{
    674674    pVM->cpum.s.Guest.ss = ss;
    … …  
    677677
    678678
    679 CPUMDECL(int) CPUMSetGuestCS(PVM pVM, uint16_t cs)
     679VMMDECL(int) CPUMSetGuestCS(PVM pVM, uint16_t cs)
    680680{
    681681    pVM->cpum.s.Guest.cs = cs;
    … …  
    684684
    685685
    686 CPUMDECL(int) CPUMSetGuestDS(PVM pVM, uint16_t ds)
     686VMMDECL(int) CPUMSetGuestDS(PVM pVM, uint16_t ds)
    687687{
    688688    pVM->cpum.s.Guest.ds = ds;
    … …  
    691691
    692692
    693 CPUMDECL(int) CPUMSetGuestES(PVM pVM, uint16_t es)
     693VMMDECL(int) CPUMSetGuestES(PVM pVM, uint16_t es)
    694694{
    695695    pVM->cpum.s.Guest.es = es;
    … …  
    698698
    699699
    700 CPUMDECL(int) CPUMSetGuestFS(PVM pVM, uint16_t fs)
     700VMMDECL(int) CPUMSetGuestFS(PVM pVM, uint16_t fs)
    701701{
    702702    pVM->cpum.s.Guest.fs = fs;
    … …  
    705705
    706706
    707 CPUMDECL(int) CPUMSetGuestGS(PVM pVM, uint16_t gs)
     707VMMDECL(int) CPUMSetGuestGS(PVM pVM, uint16_t gs)
    708708{
    709709    pVM->cpum.s.Guest.gs = gs;
    … …  
    712712
    713713
    714 CPUMDECL(void) CPUMSetGuestEFER(PVM pVM, uint64_t val)
     714VMMDECL(void) CPUMSetGuestEFER(PVM pVM, uint64_t val)
    715715{
    716716    pVM->cpum.s.Guest.msrEFER = val;
    … …  
    718718
    719719
    720 CPUMDECL(uint64_t)  CPUMGetGuestMsr(PVM pVM, unsigned idMsr)
     720VMMDECL(uint64_t)  CPUMGetGuestMsr(PVM pVM, unsigned idMsr)
    721721{
    722722    uint64_t u64 = 0;
    … …  
    773773
    774774
    775 CPUMDECL(RTGCPTR) CPUMGetGuestIDTR(PVM pVM, uint16_t *pcbLimit)
     775VMMDECL(RTGCPTR) CPUMGetGuestIDTR(PVM pVM, uint16_t *pcbLimit)
    776776{
    777777    if (pcbLimit)
    … …  
    781781
    782782
    783 CPUMDECL(RTSEL) CPUMGetGuestTR(PVM pVM)
     783VMMDECL(RTSEL) CPUMGetGuestTR(PVM pVM)
    784784{
    785785    return pVM->cpum.s.Guest.tr;
    … …  
    787787
    788788
    789 CPUMDECL(RTSEL) CPUMGetGuestCS(PVM pVM)
     789VMMDECL(RTSEL) CPUMGetGuestCS(PVM pVM)
    790790{
    791791    return pVM->cpum.s.Guest.cs;
    … …  
    793793
    794794
    795 CPUMDECL(RTSEL) CPUMGetGuestDS(PVM pVM)
     795VMMDECL(RTSEL) CPUMGetGuestDS(PVM pVM)
    796796{
    797797    return pVM->cpum.s.Guest.ds;
    … …  
    799799
    800800
    801 CPUMDECL(RTSEL) CPUMGetGuestES(PVM pVM)
     801VMMDECL(RTSEL) CPUMGetGuestES(PVM pVM)
    802802{
    803803    return pVM->cpum.s.Guest.es;
    … …  
    805805
    806806
    807 CPUMDECL(RTSEL) CPUMGetGuestFS(PVM pVM)
     807VMMDECL(RTSEL) CPUMGetGuestFS(PVM pVM)
    808808{
    809809    return pVM->cpum.s.Guest.fs;
    … …  
    811811
    812812
    813 CPUMDECL(RTSEL) CPUMGetGuestGS(PVM pVM)
     813VMMDECL(RTSEL) CPUMGetGuestGS(PVM pVM)
    814814{
    815815    return pVM->cpum.s.Guest.gs;
    … …  
    817817
    818818
    819 CPUMDECL(RTSEL) CPUMGetGuestSS(PVM pVM)
     819VMMDECL(RTSEL) CPUMGetGuestSS(PVM pVM)
    820820{
    821821    return pVM->cpum.s.Guest.ss;
    … …  
    823823
    824824
    825 CPUMDECL(RTSEL) CPUMGetGuestLDTR(PVM pVM)
     825VMMDECL(RTSEL) CPUMGetGuestLDTR(PVM pVM)
    826826{
    827827    return pVM->cpum.s.Guest.ldtr;
    … …  
    829829
    830830
    831 CPUMDECL(uint64_t) CPUMGetGuestCR0(PVM pVM)
     831VMMDECL(uint64_t) CPUMGetGuestCR0(PVM pVM)
    832832{
    833833    return pVM->cpum.s.Guest.cr0;
    … …  
    835835
    836836
    837 CPUMDECL(uint64_t) CPUMGetGuestCR2(PVM pVM)
     837VMMDECL(uint64_t) CPUMGetGuestCR2(PVM pVM)
    838838{
    839839    return pVM->cpum.s.Guest.cr2;
    … …  
    841841
    842842
    843 CPUMDECL(uint64_t) CPUMGetGuestCR3(PVM pVM)
     843VMMDECL(uint64_t) CPUMGetGuestCR3(PVM pVM)
    844844{
    845845    return pVM->cpum.s.Guest.cr3;
    … …  
    847847
    848848
    849 CPUMDECL(uint64_t) CPUMGetGuestCR4(PVM pVM)
     849VMMDECL(uint64_t) CPUMGetGuestCR4(PVM pVM)
    850850{
    851851    return pVM->cpum.s.Guest.cr4;
    … …  
    853853
    854854
    855 CPUMDECL(void) CPUMGetGuestGDTR(PVM pVM, PVBOXGDTR pGDTR)
     855VMMDECL(void) CPUMGetGuestGDTR(PVM pVM, PVBOXGDTR pGDTR)
    856856{
    857857    *pGDTR = pVM->cpum.s.Guest.gdtr;
    … …  
    859859
    860860
    861 CPUMDECL(uint32_t) CPUMGetGuestEIP(PVM pVM)
     861VMMDECL(uint32_t) CPUMGetGuestEIP(PVM pVM)
    862862{
    863863    return pVM->cpum.s.Guest.eip;
    … …  
    865865
    866866
    867 CPUMDECL(uint64_t) CPUMGetGuestRIP(PVM pVM)
     867VMMDECL(uint64_t) CPUMGetGuestRIP(PVM pVM)
    868868{
    869869    return pVM->cpum.s.Guest.rip;
    … …  
    871871
    872872
    873 CPUMDECL(uint32_t) CPUMGetGuestEAX(PVM pVM)
     873VMMDECL(uint32_t) CPUMGetGuestEAX(PVM pVM)
    874874{
    875875    return pVM->cpum.s.Guest.eax;
    … …  
    877877
    878878
    879 CPUMDECL(uint32_t) CPUMGetGuestEBX(PVM pVM)
     879VMMDECL(uint32_t) CPUMGetGuestEBX(PVM pVM)
    880880{
    881881    return pVM->cpum.s.Guest.ebx;
    … …  
    883883
    884884
    885 CPUMDECL(uint32_t) CPUMGetGuestECX(PVM pVM)
     885VMMDECL(uint32_t) CPUMGetGuestECX(PVM pVM)
    886886{
    887887    return pVM->cpum.s.Guest.ecx;
    … …  
    889889
    890890
    891 CPUMDECL(uint32_t) CPUMGetGuestEDX(PVM pVM)
     891VMMDECL(uint32_t) CPUMGetGuestEDX(PVM pVM)
    892892{
    893893    return pVM->cpum.s.Guest.edx;
    … …  
    895895
    896896
    897 CPUMDECL(uint32_t) CPUMGetGuestESI(PVM pVM)
     897VMMDECL(uint32_t) CPUMGetGuestESI(PVM pVM)
    898898{
    899899    return pVM->cpum.s.Guest.esi;
    … …  
    901901
    902902
    903 CPUMDECL(uint32_t) CPUMGetGuestEDI(PVM pVM)
     903VMMDECL(uint32_t) CPUMGetGuestEDI(PVM pVM)
    904904{
    905905    return pVM->cpum.s.Guest.edi;
    … …  
    907907
    908908
    909 CPUMDECL(uint32_t) CPUMGetGuestESP(PVM pVM)
     909VMMDECL(uint32_t) CPUMGetGuestESP(PVM pVM)
    910910{
    911911    return pVM->cpum.s.Guest.esp;
    … …  
    913913
    914914
    915 CPUMDECL(uint32_t) CPUMGetGuestEBP(PVM pVM)
     915VMMDECL(uint32_t) CPUMGetGuestEBP(PVM pVM)
    916916{
    917917    return pVM->cpum.s.Guest.ebp;
    … …  
    919919
    920920
    921 CPUMDECL(uint32_t) CPUMGetGuestEFlags(PVM pVM)
     921VMMDECL(uint32_t) CPUMGetGuestEFlags(PVM pVM)
    922922{
    923923    return pVM->cpum.s.Guest.eflags.u32;
    … …  
    925925
    926926
    927 CPUMDECL(CPUMSELREGHID *) CPUMGetGuestTRHid(PVM pVM)
     927VMMDECL(CPUMSELREGHID *) CPUMGetGuestTRHid(PVM pVM)
    928928{
    929929    return &pVM->cpum.s.Guest.trHid;
    … …  
    932932
    933933///@todo: crx should be an array
    934 CPUMDECL(int) CPUMGetGuestCRx(PVM pVM, unsigned iReg, uint64_t *pValue)
     934VMMDECL(int) CPUMGetGuestCRx(PVM pVM, unsigned iReg, uint64_t *pValue)
    935935{
    936936    switch (iReg)
    … …  
    955955
    956956
    957 CPUMDECL(uint64_t) CPUMGetGuestDR0(PVM pVM)
     957VMMDECL(uint64_t) CPUMGetGuestDR0(PVM pVM)
    958958{
    959959    return pVM->cpum.s.Guest.dr[0];
    … …  
    961961
    962962
    963 CPUMDECL(uint64_t) CPUMGetGuestDR1(PVM pVM)
     963VMMDECL(uint64_t) CPUMGetGuestDR1(PVM pVM)
    964964{
    965965    return pVM->cpum.s.Guest.dr[1];
    … …  
    967967
    968968
    969 CPUMDECL(uint64_t) CPUMGetGuestDR2(PVM pVM)
     969VMMDECL(uint64_t) CPUMGetGuestDR2(PVM pVM)
    970970{
    971971    return pVM->cpum.s.Guest.dr[2];
    … …  
    973973
    974974
    975 CPUMDECL(uint64_t) CPUMGetGuestDR3(PVM pVM)
     975VMMDECL(uint64_t) CPUMGetGuestDR3(PVM pVM)
    976976{
    977977    return pVM->cpum.s.Guest.dr[3];
    … …  
    979979
    980980
    981 CPUMDECL(uint64_t) CPUMGetGuestDR6(PVM pVM)
     981VMMDECL(uint64_t) CPUMGetGuestDR6(PVM pVM)
    982982{
    983983    return pVM->cpum.s.Guest.dr[6];
    … …  
    985985
    986986
    987 CPUMDECL(uint64_t) CPUMGetGuestDR7(PVM pVM)
     987VMMDECL(uint64_t) CPUMGetGuestDR7(PVM pVM)
    988988{
    989989    return pVM->cpum.s.Guest.dr[7];
    … …  
    991991
    992992
    993 CPUMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue)
     993VMMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue)
    994994{
    995995    AssertReturn(iReg <= USE_REG_DR7, VERR_INVALID_PARAMETER);
    … …  
    10021002
    10031003
    1004 CPUMDECL(uint64_t) CPUMGetGuestEFER(PVM pVM)
     1004VMMDECL(uint64_t) CPUMGetGuestEFER(PVM pVM)
    10051005{
    10061006    return pVM->cpum.s.Guest.msrEFER;
    … …  
    10181018 * @param   pEdx    Where to store the EDX value.
    10191019 */
    1020 CPUMDECL(void) CPUMGetGuestCpuId(PVM pVM, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
     1020VMMDECL(void) CPUMGetGuestCpuId(PVM pVM, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
    10211021{
    10221022    PCCPUMCPUID pCpuId;
    … …  
    10471047 * @remark  Intended for PATM.
    10481048 */
    1049 CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM)
     1049VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM)
    10501050{
    10511051    return RCPTRTYPE(PCCPUMCPUID)VM_GUEST_ADDR(pVM, &pVM->cpum.s.aGuestCpuIdStd[0]);
    … …  
    10621062 * @remark  Intended for PATM.
    10631063 */
    1064 CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdExtGCPtr(PVM pVM)
     1064VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdExtGCPtr(PVM pVM)
    10651065{
    10661066    return (RCPTRTYPE(PCCPUMCPUID))VM_GUEST_ADDR(pVM, &pVM->cpum.s.aGuestCpuIdExt[0]);
    … …  
    10771077 * @remark  Intended for PATM.
    10781078 */
    1079 CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurGCPtr(PVM pVM)
     1079VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurGCPtr(PVM pVM)
    10801080{
    10811081    return (RCPTRTYPE(PCCPUMCPUID))VM_GUEST_ADDR(pVM, &pVM->cpum.s.aGuestCpuIdCentaur[0]);
    … …  
    10901090 * @remark  Intended for PATM.
    10911091 */
    1092 CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdDefGCPtr(PVM pVM)
     1092VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdDefGCPtr(PVM pVM)
    10931093{
    10941094    return (RCPTRTYPE(PCCPUMCPUID))VM_GUEST_ADDR(pVM, &pVM->cpum.s.GuestCpuIdDef);
    … …  
    11031103 * @remark  Intended for PATM.
    11041104 */
    1105 CPUMDECL(uint32_t) CPUMGetGuestCpuIdStdMax(PVM pVM)
     1105VMMDECL(uint32_t) CPUMGetGuestCpuIdStdMax(PVM pVM)
    11061106{
    11071107    return RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd);
    … …  
    11161116 * @remark  Intended for PATM.
    11171117 */
    1118 CPUMDECL(uint32_t) CPUMGetGuestCpuIdExtMax(PVM pVM)
     1118VMMDECL(uint32_t) CPUMGetGuestCpuIdExtMax(PVM pVM)
    11191119{
    11201120    return RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdExt);
    … …  
    11291129 * @remark  Intended for PATM.
    11301130 */
    1131 CPUMDECL(uint32_t) CPUMGetGuestCpuIdCentaurMax(PVM pVM)
     1131VMMDECL(uint32_t) CPUMGetGuestCpuIdCentaurMax(PVM pVM)
    11321132{
    11331133    return RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur);
    … …  
    11411141 * @param   enmFeature      The feature to set.
    11421142 */
    1143 CPUMDECL(void) CPUMSetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
     1143VMMDECL(void) CPUMSetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
    11441144{
    11451145    switch (enmFeature)
    … …  
    13011301 * @param   enmFeature      The feature to query.
    13021302 */
    1303 CPUMDECL(bool) CPUMGetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
     1303VMMDECL(bool) CPUMGetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
    13041304{
    13051305    switch (enmFeature)
    … …  
    13261326 * @param   enmFeature      The feature to clear.
    13271327 */
    1328 CPUMDECL(void) CPUMClearGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
     1328VMMDECL(void) CPUMClearGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature)
    13291329{
    13301330    switch (enmFeature)
    … …  
    13871387 * @param   pVM     The VM handle.
    13881388 */
    1389 CPUMDECL(CPUMCPUVENDOR) CPUMGetCPUVendor(PVM pVM)
     1389VMMDECL(CPUMCPUVENDOR) CPUMGetCPUVendor(PVM pVM)
    13901390{
    13911391    return pVM->cpum.s.enmCPUVendor;
    … …  
    13931393
    13941394
    1395 CPUMDECL(int) CPUMSetGuestDR0(PVM pVM, uint64_t uDr0)
     1395VMMDECL(int) CPUMSetGuestDR0(PVM pVM, uint64_t uDr0)
    13961396{
    13971397    pVM->cpum.s.Guest.dr[0] = uDr0;
    … …  
    14001400
    14011401
    1402 CPUMDECL(int) CPUMSetGuestDR1(PVM pVM, uint64_t uDr1)
     1402VMMDECL(int) CPUMSetGuestDR1(PVM pVM, uint64_t uDr1)
    14031403{
    14041404    pVM->cpum.s.Guest.dr[1] = uDr1;
    … …  
    14071407
    14081408
    1409 CPUMDECL(int) CPUMSetGuestDR2(PVM pVM, uint64_t uDr2)
     1409VMMDECL(int) CPUMSetGuestDR2(PVM pVM, uint64_t uDr2)
    14101410{
    14111411    pVM->cpum.s.Guest.dr[2] = uDr2;
    … …  
    14141414
    14151415
    1416 CPUMDECL(int) CPUMSetGuestDR3(PVM pVM, uint64_t uDr3)
     1416VMMDECL(int) CPUMSetGuestDR3(PVM pVM, uint64_t uDr3)
    14171417{
    14181418    pVM->cpum.s.Guest.dr[3] = uDr3;
    … …  
    14211421
    14221422
    1423 CPUMDECL(int) CPUMSetGuestDR6(PVM pVM, uint64_t uDr6)
     1423VMMDECL(int) CPUMSetGuestDR6(PVM pVM, uint64_t uDr6)
    14241424{
    14251425    pVM->cpum.s.Guest.dr[6] = uDr6;
    … …  
    14281428
    14291429
    1430 CPUMDECL(int) CPUMSetGuestDR7(PVM pVM, uint64_t uDr7)
     1430VMMDECL(int) CPUMSetGuestDR7(PVM pVM, uint64_t uDr7)
    14311431{
    14321432    pVM->cpum.s.Guest.dr[7] = uDr7;
    … …  
    14351435
    14361436
    1437 CPUMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value)
     1437VMMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value)
    14381438{
    14391439    AssertReturn(iReg <= USE_REG_DR7, VERR_INVALID_PARAMETER);
    … …  
    14571457 * @param   pVM     The VM handle.
    14581458 */
    1459 CPUMDECL(int) CPUMRecalcHyperDRx(PVM pVM)
     1459VMMDECL(int) CPUMRecalcHyperDRx(PVM pVM)
    14601460{
    14611461    /*
    … …  
    15911591 * @see     @ref pg_raw
    15921592 */
    1593 CPUMDECL(int) CPUMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
     1593VMMDECL(int) CPUMRawEnter(PVM pVM, PCPUMCTXCORE pCtxCore)
    15941594{
    15951595    Assert(!pVM->cpum.s.fRawEntered);
    … …  
    16511651 * @see     @ref pg_raw
    16521652 */
    1653 CPUMDECL(int) CPUMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rc)
     1653VMMDECL(int) CPUMRawLeave(PVM pVM, PCPUMCTXCORE pCtxCore, int rc)
    16541654{
    16551655    /*
    … …  
    17261726 * @param   eflags      The new EFLAGS value.
    17271727 */
    1728 CPUMDECL(void) CPUMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t eflags)
     1728VMMDECL(void) CPUMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t eflags)
    17291729{
    17301730    if (!pVM->cpum.s.fRawEntered)
    … …  
    17451745 * @param   pCtxCore    The context core.
    17461746 */
    1747 CPUMDECL(uint32_t) CPUMRawGetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore)
     1747VMMDECL(uint32_t) CPUMRawGetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore)
    17481748{
    17491749#ifdef IN_RING0
    … …  
    17641764 * @param   pVM         The VM handle.
    17651765 */
    1766 CPUMDECL(unsigned) CPUMGetAndClearChangedFlagsREM(PVM pVM)
     1766VMMDECL(unsigned) CPUMGetAndClearChangedFlagsREM(PVM pVM)
    17671767{
    17681768    unsigned fFlags = pVM->cpum.s.fChanged;
    … …  
    17831783 * @param   pVM     The VM handle.
    17841784 */
    1785 CPUMDECL(void) CPUMSetChangedFlags(PVM pVM, uint32_t fChangedFlags)
     1785VMMDECL(void) CPUMSetChangedFlags(PVM pVM, uint32_t fChangedFlags)
    17861786{
    17871787    pVM->cpum.s.fChanged |= fChangedFlags;
    … …  
    17951795 * @param   pVM     The VM handle.
    17961796 */
    1797 CPUMDECL(bool) CPUMSupportsFXSR(PVM pVM)
     1797VMMDECL(bool) CPUMSupportsFXSR(PVM pVM)
    17981798{
    17991799    return pVM->cpum.s.CPUFeatures.edx.u1FXSR != 0;
    … …  
    18071807 * @param   pVM     The VM handle.
    18081808 */
    1809 CPUMDECL(bool) CPUMIsHostUsingSysEnter(PVM pVM)
     1809VMMDECL(bool) CPUMIsHostUsingSysEnter(PVM pVM)
    18101810{
    18111811    return (pVM->cpum.s.fUseFlags & CPUM_USE_SYSENTER) != 0;
    … …  
    18191819 * @param   pVM     The VM handle.
    18201820 */
    1821 CPUMDECL(bool) CPUMIsHostUsingSysCall(PVM pVM)
     1821VMMDECL(bool) CPUMIsHostUsingSysCall(PVM pVM)
    18221822{
    18231823    return (pVM->cpum.s.fUseFlags & CPUM_USE_SYSCALL) != 0;
    … …  
    18321832 * @param   pVM         VM handle.
    18331833 */
    1834 CPUMDECL(int) CPUMHandleLazyFPU(PVM pVM)
     1834VMMDECL(int) CPUMHandleLazyFPU(PVM pVM)
    18351835{
    18361836    return CPUMHandleLazyFPUAsm(&pVM->cpum.s);
    … …  
    18441844 * @param   pVM         VM handle.
    18451845 */
    1846 CPUMDECL(int) CPUMRestoreHostFPUState(PVM pVM)
     1846VMMDECL(int) CPUMRestoreHostFPUState(PVM pVM)
    18471847{
    18481848    Assert(pVM->cpum.s.CPUFeatures.edx.u1FXSR);
    … …  
    18581858 * @param   pVM     The VM handle.
    18591859 */
    1860 CPUMDECL(bool) CPUMIsGuestFPUStateActive(PVM pVM)
     1860VMMDECL(bool) CPUMIsGuestFPUStateActive(PVM pVM)
    18611861{
    18621862    return (pVM->cpum.s.fUseFlags & CPUM_USED_FPU) != 0;
    … …  
    18681868 * @param   pVM     The VM handle.
    18691869 */
    1870 CPUMDECL(void) CPUMDeactivateGuestFPUState(PVM pVM)
     1870VMMDECL(void) CPUMDeactivateGuestFPUState(PVM pVM)
    18711871{
    18721872    pVM->cpum.s.fUseFlags &= ~CPUM_USED_FPU;
    … …  
    18801880 * @param   pVM         VM handle.
    18811881 */
    1882 CPUMDECL(bool) CPUMIsGuestDebugStateActive(PVM pVM)
     1882VMMDECL(bool) CPUMIsGuestDebugStateActive(PVM pVM)
    18831883{
    18841884    return (pVM->cpum.s.fUseFlags & CPUM_USE_DEBUG_REGS) != 0;
    … …  
    18921892 * @param   pVM         VM handle.
    18931893 */
    1894 CPUMDECL(void) CPUMDeactivateGuestDebugState(PVM pVM)
     1894VMMDECL(void) CPUMDeactivateGuestDebugState(PVM pVM)
    18951895{
    18961896    pVM->cpum.s.fUseFlags &= ~CPUM_USE_DEBUG_REGS;
    … …  
    19041904 * @param   pVM     The VM handle.
    19051905 */
    1906 CPUMDECL(bool) CPUMAreHiddenSelRegsValid(PVM pVM)
     1906VMMDECL(bool) CPUMAreHiddenSelRegsValid(PVM pVM)
    19071907{
    19081908    return !!pVM->cpum.s.fValidHiddenSelRegs; /** @todo change fValidHiddenSelRegs to bool! */
    … …  
    19151915 * @param   fValid  Valid or not
    19161916 */
    1917 CPUMDECL(void) CPUMSetHiddenSelRegsValid(PVM pVM, bool fValid)
     1917VMMDECL(void) CPUMSetHiddenSelRegsValid(PVM pVM, bool fValid)
    19181918{
    19191919    pVM->cpum.s.fValidHiddenSelRegs = fValid;
    … …  
    19281928 * @param   pRegFrame   Trap register frame.
    19291929 */
    1930 CPUMDECL(uint32_t) CPUMGetGuestCPL(PVM pVM, PCPUMCTXCORE pCtxCore)
     1930VMMDECL(uint32_t) CPUMGetGuestCPL(PVM pVM, PCPUMCTXCORE pCtxCore)
    19311931{
    19321932    uint32_t cpl;
    … …  
    19791979 * @param   pVM         The VM handle.
    19801980 */
    1981 CPUMDECL(CPUMMODE) CPUMGetGuestMode(PVM pVM)
     1981VMMDECL(CPUMMODE) CPUMGetGuestMode(PVM pVM)
    19821982{
    19831983    CPUMMODE enmMode;

  • trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp

    r12688 r12989  
    3737 * @param   pVM         The VM handle.
    3838 */
    39 DBGFDECL(RTGCUINTREG) DBGFBpGetDR7(PVM pVM)
     39VMMDECL(RTGCUINTREG) DBGFBpGetDR7(PVM pVM)
    4040{
    4141    RTGCUINTREG uDr7 = X86_DR7_GD | X86_DR7_GE | X86_DR7_LE | X86_DR7_MB1_MASK;
    … …  
    6868 * @param   pVM         The VM handle.
    6969 */
    70 DBGFDECL(RTGCUINTREG) DBGFBpGetDR0(PVM pVM)
     70VMMDECL(RTGCUINTREG) DBGFBpGetDR0(PVM pVM)
    7171{
    7272    PCDBGFBP    pBp = &pVM->dbgf.s.aHwBreakpoints[0];
    … …  
    8282 * @param   pVM         The VM handle.
    8383 */
    84 DBGFDECL(RTGCUINTREG) DBGFBpGetDR1(PVM pVM)
     84VMMDECL(RTGCUINTREG) DBGFBpGetDR1(PVM pVM)
    8585{
    8686    PCDBGFBP    pBp = &pVM->dbgf.s.aHwBreakpoints[1];
    … …  
    9696 * @param   pVM         The VM handle.
    9797 */
    98 DBGFDECL(RTGCUINTREG) DBGFBpGetDR2(PVM pVM)
     98VMMDECL(RTGCUINTREG) DBGFBpGetDR2(PVM pVM)
    9999{
    100100    PCDBGFBP    pBp = &pVM->dbgf.s.aHwBreakpoints[2];
    … …  
    110110 * @param   pVM         The VM handle.
    111111 */
    112 DBGFDECL(RTGCUINTREG) DBGFBpGetDR3(PVM pVM)
     112VMMDECL(RTGCUINTREG) DBGFBpGetDR3(PVM pVM)
    113113{
    114114    PCDBGFBP    pBp = &pVM->dbgf.s.aHwBreakpoints[3];
    … …  
    124124 * @param   pVM         The VM handle.
    125125 */
    126 DBGFDECL(bool) DBGFIsStepping(PVM pVM)
     126VMMDECL(bool) DBGFIsStepping(PVM pVM)
    127127{
    128128    return pVM->dbgf.s.fSingleSteppingRaw;

  • trunk/src/VBox/VMM/VMMAll/EMAll.cpp

    r12801 r12989  
    7979 * @returns Current status.
    8080 */
    81 EMDECL(EMSTATE) EMGetState(PVM pVM)
     81VMMDECL(EMSTATE) EMGetState(PVM pVM)
    8282{
    8383    return pVM->em.s.enmState;
    … …  
    9292 * @todo    This doesn't belong here, it should go in REMAll.cpp!
    9393 */
    94 EMDECL(void) EMFlushREMTBs(PVM pVM)
     94VMMDECL(void) EMFlushREMTBs(PVM pVM)
    9595{
    9696    Log(("EMFlushREMTBs\n"));
    … …  
    161161 * @param   pcbInstr        Where to return the instruction size. (optional)
    162162 */
    163 EMDECL(int) EMInterpretDisasOne(PVM pVM, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
     163VMMDECL(int) EMInterpretDisasOne(PVM pVM, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
    164164{
    165165    RTGCPTR GCPtrInstr;
    … …  
    186186 * @param   pcbInstr        Where to return the instruction size. (optional)
    187187 */
    188 EMDECL(int) EMInterpretDisasOneEx(PVM pVM, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
     188VMMDECL(int) EMInterpretDisasOneEx(PVM pVM, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
    189189{
    190190    int rc = DISCoreOneEx(GCPtrInstr, SELMGetCpuModeFromSelector(pVM, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid),
    … …  
    220220 *          to worry about e.g. invalid modrm combinations (!)
    221221 */
    222 EMDECL(int) EMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
     222VMMDECL(int) EMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
    223223{
    224224    RTGCPTR pbCode;
    … …  
    272272 *          Make sure this can't happen!! (will add some assertions/checks later)
    273273 */
    274 EMDECL(int) EMInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
     274VMMDECL(int) EMInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
    275275{
    276276    STAM_PROFILE_START(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Emulate), a);
    … …  
    295295 * @remark  This may raise exceptions.
    296296 */
    297 EMDECL(int) EMInterpretPortIO(PVM pVM, PCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, uint32_t cbOp)
     297VMMDECL(int) EMInterpretPortIO(PVM pVM, PCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, uint32_t cbOp)
    298298{
    299299    /*
    … …  
    17031703 *
    17041704 */
    1705 EMDECL(int) EMInterpretIret(PVM pVM, PCPUMCTXCORE pRegFrame)
     1705VMMDECL(int) EMInterpretIret(PVM pVM, PCPUMCTXCORE pRegFrame)
    17061706{
    17071707    RTGCUINTPTR pIretStack = (RTGCUINTPTR)pRegFrame->esp;
    … …  
    17681768 *
    17691769 */
    1770 EMDECL(int) EMInterpretInvlpg(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC)
     1770VMMDECL(int) EMInterpretInvlpg(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC)
    17711771{
    17721772    int rc;
    … …  
    18411841 *
    18421842 */
    1843 EMDECL(int) EMInterpretCpuId(PVM pVM, PCPUMCTXCORE pRegFrame)
     1843VMMDECL(int) EMInterpretCpuId(PVM pVM, PCPUMCTXCORE pRegFrame)
    18441844{
    18451845    uint32_t iLeaf = pRegFrame->eax; NOREF(iLeaf);
    … …  
    18721872 *
    18731873 */
    1874 EMDECL(int) EMInterpretCRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegCrx)
     1874VMMDECL(int) EMInterpretCRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegCrx)
    18751875{
    18761876    int      rc;
    … …  
    19111911 *
    19121912 */
    1913 EMDECL(int) EMInterpretLMSW(PVM pVM, uint16_t u16Data)
     1913VMMDECL(int) EMInterpretLMSW(PVM pVM, uint16_t u16Data)
    19141914{
    19151915    uint64_t OldCr0 = CPUMGetGuestCR0(pVM);
    … …  
    19351935 *
    19361936 */
    1937 EMDECL(int) EMInterpretCLTS(PVM pVM)
     1937VMMDECL(int) EMInterpretCLTS(PVM pVM)
    19381938{
    19391939    uint64_t cr0 = CPUMGetGuestCR0(pVM);
    … …  
    19621962 *
    19631963 */
    1964 EMDECL(int) EMInterpretCRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegCrx, uint32_t SrcRegGen)
     1964VMMDECL(int) EMInterpretCRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegCrx, uint32_t SrcRegGen)
    19651965{
    19661966    uint64_t val;
    … …  
    21232123 *
    21242124 */
    2125 EMDECL(int) EMInterpretDRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegDrx, uint32_t SrcRegGen)
     2125VMMDECL(int) EMInterpretDRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegDrx, uint32_t SrcRegGen)
    21262126{
    21272127    uint64_t val;
    … …  
    21612161 *
    21622162 */
    2163 EMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx)
     2163VMMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx)
    21642164{
    21652165    uint64_t val64;
    … …  
    23342334 *
    23352335 */
    2336 EMDECL(int) EMInterpretRdtsc(PVM pVM, PCPUMCTXCORE pRegFrame)
     2336VMMDECL(int) EMInterpretRdtsc(PVM pVM, PCPUMCTXCORE pRegFrame)
    23372337{
    23382338    unsigned uCR4 = CPUMGetGuestCR4(pVM);
    … …  
    24842484 *
    24852485 */
    2486 EMDECL(int) EMInterpretRdmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
     2486VMMDECL(int) EMInterpretRdmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
    24872487{
    24882488    uint32_t u32Dummy, u32Features, cpl;
    … …  
    26052605 * @param   pRegFrame   The register frame.
    26062606 */
    2607 EMDECL(int) EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
     2607VMMDECL(int) EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
    26082608{
    26092609    uint32_t u32Dummy, u32Features, cpl;
    … …  
    29002900 * @param   PC          The PC.
    29012901 */
    2902 EMDECL(void) EMSetInhibitInterruptsPC(PVM pVM, RTGCUINTPTR PC)
     2902VMMDECL(void) EMSetInhibitInterruptsPC(PVM pVM, RTGCUINTPTR PC)
    29032903{
    29042904    pVM->em.s.GCPtrInhibitInterrupts = PC;
    … …  
    29202920 *
    29212921 */
    2922 EMDECL(RTGCUINTPTR) EMGetInhibitInterruptsPC(PVM pVM)
     2922VMMDECL(RTGCUINTPTR) EMGetInhibitInterruptsPC(PVM pVM)
    29232923{
    29242924    return pVM->em.s.GCPtrInhibitInterrupts;

  • trunk/src/VBox/VMM/VMMAll/EMAllA.asm

    r12688 r12989  
    4848;;
    4949; Emulate CMP instruction, CDECL calling conv.
    50 ; EMDECL(uint32_t) EMEmulateCmp(uint32_t u32Param1, uint64_t u64Param2, size_t cb);
     50; VMMDECL(uint32_t) EMEmulateCmp(uint32_t u32Param1, uint64_t u64Param2, size_t cb);
    5151;
    5252; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    112112;;
    113113; Emulate AND instruction, CDECL calling conv.
    114 ; EMDECL(uint32_t) EMEmulateAnd(void *pvParam1, uint64_t u64Param2, size_t cb);
     114; VMMDECL(uint32_t) EMEmulateAnd(void *pvParam1, uint64_t u64Param2, size_t cb);
    115115;
    116116; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    177177;;
    178178; Emulate OR instruction, CDECL calling conv.
    179 ; EMDECL(uint32_t) EMEmulateOr(void *pvParam1, uint64_t u64Param2, size_t cb);
     179; VMMDECL(uint32_t) EMEmulateOr(void *pvParam1, uint64_t u64Param2, size_t cb);
    180180;
    181181; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    242242;;
    243243; Emulate LOCK OR instruction.
    244 ; EMDECL(int)      EMEmulateLockOr(void *pvParam1, uint64_t u64Param2, size_t cbSize, RTGCUINTREG32 *pf);
     244; VMMDECL(int)      EMEmulateLockOr(void *pvParam1, uint64_t u64Param2, size_t cbSize, RTGCUINTREG32 *pf);
    245245;
    246246; @returns VINF_SUCCESS on success, VERR_ACCESS_DENIED on \#PF (GC only).
    … …  
    326326;;
    327327; Emulate XOR instruction, CDECL calling conv.
    328 ; EMDECL(uint32_t) EMEmulateXor(void *pvParam1, uint64_t u64Param2, size_t cb);
     328; VMMDECL(uint32_t) EMEmulateXor(void *pvParam1, uint64_t u64Param2, size_t cb);
    329329;
    330330; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    391391;;
    392392; Emulate INC instruction, CDECL calling conv.
    393 ; EMDECL(uint32_t) EMEmulateInc(void *pvParam1, size_t cb);
     393; VMMDECL(uint32_t) EMEmulateInc(void *pvParam1, size_t cb);
    394394;
    395395; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    454454;;
    455455; Emulate DEC instruction, CDECL calling conv.
    456 ; EMDECL(uint32_t) EMEmulateDec(void *pvParam1, size_t cb);
     456; VMMDECL(uint32_t) EMEmulateDec(void *pvParam1, size_t cb);
    457457;
    458458; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    517517;;
    518518; Emulate ADD instruction, CDECL calling conv.
    519 ; EMDECL(uint32_t) EMEmulateAdd(void *pvParam1, uint64_t u64Param2, size_t cb);
     519; VMMDECL(uint32_t) EMEmulateAdd(void *pvParam1, uint64_t u64Param2, size_t cb);
    520520;
    521521; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    582582;;
    583583; Emulate ADC instruction, CDECL calling conv.
    584 ; EMDECL(uint32_t) EMEmulateAdcWithCarrySet(void *pvParam1, uint64_t u64Param2, size_t cb);
     584; VMMDECL(uint32_t) EMEmulateAdcWithCarrySet(void *pvParam1, uint64_t u64Param2, size_t cb);
    585585;
    586586; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    651651;;
    652652; Emulate SUB instruction, CDECL calling conv.
    653 ; EMDECL(uint32_t) EMEmulateSub(void *pvParam1, uint64_t u64Param2, size_t cb);
     653; VMMDECL(uint32_t) EMEmulateSub(void *pvParam1, uint64_t u64Param2, size_t cb);
    654654;
    655655; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    716716;;
    717717; Emulate BTR instruction, CDECL calling conv.
    718 ; EMDECL(uint32_t) EMEmulateBtr(void *pvParam1, uint64_t u64Param2);
     718; VMMDECL(uint32_t) EMEmulateBtr(void *pvParam1, uint64_t u64Param2);
    719719;
    720720; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    746746;;
    747747; Emulate LOCK BTR instruction.
    748 ; EMDECL(int)      EMEmulateLockBtr(void *pvParam1, uint64_t u64Param2, RTGCUINTREG32 *pf);
     748; VMMDECL(int)      EMEmulateLockBtr(void *pvParam1, uint64_t u64Param2, RTGCUINTREG32 *pf);
    749749;
    750750; @returns VINF_SUCCESS on success, VERR_ACCESS_DENIED on \#PF (GC only).
    … …  
    790790;;
    791791; Emulate BTC instruction, CDECL calling conv.
    792 ; EMDECL(uint32_t) EMEmulateBtc(void *pvParam1, uint64_t u64Param2);
     792; VMMDECL(uint32_t) EMEmulateBtc(void *pvParam1, uint64_t u64Param2);
    793793;
    794794; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    821821;;
    822822; Emulate BTS instruction, CDECL calling conv.
    823 ; EMDECL(uint32_t) EMEmulateBts(void *pvParam1, uint64_t u64Param2);
     823; VMMDECL(uint32_t) EMEmulateBts(void *pvParam1, uint64_t u64Param2);
    824824;
    825825; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    852852;;
    853853; Emulate LOCK CMPXCHG instruction, CDECL calling conv.
    854 ; EMDECL(uint32_t) EMEmulateLockCmpXchg(void *pvParam1, uint64_t *pu64Param2, uint64_t u64Param3, size_t cbSize);
     854; VMMDECL(uint32_t) EMEmulateLockCmpXchg(void *pvParam1, uint64_t *pu64Param2, uint64_t u64Param3, size_t cbSize);
    855855;
    856856; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    940940;;
    941941; Emulate CMPXCHG instruction, CDECL calling conv.
    942 ; EMDECL(uint32_t) EMEmulateCmpXchg(void *pvParam1, uint64_t *pu32Param2, uint64_t u32Param3, size_t cbSize);
     942; VMMDECL(uint32_t) EMEmulateCmpXchg(void *pvParam1, uint64_t *pu32Param2, uint64_t u32Param3, size_t cbSize);
    943943;
    944944; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    10311031;;
    10321032; Emulate LOCK CMPXCHG8B instruction, CDECL calling conv.
    1033 ; EMDECL(uint32_t) EMEmulateLockCmpXchg8b(RTHCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
     1033; VMMDECL(uint32_t) EMEmulateLockCmpXchg8b(RTHCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
    10341034;
    10351035; @returns EFLAGS after the operation, only arithmetic flags are valid.
    … …  
    10711071;;
    10721072; Emulate CMPXCHG8B instruction, CDECL calling conv.
    1073 ; EMDECL(uint32_t) EMEmulateCmpXchg8b(RTHCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
     1073; VMMDECL(uint32_t) EMEmulateCmpXchg8b(RTHCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
    10741074;
    10751075; @returns EFLAGS after the operation, only arithmetic flags are valid.

  • trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp

    r12932 r12989  
    5151 * @param   GCVirt      Page to invalidate
    5252 */
    53 HWACCMDECL(int) HWACCMInvalidatePage(PVM pVM, RTGCPTR GCVirt)
     53VMMDECL(int) HWACCMInvalidatePage(PVM pVM, RTGCPTR GCVirt)
    5454{
    5555    /** @todo Intel for nested paging */
    … …  
    6868 * @param   pVM         The VM to operate on.
    6969 */
    70 HWACCMDECL(int) HWACCMFlushTLB(PVM pVM)
     70VMMDECL(int) HWACCMFlushTLB(PVM pVM)
    7171{
    7272    /** @todo Intel for nested paging */
    … …  
    8686 * @param   pVM         The VM to operate on.
    8787 */
    88 HWACCMDECL(bool) HWACCMIsNestedPagingActive(PVM pVM)
     88VMMDECL(bool) HWACCMIsNestedPagingActive(PVM pVM)
    8989{
    9090    return HWACCMIsEnabled(pVM) && pVM->hwaccm.s.fNestedPaging;
    … …  
    9797 * @param   pVM         The VM to operate on.
    9898 */
    99 HWACCMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM)
     99VMMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM)
    100100{
    101101    Assert(HWACCMIsNestedPagingActive(pVM));
    … …  
    115115 * @param   GCPhys      Page to invalidate
    116116 */
    117 HWACCMDECL(int) HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
     117VMMDECL(int) HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
    118118{
    119119    if (!HWACCMIsNestedPagingActive(pVM))
    … …  
    138138 * @param   pVM         The VM to operate on.
    139139 */
    140 HWACCMDECL(bool) HWACCMHasPendingIrq(PVM pVM)
     140VMMDECL(bool) HWACCMHasPendingIrq(PVM pVM)
    141141{
    142142    return !!pVM->hwaccm.s.Event.fPending;

  • trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

    r12772 r12989  
    205205 * @param   cbValue     The size of the register to read in bytes. 1, 2 or 4 bytes.
    206206 */
    207 IOMDECL(int) IOMIOPortRead(PVM pVM, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
     207VMMDECL(int) IOMIOPortRead(PVM pVM, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
    208208{
    209209#ifdef VBOX_WITH_STATISTICS
    … …  
    346346 * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
    347347 *   */
    348 IOMDECL(int) IOMIOPortReadString(PVM pVM, RTIOPORT Port, PRTGCPTR pGCPtrDst, PRTGCUINTREG pcTransfers, unsigned cb)
     348VMMDECL(int) IOMIOPortReadString(PVM pVM, RTIOPORT Port, PRTGCPTR pGCPtrDst, PRTGCUINTREG pcTransfers, unsigned cb)
    349349{
    350350#ifdef LOG_ENABLED
    … …  
    468468 * @param   cbValue     The size of the register to read in bytes. 1, 2 or 4 bytes.
    469469 */
    470 IOMDECL(int) IOMIOPortWrite(PVM pVM, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
     470VMMDECL(int) IOMIOPortWrite(PVM pVM, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
    471471{
    472472/** @todo bird: When I get time, I'll remove the GC tree and link the GC entries to the ring-3 node. */
    … …  
    587587 * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
    588588 *   */
    589 IOMDECL(int) IOMIOPortWriteString(PVM pVM, RTIOPORT Port, PRTGCPTR pGCPtrSrc, PRTGCUINTREG pcTransfers, unsigned cb)
     589VMMDECL(int) IOMIOPortWriteString(PVM pVM, RTIOPORT Port, PRTGCPTR pGCPtrSrc, PRTGCUINTREG pcTransfers, unsigned cb)
    590590{
    591591#ifdef LOG_ENABLED
    … …  
    709709 * @param   cb          The access size.
    710710 */
    711 IOMDECL(int) IOMInterpretCheckPortIOAccess(PVM pVM, PCPUMCTXCORE pCtxCore, RTIOPORT Port, unsigned cb)
     711VMMDECL(int) IOMInterpretCheckPortIOAccess(PVM pVM, PCPUMCTXCORE pCtxCore, RTIOPORT Port, unsigned cb)
    712712{
    713713    /*
    … …  
    807807 * @param   pCpu        Disassembler CPU state.
    808808 */
    809 IOMDECL(int) IOMInterpretIN(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     809VMMDECL(int) IOMInterpretIN(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    810810{
    811811#ifdef IN_GC
    … …  
    866866 * @param   pCpu        Disassembler CPU state.
    867867 */
    868 IOMDECL(int) IOMInterpretOUT(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     868VMMDECL(int) IOMInterpretOUT(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    869869{
    870870#ifdef IN_GC

  • trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

    r12772 r12989  
    10141014 * @param   pvUser      Pointer to the MMIO ring-3 range entry.
    10151015 */
    1016 IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser)
     1016VMMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser)
    10171017{
    10181018    STAM_PROFILE_START(&pVM->iom.s.StatRZMMIOHandler, a);
    … …  
    12411241 * @param   cbValue     The size of the register to read in bytes. 1, 2 or 4 bytes.
    12421242 */
    1243 IOMDECL(int) IOMMMIORead(PVM pVM, RTGCPHYS GCPhys, uint32_t *pu32Value, size_t cbValue)
     1243VMMDECL(int) IOMMMIORead(PVM pVM, RTGCPHYS GCPhys, uint32_t *pu32Value, size_t cbValue)
    12441244{
    12451245    /*
    … …  
    13461346 * @param   cbValue     The size of the register to read in bytes. 1, 2 or 4 bytes.
    13471347 */
    1348 IOMDECL(int) IOMMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue)
     1348VMMDECL(int) IOMMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue)
    13491349{
    13501350    /*
    … …  
    14281428 * @param   cbTransfer      Size of transfer unit
    14291429 */
    1430 IOMDECL(int) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
     1430VMMDECL(int) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
    14311431{
    14321432#ifdef VBOX_WITH_STATISTICS
    … …  
    15431543 * @param   pCpu        Disassembler CPU state.
    15441544 */
    1545 IOMDECL(int) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     1545VMMDECL(int) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    15461546{
    15471547    /*
    … …  
    15891589 * @param   cbTransfer      Size of transfer unit
    15901590 */
    1591 IOMDECL(int) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
     1591VMMDECL(int) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
    15921592{
    15931593#ifdef VBOX_WITH_STATISTICS
    … …  
    17061706 * @param   pCpu        Disassembler CPU state.
    17071707 */
    1708 IOMDECL(int) IOMInterpretOUTS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     1708VMMDECL(int) IOMInterpretOUTS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    17091709{
    17101710    /*

  • trunk/src/VBox/VMM/VMMAll/MMAll.cpp

    r12967 r12989  
    274274 * @thread  The Emulation Thread.
    275275 */
    276 MMDECL(RTR3PTR) MMHyperR0ToR3(PVM pVM, RTR0PTR R0Ptr)
     276VMMDECL(RTR3PTR) MMHyperR0ToR3(PVM pVM, RTR0PTR R0Ptr)
    277277{
    278278    uint32_t off;
    … …  
    293293 * @thread  The Emulation Thread.
    294294 */
    295 MMDECL(RTRCPTR) MMHyperR0ToRC(PVM pVM, RTR0PTR R0Ptr)
     295VMMDECL(RTRCPTR) MMHyperR0ToRC(PVM pVM, RTR0PTR R0Ptr)
    296296{
    297297    uint32_t off;
    … …  
    313313 * @thread  The Emulation Thread.
    314314 */
    315 MMDECL(void *) MMHyperR0ToCC(PVM pVM, RTR0PTR R0Ptr)
     315VMMDECL(void *) MMHyperR0ToCC(PVM pVM, RTR0PTR R0Ptr)
    316316{
    317317    uint32_t off;
    … …  
    333333 * @thread  The Emulation Thread.
    334334 */
    335 MMDECL(RTR0PTR) MMHyperR3ToR0(PVM pVM, RTR3PTR R3Ptr)
     335VMMDECL(RTR0PTR) MMHyperR3ToR0(PVM pVM, RTR3PTR R3Ptr)
    336336{
    337337    uint32_t off;
    … …  
    353353 * @thread  The Emulation Thread.
    354354 */
    355 MMDECL(RTRCPTR) MMHyperR3ToRC(PVM pVM, RTR3PTR R3Ptr)
     355VMMDECL(RTRCPTR) MMHyperR3ToRC(PVM pVM, RTR3PTR R3Ptr)
    356356{
    357357    uint32_t off;
    … …  
    374374 */
    375375#ifndef IN_RING3
    376 MMDECL(void *) MMHyperR3ToCC(PVM pVM, RTR3PTR R3Ptr)
     376VMMDECL(void *) MMHyperR3ToCC(PVM pVM, RTR3PTR R3Ptr)
    377377{
    378378    uint32_t off;
    … …  
    394394 * @thread  The Emulation Thread.
    395395 */
    396 MMDECL(RTR3PTR) MMHyperRCToR3(PVM pVM, RTRCPTR RCPtr)
     396VMMDECL(RTR3PTR) MMHyperRCToR3(PVM pVM, RTRCPTR RCPtr)
    397397{
    398398    uint32_t off;
    … …  
    413413 * @thread  The Emulation Thread.
    414414 */
    415 MMDECL(RTR0PTR) MMHyperRCToR0(PVM pVM, RTRCPTR RCPtr)
     415VMMDECL(RTR0PTR) MMHyperRCToR0(PVM pVM, RTRCPTR RCPtr)
    416416{
    417417    uint32_t off;
    … …  
    433433 */
    434434#ifndef IN_GC
    435 MMDECL(void *) MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr)
     435VMMDECL(void *) MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr)
    436436{
    437437    uint32_t off;
    … …  
    455455 */
    456456#ifndef IN_RING3
    457 MMDECL(RTR3PTR) MMHyperCCToR3(PVM pVM, void *pv)
     457VMMDECL(RTR3PTR) MMHyperCCToR3(PVM pVM, void *pv)
    458458{
    459459    uint32_t off;
    … …  
    475475 */
    476476#ifndef IN_RING0
    477 MMDECL(RTR0PTR) MMHyperCCToR0(PVM pVM, void *pv)
     477VMMDECL(RTR0PTR) MMHyperCCToR0(PVM pVM, void *pv)
    478478{
    479479    uint32_t off;
    … …  
    496496 */
    497497#ifndef IN_GC
    498 MMDECL(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv)
     498VMMDECL(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv)
    499499{
    500500    uint32_t off;

  • trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp

    r12968 r12989  
    168168 * @remark  This is assumed not to be used at times when serialization is required.
    169169 */
    170 MMDECL(int) MMHyperAlloc(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
     170VMMDECL(int) MMHyperAlloc(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
    171171{
    172172    AssertMsg(cb >= 8, ("Hey! Do you really mean to allocate less than 8 bytes?! cb=%d\n", cb));
    … …  
    705705 * @remark  Try avoid free hyper memory.
    706706 */
    707 MMDECL(int) MMHyperFree(PVM pVM, void *pv)
     707VMMDECL(int) MMHyperFree(PVM pVM, void *pv)
    708708{
    709709    Log2(("MMHyperFree: pv=%p\n", pv));
    … …  
    11141114 * @param   pVM         Pointer to the shared VM structure.
    11151115 */
    1116 MMDECL(void) MMHyperHeapCheck(PVM pVM)
     1116VMMDECL(void) MMHyperHeapCheck(PVM pVM)
    11171117{
    11181118#ifdef MMHYPER_HEAP_STRICT
    … …  
    11271127 * @param pVM       VM Handle.
    11281128 */
    1129 MMDECL(void) MMHyperHeapDump(PVM pVM)
     1129VMMDECL(void) MMHyperHeapDump(PVM pVM)
    11301130{
    11311131    Log(("MMHyperHeapDump: *** heap dump - start ***\n"));
    … …  
    11511151 * @returns Number of free bytes in the hypervisor heap.
    11521152 */
    1153 MMDECL(size_t) MMHyperHeapGetFreeSize(PVM pVM)
     1153VMMDECL(size_t) MMHyperHeapGetFreeSize(PVM pVM)
    11541154{
    11551155    return pVM->mm.s.CTX_SUFF(pHyperHeap)->cbFree;
    … …  
    11611161 * @returns The size of the hypervisor heap in bytes.
    11621162 */
    1163 MMDECL(size_t) MMHyperHeapGetSize(PVM pVM)
     1163VMMDECL(size_t) MMHyperHeapGetSize(PVM pVM)
    11641164{
    11651165    return pVM->mm.s.CTX_SUFF(pHyperHeap)->cbHeap;
    … …  
    11741174 * @param   pcb         Where to store the size of the hypervisor area. (out)
    11751175 */
    1176 MMDECL(RTGCPTR) MMHyperGetArea(PVM pVM, size_t *pcb)
     1176VMMDECL(RTGCPTR) MMHyperGetArea(PVM pVM, size_t *pcb)
    11771177{
    11781178    if (pcb)
    … …  
    11901190 * @param   GCPtr       The pointer to check.
    11911191 */
    1192 MMDECL(bool) MMHyperIsInsideArea(PVM pVM, RTGCPTR GCPtr)
     1192VMMDECL(bool) MMHyperIsInsideArea(PVM pVM, RTGCPTR GCPtr)
    11931193{
    11941194    return (RTGCUINTPTR)GCPtr - (RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC < pVM->mm.s.cbHyperArea;

  • trunk/src/VBox/VMM/VMMAll/MMAllPagePool.cpp

    r12968 r12989  
    5454 * @thread  The Emulation Thread.
    5555 */
    56 MMDECL(RTHCPHYS) mmPagePoolPtr2Phys(PMMPAGEPOOL pPool, void *pv)
     56VMMDECL(RTHCPHYS) mmPagePoolPtr2Phys(PMMPAGEPOOL pPool, void *pv)
    5757{
    5858#ifdef IN_RING3
    … …  
    9393 * @thread  The Emulation Thread.
    9494 */
    95 MMDECL(void *) mmPagePoolPhys2Ptr(PMMPAGEPOOL pPool, RTHCPHYS HCPhys)
     95VMMDECL(void *) mmPagePoolPhys2Ptr(PMMPAGEPOOL pPool, RTHCPHYS HCPhys)
    9696{
    9797#if 0 /** @todo have to fix the debugger, but until then this is going on my nerves. */
    … …  
    127127 * @thread  The Emulation Thread.
    128128 */
    129 MMDECL(RTHCPHYS) MMPage2Phys(PVM pVM, void *pvPage)
     129VMMDECL(RTHCPHYS) MMPage2Phys(PVM pVM, void *pvPage)
    130130{
    131131    RTHCPHYS HCPhys = mmPagePoolPtr2Phys(pVM->mm.s.CTX_SUFF(pPagePool), pvPage);
    … …  
    153153 * @thread  The Emulation Thread.
    154154 */
    155 MMDECL(void *) MMPagePhys2Page(PVM pVM, RTHCPHYS HCPhysPage)
     155VMMDECL(void *) MMPagePhys2Page(PVM pVM, RTHCPHYS HCPhysPage)
    156156{
    157157    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);
    … …  
    180180 * @thread  The Emulation Thread.
    181181 */
    182 MMDECL(int) MMPagePhys2PageEx(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
     182VMMDECL(int) MMPagePhys2PageEx(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
    183183{
    184184    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);
    … …  
    209209 * @thread  The Emulation Thread.
    210210 */
    211 MMDECL(int) MMPagePhys2PageTry(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
     211VMMDECL(int) MMPagePhys2PageTry(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
    212212{
    213213    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);

  • trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

    r12687 r12989  
    4343 * @param   pu8Interrupt    Where to store the interrupt on success.
    4444 */
    45 PDMDECL(int) PDMGetInterrupt(PVM pVM, uint8_t *pu8Interrupt)
     45VMMDECL(int) PDMGetInterrupt(PVM pVM, uint8_t *pu8Interrupt)
    4646{
    4747    pdmLock(pVM);
    … …  
    9898 * @param   u8Level         The new level.
    9999 */
    100 PDMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
     100VMMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
    101101{
    102102    pdmLock(pVM);
    … …  
    130130 * @param   u8Level         The new level.
    131131 */
    132 PDMDECL(int) PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
     132VMMDECL(int) PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
    133133{
    134134    if (pVM->pdm.s.IoApic.CTX_SUFF(pDevIns))
    … …  
    151151 * @param   u64Base         The new base.
    152152 */
    153 PDMDECL(int) PDMApicSetBase(PVM pVM, uint64_t u64Base)
     153VMMDECL(int) PDMApicSetBase(PVM pVM, uint64_t u64Base)
    154154{
    155155    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
    … …  
    172172 * @param   pu64Base        Where to store the APIC base.
    173173 */
    174 PDMDECL(int) PDMApicGetBase(PVM pVM, uint64_t *pu64Base)
     174VMMDECL(int) PDMApicGetBase(PVM pVM, uint64_t *pu64Base)
    175175{
    176176    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
    … …  
    194194 * @param   pfPending       Pending state (out).
    195195 */
    196 PDMDECL(int) PDMApicHasPendingIrq(PVM pVM, bool *pfPending)
     196VMMDECL(int) PDMApicHasPendingIrq(PVM pVM, bool *pfPending)
    197197{
    198198    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
    … …  
    215215 * @param   u8TPR           The new TPR.
    216216 */
    217 PDMDECL(int) PDMApicSetTPR(PVM pVM, uint8_t u8TPR)
     217VMMDECL(int) PDMApicSetTPR(PVM pVM, uint8_t u8TPR)
    218218{
    219219    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
    … …  
    237237 * @param   pfPending       Pending interrupt state (out).
    238238*/
    239 PDMDECL(int) PDMApicGetTPR(PVM pVM, uint8_t *pu8TPR, bool *pfPending)
     239VMMDECL(int) PDMApicGetTPR(PVM pVM, uint8_t *pu8TPR, bool *pfPending)
    240240{
    241241    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
    … …  
    312312 * @param   pGCPhys         GC phys address (out).
    313313 */
    314 PDMDECL(int) PDMVMMDevHeapR3ToGCPhys(PVM pVM, RTR3PTR pv, RTGCPHYS *pGCPhys)
     314VMMDECL(int) PDMVMMDevHeapR3ToGCPhys(PVM pVM, RTR3PTR pv, RTGCPHYS *pGCPhys)
    315315{
    316316    AssertReturn(pv >= pVM->pdm.s.pvVMMDevHeap && (RTR3UINTPTR)pv < (RTR3UINTPTR)pVM->pdm.s.pvVMMDevHeap + pVM->pdm.s.cbVMMDevHeap, VERR_INVALID_PARAMETER);

  • trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

    r12983 r12989  
    5050 *                              and the section is busy.
    5151 */
    52 PDMDECL(int) PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy)
     52VMMDECL(int) PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy)
    5353{
    5454    Assert(pCritSect->s.Core.cNestings < 8);  /* useful to catch incorrect locking */
    … …  
    109109 * @param   fCallHost           Whether this is a VMMGCCallHost() or VMMR0CallHost() request.
    110110 */
    111 PDMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost)
     111VMMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost)
    112112{
    113113    int rc = PDMCritSectEnter(pCritSect, VERR_INTERNAL_ERROR);
    … …  
    129129 * @param   pCritSect           The PDM critical section to leave.
    130130 */
    131 PDMDECL(void) PDMCritSectLeave(PPDMCRITSECT pCritSect)
     131VMMDECL(void) PDMCritSectLeave(PPDMCRITSECT pCritSect)
    132132{
    133133#ifdef IN_RING3
    … …  
    210210 * @param   pCritSect   The critical section.
    211211 */
    212 PDMDECL(bool) PDMCritSectIsOwner(PCPDMCRITSECT pCritSect)
     212VMMDECL(bool) PDMCritSectIsOwner(PCPDMCRITSECT pCritSect)
    213213{
    214214#ifdef IN_RING3
    … …  
    229229 * @param   pCritSect   The critical section.
    230230 */
    231 PDMDECL(bool) PDMCritSectIsInitialized(PCPDMCRITSECT pCritSect)
     231VMMDECL(bool) PDMCritSectIsInitialized(PCPDMCRITSECT pCritSect)
    232232{
    233233    return pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC;

  • trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

    r12986 r12989  
    4848 * @thread  Any thread.
    4949 */
    50 PDMDECL(PPDMQUEUEITEMCORE) PDMQueueAlloc(PPDMQUEUE pQueue)
     50VMMDECL(PPDMQUEUEITEMCORE) PDMQueueAlloc(PPDMQUEUE pQueue)
    5151{
    5252    Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
    … …  
    7575 * @thread  Any thread.
    7676 */
    77 PDMDECL(void) PDMQueueInsert(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem)
     77VMMDECL(void) PDMQueueInsert(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem)
    7878{
    7979    Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
    … …  
    111111 * @thread  Any thread.
    112112 */
    113 PDMDECL(void) PDMQueueInsertEx(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem, uint64_t NanoMaxDelay)
     113VMMDECL(void) PDMQueueInsertEx(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem, uint64_t NanoMaxDelay)
    114114{
    115115    PDMQueueInsert(pQueue, pItem);
    … …  
    138138 * @param   pQueue          The queue handle.
    139139 */
    140 PDMDECL(RCPTRTYPE(PPDMQUEUE)) PDMQueueRCPtr(PPDMQUEUE pQueue)
     140VMMDECL(RCPTRTYPE(PPDMQUEUE)) PDMQueueRCPtr(PPDMQUEUE pQueue)
    141141{
    142142    Assert(VALID_PTR(pQueue));
    … …  
    157157 * @param   pQueue          The queue handle.
    158158 */
    159 PDMDECL(R0PTRTYPE(PPDMQUEUE)) PDMQueueR0Ptr(PPDMQUEUE pQueue)
     159VMMDECL(R0PTRTYPE(PPDMQUEUE)) PDMQueueR0Ptr(PPDMQUEUE pQueue)
    160160{
    161161    Assert(VALID_PTR(pQueue));
    … …  
    174174 * @param   pQueue          The queue handle.
    175175 */
    176 PDMDECL(void) PDMQueueFlush(PPDMQUEUE pQueue)
     176VMMDECL(void) PDMQueueFlush(PPDMQUEUE pQueue)
    177177{
    178178    Assert(VALID_PTR(pQueue));

  • trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

    r12936 r12989  
    348348 * @param   pvFault     The fault address.
    349349 */
    350 PGMDECL(int)     PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
     350VMMDECL(int)     PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
    351351{
    352352    LogFlow(("PGMTrap0eHandler: uErr=%RGu pvFault=%VGv eip=%VGv\n", uErr, pvFault, pRegFrame->rip));
    … …  
    419419 * @param   GCPtrPage   Page to invalidate.
    420420 */
    421 PGMDECL(int) PGMPrefetchPage(PVM pVM, RTGCPTR GCPtrPage)
     421VMMDECL(int) PGMPrefetchPage(PVM pVM, RTGCPTR GCPtrPage)
    422422{
    423423    STAM_PROFILE_START(&pVM->pgm.s.StatHCPrefetch, a);
    … …  
    467467 * @param   fAccess     Access type (r/w, user/supervisor (X86_PTE_*))
    468468 */
    469 PGMDECL(int) PGMIsValidAccess(PVM pVM, RTGCUINTPTR Addr, uint32_t cbSize, uint32_t fAccess)
     469VMMDECL(int) PGMIsValidAccess(PVM pVM, RTGCUINTPTR Addr, uint32_t cbSize, uint32_t fAccess)
    470470{
    471471    /*
    … …  
    519519 * @param   fAccess     Access type (r/w, user/supervisor (X86_PTE_*))
    520520 */
    521 PGMDECL(int) PGMVerifyAccess(PVM pVM, RTGCUINTPTR Addr, uint32_t cbSize, uint32_t fAccess)
     521VMMDECL(int) PGMVerifyAccess(PVM pVM, RTGCUINTPTR Addr, uint32_t cbSize, uint32_t fAccess)
    522522{
    523523    /*
    … …  
    628628 * @todo    Flush page or page directory only if necessary!
    629629 */
    630 PGMDECL(int) PGMInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
     630VMMDECL(int) PGMInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
    631631{
    632632    int rc;
    … …  
    684684 * @param   pvFault     Fault address.
    685685 */
    686 PGMDECL(int) PGMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
     686VMMDECL(int) PGMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
    687687{
    688688    uint32_t cb;
    … …  
    707707 * @remark  You should use PGMMapGetPage() for pages in a mapping.
    708708 */
    709 PGMDECL(int) PGMShwGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys)
     709VMMDECL(int) PGMShwGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys)
    710710{
    711711    return PGM_SHW_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, pfFlags, pHCPhys);
    … …  
    723723 * @remark  You must use PGMMapSetPage() for pages in a mapping.
    724724 */
    725 PGMDECL(int) PGMShwSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags)
     725VMMDECL(int) PGMShwSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags)
    726726{
    727727    return PGMShwModifyPage(pVM, GCPtr, cb, fFlags, 0);
    … …  
    743743 * @remark  You must use PGMMapModifyPage() for pages in a mapping.
    744744 */
    745 PGMDECL(int)  PGMShwModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
     745VMMDECL(int)  PGMShwModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
    746746{
    747747    /*
    … …  
    782782 * @param   ppPD        Receives address of page directory
    783783 */
    784 PGMDECL(int) PGMShwSyncPAEPDPtr(PVM pVM, RTGCUINTPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
     784VMMDECL(int) PGMShwSyncPAEPDPtr(PVM pVM, RTGCUINTPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
    785785{
    786786    PPGM           pPGM   = &pVM->pgm.s;
    … …  
    834834 * @param   ppPD        Receives address of page directory
    835835 */
    836 PGMDECL(int) PGMShwGetPAEPDPtr(PVM pVM, RTGCUINTPTR GCPtr, PX86PDPT *ppPdpt, PX86PDPAE *ppPD)
     836VMMDECL(int) PGMShwGetPAEPDPtr(PVM pVM, RTGCUINTPTR GCPtr, PX86PDPT *ppPdpt, PX86PDPAE *ppPD)
    837837{
    838838    PPGM           pPGM   = &pVM->pgm.s;
    … …  
    869869 * @param   ppPD        Receives address of page directory
    870870 */
    871 PGMDECL(int) PGMShwSyncLongModePDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
     871VMMDECL(int) PGMShwSyncLongModePDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
    872872{
    873873    PPGM           pPGM   = &pVM->pgm.s;
    … …  
    971971 * @param   ppPD        Receives address of page directory
    972972 */
    973 PGMDECL(int) PGMShwGetLongModePDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PX86PDPT *ppPdpt, PX86PDPAE *ppPD)
     973VMMDECL(int) PGMShwGetLongModePDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PX86PDPT *ppPdpt, PX86PDPAE *ppPD)
    974974{
    975975    PPGM           pPGM   = &pVM->pgm.s;
    … …  
    10051005/**
    10061006 * Syncs the SHADOW EPT page directory pointer for the specified address. Allocates
    1007  * backing pages in case the PDPT or PML4 entry is missing. 
     1007 * backing pages in case the PDPT or PML4 entry is missing.
    10081008 *
    10091009 * @returns VBox status.
    … …  
    10131013 * @param   ppPD        Receives address of page directory
    10141014 */
    1015 PGMDECL(int)    PGMShwGetEPTPDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
     1015VMMDECL(int)    PGMShwGetEPTPDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
    10161016{
    10171017    PPGM           pPGM   = &pVM->pgm.s;
    … …  
    11051105 *                      This is page aligned. The fact that the
    11061106 */
    1107 PGMDECL(int) PGMGstGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTGCPHYS pGCPhys)
     1107VMMDECL(int) PGMGstGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTGCPHYS pGCPhys)
    11081108{
    11091109    return PGM_GST_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, pfFlags, pGCPhys);
    … …  
    11191119 * @param   GCPtr       Address within the page.
    11201120 */
    1121 PGMDECL(bool) PGMGstIsPagePresent(PVM pVM, RTGCPTR GCPtr)
     1121VMMDECL(bool) PGMGstIsPagePresent(PVM pVM, RTGCPTR GCPtr)
    11221122{
    11231123    int rc = PGMGstGetPage(pVM, GCPtr, NULL, NULL);
    … …  
    11351135 * @param   fFlags      Page flags X86_PTE_*, excluding the page mask of course.
    11361136 */
    1137 PGMDECL(int)  PGMGstSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags)
     1137VMMDECL(int)  PGMGstSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags)
    11381138{
    11391139    return PGMGstModifyPage(pVM, GCPtr, cb, fFlags, 0);
    … …  
    11541154 *                      Be very CAREFUL when ~'ing constants which could be 32-bit!
    11551155 */
    1156 PGMDECL(int)  PGMGstModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
     1156VMMDECL(int)  PGMGstModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
    11571157{
    11581158    STAM_PROFILE_START(&CTXMID(pVM->pgm.s.Stat,GstModifyPage), a);
    … …  
    11991199 * @param   pVM         The VM handle.
    12001200 */
    1201 PGMDECL(RTHCPHYS) PGMGetHyperCR3(PVM pVM)
     1201VMMDECL(RTHCPHYS) PGMGetHyperCR3(PVM pVM)
    12021202{
    12031203    PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
    … …  
    12321232 * @param   pVM         The VM handle.
    12331233 */
    1234 PGMDECL(RTHCPHYS) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode)
     1234VMMDECL(RTHCPHYS) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode)
    12351235{
    12361236    switch (enmShadowMode)
    … …  
    12591259 * @param   pVM         The VM handle.
    12601260 */
    1261 PGMDECL(RTHCPHYS) PGMGetHyper32BitCR3(PVM pVM)
     1261VMMDECL(RTHCPHYS) PGMGetHyper32BitCR3(PVM pVM)
    12621262{
    12631263    return pVM->pgm.s.HCPhys32BitPD;
    … …  
    12701270 * @param   pVM         The VM handle.
    12711271 */
    1272 PGMDECL(RTHCPHYS) PGMGetHyperPaeCR3(PVM pVM)
     1272VMMDECL(RTHCPHYS) PGMGetHyperPaeCR3(PVM pVM)
    12731273{
    12741274    return pVM->pgm.s.HCPhysPaePDPT;
    … …  
    12811281 * @param   pVM         The VM handle.
    12821282 */
    1283 PGMDECL(RTHCPHYS) PGMGetHyperAmd64CR3(PVM pVM)
     1283VMMDECL(RTHCPHYS) PGMGetHyperAmd64CR3(PVM pVM)
    12841284{
    12851285    return pVM->pgm.s.HCPhysPaePML4;
    … …  
    12921292 * @param   pVM         The VM handle.
    12931293 */
    1294 PGMDECL(RTHCPHYS) PGMGetInterHCCR3(PVM pVM)
     1294VMMDECL(RTHCPHYS) PGMGetInterHCCR3(PVM pVM)
    12951295{
    12961296    switch (pVM->pgm.s.enmHostMode)
    … …  
    13241324 * @param   pVM         The VM handle.
    13251325 */
    1326 PGMDECL(RTHCPHYS) PGMGetInterGCCR3(PVM pVM)
     1326VMMDECL(RTHCPHYS) PGMGetInterGCCR3(PVM pVM)
    13271327{
    13281328    switch (pVM->pgm.s.enmShadowMode)
    … …  
    13551355 * @param   pVM         The VM handle.
    13561356 */
    1357 PGMDECL(RTHCPHYS) PGMGetInter32BitCR3(PVM pVM)
     1357VMMDECL(RTHCPHYS) PGMGetInter32BitCR3(PVM pVM)
    13581358{
    13591359    return pVM->pgm.s.HCPhysInterPD;
    … …  
    13661366 * @param   pVM         The VM handle.
    13671367 */
    1368 PGMDECL(RTHCPHYS) PGMGetInterPaeCR3(PVM pVM)
     1368VMMDECL(RTHCPHYS) PGMGetInterPaeCR3(PVM pVM)
    13691369{
    13701370    return pVM->pgm.s.HCPhysInterPaePDPT;
    … …  
    13771377 * @param   pVM         The VM handle.
    13781378 */
    1379 PGMDECL(RTHCPHYS) PGMGetInterAmd64CR3(PVM pVM)
     1379VMMDECL(RTHCPHYS) PGMGetInterAmd64CR3(PVM pVM)
    13801380{
    13811381    return pVM->pgm.s.HCPhysInterPaePML4;
    … …  
    13951395 * @param   fGlobal     Indicates whether this is a global flush or not.
    13961396 */
    1397 PGMDECL(int) PGMFlushTLB(PVM pVM, uint64_t cr3, bool fGlobal)
     1397VMMDECL(int) PGMFlushTLB(PVM pVM, uint64_t cr3, bool fGlobal)
    13981398{
    13991399    STAM_PROFILE_START(&pVM->pgm.s.StatFlushTLB, a);
    … …  
    14661466 * @param   cr3         The new cr3.
    14671467 */
    1468 PGMDECL(int) PGMUpdateCR3(PVM pVM, uint64_t cr3)
     1468VMMDECL(int) PGMUpdateCR3(PVM pVM, uint64_t cr3)
    14691469{
    14701470    LogFlow(("PGMUpdateCR3: cr3=%VX64 OldCr3=%VX64\n", cr3, pVM->pgm.s.GCPhysCR3));
    … …  
    15101510 * @param   fGlobal     Including global page directories or not
    15111511 */
    1512 PGMDECL(int) PGMSyncCR3(PVM pVM, uint64_t cr0, uint64_t cr3, uint64_t cr4, bool fGlobal)
     1512VMMDECL(int) PGMSyncCR3(PVM pVM, uint64_t cr0, uint64_t cr3, uint64_t cr4, bool fGlobal)
    15131513{
    15141514    /*
    … …  
    15821582 * @param   efer        The new extended feature enable register.
    15831583 */
    1584 PGMDECL(int) PGMChangeMode(PVM pVM, uint64_t cr0, uint64_t cr4, uint64_t efer)
     1584VMMDECL(int) PGMChangeMode(PVM pVM, uint64_t cr0, uint64_t cr4, uint64_t efer)
    15851585{
    15861586    PGMMODE enmGuestMode;
    … …  
    16361636 * @param   pVM             The VM handle.
    16371637 */
    1638 PGMDECL(PGMMODE) PGMGetGuestMode(PVM pVM)
     1638VMMDECL(PGMMODE) PGMGetGuestMode(PVM pVM)
    16391639{
    16401640    return pVM->pgm.s.enmGuestMode;
    … …  
    16481648 * @param   pVM             The VM handle.
    16491649 */
    1650 PGMDECL(PGMMODE) PGMGetShadowMode(PVM pVM)
     1650VMMDECL(PGMMODE) PGMGetShadowMode(PVM pVM)
    16511651{
    16521652    return pVM->pgm.s.enmShadowMode;
    … …  
    16591659 * @param   pVM             The VM handle.
    16601660 */
    1661 PGMDECL(PGMMODE) PGMGetHostMode(PVM pVM)
     1661VMMDECL(PGMMODE) PGMGetHostMode(PVM pVM)
    16621662{
    16631663    switch (pVM->pgm.s.enmHostMode)
    … …  
    16961696 * @param   enmMode     The mode which name is desired.
    16971697 */
    1698 PGMDECL(const char *) PGMGetModeName(PGMMODE enmMode)
     1698VMMDECL(const char *) PGMGetModeName(PGMMODE enmMode)
    16991699{
    17001700    switch (enmMode)
    … …  
    17551755 * @param   pVM     The VM Handle.
    17561756 */
    1757 PGMDECL(unsigned) PGMAssertNoMappingConflicts(PVM pVM)
     1757VMMDECL(unsigned) PGMAssertNoMappingConflicts(PVM pVM)
    17581758{
    17591759    unsigned cErrors = 0;
    … …  
    17971797 * @param   cr4     The current guest CR4 register value.
    17981798 */
    1799 PGMDECL(unsigned) PGMAssertCR3(PVM pVM, uint64_t cr3, uint64_t cr4)
     1799VMMDECL(unsigned) PGMAssertCR3(PVM pVM, uint64_t cr3, uint64_t cr4)
    18001800{
    18011801    STAM_PROFILE_START(&pVM->pgm.s.CTXMID(Stat,SyncCR3), a);

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r12964 r12989  
    35813581 */
    35823582__BEGIN_DECLS
    3583 PGMR3DECL(int) PGMR3DumpHierarchyHC(PVM pVM, uint32_t cr3, uint32_t cr4, bool fLongMode, unsigned cMaxDepth, PCDBGFINFOHLP pHlp);
     3583VMMR3DECL(int) PGMR3DumpHierarchyHC(PVM pVM, uint32_t cr3, uint32_t cr4, bool fLongMode, unsigned cMaxDepth, PCDBGFINFOHLP pHlp);
    35843584__END_DECLS
    35853585

  • trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

    r11309 r12989  
    7979 * @param   pszDesc         Pointer to description string. This must not be freed.
    8080 */
    81 PGMDECL(int) PGMHandlerPhysicalRegisterEx(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
     81VMMDECL(int) PGMHandlerPhysicalRegisterEx(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
    8282                                          R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
    8383                                          R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
    … …  
    284284 * @param   GCPhys      Start physical address.
    285285 */
    286 PGMDECL(int)  PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys)
     286VMMDECL(int)  PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys)
    287287{
    288288    /*
    … …  
    485485 * @param   GCPhysLast      New last location.
    486486 */
    487 PGMDECL(int) PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast)
     487VMMDECL(int) PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast)
    488488{
    489489    /*
    … …  
    597597 * @param   pszDesc         Pointer to description string. This must not be freed.
    598598 */
    599 PGMDECL(int) PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,
     599VMMDECL(int) PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,
    600600                                               R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
    601601                                               R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
    … …  
    641641 * @param   GCPhysSplit     The split address.
    642642 */
    643 PGMDECL(int) PGMHandlerPhysicalSplit(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysSplit)
     643VMMDECL(int) PGMHandlerPhysicalSplit(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysSplit)
    644644{
    645645    AssertReturn(GCPhys < GCPhysSplit, VERR_INVALID_PARAMETER);
    … …  
    707707 * @param   GCPhys2         Start physical address of the second handler.
    708708 */
    709 PGMDECL(int) PGMHandlerPhysicalJoin(PVM pVM, RTGCPHYS GCPhys1, RTGCPHYS GCPhys2)
     709VMMDECL(int) PGMHandlerPhysicalJoin(PVM pVM, RTGCPHYS GCPhys1, RTGCPHYS GCPhys2)
    710710{
    711711    /*
    … …  
    784784 * @param   GCPhys      Start physical address earlier passed to PGMR3HandlerPhysicalRegister().
    785785 */
    786 PGMDECL(int)  PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys)
     786VMMDECL(int)  PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys)
    787787{
    788788    pgmLock(pVM);
    … …  
    864864 * @param   GCPhysPage  Physical address of the page to turn off access monitoring for.
    865865 */
    866 PGMDECL(int)  PGMHandlerPhysicalPageTempOff(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage)
     866VMMDECL(int)  PGMHandlerPhysicalPageTempOff(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage)
    867867{
    868868    /*
    … …  
    918918 * @param   GCPhysPage  Physical address of the page to turn on access monitoring for.
    919919 */
    920 PGMDECL(int)  PGMHandlerPhysicalPageReset(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage)
     920VMMDECL(int)  PGMHandlerPhysicalPageReset(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage)
    921921{
    922922    /*
    … …  
    963963 * @param   GCPhys      Start physical address earlier passed to PGMR3HandlerPhysicalRegister().
    964964 */
    965 PGMDECL(bool) PGMHandlerPhysicalIsRegistered(PVM pVM, RTGCPHYS GCPhys)
     965VMMDECL(bool) PGMHandlerPhysicalIsRegistered(PVM pVM, RTGCPHYS GCPhys)
    966966{
    967967    /*
    … …  
    13351335 * @param   pVM     The VM handle.
    13361336 */
    1337 PGMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
     1337VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
    13381338{
    13391339    PPGM        pPGM = &pVM->pgm.s;

  • trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

    r11311 r12989  
    4545 * @param   fFlags      Page flags (X86_PTE_*).
    4646 */
    47 PGMDECL(int) PGMMap(PVM pVM, RTGCUINTPTR GCPtr, RTHCPHYS HCPhys, uint32_t cbPages, unsigned fFlags)
     47VMMDECL(int) PGMMap(PVM pVM, RTGCUINTPTR GCPtr, RTHCPHYS HCPhys, uint32_t cbPages, unsigned fFlags)
    4848{
    4949    AssertMsg(pVM->pgm.s.offVM, ("Bad init order\n"));
    … …  
    125125 * @param   fFlags      Page flags X86_PTE_*, excluding the page mask of course.
    126126 */
    127 PGMDECL(int) PGMMapSetPage(PVM pVM, RTGCPTR GCPtr, uint64_t cb, uint64_t fFlags)
     127VMMDECL(int) PGMMapSetPage(PVM pVM, RTGCPTR GCPtr, uint64_t cb, uint64_t fFlags)
    128128{
    129129    return PGMMapModifyPage(pVM, GCPtr, cb, fFlags, 0);
    … …  
    143143 * @param   fMask       The AND mask - page flags X86_PTE_*, excluding the page mask of course.
    144144 */
    145 PGMDECL(int)  PGMMapModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
     145VMMDECL(int)  PGMMapModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
    146146{
    147147    /*

  • trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

    r12964 r12989  
    6969 * @param   pvUser      User argument. Pointer to the ROM range structure.
    7070 */
    71 PGMDECL(int) pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser)
     71VMMDECL(int) pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser)
    7272{
    7373    int rc;
    … …  
    136136 * @param   pVM     VM handle.
    137137 */
    138 PGMDECL(bool) PGMPhysIsA20Enabled(PVM pVM)
     138VMMDECL(bool) PGMPhysIsA20Enabled(PVM pVM)
    139139{
    140140    LogFlow(("PGMPhysIsA20Enabled %d\n", pVM->pgm.s.fA20Enabled));
    … …  
    151151 * @param   GCPhys  The physical address to validate.
    152152 */
    153 PGMDECL(bool) PGMPhysIsGCPhysValid(PVM pVM, RTGCPHYS GCPhys)
     153VMMDECL(bool) PGMPhysIsGCPhysValid(PVM pVM, RTGCPHYS GCPhys)
    154154{
    155155    PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
    … …  
    167167 * @param   GCPhys  The physical address to check.
    168168 */
    169 PGMDECL(bool) PGMPhysIsGCPhysNormal(PVM pVM, RTGCPHYS GCPhys)
     169VMMDECL(bool) PGMPhysIsGCPhysNormal(PVM pVM, RTGCPHYS GCPhys)
    170170{
    171171    PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
    … …  
    188188 * @param   pHCPhys Where to store the HC physical address on success.
    189189 */
    190 PGMDECL(int) PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys)
     190VMMDECL(int) PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys)
    191191{
    192192    PPGMPAGE pPage;
    … …  
    210210 * @param   pVM     The VM handle.
    211211 */
    212 PDMDECL(void) PGMPhysInvalidatePageGCMapTLB(PVM pVM)
     212VMMDECL(void) PGMPhysInvalidatePageGCMapTLB(PVM pVM)
    213213{
    214214    /* later */
    … …  
    222222 * @param   pVM     The VM handle.
    223223 */
    224 PDMDECL(void) PGMPhysInvalidatePageR0MapTLB(PVM pVM)
     224VMMDECL(void) PGMPhysInvalidatePageR0MapTLB(PVM pVM)
    225225{
    226226    PGMPhysInvalidatePageR3MapTLB(pVM);
    … …  
    233233 * @param   pVM     The VM handle.
    234234 */
    235 PDMDECL(void) PGMPhysInvalidatePageR3MapTLB(PVM pVM)
     235VMMDECL(void) PGMPhysInvalidatePageR3MapTLB(PVM pVM)
    236236{
    237237    pgmLock(pVM);
    … …  
    641641 * @thread  Any thread.
    642642 */
    643 PGMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
     643VMMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
    644644{
    645645#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    727727 * @thread  Any thread.
    728728 */
    729 PGMDECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
     729VMMDECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
    730730{
    731731    /** @todo implement this */
    … …  
    761761 * @thread  EMT
    762762 */
    763 PGMDECL(int) PGMPhysGCPtr2CCPtr(PVM pVM, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock)
     763VMMDECL(int) PGMPhysGCPtr2CCPtr(PVM pVM, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock)
    764764{
    765765    RTGCPHYS GCPhys;
    … …  
    794794 * @thread  EMT
    795795 */
    796 PGMDECL(int) PGMPhysGCPtr2CCPtrReadOnly(PVM pVM, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock)
     796VMMDECL(int) PGMPhysGCPtr2CCPtrReadOnly(PVM pVM, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock)
    797797{
    798798    RTGCPHYS GCPhys;
    … …  
    813813 * @param   pLock       The lock structure initialized by the mapping function.
    814814 */
    815 PGMDECL(void) PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock)
     815VMMDECL(void) PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock)
    816816{
    817817#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    859859 * @param   pHCPtr  Where to store the HC pointer on success.
    860860 */
    861 PGMDECL(int) PGMPhysGCPhys2HCPtr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR pHCPtr)
     861VMMDECL(int) PGMPhysGCPhys2HCPtr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR pHCPtr)
    862862{
    863863#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    911911 * @param   cbRange     Physical range.
    912912 */
    913 PGMDECL(RTHCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
     913VMMDECL(RTHCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
    914914{
    915915    RTHCPTR HCPtr;
    … …  
    931931 * @param   pGCPhys     Where to store the GC physical address.
    932932 */
    933 PGMDECL(int) PGMPhysGCPtr2GCPhys(PVM pVM, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
     933VMMDECL(int) PGMPhysGCPtr2GCPhys(PVM pVM, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
    934934{
    935935    int rc = PGM_GST_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, NULL, pGCPhys);
    … …  
    950950 * @param   pHCPhys     Where to store the HC physical address.
    951951 */
    952 PGMDECL(int) PGMPhysGCPtr2HCPhys(PVM pVM, RTGCPTR GCPtr, PRTHCPHYS pHCPhys)
     952VMMDECL(int) PGMPhysGCPtr2HCPhys(PVM pVM, RTGCPTR GCPtr, PRTHCPHYS pHCPhys)
    953953{
    954954    RTGCPHYS GCPhys;
    … …  
    970970 * @param   pHCPtr      Where to store the HC virtual address.
    971971 */
    972 PGMDECL(int) PGMPhysGCPtr2HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHCPtr)
     972VMMDECL(int) PGMPhysGCPtr2HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHCPtr)
    973973{
    974974#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    998998 *          future DBGF API to cpu state independent conversions.
    999999 */
    1000 PGMDECL(int) PGMPhysGCPtr2HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHCPtr)
     1000VMMDECL(int) PGMPhysGCPtr2HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHCPtr)
    10011001{
    10021002#ifdef VBOX_WITH_NEW_PHYS_CODE
    … …  
    11311131 * @param   cbRead          How many bytes to read.
    11321132 */
    1133 PGMDECL(void) PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead)
     1133VMMDECL(void) PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead)
    11341134{
    11351135#ifdef IN_RING3
    … …  
    13921392 * @param   cbWrite         How many bytes to write.
    13931393 */
    1394 PGMDECL(void) PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite)
     1394VMMDECL(void) PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite)
    13951395{
    13961396#ifdef IN_RING3
    … …  
    17301730 * @param   cb          The number of bytes to read.
    17311731 */
    1732 PGMDECL(int) PGMPhysReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb)
     1732VMMDECL(int) PGMPhysReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb)
    17331733{
    17341734    /*
    … …  
    18121812 * @param   cb          The number of bytes to write.
    18131813 */
    1814 PGMDECL(int) PGMPhysWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb)
     1814VMMDECL(int) PGMPhysWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb)
    18151815{
    18161816    /*
    … …  
    18991899 * @param   cb          The number of bytes to read.
    19001900 */
    1901 PGMDECL(int) PGMPhysReadGCPtr(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
     1901VMMDECL(int) PGMPhysReadGCPtr(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
    19021902{
    19031903    /*
    … …  
    19601960 * @param   cb          The number of bytes to write.
    19611961 */
    1962 PGMDECL(int) PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
     1962VMMDECL(int) PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
    19631963{
    19641964    /*
    … …  
    20232023 */
    20242024/** @todo use the PGMPhysReadGCPtr name and rename the unsafe one to something appropriate */
    2025 PGMDECL(int) PGMPhysReadGCPtrSafe(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
     2025VMMDECL(int) PGMPhysReadGCPtrSafe(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
    20262026{
    20272027    RTGCPHYS    GCPhys;
    … …  
    20962096 */
    20972097/** @todo use the PGMPhysWriteGCPtr name and rename the unsafe one to something appropriate */
    2098 PGMDECL(int) PGMPhysWriteGCPtrSafe(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
     2098VMMDECL(int) PGMPhysWriteGCPtrSafe(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
    20992099{
    21002100    RTGCPHYS    GCPhys;
    … …  
    21692169 * @param   cb          The number of bytes to write.
    21702170 */
    2171 PGMDECL(int) PGMPhysWriteGCPtrDirty(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
     2171VMMDECL(int) PGMPhysWriteGCPtrDirty(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
    21722172{
    21732173    /*
    … …  
    22502250 *          mappings done by the caller. Be careful!
    22512251 */
    2252 PGMDECL(int) PGMPhysInterpretedRead(PVM pVM, PCPUMCTXCORE pCtxCore, void *pvDst, RTGCUINTPTR GCPtrSrc, size_t cb)
     2252VMMDECL(int) PGMPhysInterpretedRead(PVM pVM, PCPUMCTXCORE pCtxCore, void *pvDst, RTGCUINTPTR GCPtrSrc, size_t cb)
    22532253{
    22542254    Assert(cb <= PAGE_SIZE);
    … …  
    23882388}
    23892389
    2390 /// @todo PGMDECL(int) PGMPhysInterpretedWrite(PVM pVM, PCPUMCTXCORE pCtxCore, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
    2391 
    2392 
     2390/// @todo VMMDECL(int) PGMPhysInterpretedWrite(PVM pVM, PCPUMCTXCORE pCtxCore, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
     2391
     2392

  • trunk/src/VBox/VMM/VMMAll/REMAll.cpp

    r11311 r12989  
    4444 * @param   GCPtrPage   The
    4545 */
    46 REMDECL(int) REMNotifyInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
     46VMMDECL(int) REMNotifyInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
    4747{
    4848    if (pVM->rem.s.cInvalidatedPages < RT_ELEMENTS(pVM->rem.s.aGCPtrInvalidatedPages))
    … …  
    9292 * @param   fHasHCHandler   Set if the handler have a HC callback function.
    9393 */
    94 REMDECL(void) REMNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler)
     94VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler)
    9595{
    9696    if (pVM->rem.s.cHandlerNotifications >= RT_ELEMENTS(pVM->rem.s.aHandlerNotifications))
    … …  
    116116 * @param   fRestoreAsRAM   Whether the to restore it as normal RAM or as unassigned memory.
    117117 */
    118 REMDECL(void) REMNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
     118VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
    119119{
    120120    if (pVM->rem.s.cHandlerNotifications >= RT_ELEMENTS(pVM->rem.s.aHandlerNotifications))
    … …  
    142142 * @param   fRestoreAsRAM   Whether the to restore it as normal RAM or as unassigned memory.
    143143 */
    144 REMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
     144VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
    145145{
    146146    if (pVM->rem.s.cHandlerNotifications >= RT_ELEMENTS(pVM->rem.s.aHandlerNotifications))

  • trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

    r12404 r12989  
    5151 * @remarks Don't use when in long mode.
    5252 */
    53 SELMDECL(RTGCPTR) SELMToFlatBySel(PVM pVM, RTSEL Sel, RTGCPTR Addr)
     53VMMDECL(RTGCPTR) SELMToFlatBySel(PVM pVM, RTSEL Sel, RTGCPTR Addr)
    5454{
    5555    Assert(!CPUMIsGuestInLongMode(pVM));    /* DON'T USE! */
    … …  
    8686 * @param   Addr        Address part.
    8787 */
    88 SELMDECL(RTGCPTR) SELMToFlat(PVM pVM, DIS_SELREG SelReg, PCPUMCTXCORE pCtxCore, RTGCPTR Addr)
     88VMMDECL(RTGCPTR) SELMToFlat(PVM pVM, DIS_SELREG SelReg, PCPUMCTXCORE pCtxCore, RTGCPTR Addr)
    8989{
    9090    PCPUMSELREGHID pHiddenSel;
    … …  
    147147 * @param   ppvGC       Where to store the GC flat address.
    148148 */
    149 SELMDECL(int) SELMToFlatEx(PVM pVM, DIS_SELREG SelReg, PCCPUMCTXCORE pCtxCore, RTGCPTR Addr, unsigned fFlags, PRTGCPTR ppvGC)
     149VMMDECL(int) SELMToFlatEx(PVM pVM, DIS_SELREG SelReg, PCCPUMCTXCORE pCtxCore, RTGCPTR Addr, unsigned fFlags, PRTGCPTR ppvGC)
    150150{
    151151    PCPUMSELREGHID pHiddenSel;
    … …  
    455455 * @remarks Don't use when in long mode.
    456456 */
    457 SELMDECL(int) SELMToFlatBySelEx(PVM pVM, X86EFLAGS eflags, RTSEL Sel, RTGCPTR Addr, CPUMSELREGHID *pHiddenSel, unsigned fFlags, PRTGCPTR ppvGC, uint32_t *pcb)
     457VMMDECL(int) SELMToFlatBySelEx(PVM pVM, X86EFLAGS eflags, RTSEL Sel, RTGCPTR Addr, CPUMSELREGHID *pHiddenSel, unsigned fFlags, PRTGCPTR ppvGC, uint32_t *pcb)
    458458{
    459459    Assert(!CPUMIsGuestInLongMode(pVM));    /* DON'T USE! */
    … …  
    830830 * @param   pcBits       Where to store the 64-bit/32-bit/16-bit indicator.
    831831 */
    832 SELMDECL(int) SELMValidateAndConvertCSAddrGCTrap(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, RTGCPTR Addr, PRTGCPTR ppvFlat, uint32_t *pcBits)
     832VMMDECL(int) SELMValidateAndConvertCSAddrGCTrap(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, RTGCPTR Addr, PRTGCPTR ppvFlat, uint32_t *pcBits)
    833833{
    834834    if (    CPUMIsGuestInRealMode(pVM)
    … …  
    855855 * @param   ppvFlat      Where to store the flat address.
    856856 */
    857 SELMDECL(int) SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, CPUMSELREGHID *pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat)
     857VMMDECL(int) SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, CPUMSELREGHID *pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat)
    858858{
    859859    if (    CPUMIsGuestInRealMode(pVM)
    … …  
    902902 * @param   pHiddenSel The hidden selector register.
    903903 */
    904 SELMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
     904VMMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
    905905{
    906906    if (!CPUMAreHiddenSelRegsValid(pVM))
    … …  
    930930 * @param   pVM     VM Handle.
    931931 */
    932 SELMDECL(RTSEL) SELMGetTrap8Selector(PVM pVM)
     932VMMDECL(RTSEL) SELMGetTrap8Selector(PVM pVM)
    933933{
    934934    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08];
    … …  
    942942 * @param   u32EIP  EIP of Trap 08 handler.
    943943 */
    944 SELMDECL(void) SELMSetTrap8EIP(PVM pVM, uint32_t u32EIP)
     944VMMDECL(void) SELMSetTrap8EIP(PVM pVM, uint32_t u32EIP)
    945945{
    946946    pVM->selm.s.TssTrap08.eip = u32EIP;
    … …  
    955955 * @param   esp     Ring1 ESP register value.
    956956 */
    957 SELMDECL(void) SELMSetRing1Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp)
     957VMMDECL(void) SELMSetRing1Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp)
    958958{
    959959    pVM->selm.s.Tss.ss1  = ss;
    … …  
    970970 * @param   pEsp    Ring1 ESP register value.
    971971 */
    972 SELMDECL(int) SELMGetRing1Stack(PVM pVM, uint32_t *pSS, PRTGCPTR32 pEsp)
     972VMMDECL(int) SELMGetRing1Stack(PVM pVM, uint32_t *pSS, PRTGCPTR32 pEsp)
    973973{
    974974    if (pVM->selm.s.fSyncTSSRing0Stack)
    … …  
    10431043 * @param   pVM     VM Handle.
    10441044 */
    1045 SELMDECL(RTGCPTR) SELMGetGuestTSS(PVM pVM)
     1045VMMDECL(RTGCPTR) SELMGetGuestTSS(PVM pVM)
    10461046{
    10471047    return (RTGCPTR)pVM->selm.s.GCPtrGuestTss;
    … …  
    10561056 * @param   SelCPL      The selector defining the CPL (SS).
    10571057 */
    1058 SELMDECL(int) SELMSelInfoValidateCS(PCSELMSELINFO pSelInfo, RTSEL SelCPL)
     1058VMMDECL(int) SELMSelInfoValidateCS(PCSELMSELINFO pSelInfo, RTSEL SelCPL)
    10591059{
    10601060    /*
    … …  
    10911091 * @param   pVM     The VM handle.
    10921092 */
    1093 SELMDECL(RTSEL) SELMGetHyperCS(PVM pVM)
     1093VMMDECL(RTSEL) SELMGetHyperCS(PVM pVM)
    10941094{
    10951095    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS];
    … …  
    11021102 * @param   pVM     The VM handle.
    11031103 */
    1104 SELMDECL(RTSEL) SELMGetHyperCS64(PVM pVM)
     1104VMMDECL(RTSEL) SELMGetHyperCS64(PVM pVM)
    11051105{
    11061106    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64];
    … …  
    11131113 * @param   pVM     The VM handle.
    11141114 */
    1115 SELMDECL(RTSEL) SELMGetHyperDS(PVM pVM)
     1115VMMDECL(RTSEL) SELMGetHyperDS(PVM pVM)
    11161116{
    11171117    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS];
    … …  
    11241124 * @param   pVM     The VM handle.
    11251125 */
    1126 SELMDECL(RTSEL) SELMGetHyperTSS(PVM pVM)
     1126VMMDECL(RTSEL) SELMGetHyperTSS(PVM pVM)
    11271127{
    11281128    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS];
    … …  
    11351135 * @param   pVM     The VM handle.
    11361136 */
    1137 SELMDECL(RTSEL) SELMGetHyperTSSTrap08(PVM pVM)
     1137VMMDECL(RTSEL) SELMGetHyperTSSTrap08(PVM pVM)
    11381138{
    11391139    return pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08];
    … …  
    11481148 *          switchers. Don't exploit this API!
    11491149 */
    1150 SELMDECL(RTGCPTR) SELMGetHyperGDT(PVM pVM)
     1150VMMDECL(RTGCPTR) SELMGetHyperGDT(PVM pVM)
    11511151{
    11521152    /*
    … …  
    11711171 * @param   pfCanHaveIOBitmap   Where to store the can-have-I/O-bitmap indicator. (optional)
    11721172 */
    1173 SELMDECL(int) SELMGetTSSInfo(PVM pVM, PRTGCUINTPTR pGCPtrTss, PRTGCUINTPTR pcbTss, bool *pfCanHaveIOBitmap)
     1173VMMDECL(int) SELMGetTSSInfo(PVM pVM, PRTGCUINTPTR pGCPtrTss, PRTGCUINTPTR pcbTss, bool *pfCanHaveIOBitmap)
    11741174{
    11751175    if (!CPUMAreHiddenSelRegsValid(pVM))

  • trunk/src/VBox/VMM/VMMAll/TMAll.cpp

    r12549 r12989  
    5555 * @param   pVM         Pointer to the shared VM structure.
    5656 */
    57 TMDECL(void) TMNotifyStartOfExecution(PVM pVM)
     57VMMDECL(void) TMNotifyStartOfExecution(PVM pVM)
    5858{
    5959    if (pVM->tm.s.fTSCTiedToExecution)
    … …  
    7272 * @param   pVM         Pointer to the shared VM structure.
    7373 */
    74 TMDECL(void) TMNotifyEndOfExecution(PVM pVM)
     74VMMDECL(void) TMNotifyEndOfExecution(PVM pVM)
    7575{
    7676    if (pVM->tm.s.fTSCTiedToExecution)
    … …  
    8989 * @param   pVM         Pointer to the shared VM structure.
    9090 */
    91 TMDECL(void) TMNotifyStartOfHalt(PVM pVM)
     91VMMDECL(void) TMNotifyStartOfHalt(PVM pVM)
    9292{
    9393    if (    pVM->tm.s.fTSCTiedToExecution
    … …  
    107107 * @param   pVM         Pointer to the shared VM structure.
    108108 */
    109 TMDECL(void) TMNotifyEndOfHalt(PVM pVM)
     109VMMDECL(void) TMNotifyEndOfHalt(PVM pVM)
    110110{
    111111    if (    pVM->tm.s.fTSCTiedToExecution
    … …  
    216216 * @thread  The emulation thread.
    217217 */
    218 TMDECL(uint64_t) TMTimerPoll(PVM pVM)
     218VMMDECL(uint64_t) TMTimerPoll(PVM pVM)
    219219{
    220220    /*
    … …  
    310310 * @thread  The emulation thread.
    311311 */
    312 TMDECL(uint64_t) TMTimerPollGIP(PVM pVM, uint64_t *pu64Delta)
     312VMMDECL(uint64_t) TMTimerPollGIP(PVM pVM, uint64_t *pu64Delta)
    313313{
    314314    /*
    … …  
    413413 * @param   pTimer      Timer handle as returned by one of the create functions.
    414414 */
    415 TMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer)
     415VMMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer)
    416416{
    417417    return (PTMTIMERR3)MMHyperCCToR3(pTimer->CTXALLSUFF(pVM), pTimer);
    … …  
    425425 * @param   pTimer      Timer handle as returned by one of the create functions.
    426426 */
    427 TMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer)
     427VMMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer)
    428428{
    429429    return (PTMTIMERR0)MMHyperCCToR0(pTimer->CTXALLSUFF(pVM), pTimer);
    … …  
    437437 * @param   pTimer      Timer handle as returned by one of the create functions.
    438438 */
    439 TMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer)
     439VMMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer)
    440440{
    441441    return (PTMTIMERRC)MMHyperCCToRC(pTimer->CTXALLSUFF(pVM), pTimer);
    … …  
    449449 * @param   pTimer          Timer handle as returned by one of the create functions.
    450450 */
    451 TMDECL(int) TMTimerDestroy(PTMTIMER pTimer)
     451VMMDECL(int) TMTimerDestroy(PTMTIMER pTimer)
    452452{
    453453    int cRetries = 1000;
    … …  
    547547 * @param   u64Expire       New expire time.
    548548 */
    549 TMDECL(int) TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire)
     549VMMDECL(int) TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire)
    550550{
    551551    STAM_PROFILE_START(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerSet), a);
    … …  
    657657 * @param   cMilliesToNext  Number of millieseconds to the next tick.
    658658 */
    659 TMDECL(int) TMTimerSetMillies(PTMTIMER pTimer, uint32_t cMilliesToNext)
     659VMMDECL(int) TMTimerSetMillies(PTMTIMER pTimer, uint32_t cMilliesToNext)
    660660{
    661661    PVM pVM = pTimer->CTXALLSUFF(pVM);
    … …  
    686686 * @param   cMicrosToNext   Number of microseconds to the next tick.
    687687 */
    688 TMDECL(int) TMTimerSetMicro(PTMTIMER pTimer, uint64_t cMicrosToNext)
     688VMMDECL(int) TMTimerSetMicro(PTMTIMER pTimer, uint64_t cMicrosToNext)
    689689{
    690690    PVM pVM = pTimer->CTXALLSUFF(pVM);
    … …  
    720720 * @param   cNanosToNext    Number of nanoseconds to the next tick.
    721721 */
    722 TMDECL(int) TMTimerSetNano(PTMTIMER pTimer, uint64_t cNanosToNext)
     722VMMDECL(int) TMTimerSetNano(PTMTIMER pTimer, uint64_t cNanosToNext)
    723723{
    724724    PVM pVM = pTimer->CTXALLSUFF(pVM);
    … …  
    754754 * @param   pTimer          Timer handle as returned by one of the create functions.
    755755 */
    756 TMDECL(int) TMTimerStop(PTMTIMER pTimer)
     756VMMDECL(int) TMTimerStop(PTMTIMER pTimer)
    757757{
    758758    STAM_PROFILE_START(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerStop), a);
    … …  
    844844 * @param   pTimer          Timer handle as returned by one of the create functions.
    845845 */
    846 TMDECL(uint64_t) TMTimerGet(PTMTIMER pTimer)
     846VMMDECL(uint64_t) TMTimerGet(PTMTIMER pTimer)
    847847{
    848848    uint64_t u64;
    … …  
    879879 * @param   pTimer          Timer handle as returned by one of the create functions.
    880880 */
    881 TMDECL(uint64_t) TMTimerGetFreq(PTMTIMER pTimer)
     881VMMDECL(uint64_t) TMTimerGetFreq(PTMTIMER pTimer)
    882882{
    883883    switch (pTimer->enmClock)
    … …  
    906906 * @param   pTimer          Timer handle as returned by one of the create functions.
    907907 */
    908 TMDECL(uint64_t) TMTimerGetNano(PTMTIMER pTimer)
     908VMMDECL(uint64_t) TMTimerGetNano(PTMTIMER pTimer)
    909909{
    910910    return TMTimerToNano(pTimer, TMTimerGet(pTimer));
    … …  
    918918 * @param   pTimer          Timer handle as returned by one of the create functions.
    919919 */
    920 TMDECL(uint64_t) TMTimerGetMicro(PTMTIMER pTimer)
     920VMMDECL(uint64_t) TMTimerGetMicro(PTMTIMER pTimer)
    921921{
    922922    return TMTimerToMicro(pTimer, TMTimerGet(pTimer));
    … …  
    930930 * @param   pTimer          Timer handle as returned by one of the create functions.
    931931 */
    932 TMDECL(uint64_t) TMTimerGetMilli(PTMTIMER pTimer)
     932VMMDECL(uint64_t) TMTimerGetMilli(PTMTIMER pTimer)
    933933{
    934934    return TMTimerToMilli(pTimer, TMTimerGet(pTimer));
    … …  
    945945 *          without any adjustments.
    946946 */
    947 TMDECL(uint64_t) TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks)
     947VMMDECL(uint64_t) TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks)
    948948{
    949949    switch (pTimer->enmClock)
    … …  
    978978 *          without any adjustments.
    979979 */
    980 TMDECL(uint64_t) TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks)
     980VMMDECL(uint64_t) TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks)
    981981{
    982982    switch (pTimer->enmClock)
    … …  
    10111011 *          without any adjustments.
    10121012 */
    1013 TMDECL(uint64_t) TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks)
     1013VMMDECL(uint64_t) TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks)
    10141014{
    10151015    switch (pTimer->enmClock)
    … …  
    10431043 * @remark  There could be rounding and overflow errors here.
    10441044 */
    1045 TMDECL(uint64_t) TMTimerFromNano(PTMTIMER pTimer, uint64_t u64NanoTS)
     1045VMMDECL(uint64_t) TMTimerFromNano(PTMTIMER pTimer, uint64_t u64NanoTS)
    10461046{
    10471047    switch (pTimer->enmClock)
    … …  
    10751075 * @remark  There could be rounding and overflow errors here.
    10761076 */
    1077 TMDECL(uint64_t) TMTimerFromMicro(PTMTIMER pTimer, uint64_t u64MicroTS)
     1077VMMDECL(uint64_t) TMTimerFromMicro(PTMTIMER pTimer, uint64_t u64MicroTS)
    10781078{
    10791079    switch (pTimer->enmClock)
    … …  
    11071107 * @remark  There could be rounding and overflow errors here.
    11081108 */
    1109 TMDECL(uint64_t) TMTimerFromMilli(PTMTIMER pTimer, uint64_t u64MilliTS)
     1109VMMDECL(uint64_t) TMTimerFromMilli(PTMTIMER pTimer, uint64_t u64MilliTS)
    11101110{
    11111111    switch (pTimer->enmClock)
    … …  
    11381138 * @param   pTimer          Timer handle as returned by one of the create functions.
    11391139 */
    1140 TMDECL(uint64_t) TMTimerGetExpire(PTMTIMER pTimer)
     1140VMMDECL(uint64_t) TMTimerGetExpire(PTMTIMER pTimer)
    11411141{
    11421142    int cRetries = 1000;
    … …  
    11991199 * @param   pTimer          Timer handle as returned by one of the create functions.
    12001200 */
    1201 TMDECL(bool) TMTimerIsActive(PTMTIMER pTimer)
     1201VMMDECL(bool) TMTimerIsActive(PTMTIMER pTimer)
    12021202{
    12031203    TMTIMERSTATE    enmState = pTimer->enmState;

  • trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp

    r12549 r12989  
    8383 * @todo replace this with TMNotifyResume
    8484 */
    85 TMDECL(int) TMCpuTickResume(PVM pVM)
     85VMMDECL(int) TMCpuTickResume(PVM pVM)
    8686{
    8787    if (!pVM->tm.s.fTSCTiedToExecution)
    … …  
    119119 * @todo replace this with TMNotifySuspend
    120120 */
    121 TMDECL(int) TMCpuTickPause(PVM pVM)
     121VMMDECL(int) TMCpuTickPause(PVM pVM)
    122122{
    123123    if (!pVM->tm.s.fTSCTiedToExecution)
    … …  
    137137 * @thread EMT.
    138138 */
    139 TMDECL(bool) TMCpuTickCanUseRealTSC(PVM pVM, uint64_t *poffRealTSC)
     139VMMDECL(bool) TMCpuTickCanUseRealTSC(PVM pVM, uint64_t *poffRealTSC)
    140140{
    141141    /*
    … …  
    193193 * @param   pVM         The VM to operate on.
    194194 */
    195 TMDECL(uint64_t) TMCpuTickGet(PVM pVM)
     195VMMDECL(uint64_t) TMCpuTickGet(PVM pVM)
    196196{
    197197    uint64_t u64;
    … …  
    222222 * @param   u64Tick     The new timestamp value.
    223223 */
    224 TMDECL(int) TMCpuTickSet(PVM pVM, uint64_t u64Tick)
     224VMMDECL(int) TMCpuTickSet(PVM pVM, uint64_t u64Tick)
    225225{
    226226    Assert(!pVM->tm.s.fTSCTicking);
    … …  
    236236 * @param   pVM     The VM.
    237237 */
    238 TMDECL(uint64_t) TMCpuTicksPerSecond(PVM pVM)
     238VMMDECL(uint64_t) TMCpuTicksPerSecond(PVM pVM)
    239239{
    240240    if (pVM->tm.s.fTSCUseRealTSC)

  • trunk/src/VBox/VMM/VMMAll/TMAllReal.cpp

    r8155 r12989  
    3737 * @param   pVM             The VM handle.
    3838 */
    39 TMDECL(uint64_t) TMRealGet(PVM pVM)
     39VMMDECL(uint64_t) TMRealGet(PVM pVM)
    4040{
    4141    return RTTimeMilliTS();
    … …  
    4949 * @param   pVM             The VM handle.
    5050 */
    51 TMDECL(uint64_t) TMRealGetFreq(PVM pVM)
     51VMMDECL(uint64_t) TMRealGetFreq(PVM pVM)
    5252{
    5353    return TMCLOCK_FREQ_REAL;

  • trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

    r8579 r12989  
    357357 *          makes use of TSC and kernel timers.
    358358 */
    359 TMDECL(uint64_t) TMVirtualGet(PVM pVM)
     359VMMDECL(uint64_t) TMVirtualGet(PVM pVM)
    360360{
    361361    return TMVirtualGetEx(pVM, true /* check timers */);
    … …  
    375375 *          makes use of TSC and kernel timers.
    376376 */
    377 TMDECL(uint64_t) TMVirtualGetEx(PVM pVM, bool fCheckTimers)
     377VMMDECL(uint64_t) TMVirtualGetEx(PVM pVM, bool fCheckTimers)
    378378{
    379379    return tmVirtualGet(pVM, fCheckTimers);
    … …  
    389389 * @thread  EMT.
    390390 */
    391 TMDECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers)
     391VMMDECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers)
    392392{
    393393    VM_ASSERT_EMT(pVM);
    … …  
    509509 * @thread  EMT.
    510510 */
    511 TMDECL(uint64_t) TMVirtualSyncGet(PVM pVM)
     511VMMDECL(uint64_t) TMVirtualSyncGet(PVM pVM)
    512512{
    513513    return TMVirtualSyncGetEx(pVM, true /* check timers */);
    … …  
    521521 * @param   pVM     VM handle.
    522522 */
    523 TMDECL(uint64_t) TMVirtualSyncGetLag(PVM pVM)
     523VMMDECL(uint64_t) TMVirtualSyncGetLag(PVM pVM)
    524524{
    525525    return pVM->tm.s.offVirtualSync - pVM->tm.s.offVirtualSyncGivenUp;
    … …  
    533533 * @param   pVM     VM handle.
    534534 */
    535 TMDECL(uint32_t) TMVirtualSyncGetCatchUpPct(PVM pVM)
     535VMMDECL(uint32_t) TMVirtualSyncGetCatchUpPct(PVM pVM)
    536536{
    537537    if (pVM->tm.s.fVirtualSyncCatchUp)
    … …  
    547547 * @param   pVM     VM handle.
    548548 */
    549 TMDECL(uint64_t) TMVirtualGetFreq(PVM pVM)
     549VMMDECL(uint64_t) TMVirtualGetFreq(PVM pVM)
    550550{
    551551    return TMCLOCK_FREQ_VIRTUAL;
    … …  
    560560 * @param   pVM     VM handle.
    561561 */
    562 TMDECL(int) TMVirtualResume(PVM pVM)
     562VMMDECL(int) TMVirtualResume(PVM pVM)
    563563{
    564564    if (!pVM->tm.s.fVirtualTicking)
    … …  
    585585 * @param   pVM     VM handle.
    586586 */
    587 TMDECL(int) TMVirtualPause(PVM pVM)
     587VMMDECL(int) TMVirtualPause(PVM pVM)
    588588{
    589589    if (pVM->tm.s.fVirtualTicking)
    … …  
    607607 * @param   pVM         The VM handle.
    608608 */
    609 TMDECL(uint32_t) TMVirtualGetWarpDrive(PVM pVM)
     609VMMDECL(uint32_t) TMVirtualGetWarpDrive(PVM pVM)
    610610{
    611611    return pVM->tm.s.u32VirtualWarpDrivePercentage;
    … …  
    620620 * @param   u32Percent  The new percentage. 100 means normal operation.
    621621 */
    622 TMDECL(int) TMVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent)
     622VMMDECL(int) TMVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent)
    623623{
    624624/** @todo This isn't a feature specific to virtual time, move to TM level. (It
    … …  
    694694 *          without any adjustments.
    695695 */
    696 TMDECL(uint64_t) TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks)
     696VMMDECL(uint64_t) TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks)
    697697{
    698698    AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
    … …  
    710710 *          without any adjustments.
    711711 */
    712 TMDECL(uint64_t) TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks)
     712VMMDECL(uint64_t) TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks)
    713713{
    714714    AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
    … …  
    726726 *          without any adjustments.
    727727 */
    728 TMDECL(uint64_t) TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks)
     728VMMDECL(uint64_t) TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks)
    729729{
    730730        AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
    … …  
    741741 * @remark  There could be rounding and overflow errors here.
    742742 */
    743 TMDECL(uint64_t) TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS)
     743VMMDECL(uint64_t) TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS)
    744744{
    745745    AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
    … …  
    756756 * @remark  There could be rounding and overflow errors here.
    757757 */
    758 TMDECL(uint64_t) TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS)
     758VMMDECL(uint64_t) TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS)
    759759{
    760760    AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
    … …  
    771771 * @remark  There could be rounding and overflow errors here.
    772772 */
    773 TMDECL(uint64_t) TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS)
     773VMMDECL(uint64_t) TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS)
    774774{
    775775    AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);

  • trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

    r11933 r12989  
    5353 * @param   pEnmType                Where to store the trap type
    5454 */
    55 TRPMDECL(int)  TRPMQueryTrap(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType)
     55VMMDECL(int)  TRPMQueryTrap(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType)
    5656{
    5757    /*
    … …  
    8080 * @param   pVM         VM handle.
    8181 */
    82 TRPMDECL(uint8_t)  TRPMGetTrapNo(PVM pVM)
     82VMMDECL(uint8_t)  TRPMGetTrapNo(PVM pVM)
    8383{
    8484    AssertMsg(pVM->trpm.s.uActiveVector != ~0U, ("No active trap!\n"));
    … …  
    9696 * @param   pVM         VM handle.
    9797 */
    98 TRPMDECL(RTGCUINT)  TRPMGetErrorCode(PVM pVM)
     98VMMDECL(RTGCUINT)  TRPMGetErrorCode(PVM pVM)
    9999{
    100100    AssertMsg(pVM->trpm.s.uActiveVector != ~0U, ("No active trap!\n"));
    … …  
    128128 * @param   pVM         VM handle.
    129129 */
    130 TRPMDECL(RTGCUINTPTR) TRPMGetFaultAddress(PVM pVM)
     130VMMDECL(RTGCUINTPTR) TRPMGetFaultAddress(PVM pVM)
    131131{
    132132    AssertMsg(pVM->trpm.s.uActiveVector != ~0U, ("No active trap!\n"));
    … …  
    145145 * @param   pVM         The virtual machine handle.
    146146 */
    147 TRPMDECL(int) TRPMResetTrap(PVM pVM)
     147VMMDECL(int) TRPMResetTrap(PVM pVM)
    148148{
    149149    /*
    … …  
    175175 * @param   enmType             Trap type.
    176176 */
    177 TRPMDECL(int)  TRPMAssertTrap(PVM pVM, uint8_t u8TrapNo, TRPMEVENT enmType)
     177VMMDECL(int)  TRPMAssertTrap(PVM pVM, uint8_t u8TrapNo, TRPMEVENT enmType)
    178178{
    179179    Log2(("TRPMAssertTrap: u8TrapNo=%02x type=%d\n", u8TrapNo, enmType));
    … …  
    206206 * @param   uErrorCode  The new error code.
    207207 */
    208 TRPMDECL(void)  TRPMSetErrorCode(PVM pVM, RTGCUINT uErrorCode)
     208VMMDECL(void)  TRPMSetErrorCode(PVM pVM, RTGCUINT uErrorCode)
    209209{
    210210    Log2(("TRPMSetErrorCode: uErrorCode=%VGv\n", uErrorCode));
    … …  
    238238 * @param   uCR2        The new fault address (cr2 register).
    239239 */
    240 TRPMDECL(void)  TRPMSetFaultAddress(PVM pVM, RTGCUINTPTR uCR2)
     240VMMDECL(void)  TRPMSetFaultAddress(PVM pVM, RTGCUINTPTR uCR2)
    241241{
    242242    Log2(("TRPMSetFaultAddress: uCR2=%VGv\n", uCR2));
    … …  
    258258 * @param   pVM         VM handle.
    259259 */
    260 TRPMDECL(bool) TRPMIsSoftwareInterrupt(PVM pVM)
     260VMMDECL(bool) TRPMIsSoftwareInterrupt(PVM pVM)
    261261{
    262262    AssertMsg(pVM->trpm.s.uActiveVector != ~0U, ("No active trap!\n"));
    … …  
    271271 * @param   pVM         The virtual machine.
    272272 */
    273 TRPMDECL(bool)  TRPMHasTrap(PVM pVM)
     273VMMDECL(bool)  TRPMHasTrap(PVM pVM)
    274274{
    275275    return pVM->trpm.s.uActiveVector != ~0U;
    … …  
    289289 * @param   puCR2                   Where to store the CR2 associated with a trap 0E.
    290290 */
    291 TRPMDECL(int)  TRPMQueryTrapAll(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType, PRTGCUINT puErrorCode, PRTGCUINTPTR puCR2)
     291VMMDECL(int)  TRPMQueryTrapAll(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType, PRTGCUINT puErrorCode, PRTGCUINTPTR puCR2)
    292292{
    293293    /*
    … …  
    319319 * @param   pVM     VM handle.
    320320 */
    321 TRPMDECL(void) TRPMSaveTrap(PVM pVM)
     321VMMDECL(void) TRPMSaveTrap(PVM pVM)
    322322{
    323323    pVM->trpm.s.uSavedVector        = pVM->trpm.s.uActiveVector;
    … …  
    335335 * @param   pVM     VM handle.
    336336 */
    337 TRPMDECL(void) TRPMRestoreTrap(PVM pVM)
     337VMMDECL(void) TRPMRestoreTrap(PVM pVM)
    338338{
    339339    pVM->trpm.s.uActiveVector       = pVM->trpm.s.uSavedVector;
    … …  
    360360 * @internal
    361361 */
    362 TRPMDECL(int) TRPMForwardTrap(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t iGate, uint32_t opsize, TRPMERRORCODE enmError, TRPMEVENT enmType, int32_t iOrgTrap)
     362VMMDECL(int) TRPMForwardTrap(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t iGate, uint32_t opsize, TRPMERRORCODE enmError, TRPMEVENT enmType, int32_t iOrgTrap)
    363363{
    364364#ifdef TRPM_FORWARD_TRAPS_IN_GC
    … …  
    756756 * @param   enmXcpt     The exception.
    757757 */
    758 TRPMDECL(int) TRPMRaiseXcpt(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt)
     758VMMDECL(int) TRPMRaiseXcpt(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt)
    759759{
    760760    LogFlow(("TRPMRaiseXcptErr: cs:eip=%RTsel:%RX32 enmXcpt=%#x\n", pCtxCore->cs, pCtxCore->eip, enmXcpt));
    … …  
    783783 * @param   uErr        The error code.
    784784 */
    785 TRPMDECL(int) TRPMRaiseXcptErr(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt, uint32_t uErr)
     785VMMDECL(int) TRPMRaiseXcptErr(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt, uint32_t uErr)
    786786{
    787787    LogFlow(("TRPMRaiseXcptErr: cs:eip=%RTsel:%RX32 enmXcpt=%#x uErr=%RX32\n", pCtxCore->cs, pCtxCore->eip, enmXcpt, uErr));
    … …  
    811811 * @param   uCR2        The CR2 value.
    812812 */
    813 TRPMDECL(int) TRPMRaiseXcptErrCR2(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt, uint32_t uErr, RTGCUINTPTR uCR2)
     813VMMDECL(int) TRPMRaiseXcptErrCR2(PVM pVM, PCPUMCTXCORE pCtxCore, X86XCPT enmXcpt, uint32_t uErr, RTGCUINTPTR uCR2)
    814814{
    815815    LogFlow(("TRPMRaiseXcptErr: cs:eip=%RTsel:%RX32 enmXcpt=%#x uErr=%RX32 uCR2=%RGv\n", pCtxCore->cs, pCtxCore->eip, enmXcpt, uErr, uCR2));
    … …  
    830830 * @param   iTrap       Interrupt/trap number.
    831831 */
    832 TRPMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap)
     832VMMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap)
    833833{
    834834    /*

  • trunk/src/VBox/VMM/VMMAll/VMAll.cpp

    r8155 r12989  
    4949 * @thread  Any
    5050 */
    51 VMDECL(int) VMSetError(PVM pVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
     51VMMDECL(int) VMSetError(PVM pVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
    5252{
    5353    va_list args;
    … …  
    7373 * @thread  Any
    7474 */
    75 VMDECL(int) VMSetErrorV(PVM pVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list args)
     75VMMDECL(int) VMSetErrorV(PVM pVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list args)
    7676{
    7777#ifdef IN_RING3
    … …  
    225225 *                  Also, why a string ID and not an enum?
    226226 */
    227 VMDECL(int) VMSetRuntimeError(PVM pVM, bool fFatal, const char *pszErrorID,
     227VMMDECL(int) VMSetRuntimeError(PVM pVM, bool fFatal, const char *pszErrorID,
    228228                              const char *pszFormat, ...)
    229229{
    … …  
    250250 * @thread  Any
    251251 */
    252 VMDECL(int) VMSetRuntimeErrorV(PVM pVM, bool fFatal, const char *pszErrorID,
     252VMMDECL(int) VMSetRuntimeErrorV(PVM pVM, bool fFatal, const char *pszErrorID,
    253253                               const char *pszFormat, va_list args)
    254254{
    … …  
    357357 * @param   enmState    The state.
    358358 */
    359 VMDECL(const char *) VMGetStateName(VMSTATE enmState)
     359VMMDECL(const char *) VMGetStateName(VMSTATE enmState)
    360360{
    361361    switch (enmState)

  • trunk/src/VBox/VMM/VMMGC/CPUMGCA.asm

    r12657 r12989  
    143143; @remark This call never returns!
    144144;
    145 ; CPUMGCDECL(void) CPUMGCCallGuestTrapHandler(PCPUMCTXCORE pRegFrame, uint32_t selCS, RTGCPTR pHandler, uint32_t eflags, uint32_t selSS, RTGCPTR pEsp);
     145; VMMRCDECL(void) CPUMGCCallGuestTrapHandler(PCPUMCTXCORE pRegFrame, uint32_t selCS, RTGCPTR pHandler, uint32_t eflags, uint32_t selSS, RTGCPTR pEsp);
    146146align 16
    147147BEGINPROC_EXPORTED CPUMGCCallGuestTrapHandler
    … …  
    198198; This function does not return!
    199199;
    200 ;CPUMGCDECL(void) CPUMGCCallV86Code(PCPUMCTXCORE pRegFrame);
     200;VMMRCDECL(void) CPUMGCCallV86Code(PCPUMCTXCORE pRegFrame);
    201201align 16
    202202BEGINPROC CPUMGCCallV86Code

  • trunk/src/VBox/VMM/VMMGC/DBGFGC.cpp

    r12663 r12989  
    4848 * @param   uDr6        The DR6 register value.
    4949 */
    50 DBGFGCDECL(int) DBGFGCTrap01Handler(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
     50VMMRCDECL(int) DBGFGCTrap01Handler(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
    5151{
    5252    const bool fInHyper = !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM;
    … …  
    108108 * @param   pRegFrame   Pointer to the register frame for the trap.
    109109 */
    110 DBGFGCDECL(int) DBGFGCTrap03Handler(PVM pVM, PCPUMCTXCORE pRegFrame)
     110VMMRCDECL(int) DBGFGCTrap03Handler(PVM pVM, PCPUMCTXCORE pRegFrame)
    111111{
    112112    /*

  • trunk/src/VBox/VMM/VMMGC/EMGCA.asm

    r9247 r12989  
    3131;;
    3232; Emulate LOCK CMPXCHG instruction, CDECL calling conv.
    33 ; EMGCDECL(uint32_t) EMGCEmulateLockCmpXchg(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
     33; VMMRCDECL(uint32_t) EMGCEmulateLockCmpXchg(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
    3434;
    3535; @returns eax=0 if data written, other code - invalid access, #PF was generated.
    … …  
    102102;;
    103103; Emulate CMPXCHG instruction, CDECL calling conv.
    104 ; EMGCDECL(uint32_t) EMGCEmulateCmpXchg(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
     104; VMMRCDECL(uint32_t) EMGCEmulateCmpXchg(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
    105105;
    106106; @returns eax=0 if data written, other code - invalid access, #PF was generated.
    … …  
    172172;;
    173173; Emulate LOCK CMPXCHG8B instruction, CDECL calling conv.
    174 ; EMGCDECL(uint32_t) EMGCEmulateLockCmpXchg8b(RTGCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX, uint32_t *pEflags);
     174; VMMRCDECL(uint32_t) EMGCEmulateLockCmpXchg8b(RTGCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX, uint32_t *pEflags);
    175175;
    176176; @returns eax=0 if data written, other code - invalid access, #PF was generated.
    … …  
    228228;;
    229229; Emulate CMPXCHG8B instruction, CDECL calling conv.
    230 ; EMGCDECL(uint32_t) EMGCEmulateCmpXchg8b(RTGCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX, uint32_t *pEflags);
     230; VMMRCDECL(uint32_t) EMGCEmulateCmpXchg8b(RTGCPTR pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX, uint32_t *pEflags);
    231231;
    232232; @returns eax=0 if data written, other code - invalid access, #PF was generated.
    … …  
    283283;;
    284284; Emulate LOCK XADD instruction, CDECL calling conv.
    285 ; EMGCDECL(uint32_t) EMGCEmulateLockXAdd(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
     285; VMMRCDECL(uint32_t) EMGCEmulateLockXAdd(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
    286286;
    287287; @returns eax=0 if data exchanged, other code - invalid access, #PF was generated.
    … …  
    344344;;
    345345; Emulate XADD instruction, CDECL calling conv.
    346 ; EMGCDECL(uint32_t) EMGCEmulateXAdd(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
     346; VMMRCDECL(uint32_t) EMGCEmulateXAdd(RTGCPTR pu32Param1, uint32_t *pu32Param2, uint32_t u32Param3, size_t cbSize, uint32_t *pEflags);
    347347;
    348348; @returns eax=0 if data written, other code - invalid access, #PF was generated.

  • trunk/src/VBox/VMM/VMMGC/IOMGC.cpp

    r8155 r12989  
    6868 * @param   pCpu        Disassembler CPU state.
    6969 */
    70 IOMGCDECL(int) IOMGCIOPortHandler(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
     70VMMRCDECL(int) IOMGCIOPortHandler(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
    7171{
    7272    switch (pCpu->pCurInstr->opcode)

  • trunk/src/VBox/VMM/VMMGC/MMRamGC.cpp

    r12965 r12989  
    7373 * @param   pVM         VM handle.
    7474 */
    75 MMGCDECL(void) MMGCRamRegisterTrapHandler(PVM pVM)
     75VMMRCDECL(void) MMGCRamRegisterTrapHandler(PVM pVM)
    7676{
    7777    TRPMGCSetTempHandler(pVM, 0xe, mmGCRamTrap0eHandler);
    … …  
    8585 * @param   pVM         VM handle.
    8686 */
    87 MMGCDECL(void) MMGCRamDeregisterTrapHandler(PVM pVM)
     87VMMRCDECL(void) MMGCRamDeregisterTrapHandler(PVM pVM)
    8888{
    8989    TRPMGCSetTempHandler(pVM, 0xe, NULL);
    … …  
    100100 * @param   cb          Size of data to read, only 1/2/4/8 is valid.
    101101 */
    102 MMGCDECL(int) MMGCRamRead(PVM pVM, void *pDst, void *pSrc, size_t cb)
     102VMMRCDECL(int) MMGCRamRead(PVM pVM, void *pDst, void *pSrc, size_t cb)
    103103{
    104104    int rc;
    … …  
    125125 * @param   cb          Size of data to write, only 1/2/4 is valid.
    126126 */
    127 MMGCDECL(int) MMGCRamWrite(PVM pVM, void *pDst, void *pSrc, size_t cb)
     127VMMRCDECL(int) MMGCRamWrite(PVM pVM, void *pDst, void *pSrc, size_t cb)
    128128{
    129129    TRPMSaveTrap(pVM);  /* save the current trap info, because it will get trashed if our access failed. */

  • trunk/src/VBox/VMM/VMMGC/MMRamGCA.asm

    r8155 r12989  
    3434;;
    3535; Read data in guest context, CDECL calling conv.
    36 ; MMGCDECL(int) MMGCRamRead(void *pDst, void *pSrc, size_t cb);
     36; VMMRCDECL(int) MMGCRamRead(void *pDst, void *pSrc, size_t cb);
    3737; MMRamGC page fault handler must be installed prior this call for safe operation.
    3838;
    … …  
    106106;;
    107107; Write data in guest context, CDECL calling conv.
    108 ; MMGCDECL(int) MMGCRamWrite(void *pDst, void *pSrc, size_t cb);
     108; VMMRCDECL(int) MMGCRamWrite(void *pDst, void *pSrc, size_t cb);
    109109;
    110110; @returns eax=0 if data written, other code - invalid access, #PF was generated.

  • trunk/src/VBox/VMM/VMMGC/PGMGC.cpp

    r11311 r12989  
    177177 * @param   ppv         Where to store the address of the mapping.
    178178 */
    179 PGMGCDECL(int) PGMGCDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv)
     179VMMRCDECL(int) PGMGCDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv)
    180180{
    181181    AssertMsg(!(GCPhys & PAGE_OFFSET_MASK), ("GCPhys=%VGp\n", GCPhys));
    … …  
    217217 * @param   ppv         Where to store the address of the mapping address corresponding to GCPhys.
    218218 */
    219 PGMGCDECL(int) PGMGCDynMapGCPageEx(PVM pVM, RTGCPHYS GCPhys, void **ppv)
     219VMMRCDECL(int) PGMGCDynMapGCPageEx(PVM pVM, RTGCPHYS GCPhys, void **ppv)
    220220{
    221221    /*
    … …  
    253253 * @param   ppv         Where to store the address of the mapping.
    254254 */
    255 PGMGCDECL(int) PGMGCDynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv)
     255VMMRCDECL(int) PGMGCDynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv)
    256256{
    257257    AssertMsg(!(HCPhys & PAGE_OFFSET_MASK), ("HCPhys=%VHp\n", HCPhys));
    … …  
    315315 * @param   GCPtrPage   Page to invalidate.
    316316 */
    317 PGMGCDECL(int) PGMGCInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
     317VMMRCDECL(int) PGMGCInvalidatePage(PVM pVM, RTGCPTR GCPtrPage)
    318318{
    319319    LogFlow(("PGMGCInvalidatePage: GCPtrPage=%VGv\n", GCPtrPage));

  • trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

    r10087 r12989  
    182182 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    183183 */
    184 SELMGCDECL(int) selmgcGuestGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     184VMMRCDECL(int) selmgcGuestGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    185185{
    186186    LogFlow(("selmgcGuestGDTWriteHandler errcode=%x fault=%VGv offRange=%08x\n", (uint32_t)uErrorCode, pvFault, offRange));
    … …  
    255255 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    256256 */
    257 SELMGCDECL(int) selmgcGuestLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     257VMMRCDECL(int) selmgcGuestLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    258258{
    259259    /** @todo To be implemented. */
    … …  
    278278 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    279279 */
    280 SELMGCDECL(int) selmgcGuestTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     280VMMRCDECL(int) selmgcGuestTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    281281{
    282282    LogFlow(("selmgcGuestTSSWriteHandler errcode=%x fault=%VGv offRange=%08x\n", (uint32_t)uErrorCode, pvFault, offRange));
    … …  
    309309
    310310            /** @todo not sure how the partial case is handled; probably not allowed */
    311             if (   offIntRedirBitmap <= offRange 
     311            if (   offIntRedirBitmap <= offRange
    312312                && offIntRedirBitmap + sizeof(pVM->selm.s.Tss.IntRedirBitmap) >= offRange + cb
    313313                && offIntRedirBitmap + sizeof(pVM->selm.s.Tss.IntRedirBitmap) <= pVM->selm.s.cbGuestTss)
    … …  
    361361 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    362362 */
    363 SELMGCDECL(int) selmgcShadowGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     363VMMRCDECL(int) selmgcShadowGDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    364364{
    365365    LogRel(("FATAL ERROR: selmgcShadowGDTWriteHandler: eip=%08X pvFault=%VGv pvRange=%VGv\r\n", pRegFrame->eip, pvFault, pvRange));
    … …  
    379379 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    380380 */
    381 SELMGCDECL(int) selmgcShadowLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     381VMMRCDECL(int) selmgcShadowLDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    382382{
    383383    LogRel(("FATAL ERROR: selmgcShadowLDTWriteHandler: eip=%08X pvFault=%VGv pvRange=%VGv\r\n", pRegFrame->eip, pvFault, pvRange));
    … …  
    398398 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    399399 */
    400 SELMGCDECL(int) selmgcShadowTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     400VMMRCDECL(int) selmgcShadowTSSWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    401401{
    402402    LogRel(("FATAL ERROR: selmgcShadowTSSWriteHandler: eip=%08X pvFault=%VGv pvRange=%VGv\r\n", pRegFrame->eip, pvFault, pvRange));
    … …  
    413413 * @param   pEsp    Ring1 ESP register value.
    414414 */
    415 SELMGCDECL(int) SELMGCGetRing1Stack(PVM pVM, uint32_t *pSS, uint32_t *pEsp)
     415VMMRCDECL(int) SELMGCGetRing1Stack(PVM pVM, uint32_t *pSS, uint32_t *pEsp)
    416416{
    417417    if (pVM->selm.s.fSyncTSSRing0Stack)

  • trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

    r11311 r12989  
    5555 * @param   pfnHandler  Pointer to the handler. Use NULL for uninstalling the handler.
    5656 */
    57 TRPMGCDECL(int) TRPMGCSetTempHandler(PVM pVM, unsigned iTrap, PFNTRPMGCTRAPHANDLER pfnHandler)
     57VMMRCDECL(int) TRPMGCSetTempHandler(PVM pVM, unsigned iTrap, PFNTRPMGCTRAPHANDLER pfnHandler)
    5858{
    5959    /*
    … …  
    8383 * @param   rc      The return code for host context.
    8484 */
    85 TRPMGCDECL(void) TRPMGCHyperReturnToHost(PVM pVM, int rc)
     85VMMRCDECL(void) TRPMGCHyperReturnToHost(PVM pVM, int rc)
    8686{
    8787    LogFlow(("TRPMGCHyperReturnToHost: rc=%Vrc\n", rc));
    … …  
    105105 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    106106 */
    107 TRPMGCDECL(int) trpmgcGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     107VMMRCDECL(int) trpmgcGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    108108{
    109109    uint16_t    cbIDT;
    … …  
    166166 *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
    167167 */
    168 TRPMGCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
     168VMMRCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
    169169{
    170170    LogRel(("FATAL ERROR: trpmgcShadowIDTWriteHandler: eip=%08X pvFault=%VGv pvRange=%08X\r\n", pRegFrame->eip, pvFault, pvRange));

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

    r10804 r12989  
    6262 * @param   uArg        Argument to that operation.
    6363 */
    64 VMMGCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
     64VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
    6565{
    6666    /* todo */
    … …  
    168168 * @remark  This function must be exported!
    169169 */
    170 VMMGCDECL(int) vmmGCLoggerFlush(PRTLOGGERRC pLogger)
     170VMMRCDECL(int) vmmGCLoggerFlush(PRTLOGGERRC pLogger)
    171171{
    172172    PVM pVM = &g_VM;
    … …  
    182182 * @param   rc          The status code.
    183183 */
    184 VMMGCDECL(void) VMMGCGuestToHost(PVM pVM, int rc)
     184VMMRCDECL(void) VMMGCGuestToHost(PVM pVM, int rc)
    185185{
    186186    pVM->vmm.s.pfnGCGuestToHost(rc);
    … …  
    196196 * @param   uArg            The argument to the operation.
    197197 */
    198 VMMGCDECL(int) VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
     198VMMRCDECL(int) VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
    199199{
    200200/** @todo profile this! */

  • trunk/src/VBox/VMM/VMMGC/VMMGCA.asm

    r8155 r12989  
    6262; * Internal GC logger worker: Logger wrapper.
    6363; */
    64 ;VMMGCDECL(void) vmmGCLoggerWrapper(const char *pszFormat, ...);
     64;VMMRCDECL(void) vmmGCLoggerWrapper(const char *pszFormat, ...);
    6565EXPORTEDNAME vmmGCLoggerWrapper
    6666%ifdef __YASM__
    … …  
    8282; * Internal GC logger worker: Logger (release) wrapper.
    8383; */
    84 ;VMMGCDECL(void) vmmGCRelLoggerWrapper(const char *pszFormat, ...);
     84;VMMRCDECL(void) vmmGCRelLoggerWrapper(const char *pszFormat, ...);
    8585EXPORTEDNAME vmmGCRelLoggerWrapper
    8686%ifdef __YASM__

  • trunk/src/VBox/VMM/VMMInternal.h

    r12837 r12989  
    2929
    3030
    31 #if !defined(IN_VMM_R3) && !defined(IN_VMM_R0) && !defined(IN_VMM_GC)
     31#if !defined(IN_VMM_R3) && !defined(IN_VMM_R0) && !defined(IN_VMM_RC)
    3232# error "Not in VMM! This is an internal header!"
    3333#endif
    … …  
    466466 * Internal GC logger worker: Logger wrapper.
    467467 */
    468 VMMGCDECL(void) vmmGCLoggerWrapper(const char *pszFormat, ...);
     468VMMRCDECL(void) vmmGCLoggerWrapper(const char *pszFormat, ...);
    469469
    470470/**
    471471 * Internal GC release logger worker: Logger wrapper.
    472472 */
    473 VMMGCDECL(void) vmmGCRelLoggerWrapper(const char *pszFormat, ...);
     473VMMRCDECL(void) vmmGCRelLoggerWrapper(const char *pszFormat, ...);
    474474
    475475/**
    … …  
    480480 * @remark  This function must be exported!
    481481 */
    482 VMMGCDECL(int) vmmGCLoggerFlush(PRTLOGGERRC pLogger);
     482VMMRCDECL(int) vmmGCLoggerFlush(PRTLOGGERRC pLogger);
    483483
    484484/** @name Trap testcases and related labels.

  • trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

    r12657 r12989  
    4545 * @param   pVM         The VM to operate on.
    4646 */
    47 CPUMR0DECL(int) CPUMR0Init(PVM pVM)
     47VMMR0DECL(int) CPUMR0Init(PVM pVM)
    4848{
    4949    LogFlow(("CPUMR0Init: %p\n", pVM));
    … …  
    116116 * @param   pCtx        CPU context
    117117 */
    118 CPUMR0DECL(int) CPUMR0LoadGuestFPU(PVM pVM, PCPUMCTX pCtx)
     118VMMR0DECL(int) CPUMR0LoadGuestFPU(PVM pVM, PCPUMCTX pCtx)
    119119{
    120120    Assert(pVM->cpum.s.CPUFeatures.edx.u1FXSR);
    … …  
    236236 * @param   pCtx        CPU context
    237237 */
    238 CPUMR0DECL(int) CPUMR0SaveGuestFPU(PVM pVM, PCPUMCTX pCtx)
     238VMMR0DECL(int) CPUMR0SaveGuestFPU(PVM pVM, PCPUMCTX pCtx)
    239239{
    240240    Assert(pVM->cpum.s.CPUFeatures.edx.u1FXSR);
    … …  
    287287 * @param   fDR6        Include DR6 or not
    288288 */
    289 CPUMR0DECL(int) CPUMR0SaveGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6)
     289VMMR0DECL(int) CPUMR0SaveGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6)
    290290{
    291291    Assert(pVM->cpum.s.fUseFlags & CPUM_USE_DEBUG_REGS);
    … …  
    323323 * @param   fDR6        Include DR6 or not
    324324 */
    325 CPUMR0DECL(int) CPUMR0LoadGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6)
     325VMMR0DECL(int) CPUMR0LoadGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6)
    326326{
    327327    /* Save the host state. */

  • trunk/src/VBox/VMM/VMMR0/DBGFR0.cpp

    r12663 r12989  
    4747 * @param   uDr6        The DR6 register value.
    4848 */
    49 DBGFR0DECL(int) DBGFR0Trap01Handler(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
     49VMMR0DECL(int) DBGFR0Trap01Handler(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
    5050{
    5151    /** @todo Intel docs say that X86_DR6_BS has the highest priority... */
    … …  
    105105 * @param   pRegFrame   Pointer to the register frame for the trap.
    106106 */
    107 DBGFR0DECL(int) DBGFR0Trap03Handler(PVM pVM, PCPUMCTXCORE pRegFrame)
     107VMMR0DECL(int) DBGFR0Trap03Handler(PVM pVM, PCPUMCTXCORE pRegFrame)
    108108{
    109109    /*

  • trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

    r12892 r12989  
    136136 * @returns VBox status code.
    137137 */
    138 HWACCMR0DECL(int) HWACCMR0Init(void)
     138VMMR0DECL(int) HWACCMR0Init(void)
    139139{
    140140    int        rc;
    … …  
    415415 * @returns VBox status code.
    416416 */
    417 HWACCMR0DECL(int) HWACCMR0Term(void)
     417VMMR0DECL(int) HWACCMR0Term(void)
    418418{
    419419    int aRc[RTCPUSET_MAX_CPUS];
    … …  
    512512 *
    513513 */
    514 HWACCMR0DECL(int) HWACCMR0EnableAllCpus(PVM pVM, HWACCMSTATE enmNewHwAccmState)
     514VMMR0DECL(int) HWACCMR0EnableAllCpus(PVM pVM, HWACCMSTATE enmNewHwAccmState)
    515515{
    516516    Assert(sizeof(HWACCMR0Globals.enmHwAccmState) == sizeof(uint32_t));
    … …  
    649649 * @param   pVM         The VM to operate on.
    650650 */
    651 HWACCMR0DECL(int) HWACCMR0InitVM(PVM pVM)
     651VMMR0DECL(int) HWACCMR0InitVM(PVM pVM)
    652652{
    653653    AssertReturn(pVM, VERR_INVALID_PARAMETER);
    … …  
    696696 * @param   pVM         The VM to operate on.
    697697 */
    698 HWACCMR0DECL(int) HWACCMR0TermVM(PVM pVM)
     698VMMR0DECL(int) HWACCMR0TermVM(PVM pVM)
    699699{
    700700    AssertReturn(pVM, VERR_INVALID_PARAMETER);
    … …  
    715715 * @param   pVM         The VM to operate on.
    716716 */
    717 HWACCMR0DECL(int) HWACCMR0SetupVM(PVM pVM)
     717VMMR0DECL(int) HWACCMR0SetupVM(PVM pVM)
    718718{
    719719    AssertReturn(pVM, VERR_INVALID_PARAMETER);
    … …  
    734734 * @param   pVM         The VM to operate on.
    735735 */
    736 HWACCMR0DECL(int) HWACCMR0Enter(PVM pVM)
     736VMMR0DECL(int) HWACCMR0Enter(PVM pVM)
    737737{
    738738    CPUMCTX *pCtx;
    … …  
    785785 * @param   pVM         The VM to operate on.
    786786 */
    787 HWACCMR0DECL(int) HWACCMR0Leave(PVM pVM)
     787VMMR0DECL(int) HWACCMR0Leave(PVM pVM)
    788788{
    789789    CPUMCTX *pCtx;
    … …  
    825825 * @param   pVM         The VM to operate on.
    826826 */
    827 HWACCMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM)
     827VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM)
    828828{
    829829    CPUMCTX *pCtx;
    … …  
    848848 * @param   pVM         The VM to operate on.
    849849 */
    850 HWACCMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu()
     850VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu()
    851851{
    852852    RTCPUID  idCpu = RTMpCpuId();
    … …  
    864864 * @param   pszMsg  Message to prepend the log entry with.
    865865 */
    866 HWACCMR0DECL(void) HWACCMR0DumpDescriptor(PX86DESCHC pDesc, RTSEL Sel, const char *pszMsg)
     866VMMR0DECL(void) HWACCMR0DumpDescriptor(PX86DESCHC pDesc, RTSEL Sel, const char *pszMsg)
    867867{
    868868    /*
    … …  
    985985 * @param   pCtx        The context to format.
    986986 */
    987 HWACCMR0DECL(void) HWACCMDumpRegs(PVM pVM, PCPUMCTX pCtx)
     987VMMR0DECL(void) HWACCMDumpRegs(PVM pVM, PCPUMCTX pCtx)
    988988{
    989989    /*
    … …  
    11271127
    11281128/* Dummy callback handlers. */
    1129 HWACCMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PHWACCM_CPUINFO pCpu)
     1129VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PHWACCM_CPUINFO pCpu)
    11301130{
    11311131    return VINF_SUCCESS;
    11321132}
    11331133
    1134 HWACCMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, PCPUMCTX pCtx)
     1134VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, PCPUMCTX pCtx)
    11351135{
    11361136    return VINF_SUCCESS;
    11371137}
    11381138
    1139 HWACCMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     1139VMMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    11401140{
    11411141    return VINF_SUCCESS;
    11421142}
    11431143
    1144 HWACCMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     1144VMMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    11451145{
    11461146    return VINF_SUCCESS;
    11471147}
    11481148
    1149 HWACCMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM)
     1149VMMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM)
    11501150{
    11511151    return VINF_SUCCESS;
    11521152}
    11531153
    1154 HWACCMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM)
     1154VMMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM)
    11551155{
    11561156    return VINF_SUCCESS;
    11571157}
    11581158
    1159 HWACCMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM)
     1159VMMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM)
    11601160{
    11611161    return VINF_SUCCESS;
    11621162}
    11631163
    1164 HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx)
     1164VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx)
    11651165{
    11661166    return VINF_SUCCESS;
    11671167}
    11681168
    1169 HWACCMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM)
     1169VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM)
    11701170{
    11711171    return VINF_SUCCESS;
    11721172}
    11731173
    1174 HWACCMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx)
     1174VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx)
    11751175{
    11761176    return VINF_SUCCESS;

  • trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

    r12795 r12989  
    6666 * @param   pPageCpuPhys    Physical address of the global cpu page
    6767 */
    68 HWACCMR0DECL(int) SVMR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     68VMMR0DECL(int) SVMR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    6969{
    7070    AssertReturn(pPageCpuPhys, VERR_INVALID_PARAMETER);
    … …  
    9999 * @param   pPageCpuPhys    Physical address of the global cpu page
    100100 */
    101 HWACCMR0DECL(int) SVMR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     101VMMR0DECL(int) SVMR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    102102{
    103103    AssertReturn(pPageCpuPhys, VERR_INVALID_PARAMETER);
    … …  
    125125 * @param   pVM         The VM to operate on.
    126126 */
    127 HWACCMR0DECL(int) SVMR0InitVM(PVM pVM)
     127VMMR0DECL(int) SVMR0InitVM(PVM pVM)
    128128{
    129129    int rc;
    … …  
    218218 * @param   pVM         The VM to operate on.
    219219 */
    220 HWACCMR0DECL(int) SVMR0TermVM(PVM pVM)
     220VMMR0DECL(int) SVMR0TermVM(PVM pVM)
    221221{
    222222    if (pVM->hwaccm.s.svm.pMemObjVMCB != NIL_RTR0MEMOBJ)
    … …  
    257257 * @param   pVM         The VM to operate on.
    258258 */
    259 HWACCMR0DECL(int) SVMR0SetupVM(PVM pVM)
     259VMMR0DECL(int) SVMR0SetupVM(PVM pVM)
    260260{
    261261    int         rc = VINF_SUCCESS;
    … …  
    525525 * @param   pVM         The VM to operate on.
    526526 */
    527 HWACCMR0DECL(int) SVMR0SaveHostState(PVM pVM)
     527VMMR0DECL(int) SVMR0SaveHostState(PVM pVM)
    528528{
    529529    /* Nothing to do here. */
    … …  
    540540 * @param   pCtx        Guest context
    541541 */
    542 HWACCMR0DECL(int) SVMR0LoadGuestState(PVM pVM, CPUMCTX *pCtx)
     542VMMR0DECL(int) SVMR0LoadGuestState(PVM pVM, CPUMCTX *pCtx)
    543543{
    544544    RTGCUINTPTR val;
    … …  
    799799 * @param   pCtx        Guest context
    800800 */
    801 HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
     801VMMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
    802802{
    803803    int         rc = VINF_SUCCESS;
    … …  
    20552055 * @param   pCpu        CPU info struct
    20562056 */
    2057 HWACCMR0DECL(int) SVMR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu)
     2057VMMR0DECL(int) SVMR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu)
    20582058{
    20592059    Assert(pVM->hwaccm.s.svm.fSupported);
    … …  
    20762076 * @param   pCtx        CPU context
    20772077 */
    2078 HWACCMR0DECL(int) SVMR0Leave(PVM pVM, PCPUMCTX pCtx)
     2078VMMR0DECL(int) SVMR0Leave(PVM pVM, PCPUMCTX pCtx)
    20792079{
    20802080    SVM_VMCB *pVMCB = (SVM_VMCB *)pVM->hwaccm.s.svm.pVMCB;
    … …  
    21932193 * @param   GCVirt      Page to invalidate
    21942194 */
    2195 HWACCMR0DECL(int) SVMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt)
     2195VMMR0DECL(int) SVMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt)
    21962196{
    21972197    bool fFlushPending = pVM->hwaccm.s.svm.fAlwaysFlushTLB | pVM->hwaccm.s.svm.fForceTLBFlush;
    … …  
    22252225 * @param   GCPhys      Page to invalidate
    22262226 */
    2227 HWACCMR0DECL(int) SVMR0InvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
     2227VMMR0DECL(int) SVMR0InvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
    22282228{
    22292229    bool fFlushPending = pVM->hwaccm.s.svm.fAlwaysFlushTLB | pVM->hwaccm.s.svm.fForceTLBFlush;

  • trunk/src/VBox/VMM/VMMR0/HWSVMR0.h

    r12756 r12989  
    4949 * @param   pCpu        CPU info struct
    5050 */
    51 HWACCMR0DECL(int) SVMR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu);
     51VMMR0DECL(int) SVMR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu);
    5252
    5353/**
    … …  
    5858 * @param   pCtx        CPU context
    5959 */
    60 HWACCMR0DECL(int) SVMR0Leave(PVM pVM, PCPUMCTX pCtx);
     60VMMR0DECL(int) SVMR0Leave(PVM pVM, PCPUMCTX pCtx);
    6161
    6262/**
    … …  
    6969 * @param   pPageCpuPhys    Physical address of the global cpu page
    7070 */
    71 HWACCMR0DECL(int) SVMR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     71VMMR0DECL(int) SVMR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    7272
    7373/**
    … …  
    7979 * @param   pPageCpuPhys    Physical address of the global cpu page
    8080 */
    81 HWACCMR0DECL(int) SVMR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     81VMMR0DECL(int) SVMR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    8282
    8383/**
    … …  
    8787 * @param   pVM         The VM to operate on.
    8888 */
    89 HWACCMR0DECL(int) SVMR0InitVM(PVM pVM);
     89VMMR0DECL(int) SVMR0InitVM(PVM pVM);
    9090
    9191/**
    … …  
    9595 * @param   pVM         The VM to operate on.
    9696 */
    97 HWACCMR0DECL(int) SVMR0TermVM(PVM pVM);
     97VMMR0DECL(int) SVMR0TermVM(PVM pVM);
    9898
    9999/**
    … …  
    103103 * @param   pVM         The VM to operate on.
    104104 */
    105 HWACCMR0DECL(int) SVMR0SetupVM(PVM pVM);
     105VMMR0DECL(int) SVMR0SetupVM(PVM pVM);
    106106
    107107
    … …  
    113113 * @param   pCtx        Guest context
    114114 */
    115 HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);
     115VMMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);
    116116
    117117
    … …  
    122122 * @param   pVM         The VM to operate on.
    123123 */
    124 HWACCMR0DECL(int) SVMR0SaveHostState(PVM pVM);
     124VMMR0DECL(int) SVMR0SaveHostState(PVM pVM);
    125125
    126126/**
    … …  
    131131 * @param   pCtx        Guest context
    132132 */
    133 HWACCMR0DECL(int) SVMR0LoadGuestState(PVM pVM, CPUMCTX *pCtx);
     133VMMR0DECL(int) SVMR0LoadGuestState(PVM pVM, CPUMCTX *pCtx);
    134134
    135135

  • trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

    r12824 r12989  
    7171 * @param   pPageCpuPhys    Physical address of the global cpu page
    7272 */
    73 HWACCMR0DECL(int) VMXR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     73VMMR0DECL(int) VMXR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    7474{
    7575    AssertReturn(pPageCpuPhys, VERR_INVALID_PARAMETER);
    … …  
    112112 * @param   pPageCpuPhys    Physical address of the global cpu page
    113113 */
    114 HWACCMR0DECL(int) VMXR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
     114VMMR0DECL(int) VMXR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
    115115{
    116116    AssertReturn(pPageCpuPhys, VERR_INVALID_PARAMETER);
    … …  
    135135 * @param   pVM         The VM to operate on.
    136136 */
    137 HWACCMR0DECL(int) VMXR0InitVM(PVM pVM)
     137VMMR0DECL(int) VMXR0InitVM(PVM pVM)
    138138{
    139139    int rc;
    … …  
    203203 * @param   pVM         The VM to operate on.
    204204 */
    205 HWACCMR0DECL(int) VMXR0TermVM(PVM pVM)
     205VMMR0DECL(int) VMXR0TermVM(PVM pVM)
    206206{
    207207    if (pVM->hwaccm.s.vmx.pMemObjVMCS != NIL_RTR0MEMOBJ)
    … …  
    235235 * @param   pVM         The VM to operate on.
    236236 */
    237 HWACCMR0DECL(int) VMXR0SetupVM(PVM pVM)
     237VMMR0DECL(int) VMXR0SetupVM(PVM pVM)
    238238{
    239239    int rc = VINF_SUCCESS;
    … …  
    476476    if (CPUMIsGuestInRealModeEx(pCtx))
    477477    {
    478         /* Injecting events doesn't work right with real mode emulation. 
     478        /* Injecting events doesn't work right with real mode emulation.
    479479         * (#GP if we try to inject external hardware interrupts)
    480480         * Fake an 'int x' instruction. Note that we need to take special precautions when
    … …  
    637637 * @param   pVM         The VM to operate on.
    638638 */
    639 HWACCMR0DECL(int) VMXR0SaveHostState(PVM pVM)
     639VMMR0DECL(int) VMXR0SaveHostState(PVM pVM)
    640640{
    641641    int rc = VINF_SUCCESS;
    … …  
    749749 * @param   pCtx        Guest context
    750750 */
    751 HWACCMR0DECL(int) VMXR0LoadGuestState(PVM pVM, CPUMCTX *pCtx)
     751VMMR0DECL(int) VMXR0LoadGuestState(PVM pVM, CPUMCTX *pCtx)
    752752{
    753753    int         rc = VINF_SUCCESS;
    … …  
    12301230# endif /* HWACCM_VMX_EMULATE_REALMODE */
    12311231    rc = VMXWriteVMCS(VMX_VMCS_CTRL_EXCEPTION_BITMAP, pVM->hwaccm.s.vmx.u32TrapMask);
    1232     AssertRC(rc);   
     1232    AssertRC(rc);
    12331233#endif
    12341234
    … …  
    12461246 * @param   pCtx        Guest context
    12471247 */
    1248 HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
     1248VMMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
    12491249{
    12501250    int         rc = VINF_SUCCESS;
    … …  
    26372637 * @param   pCpu        CPU info struct
    26382638 */
    2639 HWACCMR0DECL(int) VMXR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu)
     2639VMMR0DECL(int) VMXR0Enter(PVM pVM, PHWACCM_CPUINFO pCpu)
    26402640{
    26412641    Assert(pVM->hwaccm.s.vmx.fSupported);
    … …  
    26652665 * @param   pCtx        CPU context
    26662666 */
    2667 HWACCMR0DECL(int) VMXR0Leave(PVM pVM, PCPUMCTX pCtx)
     2667VMMR0DECL(int) VMXR0Leave(PVM pVM, PCPUMCTX pCtx)
    26682668{
    26692669    Assert(pVM->hwaccm.s.vmx.fSupported);

  • trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

    r12826 r12989  
    4949 * @param   pCpu        CPU info struct
    5050 */
    51 HWACCMR0DECL(int) VMXR0Enter(PVM pVMm, PHWACCM_CPUINFO pCpu);
     51VMMR0DECL(int) VMXR0Enter(PVM pVMm, PHWACCM_CPUINFO pCpu);
    5252
    5353/**
    … …  
    5858 * @param   pCtx        CPU context
    5959 */
    60 HWACCMR0DECL(int) VMXR0Leave(PVM pVM, PCPUMCTX pCtx);
     60VMMR0DECL(int) VMXR0Leave(PVM pVM, PCPUMCTX pCtx);
    6161
    6262
    … …  
    7070 * @param   pPageCpuPhys    Physical address of the global cpu page
    7171 */
    72 HWACCMR0DECL(int) VMXR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     72VMMR0DECL(int) VMXR0EnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    7373
    7474/**
    … …  
    8080 * @param   pPageCpuPhys    Physical address of the global cpu page
    8181 */
    82 HWACCMR0DECL(int) VMXR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
     82VMMR0DECL(int) VMXR0DisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
    8383
    8484/**
    … …  
    8888 * @param   pVM         The VM to operate on.
    8989 */
    90 HWACCMR0DECL(int) VMXR0InitVM(PVM pVM);
     90VMMR0DECL(int) VMXR0InitVM(PVM pVM);
    9191
    9292/**
    … …  
    9696 * @param   pVM         The VM to operate on.
    9797 */
    98 HWACCMR0DECL(int) VMXR0TermVM(PVM pVM);
     98VMMR0DECL(int) VMXR0TermVM(PVM pVM);
    9999
    100100/**
    … …  
    104104 * @param   pVM         The VM to operate on.
    105105 */
    106 HWACCMR0DECL(int) VMXR0SetupVM(PVM pVM);
     106VMMR0DECL(int) VMXR0SetupVM(PVM pVM);
    107107
    108108
    … …  
    113113 * @param   pVM         The VM to operate on.
    114114 */
    115 HWACCMR0DECL(int) VMXR0SaveHostState(PVM pVM);
     115VMMR0DECL(int) VMXR0SaveHostState(PVM pVM);
    116116
    117117/**
    … …  
    122122 * @param   pCtx        Guest context
    123123 */
    124 HWACCMR0DECL(int) VMXR0LoadGuestState(PVM pVM, CPUMCTX *pCtx);
     124VMMR0DECL(int) VMXR0LoadGuestState(PVM pVM, CPUMCTX *pCtx);
    125125
    126126
    … …  
    132132 * @param   pCtx        Guest context
    133133 */
    134 HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);
     134VMMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);
    135135
    136136

  • trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

    r10471 r12989  
    5858 * @remarks Must be called from within the PGM critical section.
    5959 */
    60 PGMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM)
     60VMMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM)
    6161{
    6262    return VERR_NOT_IMPLEMENTED;
    … …  
    7474 * @param   pvFault             The fault address.
    7575 */
    76 PGMR0DECL(int) PGMR0Trap0eHandlerNestedPaging(PVM pVM, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault)
     76VMMR0DECL(int) PGMR0Trap0eHandlerNestedPaging(PVM pVM, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault)
    7777{
    7878    int rc;
    … …  
    128128     * Call the worker.
    129129     *
    130      * We pretend the guest is in protected mode without paging, so we can use existing code to build the 
     130     * We pretend the guest is in protected mode without paging, so we can use existing code to build the
    131131     * nested page tables.
    132132     */

  • trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp

    r9412 r12989  
    4040 * @remark  Must be called with interrupts disabled.
    4141 */
    42 TRPMR0DECL(void) TRPMR0DispatchHostInterrupt(PVM pVM)
     42VMMR0DECL(void) TRPMR0DispatchHostInterrupt(PVM pVM)
    4343{
    4444    RTUINT uActiveVector = pVM->trpm.s.uActiveVector;
    … …  
    115115 * @param   pvRet       Pointer to the return address of VMMR0Entry() on the stack.
    116116 */
    117 TRPMR0DECL(void) TRPMR0SetupInterruptDispatcherFrame(PVM pVM, void *pvRet)
     117VMMR0DECL(void) TRPMR0SetupInterruptDispatcherFrame(PVM pVM, void *pvRet)
    118118{
    119119    RTUINT uActiveVector = pVM->trpm.s.uActiveVector;

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

    r8155 r12989  
    7171 * @param   ...             Function arguments.
    7272 */
    73 VMR3DECL(int) VMR3ReqCall(PVM pVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
     73VMMR3DECL(int) VMR3ReqCall(PVM pVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
    7474{
    7575    va_list va;
    … …  
    104104 * @param   ...             Function arguments.
    105105 */
    106 VMR3DECL(int) VMR3ReqCallVoidU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
     106VMMR3DECL(int) VMR3ReqCallVoidU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
    107107{
    108108    va_list va;
    … …  
    137137 * @param   ...             Function arguments.
    138138 */
    139 VMR3DECL(int) VMR3ReqCallVoid(PVM pVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
     139VMMR3DECL(int) VMR3ReqCallVoid(PVM pVM, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
    140140{
    141141    va_list va;
    … …  
    172172 * @param   ...             Function arguments.
    173173 */
    174 VMR3DECL(int) VMR3ReqCallEx(PVM pVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
     174VMMR3DECL(int) VMR3ReqCallEx(PVM pVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
    175175{
    176176    va_list va;
    … …  
    207207 * @param   ...             Function arguments.
    208208 */
    209 VMR3DECL(int) VMR3ReqCallU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
     209VMMR3DECL(int) VMR3ReqCallU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
    210210{
    211211    va_list va;
    … …  
    242242 * @param   Args            Argument vector.
    243243 */
    244 VMR3DECL(int) VMR3ReqCallVU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, va_list Args)
     244VMMR3DECL(int) VMR3ReqCallVU(PUVM pUVM, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, va_list Args)
    245245{
    246246    LogFlow(("VMR3ReqCallV: cMillies=%d fFlags=%#x pfnFunction=%p cArgs=%d\n", cMillies, fFlags, pfnFunction, cArgs));
    … …  
    365365 * @param   enmType         Package type.
    366366 */
    367 VMR3DECL(int) VMR3ReqAlloc(PVM pVM, PVMREQ *ppReq, VMREQTYPE enmType)
     367VMMR3DECL(int) VMR3ReqAlloc(PVM pVM, PVMREQ *ppReq, VMREQTYPE enmType)
    368368{
    369369    return VMR3ReqAllocU(pVM->pUVM, ppReq, enmType);
    … …  
    383383 * @param   enmType         Package type.
    384384 */
    385 VMR3DECL(int) VMR3ReqAllocU(PUVM pUVM, PVMREQ *ppReq, VMREQTYPE enmType)
     385VMMR3DECL(int) VMR3ReqAllocU(PUVM pUVM, PVMREQ *ppReq, VMREQTYPE enmType)
    386386{
    387387    /*
    … …  
    515515 * @remark  The request packet must be in allocated or completed state!
    516516 */
    517 VMR3DECL(int) VMR3ReqFree(PVMREQ pReq)
     517VMMR3DECL(int) VMR3ReqFree(PVMREQ pReq)
    518518{
    519519    /*
    … …  
    585585 *                          wait till it's completed.
    586586 */
    587 VMR3DECL(int) VMR3ReqQueue(PVMREQ pReq, unsigned cMillies)
     587VMMR3DECL(int) VMR3ReqQueue(PVMREQ pReq, unsigned cMillies)
    588588{
    589589    LogFlow(("VMR3ReqQueue: pReq=%p cMillies=%d\n", pReq, cMillies));
    … …  
    661661 *                          Use RT_INDEFINITE_WAIT to only wait till it's completed.
    662662 */
    663 VMR3DECL(int) VMR3ReqWait(PVMREQ pReq, unsigned cMillies)
     663VMMR3DECL(int) VMR3ReqWait(PVMREQ pReq, unsigned cMillies)
    664664{
    665665    LogFlow(("VMR3ReqWait: pReq=%p cMillies=%d\n", pReq, cMillies));
    … …  
    726726 * @param   pUVM            Pointer to the user mode VM structure.
    727727 */
    728 VMR3DECL(int) VMR3ReqProcessU(PUVM pUVM)
     728VMMR3DECL(int) VMR3ReqProcessU(PUVM pUVM)
    729729{
    730730    LogFlow(("VMR3ReqProcessU: (enmVMState=%d)\n", pUVM->pVM ? pUVM->pVM->enmVMState : VMSTATE_CREATING));

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r12444 r12989  
    8585#
    8686tstVMStructGC_TEMPLATE  = VBOXGCEXE
    87 tstVMStructGC_DEFS      = IN_VMM_GC IN_PDM_GC IN_CFGM_GC IN_IOM_GC IN_VM_GC IN_CPUM_GC IN_SELM_GC IN_PGM_GC IN_TRPM_GC IN_MM_GC IN_PDM_GC IN_DBGF_GC IN_PATM_GC IN_DIS_GC IN_STAM_GC IN_VGADEVICE_GC IN_CSAM_GC IN_SSM_GC IN_REM_GC IN_RRM_GC
     87tstVMStructGC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC
    8888ifdef VBOX_WITH_IDT_PATCHING
    8989tstVMStructGC_DEFS     += VBOX_WITH_IDT_PATCHING
    … …  
    9393
    9494tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
    95 tstVMStructSize_DEFS    = IN_VMM_R3 IN_PDM_R3 IN_CFGM_R3 IN_IOM_R3 IN_VM_R3 IN_CPUM_R3 IN_SELM_R3 IN_PGM_R3 IN_TRPM_R3 IN_MM_R3 IN_PDM_R3 IN_DBGF_R3 IN_PATM_R3 IN_DIS_R3 IN_STAM_R3 IN_VGADEVICE_R3 IN_CSAM_R3 IN_SSM_R3 IN_REM_R3
     95tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS
    9696ifdef VBOX_WITH_IDT_PATCHING
    9797tstVMStructSize_DEFS   += VBOX_WITH_IDT_PATCHING
    … …  
    102102
    103103tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
    104 tstAsmStructs_DEFS      = IN_VMM_R3 IN_PDM_R3 IN_CFGM_R3 IN_IOM_R3 IN_VM_R3 IN_CPUM_R3 IN_SELM_R3 IN_PGM_R3 IN_TRPM_R3 IN_MM_R3 IN_PDM_R3 IN_DBGF_R3 IN_PATM_R3 IN_DIS_R3 IN_STAM_R3 IN_VGADEVICE_R3 IN_CSAM_R3 IN_SSM_R3
     104tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS
    105105ifdef VBOX_WITH_IDT_PATCHING
    106106tstAsmStructs_DEFS     += VBOX_WITH_IDT_PATCHING
    … …  
    110110
    111111tstAsmStructsGC_TEMPLATE= VBOXGCEXE
    112 tstAsmStructsGC_DEFS    = IN_VMM_GC IN_PDM_GC IN_CFGM_GC IN_IOM_GC IN_VM_GC IN_CPUM_GC IN_SELM_GC IN_PGM_GC IN_TRPM_GC IN_MM_GC IN_PDM_GC IN_DBGF_GC IN_PATM_GC IN_DIS_GC IN_STAM_GC IN_VGADEVICE_GC IN_CSAM_GC IN_SSM_GC IN_RRM_GC
     112tstAsmStructsGC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC
    113113ifdef VBOX_WITH_IDT_PATCHING
    114114tstAsmStructsGC_DEFS    += VBOX_WITH_IDT_PATCHING
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