VirtualBox

Changeset 97226 in vbox for trunk


Ignore:
Timestamp:
Oct 18, 2022 10:57:26 PM (2 years ago)
Author:
vboxsync
Message:

VMM/NEM-darwin: Access CPUMCTX::eflags via the 'u' member when possible in preparation for putting internal info in the reserved bits.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

    r97188 r97226  
    852852        READ_GREG(HV_X86_RIP, pVCpu->cpum.GstCtx.rip);
    853853    if (fWhat & CPUMCTX_EXTRN_RFLAGS)
    854         READ_GREG(HV_X86_RFLAGS, pVCpu->cpum.GstCtx.rflags.u);
     854    {
     855        uint64_t fRFlagsTmp = 0;
     856        READ_GREG(HV_X86_RFLAGS, fRFlagsTmp);
     857        pVCpu->cpum.GstCtx.rflags.u = fRFlagsTmp;
     858    }
    855859
    856860    /* Segments */
     
    14431447        else
    14441448        {
    1445             pVCpu->cpum.GstCtx.eflags.u32 |= X86_EFL_TF;
     1449            pVCpu->cpum.GstCtx.eflags.u |= X86_EFL_TF;
    14461450            pVCpu->nem.s.fCtxChanged |= HM_CHANGED_GUEST_RFLAGS;
    14471451            pVCpu->nem.s.fClearTrapFlag = true;
     
    36853689VBOXSTRICTRC nemR3NativeRunGC(PVM pVM, PVMCPU pVCpu)
    36863690{
    3687     LogFlow(("NEM/%u: %04x:%08RX64 efl=%#08RX64 <=\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags));
     3691    LogFlow(("NEM/%u: %04x:%08RX64 efl=%#08RX64 <=\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags.u));
    36883692#ifdef LOG_ENABLED
    36893693    if (LogIs3Enabled())
     
    37743778
    37753779    LogFlow(("NEM/%u: %04x:%08RX64 efl=%#08RX64 => %Rrc\n",
    3776              pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags, VBOXSTRICTRC_VAL(rcStrict) ));
     3780             pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags.u, VBOXSTRICTRC_VAL(rcStrict) ));
    37773781    return rcStrict;
    37783782}
Note: See TracChangeset for help on using the changeset viewer.

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