diff options
| author | drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-16 17:04:41 +0000 |
|---|---|---|
| committer | drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-16 17:04:41 +0000 |
| commit | d9af160209229462a87fd5ade82b352665c77aa0 (patch) | |
| tree | 334b3d2a842b79dc3b040fb2439effee2404892f /gcc/config/arm/libunwind.S | |
| parent | 9ba35eac69022998573b5e2b21022708fd9a0f11 (diff) | |
| download | ppe42-gcc-d9af160209229462a87fd5ade82b352665c77aa0.tar.gz ppe42-gcc-d9af160209229462a87fd5ade82b352665c77aa0.zip | |
2005-11-16 Nathan Sidwell <nathan@codesourcery.com>
gcc/
* config/arm/unwind-arm.h: Reorder interface function declarations.
(_URC_END_OF_STACK): New enumeration value.
(_US_UNWIND_ACTION_MASK, _US_FORCE_UNWIND, _US_END_OF_STACK): Likewise.
(struct _Unwind_Control_Block): Document reserved field use.
(_Unwind_Stop_Fn): New typedef.
(_Unwind_ForcedUnwind): Declare.
(_Unwind_Resume_or_Rethrow): Declare.
* config/arm/libunwind.S (UNWIND_WRAPER): Add nargs
argument. Adjust.
(_Unwind_Resume_or_Rethrow, _Unwind_ForcedUnwind): New.
* config/arm/unwind-arm.c (UCB_FORCED_STOP_FN)
(UCB_FORCED_STOP_ARG): New.
(search_EIT_table): Update boundary condition checks.
(get_eit_entry): Return _URC_END_OF_STACK when cannot unwind.
(unwind_phase2): Replace for with do..while.
(unwind_phase2_forced): New.
(__gnu_Unwind_RaiseException): Replace for with do..while.
(__gnu_Unwind_ForcedUnwind): New.
(__gnu_Unwind_Resume): Set FORCE_UNWIND flag, if forced unwinding.
Use appropriate phase2 unwinder.
(__gnu_Unwind_Resume_or_Rethrow): New.
(__gnu_unwind_pr_common): Cope with forced unwinding.
gcc/testsuite/
* g++.dg/eh/forced1.C: Adjust to cope with ARM EABI
structures.
* g++.dg/eh/forced2.C: Likewise.
* g++.dg/eh/forced3.C: Likewise.
* g++.dg/eh/forced4.C: Likewise.
libstdc++-v3/
* libsupc++/eh_arm.cc (__cxa_begin_cleanup): Remember a
foreign exception too.
(__gnu_end_cleanup): Recover a foreign exception too.
* libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Cope
with forced unwinding.
* libsupc++/eh_throw.cc (__cxxabiv1::__cxa_rethrow): Use
_Unwind_Resume_or_Rethrow for ARM EABI.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107089 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/arm/libunwind.S')
| -rw-r--r-- | gcc/config/arm/libunwind.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/config/arm/libunwind.S b/gcc/config/arm/libunwind.S index 8d226df3fd2..06e13107d2a 100644 --- a/gcc/config/arm/libunwind.S +++ b/gcc/config/arm/libunwind.S @@ -78,7 +78,7 @@ ARM_FUNC_START gnu_Unwind_Save_VFP /* Wrappers to save core registers, then call the real routine. */ -.macro UNWIND_WRAPPER name +.macro UNWIND_WRAPPER name nargs ARM_FUNC_START \name /* Create a phase2_vrs structure. */ /* Split reg push in two to ensure the correct value for sp. */ @@ -89,8 +89,8 @@ ARM_FUNC_START gnu_Unwind_Save_VFP mov r3, #0 stmfd sp!, {r2, r3} - /* Point r1 at the block. Pass r0 unchanged. */ - add r1, sp, #4 + /* Point r1 at the block. Pass r[0..nargs) unchanged. */ + add r\nargs, sp, #4 #if defined(__thumb__) /* Switch back to thumb mode to avoid interworking hassle. */ adr ip, .L1_\name @@ -112,7 +112,9 @@ ARM_FUNC_START gnu_Unwind_Save_VFP UNPREFIX \name .endm -UNWIND_WRAPPER _Unwind_RaiseException -UNWIND_WRAPPER _Unwind_Resume +UNWIND_WRAPPER _Unwind_RaiseException 1 +UNWIND_WRAPPER _Unwind_Resume 1 +UNWIND_WRAPPER _Unwind_Resume_or_Rethrow 1 +UNWIND_WRAPPER _Unwind_ForcedUnwind 3 #endif /* __symbian__ */ |
