Skip to content

Commit d95b674

Browse files
seanshparkjanvorli
authored andcommitted
[x86/Linux] Fix PAL unit test paltest_pal_sxs_test1 (dotnet/coreclr#8522)
Fix unit test error for x86/Linux - fix fail of exception_handling/pal_sxs/test1/paltest_pal_sxs_test1 Commit migrated from dotnet/coreclr@b2a083a
1 parent 071e149 commit d95b674

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/coreclr/src/pal/src/arch/i386/context2.S

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ LOCAL_LABEL(Done_CONTEXT_EXTENDED_REGISTERS):
8282
// Restore
8383
pop ebx
8484
pop eax
85-
ret
85+
ret 4
8686
LEAF_END CONTEXT_CaptureContext, _TEXT
8787

8888
LEAF_ENTRY RtlCaptureContext, _TEXT
@@ -91,7 +91,6 @@ LEAF_ENTRY RtlCaptureContext, _TEXT
9191
mov DWORD PTR [eax + CONTEXT_ContextFlags], (CONTEXT_FLOATING_POINT)
9292
pop eax
9393
jmp C_FUNC(CONTEXT_CaptureContext)
94-
ret
9594
LEAF_END RtlCaptureContext, _TEXT
9695

9796
LEAF_ENTRY RtlRestoreContext, _TEXT
@@ -147,6 +146,6 @@ LOCAL_LABEL(Done_Restore_CONTEXT_EXTENDED_REGISTERS):
147146
pop esi
148147
pop edi
149148

150-
ret
149+
ret 8
151150
LEAF_END RtlRestoreContext, _TEXT
152151

src/coreclr/src/pal/src/include/pal/context.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ Parameters :
504504
505505
--*/
506506
void
507+
PALAPI
507508
CONTEXT_CaptureContext(
508509
LPCONTEXT lpContext
509510
);

src/coreclr/src/pal/src/thread/context.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ SET_DEFAULT_DEBUG_CHANNEL(THREAD); // some headers have code with asserts, so do
3333

3434
extern PGET_GCMARKER_EXCEPTION_CODE g_getGcMarkerExceptionCode;
3535

36-
// in context2.S
37-
extern void CONTEXT_CaptureContext(LPCONTEXT lpContext);
38-
3936
#define CONTEXT_AREA_MASK 0xffff
4037
#ifdef _X86_
4138
#define CONTEXT_ALL_FLOATING (CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS)

0 commit comments

Comments
 (0)