- Timestamp:
- Oct 8, 2015 10:09:23 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Doxyfile.Core
r58126 r58127 518 518 PREDEFINED += HCPTRTYPE(HCType)=HCType 519 519 PREDEFINED += R3R0PTRTYPE(R3R0Type)=R3R0Type 520 PREDEFINED += \ 521 "CTX_SUFF(var)=var##R3" \ 522 "CTX_SUFF_Z(var)=var##RZ" \ 523 "CTX_MID(first,last)=firstr##R3##last" \ 524 "CTX_MID_Z(first,last)=firstr##RZ##last" \ 520 525 521 526 # Compile assertion hacks. -
trunk/Makefile.kmk
r58114 r58127 460 460 src/VBox/VMM/VMMAll \ 461 461 src/VBox/VMM/VMMSwitcher \ 462 src/VBox/VMM/include \ 462 463 src/VBox/Debugger \ 463 464 src/VBox/Devices \ … … 676 677 $(PATH_ROOT)/include/VBox/vmm/stam.h \ 677 678 $(PATH_ROOT)/include/VBox/vmm/em.h \ 679 $(PATH_ROOT)/include/VBox/vmm/hm.h \ 680 $(PATH_ROOT)/include/VBox/vmm/hm_svm.h \ 681 $(PATH_ROOT)/include/VBox/vmm/hm_vmx.h \ 682 $(PATH_ROOT)/include/VBox/vmm/iem.h \ 678 683 $(PATH_ROOT)/include/VBox/vmm/pdm.h \ 679 684 $(PATH_ROOT)/include/VBox/vmm/rem.h \ 680 685 $(PATH_ROOT)/include/VBox/vmm/iom.h \ 681 686 $(PATH_ROOT)/include/VBox/vmm/cfgm.h \ 687 $(PATH_ROOT)/include/VBox/vmm/gim.h \ 682 688 $(PATH_ROOT)/include/VBox/vmm/tm.h \ 683 689 $(PATH_ROOT)/include/VBox/vmm/csam.h \ 684 690 $(PATH_ROOT)/include/VBox/vmm/ssm.h \ 685 $(PATH_ROOT)/include/VBox/vmm/hm.h \686 $(PATH_ROOT)/include/VBox/vmm/hm_svm.h \687 $(PATH_ROOT)/include/VBox/vmm/hm_vmx.h \688 691 \ 689 692 $(PATH_ROOT)/src/VBox/VMM/include/CFGMInternal.h \ … … 692 695 $(PATH_ROOT)/src/VBox/VMM/include/EMInternal.h \ 693 696 $(PATH_ROOT)/src/VBox/VMM/include/HMInternal.h \ 697 $(PATH_ROOT)/src/VBox/VMM/include/IEMInternal.h \ 694 698 $(PATH_ROOT)/src/VBox/VMM/include/IOMInternal.h \ 695 699 $(PATH_ROOT)/src/VBox/VMM/include/MMInternal.h \ 696 700 $(PATH_ROOT)/src/VBox/VMM/include/PDMInternal.h \ 697 701 $(PATH_ROOT)/src/VBox/VMM/include/PGMInternal.h \ 702 $(PATH_ROOT)/src/VBox/VMM/include/GIMInternal.h \ 698 703 $(PATH_ROOT)/src/VBox/VMM/include/CSAMInternal.h \ 699 704 $(PATH_ROOT)/src/VBox/VMM/include/PATMInternal.h \ … … 756 761 | $$(dir $$@) 757 762 $(QUIET)$(RM) -f $@ [email protected] $(PATH_TARGET)/Doxyfile.Core.dep 758 $( CP) -f Doxyfile.Core [email protected]759 $( APPEND) [email protected]760 $( APPEND) [email protected] "OUTPUT_DIRECTORY = $(VBOX_CORE_DOXYFILE_OUTPUT)"761 $( APPEND) [email protected] "WARN_LOGFILE = $(VBOX_CORE_DOXYFILE_OUTPUT)/errors"762 $( APPEND) [email protected] "INCLUDE_PATH = $(PATH_ROOT)/include $(PATH_ROOT)/src/VBox/VMM $(PATH_ROOT)/src/VBox/Main/include "763 $( APPEND) [email protected] "INCLUDE_FILE_PATTERNS = *.cpp.h"764 $( APPEND) [email protected]765 $( APPEND) [email protected] "INPUT = $(VBOX_CORE_DOXYFILE_INPUT)"766 $( APPEND) [email protected]767 $( APPEND) [email protected] "PREDEFINED += $(DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(ARCH_BITS_DEFS)"768 $( APPEND) [email protected] "PREDEFINED += ARCH_BITS=HC_ARCH_BITS R3_ARCH_BITS=HC_ARCH_BITS R0_ARCH_BITS=HC_ARCH_BITS "769 $( APPEND) [email protected]770 $( MV) -f [email protected] $@763 $(QUIET)$(CP) -f Doxyfile.Core [email protected] 764 $(QUIET)$(APPEND) [email protected] 765 $(QUIET)$(APPEND) [email protected] "OUTPUT_DIRECTORY = $(VBOX_CORE_DOXYFILE_OUTPUT)" 766 $(QUIET)$(APPEND) [email protected] "WARN_LOGFILE = $(VBOX_CORE_DOXYFILE_OUTPUT)/errors" 767 $(QUIET)$(APPEND) [email protected] "INCLUDE_PATH = $(PATH_ROOT)/include $(PATH_ROOT)/src/VBox/VMM $(PATH_ROOT)/src/VBox/Main/include " 768 $(QUIET)$(APPEND) [email protected] "INCLUDE_FILE_PATTERNS = *.cpp.h" 769 $(QUIET)$(APPEND) [email protected] 770 $(QUIET)$(APPEND) [email protected] "INPUT = $(VBOX_CORE_DOXYFILE_INPUT)" 771 $(QUIET)$(APPEND) [email protected] 772 $(QUIET)$(APPEND) [email protected] "PREDEFINED += $(DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(ARCH_BITS_DEFS)" 773 $(QUIET)$(APPEND) [email protected] "PREDEFINED += ARCH_BITS=HC_ARCH_BITS R3_ARCH_BITS=HC_ARCH_BITS R0_ARCH_BITS=HC_ARCH_BITS " 774 $(QUIET)$(APPEND) [email protected] 775 $(QUIET)$(MV) -f [email protected] $@ 771 776 @$(APPEND) $(PATH_TARGET)/Doxyfile.Core.dep "DOXYGEN_OUTPUT_PREV = $(VBOX_CORE_DOXYFILE_OUTPUT)" 772 777 @$(APPEND) $(PATH_TARGET)/Doxyfile.Core.dep "DOXYGEN_INPUT_PREV = $(VBOX_CORE_DOXYFILE_INPUT)" -
trunk/include/VBox/vmm/dbgftrace.h
r58106 r58127 37 37 */ 38 38 39 #if (defined(RTTRACE_ENABLED) || DBGFTRACE_ENABLED) && !defined(DBGFTRACE_DISABLED)39 #if (defined(RTTRACE_ENABLED) || defined(DBGFTRACE_ENABLED)) && !defined(DBGFTRACE_DISABLED) 40 40 # undef DBGFTRACE_ENABLED 41 41 # undef DBGFTRACE_DISABLED -
trunk/src/VBox/VMM/include/EMHandleRCTmpl.h
r58123 r58127 35 35 * @param pVM The cross context VM structure. 36 36 * @param pVCpu The cross context virtual CPU structure. 37 * @param pCtx Pointer to the guest CPU context. 37 38 * @param rc The return code. 38 * @param pCtx Pointer to the guest CPU context.39 39 */ 40 40 #ifdef EMHANDLERC_WITH_PATM 41 41 int emR3RawHandleRC(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, int rc) 42 #elif defined(EMHANDLERC_WITH_HM) 42 #elif defined(EMHANDLERC_WITH_HM) || defined(DOXYGEN_RUNNING) 43 43 int emR3HmHandleRC(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, int rc) 44 44 #endif -
trunk/src/VBox/VMM/include/GIMKvmInternal.h
r56813 r58127 197 197 /** CPUID features: Basic. */ 198 198 uint32_t uBaseFeat; 199 /** Whether GIM needs to trap #UD exceptions. */199 /** Whether GIM needs to trap \#UD exceptions. */ 200 200 bool fTrapXcptUD; 201 201 /** Disassembler opcode of hypercall instruction native for this host CPU. */ -
trunk/src/VBox/VMM/include/IEMInternal.h
r56628 r58127 44 44 * defined(IEM_VERIFICATION_MODE) && !defined(IEM_VERIFICATION_MODE_MINIMAL) 45 45 */ 46 #if defined(IEM_VERIFICATION_MODE) && !defined(IEM_VERIFICATION_MODE_MINIMAL) && !defined(IEM_VERIFICATION_MODE_FULL) 46 #if (defined(IEM_VERIFICATION_MODE) && !defined(IEM_VERIFICATION_MODE_MINIMAL) && !defined(IEM_VERIFICATION_MODE_FULL)) \ 47 || defined(DOXYGEN_RUNNING) 47 48 # define IEM_VERIFICATION_MODE_FULL 48 49 #endif … … 631 632 * Indicates that one of the verfication modes are enabled. 632 633 */ 633 #if (defined(IEM_VERIFICATION_MODE_FULL) || defined(IEM_VERIFICATION_MODE_MINIMAL)) && !defined(IEM_VERIFICATION_MODE) 634 #if (defined(IEM_VERIFICATION_MODE_FULL) || defined(IEM_VERIFICATION_MODE_MINIMAL)) && !defined(IEM_VERIFICATION_MODE) \ 635 || defined(DOXYGEN_RUNNING) 634 636 # define IEM_VERIFICATION_MODE 635 637 #endif -
trunk/src/VBox/VMM/include/PDMBlkCacheInternal.h
r56287 r58127 60 60 /** Cache the entry belongs to. */ 61 61 PPDMBLKCACHE pBlkCache; 62 /** Flags for this entry. Combinations of PDMACFILECACHE_* #defines */62 /** Flags for this entry. Combinations of PDMACFILECACHE_* \#defines */ 63 63 volatile uint32_t fFlags; 64 64 /** Reference counter. Prevents eviction of the entry if > 0. */ -
trunk/src/VBox/VMM/include/PGMInline.h
r58123 r58127 225 225 * @param HCPhys The physical address of the page. 226 226 * @param ppv Where to store the mapping address. 227 * @param SRC_POS The source location of the caller. 227 228 */ 228 229 DECLINLINE(int) pgmRZDynMapHCPageInlined(PVMCPU pVCpu, RTHCPHYS HCPhys, void **ppv RTLOG_COMMA_SRC_POS_DECL) … … 264 265 * @param GCPhys The guest physical address of the page. 265 266 * @param ppv Where to store the mapping address. 267 * @param SRC_POS The source location of the caller. 266 268 */ 267 269 DECLINLINE(int) pgmRZDynMapGCPageV2Inlined(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void **ppv RTLOG_COMMA_SRC_POS_DECL) … … 324 326 * @param GCPhys The guest physical address of the page. 325 327 * @param ppv Where to store the mapping address. 328 * @param SRC_POS The source location of the caller. 326 329 */ 327 330 DECLINLINE(int) pgmRZDynMapGCPageInlined(PVMCPU pVCpu, RTGCPHYS GCPhys, void **ppv RTLOG_COMMA_SRC_POS_DECL) … … 337 340 * @returns VBox status code, see pgmRZDynMapGCPageCommon for details. 338 341 * @param pVCpu The cross context virtual CPU structure. 339 * @param HCPhys Thephysical address of the page.342 * @param GCPhys The guest physical address of the page. 340 343 * @param ppv Where to store the mapping address. The offset is 341 344 * preserved. 345 * @param SRC_POS The source location of the caller. 342 346 */ 343 347 DECLINLINE(int) pgmRZDynMapGCPageOffInlined(PVMCPU pVCpu, RTGCPHYS GCPhys, void **ppv RTLOG_COMMA_SRC_POS_DECL) … … 401 405 * @param pVM The cross context VM structure. 402 406 * @param pPage The page. 407 * @param SRC_POS The source location of the caller. 403 408 */ 404 409 DECLINLINE(void *) pgmPoolMapPageInlined(PVM pVM, PPGMPOOLPAGE pPage RTLOG_COMMA_SRC_POS_DECL) … … 422 427 * @param pVCpu The cross context virtual CPU structure. 423 428 * @param pPage The page. 429 * @param SRC_POS The source location of the caller. 424 430 */ 425 431 DECLINLINE(void *) pgmPoolMapPageV2Inlined(PVM pVM, PVMCPU pVCpu, PPGMPOOLPAGE pPage RTLOG_COMMA_SRC_POS_DECL) … … 1073 1079 * @returns Pointer to the shadow PD. 1074 1080 * @param pVCpu The cross context virtual CPU structure. 1081 * @param pPdpt Pointer to the page directory pointer table. 1075 1082 * @param GCPtr The address. 1076 1083 */ … … 1398 1405 * Locks a page to prevent flushing (important for cr3 root pages or shadow pae pd pages). 1399 1406 * 1400 * @param p VM The cross context VM structure.1407 * @param pPool The pool. 1401 1408 * @param pPage PGM pool page 1402 1409 */ … … 1411 1418 * Unlocks a page to allow flushing again 1412 1419 * 1413 * @param p VM The cross context VM structure.1420 * @param pPool The pool. 1414 1421 * @param pPage PGM pool page 1415 1422 */
Note:
See TracChangeset
for help on using the changeset viewer.