From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18701 invoked by alias); 31 May 2007 11:09:44 -0000 Received: (qmail 18680 invoked by uid 22791); 31 May 2007 11:09:43 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate4.de.ibm.com (HELO mtagate4.de.ibm.com) (195.212.29.153) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 31 May 2007 11:09:39 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.13.8/8.13.8) with ESMTP id l4VB9a7t144388 for ; Thu, 31 May 2007 11:09:36 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.3) with ESMTP id l4VB9apm3313702 for ; Thu, 31 May 2007 13:09:36 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l4VB9ZH6012391 for ; Thu, 31 May 2007 13:09:36 +0200 Received: from [9.145.148.253] (sig-9-145-148-253.de.ibm.com [9.145.148.253]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id l4VB9XOa012255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 31 May 2007 13:09:35 +0200 Message-ID: <465EAC9E.7040401@de.ibm.com> Date: Thu, 31 May 2007 11:18:00 -0000 From: Markus Deuling User-Agent: Thunderbird 1.5.0.10 (X11/20070301) MIME-Version: 1.0 To: Jim Blandy CC: GDB Patches , Ulrich Weigand Subject: Re: [rfc] [1/6] Remove macro CALL_DUMMY_LOCATION References: <465BD442.4080300@de.ibm.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------060609090803040307040902" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-05/txt/msg00432.txt.bz2 This is a multi-part message in MIME format. --------------060609090803040307040902 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 842 Hi Jim, Jim Blandy wrote: > Markus Deuling writes: >> this patch removes CALL_DUMMY_LOCATION macro from gdbarch.sh. >> >> ChangeLog: >> >> * gdbarch.sh (CALL_DUMMY_LOCATION): Replace by >> gdbarch_call_dummy_location. >> * infcall.c (call_function_by_hand): Likewise. >> * inferior.h: Change comment. >> * arch-utils.c: Change comment. >> * gdbarch.c, gdbarch.h: Regenerate. >> >> >> Is this ok to commit? > > This looks good --- thank you! thank you very much for your review. I attached a new version of the patch where I deleted a unnecessary comment instead of rewriting it. -#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ +#include "inferior.h" If that's ok, could you please commit it Ulrich? Thanks in advance. -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------060609090803040307040902 Content-Type: text/plain; name="diff-remove-CALL_DUMMY_LOCATION" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-remove-CALL_DUMMY_LOCATION" Content-length: 3652 diff -urN src/gdb/gdbarch.c dev/gdb/gdbarch.c --- src/gdb/gdbarch.c 2007-05-14 17:16:57.000000000 +0200 +++ dev/gdb/gdbarch.c 2007-05-30 17:15:46.000000000 +0200 @@ -39,7 +39,7 @@ #include "arch-utils.h" #include "gdbcmd.h" -#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ +#include "inferior.h" #include "symcat.h" #include "floatformat.h" @@ -759,11 +759,6 @@ fprintf_unfiltered (file, "gdbarch_dump: byte_order = %s\n", paddr_d (current_gdbarch->byte_order)); -#ifdef CALL_DUMMY_LOCATION - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LOCATION # %s\n", - XSTRING (CALL_DUMMY_LOCATION)); -#endif fprintf_unfiltered (file, "gdbarch_dump: call_dummy_location = %s\n", paddr_d (current_gdbarch->call_dummy_location)); diff -urN src/gdb/gdbarch.h dev/gdb/gdbarch.h --- src/gdb/gdbarch.h 2007-05-14 17:16:57.000000000 +0200 +++ dev/gdb/gdbarch.h 2007-05-30 17:15:35.000000000 +0200 @@ -496,12 +496,6 @@ extern int gdbarch_call_dummy_location (struct gdbarch *gdbarch); extern void set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, int call_dummy_location); -#if !defined (GDB_TM_FILE) && defined (CALL_DUMMY_LOCATION) -#error "Non multi-arch definition of CALL_DUMMY_LOCATION" -#endif -#if !defined (CALL_DUMMY_LOCATION) -#define CALL_DUMMY_LOCATION (gdbarch_call_dummy_location (current_gdbarch)) -#endif extern int gdbarch_push_dummy_code_p (struct gdbarch *gdbarch); diff -urN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh --- src/gdb/gdbarch.sh 2007-05-14 17:16:57.000000000 +0200 +++ dev/gdb/gdbarch.sh 2007-05-30 17:15:29.000000000 +0200 @@ -470,7 +470,7 @@ M::CORE_ADDR:push_dummy_call:struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:function, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr # DEPRECATED_REGISTER_SIZE can be deleted. v:=:int:deprecated_register_size -v:=:int:call_dummy_location::::AT_ENTRY_POINT::0 +v::int:call_dummy_location::::AT_ENTRY_POINT::0 M::CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all::default_print_registers_info::0 @@ -1179,7 +1179,7 @@ #include "arch-utils.h" #include "gdbcmd.h" -#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ +#include "inferior.h" #include "symcat.h" #include "floatformat.h" diff -urN src/gdb/infcall.c dev/gdb/infcall.c --- src/gdb/infcall.c 2007-05-13 14:27:29.000000000 +0200 +++ dev/gdb/infcall.c 2007-05-30 17:14:27.000000000 +0200 @@ -454,7 +454,7 @@ /* The actual breakpoint (at BP_ADDR) is inserted separatly so there is no need to write that out. */ - switch (CALL_DUMMY_LOCATION) + switch (gdbarch_call_dummy_location (current_gdbarch)) { case ON_STACK: /* "dummy_addr" is here just to keep old targets happy. New diff -urN src/gdb/inferior.h dev/gdb/inferior.h --- src/gdb/inferior.h 2007-05-13 14:27:30.000000000 +0200 +++ dev/gdb/inferior.h 2007-05-30 17:14:27.000000000 +0200 @@ -402,7 +402,7 @@ extern int attach_flag; -/* Possible values for CALL_DUMMY_LOCATION. */ +/* Possible values for gdbarch_call_dummy_location. */ #define ON_STACK 1 #define AT_ENTRY_POINT 4 #define AT_SYMBOL 5 --------------060609090803040307040902--