[SCM] archer-pmuldoon-next-over-throw: gdb

[SCM] archer-pmuldoon-next-over-throw: gdb

[tromey]

The branch, archer-pmuldoon-next-over-throw has been updated
       via  59fe010b3e41156350f05d86067fd521e2c6c844 (commit)
      from  cc5b438da4153b3b5821b33ab20e495bd8f9068d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 59fe010b3e41156350f05d86067fd521e2c6c844
Author: Tom Tromey <tromey@redhat.com>
Date:   Wed May 20 13:01:52 2009 -0600

    gdb
    	* breakpoint.c (delete_longjmp_breakpoint): Don't set
    	_Unwind_DebugTrigger.
    	(set_exception_breakpoint): Likewise.
    gdb/testsuite
    	* gdb.cp/gdb9593.exp: Check for _Unwind_DebugHook.

-----------------------------------------------------------------------

Summary of changes:
 gdb/breakpoint.c                 |   35 ++---------------------------------
 gdb/testsuite/gdb.cp/gdb9593.exp |    2 +-
 2 files changed, 3 insertions(+), 34 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b5b2bd3..8adbd1f 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4475,35 +4475,13 @@ void
 delete_longjmp_breakpoint (int thread)
 {
   struct breakpoint *b, *temp;
-  int any_exc = 0, exc_count = 0;
 
   ALL_BREAKPOINTS_SAFE (b, temp)
     if (b->type == bp_longjmp || b->type == bp_exception)
       {
 	if (b->thread == thread)
-	  {
-	    if (b->type == bp_exception)
-	      any_exc = 1;
-	    delete_breakpoint (b);
-	  }
-	else if (b->type == bp_exception)
-	  {
-	    /* This ought to be per-inferior somehow.  */
-	    ++exc_count;
-	  }
+	  delete_breakpoint (b);
       }
-
-  if (any_exc && !exc_count)
-    {
-      struct symbol *debug_trigger;
-      struct value *lhs, *rhs;
-
-      debug_trigger = lookup_symbol ("_Unwind_DebugTrigger", NULL,
-				     VAR_DOMAIN, NULL);
-      lhs = read_var_value (debug_trigger, NULL);
-      rhs = value_from_longest (SYMBOL_TYPE (debug_trigger), 0);
-      value_assign (lhs, rhs);
-    }
 }
 
 /* Install a breakpoint on the unwinder's debug hook, and arrange for
@@ -4514,15 +4492,10 @@ CORE_ADDR
 set_exception_breakpoint (struct frame_info *frame)
 {
   struct minimal_symbol *debug_hook;
-  struct symbol *debug_trigger;
   CORE_ADDR stack_ptr = 0;
 
   debug_hook = lookup_minimal_symbol_text ("_Unwind_DebugHook", NULL);
-  /* We require full symbols to decode the hook arguments, so we might
-     as well require them here.  */
-  debug_trigger = lookup_symbol ("_Unwind_DebugTrigger", NULL,
-				 VAR_DOMAIN, NULL);
-  if (debug_hook != NULL && debug_trigger != NULL)
+  if (debug_hook != NULL)
     {
       struct value *lhs, *rhs;
       CORE_ADDR pc;
@@ -4534,10 +4507,6 @@ set_exception_breakpoint (struct frame_info *frame)
 	 probably broken.  */
       stack_ptr = get_frame_sp (frame);
 
-      lhs = read_var_value (debug_trigger, frame);
-      rhs = value_from_longest (SYMBOL_TYPE (debug_trigger), 1);
-      value_assign (lhs, rhs);
-
       pc = find_function_start_pc (get_frame_arch (frame),
 				   SYMBOL_VALUE_ADDRESS (debug_hook),
 				   SYMBOL_OBJ_SECTION (debug_hook));
diff --git a/gdb/testsuite/gdb.cp/gdb9593.exp b/gdb/testsuite/gdb.cp/gdb9593.exp
index 839101c..5fcab3a 100644
--- a/gdb/testsuite/gdb.cp/gdb9593.exp
+++ b/gdb/testsuite/gdb.cp/gdb9593.exp
@@ -59,7 +59,7 @@ if ![runto_main] then {
 
 # See whether we have the needed unwinder hooks.
 set ok 1
-gdb_test_multiple "print _Unwind_DebugTrigger" "check for unwinder hook" {
+gdb_test_multiple "print _Unwind_DebugHook" "check for unwinder hook" {
     -re "= 0\r\n$gdb_prompt $" {
 	pass "check for unwinder hook"
     }


hooks/post-receive
--
Repository for Project Archer.