diff options
| author | MyungJoo Ham <myungjoo.ham@gmail.com> | 2016-06-09 17:40:18 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-06-09 10:40:18 +0200 |
| commit | 6287c789b95e5a32100e09d97c568363f4d2d791 (patch) | |
| tree | 817a591e3c963527357e25c9c320ca5521cb8893 /src/pal/src/arch | |
| parent | df990785c63cecc10ba042c3606fe69f955588dc (diff) | |
| download | coreclr-6287c789b95e5a32100e09d97c568363f4d2d791.tar.gz coreclr-6287c789b95e5a32100e09d97c568363f4d2d791.tar.bz2 coreclr-6287c789b95e5a32100e09d97c568363f4d2d791.zip | |
ARM/Linux Regression Fix of Exception Handling (#5596)
This fixes the regression caused by
594b424e1328135049cf0515bc5fc58b91f07e2a, which
intended to fix #5358 while breaking many of
exception handling unit test cases.
The commit fixing #5358 was an incorrect translation
of x86 assembly code.
Fix #5595, #5358.
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'src/pal/src/arch')
| -rw-r--r-- | src/pal/src/arch/arm/exceptionhelper.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/pal/src/arch/arm/exceptionhelper.S b/src/pal/src/arch/arm/exceptionhelper.S index d7f85e7041..ed1c9c3dc2 100644 --- a/src/pal/src/arch/arm/exceptionhelper.S +++ b/src/pal/src/arch/arm/exceptionhelper.S @@ -22,12 +22,7 @@ LEAF_ENTRY ThrowExceptionFromContextInternal, _TEXT ldr r10, [r0, #(CONTEXT_R10)] ldr r11, [r0, #(CONTEXT_R11)] ldr sp, [r0, #(CONTEXT_Sp)] - - ldr r2, [r0, #(CONTEXT_Pc)] - - // Store return address to the stack - // Added r7 as a dummy to keep the stack aligned by 8 bytes. - push {r2, r7} + ldr lr, [r0, #(CONTEXT_Pc)] // The PAL_SEHException pointer mov r0, r1 |