VirtualBox

儲存庫 vbox 的更動 45955


忽略:
時間撮記:
2013-5-8 下午06:04:10 (12 年 以前)
作者:
vboxsync
訊息:

VMM: Name fixes for non-static functions.

位置:
trunk/src/VBox/VMM
檔案:
修改 4 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/VMM/VMMR0/HMR0A.asm

    r45875 r45955  
    55
    66;
    7 ; Copyright (C) 2006-2012 Oracle Corporation
     7; Copyright (C) 2006-2013 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    971971; * @param  pIdtr        Where to store the 64-bit IDTR.
    972972; */
    973 ;DECLASM(void) hmR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
    974 ALIGNCODE(16)
    975 BEGINPROC hmR0Get64bitGdtrAndIdtr
     973;DECLASM(void) HMR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
     974ALIGNCODE(16)
     975BEGINPROC HMR0Get64bitGdtrAndIdtr
    976976    db      0xea                        ; jmp far .sixtyfourbit_mode
    977977    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    … …  
    991991    dd      .the_end, NAME(SUPR0AbsKernelCS)
    992992BITS 32
    993 ENDPROC   hmR0Get64bitGdtrAndIdtr
     993ENDPROC   HMR0Get64bitGdtrAndIdtr
    994994
    995995
    … …  
    998998; * @returns CR3
    999999; */
    1000 ;DECLASM(uint64_t) hmR0Get64bitCR3(void);
    1001 ALIGNCODE(16)
    1002 BEGINPROC hmR0Get64bitCR3
     1000;DECLASM(uint64_t) HMR0Get64bitCR3(void);
     1001ALIGNCODE(16)
     1002BEGINPROC HMR0Get64bitCR3
    10031003    db      0xea                        ; jmp far .sixtyfourbit_mode
    10041004    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    … …  
    10161016    dd      .the_end, NAME(SUPR0AbsKernelCS)
    10171017BITS 32
    1018 ENDPROC   hmR0Get64bitCR3
     1018ENDPROC   HMR0Get64bitCR3
    10191019
    10201020%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    … …  
    10261026; load the guest ones when necessary.
    10271027;
    1028 ; @cproto       DECLASM(int) hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
     1028; @cproto       DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
    10291029;
    10301030; @returns      eax
    … …  
    10371037; @param        pfnStartVM      msc:[rbp+38h]
    10381038;
    1039 ; @remarks      This is essentially the same code as hmR0SVMRunWrapXMM, only the parameters differ a little bit.
     1039; @remarks      This is essentially the same code as HMR0SVMRunWrapXMM, only the parameters differ a little bit.
    10401040;
    10411041; ASSUMING 64-bit and windows for now.
    10421042ALIGNCODE(16)
    1043 BEGINPROC hmR0VMXStartVMWrapXMM
     1043BEGINPROC HMR0VMXStartVMWrapXMM
    10441044        push    xBP
    10451045        mov     xBP, xSP
    … …  
    11481148        leave
    11491149        ret
    1150 ENDPROC   hmR0VMXStartVMWrapXMM
     1150ENDPROC   HMR0VMXStartVMWrapXMM
    11511151
    11521152;;
    … …  
    11541154; load the guest ones when necessary.
    11551155;
    1156 ; @cproto       DECLASM(int) hmR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
     1156; @cproto       DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
    11571157;
    11581158; @returns      eax
    … …  
    11651165; @param        pfnVMRun        msc:[rbp+38h]
    11661166;
    1167 ; @remarks      This is essentially the same code as hmR0VMXStartVMWrapXMM, only the parameters differ a little bit.
     1167; @remarks      This is essentially the same code as HMR0VMXStartVMWrapXMM, only the parameters differ a little bit.
    11681168;
    11691169; ASSUMING 64-bit and windows for now.
    11701170ALIGNCODE(16)
    1171 BEGINPROC hmR0SVMRunWrapXMM
     1171BEGINPROC HMR0SVMRunWrapXMM
    11721172        push    xBP
    11731173        mov     xBP, xSP
    … …  
    12761276        leave
    12771277        ret
    1278 ENDPROC   hmR0SVMRunWrapXMM
     1278ENDPROC   HMR0SVMRunWrapXMM
    12791279
    12801280%endif ; VBOX_WITH_KERNEL_USING_XMM

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

    r45954 r45955  
    20642064    if (HMVMX_IS_64BIT_HOST_MODE())
    20652065    {
    2066         uint64_t uRegCR3 = hmR0Get64bitCR3();
     2066        uint64_t uRegCR3 = HMR0Get64bitCR3();
    20672067        rc = VMXWriteVmcs64(VMX_VMCS_HOST_CR3, uRegCR3);
    20682068    }
    … …  
    21682168        X86XDTR64 Gdtr64;
    21692169        X86XDTR64 Idtr64;
    2170         hmR0Get64bitGdtrAndIdtr(&Gdtr64, &Idtr64);
     2170        HMR0Get64bitGdtrAndIdtr(&Gdtr64, &Idtr64);
    21712171        rc = VMXWriteVmcs64(VMX_VMCS_HOST_GDTR_BASE, Gdtr64.uAddr);     AssertRCReturn(rc, rc);
    21722172        rc = VMXWriteVmcs64(VMX_VMCS_HOST_IDTR_BASE, Idtr64.uAddr);     AssertRCReturn(rc, rc);
    … …  
    38043804     */
    38053805#ifdef VBOX_WITH_KERNEL_USING_XMM
    3806     return hmR0VMXStartVMWrapXMM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
     3806    return HMR0VMXStartVMWrapXMM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
    38073807#else
    38083808    return pVCpu->hm.s.vmx.pfnStartVM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu);

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

    r45947 r45955  
    13261326        if (VMX_IS_64BIT_HOST_MODE())
    13271327        {
    1328             cr3 = hmR0Get64bitCR3();
     1328            cr3 = HMR0Get64bitCR3();
    13291329            rc |= VMXWriteVmcs64(VMX_VMCS_HOST_CR3,     cr3);
    13301330        }
    … …  
    13911391        {
    13921392            X86XDTR64 gdtr64, idtr64;
    1393             hmR0Get64bitGdtrAndIdtr(&gdtr64, &idtr64);
     1393            HMR0Get64bitGdtrAndIdtr(&gdtr64, &idtr64);
    13941394            rc  = VMXWriteVmcs64(VMX_VMCS_HOST_GDTR_BASE, gdtr64.uAddr);
    13951395            rc |= VMXWriteVmcs64(VMX_VMCS_HOST_IDTR_BASE, idtr64.uAddr);
    … …  
    33583358
    33593359#ifdef VBOX_WITH_KERNEL_USING_XMM
    3360     rc = hmR0VMXStartVMWrapXMM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
     3360    rc = HMR0VMXStartVMWrapXMM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
    33613361#else
    33623362    rc = pVCpu->hm.s.vmx.pfnStartVM(pVCpu->hm.s.fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu);

  • trunk/src/VBox/VMM/include/HMInternal.h

    r45947 r45955  
    929929
    930930# ifdef VBOX_WITH_KERNEL_USING_XMM
    931 DECLASM(int)   hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
    932 DECLASM(int)   hmR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
     931DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
     932DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
    933933# endif
    934934
    … …  
    939939 * @param  pIdtr        Where to store the 64-bit IDTR.
    940940 */
    941 DECLASM(void) hmR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
     941DECLASM(void) HMR0Get64bitGdtrAndIdtr(PX86XDTR64 pGdtr, PX86XDTR64 pIdtr);
    942942
    943943/**
    … …  
    945945 * @returns CR3
    946946 */
    947 DECLASM(uint64_t) hmR0Get64bitCR3(void);
     947DECLASM(uint64_t) HMR0Get64bitCR3(void);
    948948# endif
    949949
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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