From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3084 invoked by alias); 3 Jan 2003 03:35:43 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 3075 invoked from network); 3 Jan 2003 03:35:40 -0000 Received: from unknown (63.119.183.65) by 209.249.29.67 with QMTP; 3 Jan 2003 03:35:40 -0000 Received: (qmail 14677 invoked from network); 3 Jan 2003 03:33:45 -0000 Received: from cpe-24-221-209-215.co.sprintbbd.net (HELO doc.com) (24.221.209.215) by external1 with SMTP; 3 Jan 2003 03:33:45 -0000 Message-ID: <3E1504FF.2070506@doc.com> Date: Fri, 03 Jan 2003 03:35:00 -0000 From: Adam Fedor User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 X-Accept-Language: en-us, en MIME-Version: 1.0 To: GDB Patches Subject: [PATCH] Step over Objective-C dispatch function Content-Type: multipart/mixed; boundary="------------060702070309070407080901" X-SW-Source: 2003-01/txt/msg00050.txt.bz2 This is a multi-part message in MIME format. --------------060702070309070407080901 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 188 All Objective-C messages are called through the standard dispatch function. This patch steps right into the method without the user having to go through the dispatch function manually. --------------060702070309070407080901 Content-Type: text/plain; name="objc20.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="objc20.patch" Content-length: 2301 2003-01-02 Adam Fedor * infrun.c (handle_inferior_event): Add test to step over Objective-C dispatch function. * Makefile.in (infrun.o): Add $(objc_lang_h) Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.302 diff -u -p -r1.302 Makefile.in --- Makefile.in 2 Jan 2003 20:29:15 -0000 1.302 +++ Makefile.in 3 Jan 2003 03:24:54 -0000 @@ -1795,7 +1796,8 @@ infptrace.o: infptrace.c $(defs_h) $(fra infrun.o: infrun.c $(defs_h) $(gdb_string_h) $(symtab_h) $(frame_h) \ $(inferior_h) $(breakpoint_h) $(gdb_wait_h) $(gdbcore_h) $(gdbcmd_h) \ $(cli_script_h) $(target_h) $(gdbthread_h) $(annotate_h) \ - $(symfile_h) $(top_h) $(inf_loop_h) $(regcache_h) $(value_h) + $(symfile_h) $(top_h) $(inf_loop_h) $(regcache_h) $(value_h) \ + $(objc_lang_h) inftarg.o: inftarg.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \ $(gdbcore_h) $(command_h) $(gdb_stat_h) $(gdb_wait_h) infttrace.o: infttrace.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \ Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.92 diff -u -p -r1.92 infrun.c --- infrun.c 18 Dec 2002 18:03:42 -0000 1.92 +++ infrun.c 3 Jan 2003 03:20:06 -0000 @@ -42,6 +42,7 @@ #include "inf-loop.h" #include "regcache.h" #include "value.h" +#include "objc-lang.h" /* Prototypes for local functions */ @@ -1173,6 +1174,7 @@ void handle_inferior_event (struct execution_control_state *ecs) { CORE_ADDR tmp; + CORE_ADDR new_stop; int stepped_after_stopped_by_watchpoint; int sw_single_step_trap_p = 0; @@ -2428,6 +2430,22 @@ process_event_stop_test: keep_going (ecs); return; } + } + + /* Step over Objective-C dispatch function. */ + if (tmp) + find_objc_msgcall (tmp, &new_stop); + else + find_objc_msgcall (stop_pc, &new_stop); + + if (new_stop) /* step into a method call */ + ecs->stop_func_start = new_stop; + + if (new_stop) + { + tmp = SKIP_TRAMPOLINE_CODE (new_stop); + if (tmp != 0) + ecs->stop_func_start = tmp; } /* If we have line number information for the function we --------------060702070309070407080901--