From 41c5a4371c35f12b67c0dc5a7d2b807b93a9e6bd Mon Sep 17 00:00:00 2001
From: shinwell <shinwell@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Aug 2006 10:10:58 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116291 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++
gcc/config/arm/pr-support.c | 8 ++---
gcc/testsuite/ChangeLog | 4 +++
gcc/testsuite/g++.dg/eh/arm-vfp-unwind.C | 40 ++++++++++++++++++++++++
4 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/eh/arm-vfp-unwind.C
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb37d46af010..b0143f71ba66 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.
diff --git a/gcc/config/arm/pr-support.c b/gcc/config/arm/pr-support.c
index 072b4a98d5cd..0e750bf3e09f 100644
--- a/gcc/config/arm/pr-support.c
+++ b/gcc/config/arm/pr-support.c
@@ -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;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bc920d07795d..0f92e5f64657 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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
diff --git a/gcc/testsuite/g++.dg/eh/arm-vfp-unwind.C b/gcc/testsuite/g++.dg/eh/arm-vfp-unwind.C
new file mode 100644
index 000000000000..94b53b595d8a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/arm-vfp-unwind.C
@@ -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
+
--
GitLab