From d1be17ab87c51fd53381491610ede29b6dbd10fa Mon Sep 17 00:00:00 2001 From: klu2 Date: Mon, 4 May 2009 03:00:08 +0000 Subject: [PATCH] Add checking for ThunkAttribute to avoid THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL and THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 are set at same time. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8230 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseLib/X86Thunk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MdePkg/Library/BaseLib/X86Thunk.c b/MdePkg/Library/BaseLib/X86Thunk.c index 72c918756d..6b6e9f0f12 100644 --- a/MdePkg/Library/BaseLib/X86Thunk.c +++ b/MdePkg/Library/BaseLib/X86Thunk.c @@ -249,7 +249,9 @@ AsmThunk16 ( ASSERT ((UINTN)ThunkContext->RealModeBuffer < 0x100000); ASSERT (ThunkContext->RealModeBufferSize >= m16Size); ASSERT ((UINTN)ThunkContext->RealModeBuffer + m16Size <= 0x100000); - + ASSERT (((ThunkContext->ThunkAttributes & (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL)) != \ + (THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 | THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL))); + UpdatedRegs = InternalAsmThunk16 ( ThunkContext->RealModeState, ThunkContext->RealModeBuffer -- 2.39.2