From: "H.J. Lu" <hongjiu.lu@intel.com>
To: gcc-patches@gcc.gnu.org
Cc: Jason Merrill <jason@redhat.com>, Richard Henderson <rth@redhat.com>
Subject: PATCH [8/n]: Prepare x32: PR other/48007: Unwind library doesn't work with UNITS_PER_WORD > sizeof (void *)
Date: Sat, 25 Jun 2011 17:02:00 -0000 [thread overview]
Message-ID: <20110625161357.GA5401@intel.com> (raw)
Hi,
This patch introduces UNIQUE_UNWIND_CONTEXT and properly saves/stores
registers with UNITS_PER_WORD > sizeof (void *) as suggested in
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01526.html
OK for trunk?
Thanks.
H.J.
---
2011-04-09 H.J. Lu <hongjiu.lu@intel.com>
PR other/48007
* unwind-dw2.c (UNIQUE_UNWIND_CONTEXT): New.
(_Unwind_Context): If UNIQUE_UNWIND_CONTEXT is defined, add
dwarf_reg_size_table and value, remove version and by_value.
(EXTENDED_CONTEXT_BIT): Don't define if UNIQUE_UNWIND_CONTEXT
is defined.
(_Unwind_IsExtendedContext): Likewise.
(_Unwind_GetGR): Support UNIQUE_UNWIND_CONTEXT.
(_Unwind_SetGR): Likewise.
(_Unwind_GetGRPtr): Likewise.
(_Unwind_SetGRPtr): Likewise.
(_Unwind_SetGRValue): Likewise.
(_Unwind_GRByValue): Likewise.
(__frame_state_for): Initialize dwarf_reg_size_table field if
UNIQUE_UNWIND_CONTEXT is defined.
(uw_install_context_1): Likewise. Support UNIQUE_UNWIND_CONTEXT.
diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c
index 25990b4..5fa2723 100644
--- a/gcc/unwind-dw2.c
+++ b/gcc/unwind-dw2.c
@@ -59,6 +59,12 @@
#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
#endif
+#ifndef UNIQUE_UNWIND_CONTEXT
+#if defined __x86_64 && !defined __LP64__
+# define UNIQUE_UNWIND_CONTEXT
+#endif
+#endif
+
/* This is the register and unwind state for a particular frame. This
provides the information necessary to unwind up past a frame and return
to its caller. */
@@ -69,6 +75,15 @@ struct _Unwind_Context
void *ra;
void *lsda;
struct dwarf_eh_bases bases;
+#ifdef UNIQUE_UNWIND_CONTEXT
+ /* Used to check for unique _Unwind_Context. */
+ void *dwarf_reg_size_table;
+ /* Signal frame context. */
+#define SIGNAL_FRAME_BIT ((_Unwind_Word) 1 >> 0)
+ _Unwind_Word flags;
+ _Unwind_Word args_size;
+ _Unwind_Word value[DWARF_FRAME_REGISTERS+1];
+#else
/* Signal frame context. */
#define SIGNAL_FRAME_BIT ((~(_Unwind_Word) 0 >> 1) + 1)
/* Context which has version/args_size/by_value fields. */
@@ -79,6 +94,7 @@ struct _Unwind_Context
_Unwind_Word version;
_Unwind_Word args_size;
char by_value[DWARF_FRAME_REGISTERS+1];
+#endif
};
/* Byte size of every register managed by these routines. */
@@ -144,11 +160,13 @@ _Unwind_SetSignalFrame (struct _Unwind_Context *context, int val)
context->flags &= ~SIGNAL_FRAME_BIT;
}
+#ifndef UNIQUE_UNWIND_CONTEXT
static inline _Unwind_Word
_Unwind_IsExtendedContext (struct _Unwind_Context *context)
{
return context->flags & EXTENDED_CONTEXT_BIT;
}
+#endif
\f
/* Get the value of register INDEX as saved in CONTEXT. */
@@ -168,8 +186,14 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
size = dwarf_reg_size_table[index];
ptr = context->reg[index];
+#ifdef UNIQUE_UNWIND_CONTEXT
+ gcc_assert (context->dwarf_reg_size_table == &dwarf_reg_size_table);
+ if (context->reg[index] == &context->value[index])
+ return context->value[index];
+#else
if (_Unwind_IsExtendedContext (context) && context->by_value[index])
return (_Unwind_Word) (_Unwind_Internal_Ptr) ptr;
+#endif
/* This will segfault if the register hasn't been saved. */
if (size == sizeof(_Unwind_Ptr))
@@ -207,11 +231,20 @@ _Unwind_SetGR (struct _Unwind_Context *context, int index, _Unwind_Word val)
gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
size = dwarf_reg_size_table[index];
+#ifdef UNIQUE_UNWIND_CONTEXT
+ gcc_assert (context->dwarf_reg_size_table == &dwarf_reg_size_table);
+ if (context->reg[index] == &context->value[index])
+ {
+ context->value[index] = val;
+ return;
+ }
+#else
if (_Unwind_IsExtendedContext (context) && context->by_value[index])
{
context->reg[index] = (void *) (_Unwind_Internal_Ptr) val;
return;
}
+#endif
ptr = context->reg[index];
@@ -230,8 +263,10 @@ static inline void *
_Unwind_GetGRPtr (struct _Unwind_Context *context, int index)
{
index = DWARF_REG_TO_UNWIND_COLUMN (index);
+#ifndef UNIQUE_UNWIND_CONTEXT
if (_Unwind_IsExtendedContext (context) && context->by_value[index])
return &context->reg[index];
+#endif
return context->reg[index];
}
@@ -241,8 +276,10 @@ static inline void
_Unwind_SetGRPtr (struct _Unwind_Context *context, int index, void *p)
{
index = DWARF_REG_TO_UNWIND_COLUMN (index);
+#ifndef UNIQUE_UNWIND_CONTEXT
if (_Unwind_IsExtendedContext (context))
context->by_value[index] = 0;
+#endif
context->reg[index] = p;
}
@@ -254,10 +291,15 @@ _Unwind_SetGRValue (struct _Unwind_Context *context, int index,
{
index = DWARF_REG_TO_UNWIND_COLUMN (index);
gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
+#ifdef UNIQUE_UNWIND_CONTEXT
+ gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Word));
+ context->value[index] = val;
+ context->reg[index] = &context->value[index];
+#else
gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Ptr));
-
context->by_value[index] = 1;
context->reg[index] = (void *) (_Unwind_Internal_Ptr) val;
+#endif
}
/* Return nonzero if register INDEX is stored by value rather than
@@ -267,7 +309,11 @@ static inline int
_Unwind_GRByValue (struct _Unwind_Context *context, int index)
{
index = DWARF_REG_TO_UNWIND_COLUMN (index);
+#ifdef UNIQUE_UNWIND_CONTEXT
+ return context->reg[index] == &context->value[index];
+#else
return context->by_value[index];
+#endif
}
/* Retrieve the return address for CONTEXT. */
@@ -1217,7 +1263,11 @@ __frame_state_for (void *pc_target, struct frame_state *state_in)
int reg;
memset (&context, 0, sizeof (struct _Unwind_Context));
+#ifdef UNIQUE_UNWIND_CONTEXT
+ context.dwarf_reg_size_table = &dwarf_reg_size_table;
+#else
context.flags = EXTENDED_CONTEXT_BIT;
+#endif
context.ra = pc_target + 1;
if (uw_frame_state_for (&context, &fs) != _URC_NO_REASON)
@@ -1455,7 +1505,11 @@ uw_init_context_1 (struct _Unwind_Context *context,
memset (context, 0, sizeof (struct _Unwind_Context));
context->ra = ra;
+#ifdef UNIQUE_UNWIND_CONTEXT
+ context->dwarf_reg_size_table = &dwarf_reg_size_table;
+#else
context->flags = EXTENDED_CONTEXT_BIT;
+#endif
code = uw_frame_state_for (context, &fs);
gcc_assert (code == _URC_NO_REASON);
@@ -1537,8 +1591,13 @@ uw_install_context_1 (struct _Unwind_Context *current,
void *c = current->reg[i];
void *t = target->reg[i];
+#ifdef UNIQUE_UNWIND_CONTEXT
+ gcc_assert (current->reg[i] != ¤t->value[i]);
+ if (target->reg[i] == &target->value[i] && c)
+#else
gcc_assert (current->by_value[i] == 0);
if (target->by_value[i] && c)
+#endif
{
_Unwind_Word w;
_Unwind_Ptr p;
next reply other threads:[~2011-06-25 16:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-25 17:02 H.J. Lu [this message]
2011-06-25 23:34 ` Joseph S. Myers
2011-06-25 23:36 ` H.J. Lu
2011-06-26 20:06 ` Jason Merrill
2011-06-26 20:22 ` Jason Merrill
2011-06-26 21:45 ` H.J. Lu
2011-06-27 2:12 ` Jason Merrill
2011-06-27 3:17 ` H.J. Lu
2011-06-27 15:16 ` Jason Merrill
2011-06-28 19:25 ` H.J. Lu
2011-06-30 14:46 ` Jason Merrill
2011-06-30 14:53 ` H.J. Lu
2011-06-30 15:26 ` Jason Merrill
2011-06-30 16:36 ` H.J. Lu
2011-06-30 17:57 ` H.J. Lu
2011-06-30 18:01 ` H.J. Lu
2011-06-30 18:10 ` Rainer Orth
2011-06-30 18:19 ` H.J. Lu
2011-06-30 18:42 ` Rainer Orth
2011-06-30 20:14 ` H.J. Lu
2011-06-30 20:24 ` Richard Henderson
2011-06-30 21:51 ` H.J. Lu
2011-07-01 9:03 ` Rainer Orth
2011-07-01 12:51 ` H.J. Lu
2011-07-01 13:37 ` Rainer Orth
2011-07-01 13:42 ` H.J. Lu
2011-07-01 14:03 ` Rainer Orth
2011-07-01 14:06 ` H.J. Lu
2011-07-01 14:25 ` Rainer Orth
2011-07-01 14:55 ` H.J. Lu
2011-08-02 21:02 ` Jason Merrill
2011-08-02 22:27 ` H.J. Lu
2011-08-03 21:47 ` Jason Merrill
2011-06-30 20:59 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110625161357.GA5401@intel.com \
--to=hongjiu.lu@intel.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hjl.tools@gmail.com \
--cc=jason@redhat.com \
--cc=rth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).