Changeset 56286 in vbox for trunk/src/VBox/VMM/VMMRC
- Timestamp:
- Jun 9, 2015 11:06:39 AM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 100867
- Location:
- trunk/src/VBox/VMM/VMMRC
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMRC/TRPMRC.cpp
r56013 r56286 85 85 LogFlow(("TRPMGCHyperReturnToHost: rc=%Rrc\n", rc)); 86 86 TRPMResetTrap(pVCpu); 87 VMM GCGuestToHost(pVM, rc);87 VMMRCGuestToHost(pVM, rc); 88 88 AssertReleaseFailed(); 89 89 } -
trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp
r56047 r56286 121 121 *******************************************************************************/ 122 122 RT_C_DECLS_BEGIN 123 /** Defined in VMM GC0.asm or VMMGC99.asm.123 /** Defined in VMMRC0.asm or VMMRC99.asm. 124 124 * @{ */ 125 125 extern const TRPMGCHYPER g_aTrap0bHandlers[1]; -
trunk/src/VBox/VMM/VMMRC/VMMRC.cpp
r54308 r56286 58 58 * @returns VBox status code. 59 59 * @param pVM Pointer to the VM. 60 * @param uOperation Which operation to execute (VMM GCOPERATION).60 * @param uOperation Which operation to execute (VMMRCOPERATION). 61 61 * @param uArg Argument to that operation. 62 62 */ 63 VMMRCDECL(int) VMM GCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)63 VMMRCDECL(int) VMMRCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...) 64 64 { 65 65 /* todo */ … … 69 69 * Init RC modules. 70 70 */ 71 case VMM GC_DO_VMMGC_INIT:71 case VMMRC_DO_VMMRC_INIT: 72 72 { 73 73 /* … … 92 92 93 93 int rc = RTRCInit(u64TS); 94 Log(("VMM GCEntry: VMMGC_DO_VMMGC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));94 Log(("VMMRCEntry: VMMRC_DO_VMMRC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc)); 95 95 AssertRCReturn(rc, rc); 96 96 … … 107 107 * It spins for a while with interrupts enabled. 108 108 */ 109 case VMM GC_DO_TESTCASE_HYPER_INTERRUPT:109 case VMMRC_DO_TESTCASE_HYPER_INTERRUPT: 110 110 { 111 111 uint32_t volatile i = 0; … … 121 121 * profiling of the switcher. 122 122 */ 123 case VMM GC_DO_TESTCASE_NOP:123 case VMMRC_DO_TESTCASE_NOP: 124 124 return 0; 125 125 … … 127 127 * Testcase executes a privileged instruction to force a world switch. (in both SVM & VMX) 128 128 */ 129 case VMM GC_DO_TESTCASE_HM_NOP:129 case VMMRC_DO_TESTCASE_HM_NOP: 130 130 ASMRdMsr_Low(MSR_IA32_SYSENTER_CS); 131 131 return 0; … … 134 134 * Delay for ~100us. 135 135 */ 136 case VMM GC_DO_TESTCASE_INTERRUPT_MASKING:136 case VMMRC_DO_TESTCASE_INTERRUPT_MASKING: 137 137 { 138 138 uint64_t u64MaxTicks = (SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage) != ~(uint64_t)0 … … 162 162 */ 163 163 default: 164 if ( uOperation >= VMM GC_DO_TESTCASE_TRAP_FIRST165 && uOperation < VMM GC_DO_TESTCASE_TRAP_LAST)164 if ( uOperation >= VMMRC_DO_TESTCASE_TRAP_FIRST 165 && uOperation < VMMRC_DO_TESTCASE_TRAP_LAST) 166 166 return vmmGCTest(pVM, uOperation, uArg); 167 167 return VERR_INVALID_PARAMETER; … … 192 192 * @param pVM Pointer to the VM. 193 193 */ 194 VMMRCDECL(void) VMM GCLogFlushIfFull(PVM pVM)194 VMMRCDECL(void) VMMRCLogFlushIfFull(PVM pVM) 195 195 { 196 196 if ( pVM->vmm.s.pRCLoggerRC … … 210 210 * @param rc The status code. 211 211 */ 212 VMMRCDECL(void) VMM GCGuestToHost(PVM pVM, int rc)212 VMMRCDECL(void) VMMRCGuestToHost(PVM pVM, int rc) 213 213 { 214 214 pVM->vmm.s.pfnRCToHost(rc); … … 273 273 switch (uOperation) 274 274 { 275 //case VMM GC_DO_TESTCASE_TRAP_0:276 //case VMM GC_DO_TESTCASE_TRAP_1:277 //case VMM GC_DO_TESTCASE_TRAP_2:278 279 case VMM GC_DO_TESTCASE_TRAP_3:275 //case VMMRC_DO_TESTCASE_TRAP_0: 276 //case VMMRC_DO_TESTCASE_TRAP_1: 277 //case VMMRC_DO_TESTCASE_TRAP_2: 278 279 case VMMRC_DO_TESTCASE_TRAP_3: 280 280 { 281 281 if (uArg <= 1) … … 284 284 } 285 285 286 //case VMM GC_DO_TESTCASE_TRAP_4:287 //case VMM GC_DO_TESTCASE_TRAP_5:288 //case VMM GC_DO_TESTCASE_TRAP_6:289 //case VMM GC_DO_TESTCASE_TRAP_7:290 291 case VMM GC_DO_TESTCASE_TRAP_8:286 //case VMMRC_DO_TESTCASE_TRAP_4: 287 //case VMMRC_DO_TESTCASE_TRAP_5: 288 //case VMMRC_DO_TESTCASE_TRAP_6: 289 //case VMMRC_DO_TESTCASE_TRAP_7: 290 291 case VMMRC_DO_TESTCASE_TRAP_8: 292 292 { 293 293 #ifndef DEBUG_bird /** @todo dynamic check that this won't triple fault... */ … … 300 300 } 301 301 302 //VMM GC_DO_TESTCASE_TRAP_9,303 //VMM GC_DO_TESTCASE_TRAP_0A,304 //VMM GC_DO_TESTCASE_TRAP_0B,305 //VMM GC_DO_TESTCASE_TRAP_0C,306 307 case VMM GC_DO_TESTCASE_TRAP_0D:302 //VMMRC_DO_TESTCASE_TRAP_9, 303 //VMMRC_DO_TESTCASE_TRAP_0A, 304 //VMMRC_DO_TESTCASE_TRAP_0B, 305 //VMMRC_DO_TESTCASE_TRAP_0C, 306 307 case VMMRC_DO_TESTCASE_TRAP_0D: 308 308 { 309 309 if (uArg <= 1) … … 312 312 } 313 313 314 case VMM GC_DO_TESTCASE_TRAP_0E:314 case VMMRC_DO_TESTCASE_TRAP_0E: 315 315 { 316 316 if (uArg <= 1) -
trunk/src/VBox/VMM/VMMRC/VMMRC.mac
r55028 r56286 1 1 ; $Id$ 2 2 ;; @file 3 ; VMM GC - Raw-mode Context Assembly Macros.3 ; VMMRC - Raw-mode Context Assembly Macros. 4 4 ; 5 5 6 6 ; 7 ; Copyright (C) 2006-201 2Oracle Corporation7 ; Copyright (C) 2006-2015 Oracle Corporation 8 8 ; 9 9 ; This file is part of VirtualBox Open Source Edition (OSE), as … … 16 16 ; 17 17 18 %ifndef __VMM GC_mac__19 %define __VMM GC_mac__18 %ifndef __VMMRC_mac__ 19 %define __VMMRC_mac__ 20 20 21 21 %include "VBox/asmdefs.mac" -
trunk/src/VBox/VMM/VMMRC/VMMRCA.asm
r49893 r56286 1 1 ; $Id$ 2 2 ;; @file 3 ; VMM GC - Raw-mode Context Virtual Machine Monitor assembly routines.4 ; 5 6 ; 7 ; Copyright (C) 2006-201 2Oracle Corporation3 ; VMMRC - Raw-mode Context Virtual Machine Monitor assembly routines. 4 ; 5 6 ; 7 ; Copyright (C) 2006-2015 Oracle Corporation 8 8 ; 9 9 ; This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/VMM/VMMRC/VMMRCDeps.cpp
r44528 r56286 1 1 /* $Id$ */ 2 2 /** @file 3 * VMM GC Runtime Dependencies.3 * VMMRC Runtime Dependencies. 4 4 */ 5 5 … … 26 26 #endif // RT_OS_SOLARIS || RT_OS_FREEBSD 27 27 28 PFNRT g_VMM GCDeps[] =28 PFNRT g_VMMRCDeps[] = 29 29 { 30 30 (PFNRT)memset,
Note:
See TracChangeset
for help on using the changeset viewer.