VirtualBox

Changeset 1418 in vbox for trunk


Ignore:
Timestamp:
Mar 12, 2007 12:18:27 PM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
19426
Message:

Renamed variable.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/SELM.cpp

    r1416 r1418  
    897897         */
    898898        /** @todo we should try to minimize relocations by making sure our current selectors can be reused. */
    899         RTSEL aHyperGDT[SELM_HYPER_SEL_MAX];
     899        RTSEL aHyperSel[SELM_HYPER_SEL_MAX];
    900900        if (cbEffLimit >= SELM_HYPER_DEFAULT_BASE)
    901901        {
     
    910910                if (!pGDTE->Gen.u1Present)
    911911                {
    912                     aHyperGDT[iGDT] = ((uintptr_t)pGDTE - (uintptr_t)pVM->selm.s.paGdtHC) / sizeof(VBOXDESC);
    913                     aHyperGDT[iGDT] = aHyperGDT[iGDT] << X86_SEL_SHIFT;
    914                     Log(("SELM: Found unused GDT %04X\n", aHyperGDT[iGDT]));
     912                    aHyperSel[iGDT] = ((uintptr_t)pGDTE - (uintptr_t)pVM->selm.s.paGdtHC) / sizeof(VBOXDESC);
     913                    aHyperSel[iGDT] = aHyperSel[iGDT] << X86_SEL_SHIFT;
     914                    Log(("SELM: Found unused GDT %04X\n", aHyperSel[iGDT]));
    915915                    iGDT++;
    916916                }
     
    927927        else
    928928        {
    929             aHyperGDT[SELM_HYPER_SEL_CS]         = SELM_HYPER_DEFAULT_SEL_CS;
    930             aHyperGDT[SELM_HYPER_SEL_DS]         = SELM_HYPER_DEFAULT_SEL_DS;
    931             aHyperGDT[SELM_HYPER_SEL_CS64]       = SELM_HYPER_DEFAULT_SEL_CS64;
    932             aHyperGDT[SELM_HYPER_SEL_TSS]        = SELM_HYPER_DEFAULT_SEL_TSS;
    933             aHyperGDT[SELM_HYPER_SEL_TSS_TRAP08] = SELM_HYPER_DEFAULT_SEL_TSS_TRAP08;
     929            aHyperSel[SELM_HYPER_SEL_CS]         = SELM_HYPER_DEFAULT_SEL_CS;
     930            aHyperSel[SELM_HYPER_SEL_DS]         = SELM_HYPER_DEFAULT_SEL_DS;
     931            aHyperSel[SELM_HYPER_SEL_CS64]       = SELM_HYPER_DEFAULT_SEL_CS64;
     932            aHyperSel[SELM_HYPER_SEL_TSS]        = SELM_HYPER_DEFAULT_SEL_TSS;
     933            aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] = SELM_HYPER_DEFAULT_SEL_TSS_TRAP08;
    934934        }
    935935
     
    983983         * Check if our hypervisor selectors were changed.
    984984         */
    985         if (    aHyperGDT[SELM_HYPER_SEL_CS]         != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]
    986             ||  aHyperGDT[SELM_HYPER_SEL_DS]         != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]
    987             ||  aHyperGDT[SELM_HYPER_SEL_CS64]       != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64]
    988             ||  aHyperGDT[SELM_HYPER_SEL_TSS]        != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS]
    989             ||  aHyperGDT[SELM_HYPER_SEL_TSS_TRAP08] != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08])
     985        if (    aHyperSel[SELM_HYPER_SEL_CS]         != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]
     986            ||  aHyperSel[SELM_HYPER_SEL_DS]         != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]
     987            ||  aHyperSel[SELM_HYPER_SEL_CS64]       != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64]
     988            ||  aHyperSel[SELM_HYPER_SEL_TSS]        != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS]
     989            ||  aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] != pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08])
    990990        {
    991991            /* Reinitialize our hypervisor GDTs */
    992             pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]         = aHyperGDT[SELM_HYPER_SEL_CS];
    993             pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]         = aHyperGDT[SELM_HYPER_SEL_DS];
    994             pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64]       = aHyperGDT[SELM_HYPER_SEL_CS64];
    995             pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS]        = aHyperGDT[SELM_HYPER_SEL_TSS];
    996             pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] = aHyperGDT[SELM_HYPER_SEL_TSS_TRAP08];
     992            pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]         = aHyperSel[SELM_HYPER_SEL_CS];
     993            pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]         = aHyperSel[SELM_HYPER_SEL_DS];
     994            pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64]       = aHyperSel[SELM_HYPER_SEL_CS64];
     995            pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS]        = aHyperSel[SELM_HYPER_SEL_TSS];
     996            pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] = aHyperSel[SELM_HYPER_SEL_TSS_TRAP08];
    997997
    998998            STAM_COUNTER_INC(&pVM->selm.s.StatHyperSelsChanged);
Note: See TracChangeset for help on using the changeset viewer.

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