pr-support.c (__gnu_unwind_execute): Insert " + 1" in necessary places to pass the correct "number of registers"...

gcc/
	* config/arm/pr-support.c (__gnu_unwind_execute): Insert " + 1" in
	necessary places to pass the correct "number of registers" values
	to _Unwind_VRS_Pop.

	gcc/testsuite/
 	* g++.dg/eh/arm-vfp-unwind.C: New test.

From-SVN: r116291
This commit is contained in:
Mark Shinwell 2006-08-21 10:10:58 +00:00 committed by Mark Shinwell
parent 1af4bba82e
commit 08a557f682
4 changed files with 54 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2006-08-21 Mark Shinwell <shinwell@codesourcery.com>
* config/arm/pr-support.c (__gnu_unwind_execute): Insert " + 1" in
necessary places to pass the correct "number of registers" values
to _Unwind_VRS_Pop.
2006-08-20 Jan Hubicka <jh@suse.cz>
* tree-ssa-alias.c (eq_ptr_info, ptr_info_hash): New function.

View File

@ -224,7 +224,7 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws)
{
/* Pop VFP registers with fldmx. */
op = next_unwind_byte (uws);
op = ((op & 0xf0) << 12) | (op & 0xf);
op = ((op & 0xf0) << 12) | ((op & 0xf) + 1);
if (_Unwind_VRS_Pop (context, _UVRSC_VFP, op, _UVRSD_VFPX)
!= _UVRSR_OK)
return _URC_FAILURE;
@ -253,7 +253,7 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws)
{
/* Pop iWMMXt D registers. */
op = next_unwind_byte (uws);
op = ((op & 0xf0) << 12) | (op & 0xf);
op = ((op & 0xf0) << 12) | ((op & 0xf) + 1);
if (_Unwind_VRS_Pop (context, _UVRSC_WMMXD, op, _UVRSD_UINT64)
!= _UVRSR_OK)
return _URC_FAILURE;
@ -284,7 +284,7 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws)
{
/* Pop FPA registers. */
op = next_unwind_byte (uws);
op = ((op & 0xf0) << 12) | (op & 0xf);
op = ((op & 0xf0) << 12) | ((op & 0xf) + 1);
if (_Unwind_VRS_Pop (context, _UVRSC_FPA, op, _UVRSD_FPAX)
!= _UVRSR_OK)
return _URC_FAILURE;
@ -294,7 +294,7 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws)
{
/* Pop VFP registers with fldmd. */
op = next_unwind_byte (uws);
op = ((op & 0xf0) << 12) | (op & 0xf);
op = ((op & 0xf0) << 12) | ((op & 0xf) + 1);
if (_Unwind_VRS_Pop (context, _UVRSC_VFP, op, _UVRSD_DOUBLE)
!= _UVRSR_OK)
return _URC_FAILURE;

View File

@ -1,3 +1,7 @@
2006-08-21 Mark Shinwell <shinwell@codesourcery.com>
* g++.dg/eh/arm-vfp-unwind.C: New test.
2006-08-20 Mark Mitchell <mark@codesourcery.com>
PR c++/28341

View File

@ -0,0 +1,40 @@
/* { dg-require-effective-target arm32 } */
/* { dg-do run } */
/* Test to catch off-by-one errors in arm/pr-support.c. */
#if defined (__VFP_FP__) && !defined (__SOFTFP__)
#include <iostream>
#include <stdlib.h>
using namespace std;
static void donkey ()
{
asm volatile ("fcpyd d9, %P0" : : "w" (1.2345) : "d9");
throw 1;
}
int main()
{
try
{
donkey ();
}
catch (int foo)
{
return 0;
}
return 1;
}
#else
int main()
{
return 0;
}
#endif