From: Paul Brook <paul@codesourcery.com>
To: Matthias Klose <doko@ubuntu.com>
Cc: Andrew Haley <aph@redhat.com>,
gcc-patches@gcc.gnu.org, GCC Java <java@gcc.gnu.org>,
Nicola Pero <nicola.pero@meta-innovation.com>
Subject: Re: [patch] C6X unwinding/exception handling
Date: Mon, 10 Oct 2011 12:23:00 -0000 [thread overview]
Message-ID: <201110101323.00966.paul@codesourcery.com> (raw)
In-Reply-To: <4E92D68A.6080308@ubuntu.com>
> Index: libjava/exception.cc
> ===================================================================
> --- libjava/exception.cc (revision 179739)
> +++ libjava/exception.cc (working copy)
> @@ -135,6 +135,7 @@
> {
> _Unwind_Ptr Start;
> _Unwind_Ptr LPStart;
> + _Unwind_Ptr ttype_base;
> const unsigned char *TType;
> const unsigned char *action_table;
> unsigned char ttype_encoding;
> @@ -184,7 +185,7 @@
> _Unwind_Ptr ptr;
>
> ptr = (_Unwind_Ptr) (info->TType - (i * 4));
> - ptr = _Unwind_decode_target2(ptr);
> + ptr = _Unwind_decode_typeinfo_ptr (info->ttype_base, (_Unwind_Word)
> ptr);
>
> return reinterpret_cast<void **>(ptr);
> }
> @@ -325,6 +326,7 @@
>
> // Parse the LSDA header.
> p = parse_lsda_header (context, language_specific_data, &info);
> + info.ttype_base = base_of_encoded_value (info.ttype_encoding, context);
> #ifdef HAVE_GETIPINFO
> ip = _Unwind_GetIPInfo (context, &ip_before_insn);
> #else
No. The purpose of my patch was to remove the arm specific code.
The only difference I can see in this bit of code is that libstdc++ uses
base_of_encoded_value/read_encoded_value_with_base whereas libjava uses
context/read_encoded_value.
I expect you want something like the patch below (completely untested).
Paul
Index: exception.cc
===================================================================
--- exception.cc (revision 178906)
+++ exception.cc (working copy)
@@ -161,6 +161,11 @@ parse_lsda_header (_Unwind_Context *cont
info->ttype_encoding = *p++;
if (info->ttype_encoding != DW_EH_PE_omit)
{
+#if _GLIBCXX_OVERRIDE_TTYPE_ENCODING
+ /* Older ARM EABI toolchains set this value incorrectly, so use a
+ hardcoded OS-specific format. */
+ info->ttype_encoding = _GLIBCXX_OVERRIDE_TTYPE_ENCODING;
+#endif
p = read_uleb128 (p, &tmp);
info->TType = p + tmp;
}
@@ -176,21 +181,6 @@ parse_lsda_header (_Unwind_Context *cont
return p;
}
-#ifdef __ARM_EABI_UNWINDER__
-
-static void **
-get_ttype_entry(_Unwind_Context *, lsda_header_info* info, _uleb128_t i)
-{
- _Unwind_Ptr ptr;
-
- ptr = (_Unwind_Ptr) (info->TType - (i * 4));
- ptr = _Unwind_decode_target2(ptr);
-
- return reinterpret_cast<void **>(ptr);
-}
-
-#else
-
static void **
get_ttype_entry (_Unwind_Context *context, lsda_header_info *info, long i)
{
@@ -202,8 +192,6 @@ get_ttype_entry (_Unwind_Context *contex
return reinterpret_cast<void **>(ptr);
}
-#endif
-
// Using a different personality function name causes link failures
// when trying to mix code using different exception handling models.
#ifdef SJLJ_EXCEPTIONS
next prev parent reply other threads:[~2011-10-10 12:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201108041531.58790.paul@codesourcery.com>
[not found] ` <201109131348.13087.paul@codesourcery.com>
2011-10-09 11:10 ` Matthias Klose
2011-10-10 10:33 ` Andrew Haley
2011-10-10 11:27 ` Matthias Klose
2011-10-10 12:23 ` Paul Brook [this message]
2011-10-17 11:01 ` Matthias Klose
2011-10-17 11:21 ` Andrew Haley
2011-10-17 11:27 ` Matthias Klose
2011-10-17 13:49 ` Paul Brook
2011-10-17 14:11 ` Nicola Pero
2011-10-20 12:29 ` Bernd Schmidt
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=201110101323.00966.paul@codesourcery.com \
--to=paul@codesourcery.com \
--cc=aph@redhat.com \
--cc=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=java@gcc.gnu.org \
--cc=nicola.pero@meta-innovation.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).