Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Fix PAL unit test paltest_pal_sxs_test1 #8522

Merged
merged 1 commit into from
Dec 9, 2016
Merged

[x86/Linux] Fix PAL unit test paltest_pal_sxs_test1 #8522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/pal/src/arch/i386/context2.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ LOCAL_LABEL(Done_CONTEXT_EXTENDED_REGISTERS):
// Restore
pop ebx
pop eax
ret
ret 4
LEAF_END CONTEXT_CaptureContext, _TEXT

LEAF_ENTRY RtlCaptureContext, _TEXT
Expand All @@ -91,7 +91,6 @@ LEAF_ENTRY RtlCaptureContext, _TEXT
mov DWORD PTR [eax + CONTEXT_ContextFlags], (CONTEXT_FLOATING_POINT)
pop eax
jmp C_FUNC(CONTEXT_CaptureContext)
ret
LEAF_END RtlCaptureContext, _TEXT

LEAF_ENTRY RtlRestoreContext, _TEXT
Expand Down Expand Up @@ -147,6 +146,6 @@ LOCAL_LABEL(Done_Restore_CONTEXT_EXTENDED_REGISTERS):
pop esi
pop edi

ret
ret 8
LEAF_END RtlRestoreContext, _TEXT

1 change: 1 addition & 0 deletions src/pal/src/include/pal/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ Parameters :

--*/
void
PALAPI
CONTEXT_CaptureContext(
LPCONTEXT lpContext
);
Expand Down
3 changes: 0 additions & 3 deletions src/pal/src/thread/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ SET_DEFAULT_DEBUG_CHANNEL(THREAD); // some headers have code with asserts, so do

extern PGET_GCMARKER_EXCEPTION_CODE g_getGcMarkerExceptionCode;

// in context2.S
extern void CONTEXT_CaptureContext(LPCONTEXT lpContext);

#define CONTEXT_AREA_MASK 0xffff
#ifdef _X86_
#define CONTEXT_ALL_FLOATING (CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS)
Expand Down