From patchwork Mon Oct 17 11:01:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 120161 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 875B3B6F95 for ; Mon, 17 Oct 2011 22:02:00 +1100 (EST) Received: (qmail 2739 invoked by alias); 17 Oct 2011 11:01:57 -0000 Received: (qmail 2719 invoked by uid 22791); 17 Oct 2011 11:01:56 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, TW_IB X-Spam-Check-By: sourceware.org Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 17 Oct 2011 11:01:41 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.42.217] (dslb-088-073-095-073.pools.arcor-ip.net [88.73.95.73]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id p9HB1YVm010030; Mon, 17 Oct 2011 13:01:34 +0200 Message-ID: <4E9C0B03.7070002@ubuntu.com> Date: Mon, 17 Oct 2011 13:01:23 +0200 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: Paul Brook CC: Andrew Haley , gcc-patches@gcc.gnu.org, GCC Java , Nicola Pero Subject: Re: [patch] C6X unwinding/exception handling References: <201108041531.58790.paul@codesourcery.com> <4E92C9D0.10106@redhat.com> <4E92D68A.6080308@ubuntu.com> <201110101323.00966.paul@codesourcery.com> In-Reply-To: <201110101323.00966.paul@codesourcery.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 10/10/2011 02:23 PM, Paul Brook wrote: >> 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(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). I checked the attached patch, test results at http://gcc.gnu.org/ml/gcc-testresults/2011-10/msg01377.html which are the same as with my suggested patch. Ok for the trunk? Matthias libjava/ 2011-10-17 Paul Brook * exception.cc (parse_lsda_header): hardcode ttype_encoding for older ARM EABI toolchains. (get_ttype_entry) Remove __ARM_EABI_UNWINDER__ variant. libobjc/ 2011-10-17 Paul Brook Matthias Klose * exception.c (parse_lsda_header): hardcode ttype_encoding for older ARM EABI toolchains. (get_ttype_entry) Remove __ARM_EABI_UNWINDER__ variant. Index: libjava/exception.cc =================================================================== --- libjava/exception.cc (revision 180086) +++ libjava/exception.cc (working copy) @@ -161,6 +161,11 @@ 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,22 +181,7 @@ 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(ptr); -} - -#else - -static void ** get_ttype_entry (_Unwind_Context *context, lsda_header_info *info, long i) { _Unwind_Ptr ptr; @@ -202,8 +192,6 @@ return reinterpret_cast(ptr); } -#endif - // Using a different personality function name causes link failures // when trying to mix code using different exception handling models. #ifdef SJLJ_EXCEPTIONS Index: libobjc/exception.c =================================================================== --- libobjc/exception.c (revision 180086) +++ libobjc/exception.c (working copy) @@ -159,6 +159,11 @@ 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; } @@ -174,27 +179,7 @@ return p; } -#ifdef __ARM_EABI_UNWINDER__ - static Class -get_ttype_entry (struct lsda_header_info *info, _uleb128_t i) -{ - _Unwind_Ptr ptr; - - ptr = (_Unwind_Ptr) (info->TType - (i * 4)); - ptr = _Unwind_decode_target2 (ptr); - - /* NULL ptr means catch-all. Note that if the class is not found, - this will abort the program. */ - if (ptr) - return objc_getRequiredClass ((const char *) ptr); - else - return 0; -} - -#else - -static Class get_ttype_entry (struct lsda_header_info *info, _Unwind_Word i) { _Unwind_Ptr ptr; @@ -211,8 +196,6 @@ return 0; } -#endif - /* Using a different personality function name causes link failures when trying to mix code using different exception handling models. */