This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] revised PR26792: use _Unwind_GetIP when HAVE_GETIPINFO not defined


Revised version of the patch correcting misplacement of the
preprocessor statements in exception.cc that improperly allowed
ip to be deincremented twice when _Unwind_GetIP was in use.
Sorry about that. Currently testing on Darwin PPC.
                     Jack


2006-09-26  Jack Howarth  <howarth@bromo.med.uc.edu>

	PR target/26792
        * exception.cc (PERSONALITY_FUNCTION): use _Unwind_GetIP
        if HAVE_GETIPINFO not defined.
	* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Likewise.
        (_Jv_StackTrace::getLineNumberForFrame): Likewise.

Index: exception.cc
===================================================================
--- exception.cc	(revision 117238)
+++ exception.cc	(working copy)
@@ -231,9 +231,13 @@ PERSONALITY_FUNCTION (int version,
 
   // Parse the LSDA header.
   p = parse_lsda_header (context, language_specific_data, &info);
+  #ifdef HAVE_GETIPINFO
   ip = _Unwind_GetIPInfo (context, &ip_before_insn);
   if (! ip_before_insn)
     --ip;
+  #else
+  ip = _Unwind_GetIP (context) - 1;
+  #endif
   landing_pad = 0;
   action_record = 0;
   handler_switch_value = 0;
Index: stacktrace.cc
===================================================================
--- stacktrace.cc	(revision 117238)
+++ stacktrace.cc	(working copy)
@@ -131,6 +131,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _U
   else
 #endif
     {
+#ifdef HAVE_GETIPINFO
       _Unwind_Ptr ip;
       int ip_before_insn = 0;
       ip = _Unwind_GetIPInfo (context, &ip_before_insn);
@@ -139,9 +140,13 @@ _Jv_StackTrace::UnwindTraceFn (struct _U
       // to ensure we get the correct line number for the call itself.
       if (! ip_before_insn)
 	--ip;
-
+#endif
       state->frames[pos].type = frame_native;
+#ifdef HAVE_GETIPINFO
       state->frames[pos].ip = (void *) ip;
+#else
+      state->frames[pos].ip = (void *) _Unwind_GetIP (context);
+#endif
       state->frames[pos].start_ip = func_addr;
     }
 
@@ -217,6 +222,12 @@ _Jv_StackTrace::getLineNumberForFrame(_J
       else
         offset = (_Unwind_Ptr) ip - (_Unwind_Ptr) info.base;
 
+#ifndef HAVE_GETIPINFO
+      // The unwinder gives us the return address. In order to get the right
+      // line number for the stack trace, roll it back a little.
+      offset -= 1;
+#endif
+
       finder->lookup (binaryName, (jlong) offset);
       *sourceFileName = finder->getSourceFile();
       *lineNum = finder->getLineNum();


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]