vbox的更動 12989 路徑 trunk/src/VBox/VMM/VMMAll/EMAll.cpp

時間撮記:

2008-10-6 上午02:15:39 (16 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (修改) (21 筆差異)

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

@@ -79 +79 @@
  * @returns Current status.
  */
-EMDECL(EMSTATE) EMGetState(PVM pVM)
+VMMDECL(EMSTATE) EMGetState(PVM pVM)
 {
     return pVM->em.s.enmState;
@@ -92 +92 @@
  * @todo    This doesn't belong here, it should go in REMAll.cpp!
  */
-EMDECL(void) EMFlushREMTBs(PVM pVM)
+VMMDECL(void) EMFlushREMTBs(PVM pVM)
 {
     Log(("EMFlushREMTBs\n"));
@@ -161 +161 @@
  * @param   pcbInstr        Where to return the instruction size. (optional)
  */
-EMDECL(int) EMInterpretDisasOne(PVM pVM, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
+VMMDECL(int) EMInterpretDisasOne(PVM pVM, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
 {
     RTGCPTR GCPtrInstr;
@@ -186 +186 @@
  * @param   pcbInstr        Where to return the instruction size. (optional)
  */
-EMDECL(int) EMInterpretDisasOneEx(PVM pVM, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
+VMMDECL(int) EMInterpretDisasOneEx(PVM pVM, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
 {
     int rc = DISCoreOneEx(GCPtrInstr, SELMGetCpuModeFromSelector(pVM, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid),
@@ -220 +220 @@
  *          to worry about e.g. invalid modrm combinations (!)
  */
-EMDECL(int) EMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+VMMDECL(int) EMInterpretInstruction(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
     RTGCPTR pbCode;
@@ -272 +272 @@
  *          Make sure this can't happen!! (will add some assertions/checks later)
  */
-EMDECL(int) EMInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+VMMDECL(int) EMInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
     STAM_PROFILE_START(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Emulate), a);
@@ -295 +295 @@
  * @remark  This may raise exceptions.
  */
-EMDECL(int) EMInterpretPortIO(PVM pVM, PCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, uint32_t cbOp)
+VMMDECL(int) EMInterpretPortIO(PVM pVM, PCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, uint32_t cbOp)
 {
     /*
@@ -1703 +1703 @@
  *
  */
-EMDECL(int) EMInterpretIret(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) EMInterpretIret(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     RTGCUINTPTR pIretStack = (RTGCUINTPTR)pRegFrame->esp;
@@ -1768 +1768 @@
  *
  */
-EMDECL(int) EMInterpretInvlpg(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC)
+VMMDECL(int) EMInterpretInvlpg(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC)
 {
     int rc;
@@ -1841 +1841 @@
  *
  */
-EMDECL(int) EMInterpretCpuId(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) EMInterpretCpuId(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     uint32_t iLeaf = pRegFrame->eax; NOREF(iLeaf);
@@ -1872 +1872 @@
  *
  */
-EMDECL(int) EMInterpretCRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegCrx)
+VMMDECL(int) EMInterpretCRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegCrx)
 {
     int      rc;
@@ -1911 +1911 @@
  *
  */
-EMDECL(int) EMInterpretLMSW(PVM pVM, uint16_t u16Data)
+VMMDECL(int) EMInterpretLMSW(PVM pVM, uint16_t u16Data)
 {
     uint64_t OldCr0 = CPUMGetGuestCR0(pVM);
@@ -1935 +1935 @@
  *
  */
-EMDECL(int) EMInterpretCLTS(PVM pVM)
+VMMDECL(int) EMInterpretCLTS(PVM pVM)
 {
     uint64_t cr0 = CPUMGetGuestCR0(pVM);
@@ -1962 +1962 @@
  *
  */
-EMDECL(int) EMInterpretCRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegCrx, uint32_t SrcRegGen)
+VMMDECL(int) EMInterpretCRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegCrx, uint32_t SrcRegGen)
 {
     uint64_t val;
@@ -2123 +2123 @@
  *
  */
-EMDECL(int) EMInterpretDRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegDrx, uint32_t SrcRegGen)
+VMMDECL(int) EMInterpretDRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegDrx, uint32_t SrcRegGen)
 {
     uint64_t val;
@@ -2161 +2161 @@
  *
  */
-EMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx)
+VMMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx)
 {
     uint64_t val64;
@@ -2334 +2334 @@
  *
  */
-EMDECL(int) EMInterpretRdtsc(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) EMInterpretRdtsc(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     unsigned uCR4 = CPUMGetGuestCR4(pVM);
@@ -2484 +2484 @@
  *
  */
-EMDECL(int) EMInterpretRdmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) EMInterpretRdmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     uint32_t u32Dummy, u32Features, cpl;
@@ -2605 +2605 @@
  * @param   pRegFrame   The register frame.
  */
-EMDECL(int) EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
+VMMDECL(int) EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
 {
     uint32_t u32Dummy, u32Features, cpl;
@@ -2900 +2900 @@
  * @param   PC          The PC.
  */
-EMDECL(void) EMSetInhibitInterruptsPC(PVM pVM, RTGCUINTPTR PC)
+VMMDECL(void) EMSetInhibitInterruptsPC(PVM pVM, RTGCUINTPTR PC)
 {
     pVM->em.s.GCPtrInhibitInterrupts = PC;
@@ -2920 +2920 @@
  *
  */
-EMDECL(RTGCUINTPTR) EMGetInhibitInterruptsPC(PVM pVM)
+VMMDECL(RTGCUINTPTR) EMGetInhibitInterruptsPC(PVM pVM)
 {
     return pVM->em.s.GCPtrInhibitInterrupts;