Changeset 73016 in vbox

Timestamp:

Jul 10, 2018 4:44:16 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HM: Changed HM_CHANGED_XCPT_RAISED_MASK to HM_CHANGED_RAISED_XCPT_MASK to match VINF_EM_RAISED_XCPT.

Location:

trunk/src/VBox/VMM

Files:

: 3 edited

VMMR0/HMSVMR0.cpp (modified) (13 diffs)
VMMR0/HMVMXR0.cpp (modified) (8 diffs)
include/HMInternal.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

r73015	r73016
6182	6182	{
6183	6183	rcStrict = VINF_SUCCESS;
6184		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6184	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6185	6185	}
6186	6186	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6229	6229	{
6230	6230	rcStrict = VINF_SUCCESS;
6231		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6231	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6232	6232	}
6233	6233	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6259	6259	{
6260	6260	rcStrict = VINF_SUCCESS;
6261		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6261	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6262	6262	}
6263	6263	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6319	6319	{
6320	6320	rcStrict = VINF_SUCCESS;
6321		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6321	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6322	6322	}
6323	6323	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6605	6605	{
6606	6606	rcStrict = VINF_SUCCESS;
6607		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6607	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6608	6608	}
6609	6609	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6702	6702	{
6703	6703	rcStrict = VINF_SUCCESS;
6704		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6704	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6705	6705	}
6706	6706	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
6831	6831	{
6832	6832	rcStrict = VINF_SUCCESS;
6833		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	6833	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
6834	6834	}
6835	6835	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7757	7757	{
7758	7758	rcStrict = VINF_SUCCESS;
7759		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7759	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7760	7760	}
7761	7761	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7795	7795	{
7796	7796	rcStrict = VINF_SUCCESS;
7797		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7797	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7798	7798	}
7799	7799	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7840	7840	{
7841	7841	rcStrict = VINF_SUCCESS;
7842		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7842	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7843	7843	}
7844	7844	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7874	7874	{
7875	7875	rcStrict = VINF_SUCCESS;
7876		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7876	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7877	7877	}
7878	7878	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7902	7902	{
7903	7903	rcStrict = VINF_SUCCESS;
7904		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7904	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7905	7905	}
7906	7906	HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
…	…
7935	7935	{
7936	7936	rcStrict = VINF_SUCCESS;
7937		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	7937	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
7938	7938	}
7939	7939

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

r73002	r73016
11095	11095	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11096	11096	{
11097		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11097	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11098	11098	rcStrict = VINF_SUCCESS;
11099	11099	}
…	…
11160	11160	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11161	11161	{
11162		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11162	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11163	11163	rcStrict = VINF_SUCCESS;
11164	11164	}
…	…
11189	11189	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11190	11190	{
11191		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11191	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11192	11192	rcStrict = VINF_SUCCESS;
11193	11193	}
…	…
11284	11284	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11285	11285	{
11286		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11286	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11287	11287	rcStrict = VINF_SUCCESS;
11288	11288	}
…	…
11516	11516	VBOXSTRICTRC rcStrict = IEMExecDecodedXsetbv(pVCpu, pVmxTransient->cbInstr);
11517	11517	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, rcStrict != VINF_IEM_RAISED_XCPT ? HM_CHANGED_GUEST_RIP \| HM_CHANGED_GUEST_RFLAGS
11518		: HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11518	: HM_CHANGED_RAISED_XCPT_MASK);
11519	11519
11520	11520	PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
…	…
11707	11707	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11708	11708	{
11709		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11709	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11710	11710	rcStrict = VINF_SUCCESS;
11711	11711	}
…	…
11837	11837	else if (rcStrict == VINF_IEM_RAISED_XCPT)
11838	11838	{
11839		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	11839	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
11840	11840	rcStrict = VINF_SUCCESS;
11841	11841	}
…	…
12038	12038	if (rcStrict == VINF_IEM_RAISED_XCPT)
12039	12039	{
12040		ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_~~XCPT_RAISED~~_MASK);
	12040	ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
12041	12041	rcStrict = VINF_SUCCESS;
12042	12042	}

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

r73015	r73016
158	158	/** Mask of what state might have changed when IEM raised an exception.
159	159	* This is a based on IEM_CPUMCTX_EXTRN_XCPT_MASK. */
160		#define HM_CHANGED_~~XCPT_RAISED~~_MASK ( HM_CHANGED_GUEST_GPRS_MASK \
	160	#define HM_CHANGED_RAISED_XCPT_MASK ( HM_CHANGED_GUEST_GPRS_MASK \
161	161	\| HM_CHANGED_GUEST_RIP \
162	162	\| HM_CHANGED_GUEST_RFLAGS \

Note: See TracChangeset for help on using the changeset viewer.

Changeset 73016 in vbox

Legend:

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

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

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

Download in other formats: