From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26513 invoked by alias); 31 Aug 2008 17:53:00 -0000 Received: (qmail 25900 invoked by uid 22791); 31 Aug 2008 17:52:51 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.17.161) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 31 Aug 2008 17:51:48 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.1/8.13.1) with ESMTP id m7VHpjPO005036 for ; Sun, 31 Aug 2008 17:51:45 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 v9.0) with ESMTP id m7VHpjZJ3866682 for ; Sun, 31 Aug 2008 19:51:45 +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 m7VHpg10020320 for ; Sun, 31 Aug 2008 19:51:42 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m7VHpghV020317 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 31 Aug 2008 19:51:42 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (localhost.localdomain [127.0.0.1]) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8) with ESMTP id m7VHpf9w003287 for ; Sun, 31 Aug 2008 19:51:41 +0200 Received: (from uweigand@localhost) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8/Submit) id m7VHpfhP003286 for gdb-patches@sourceware.org; Sun, 31 Aug 2008 19:51:41 +0200 Message-Id: <20080831175141.684347000@de.ibm.com> References: <20080831175045.128504000@de.ibm.com> User-Agent: quilt/0.46-1 Date: Sun, 31 Aug 2008 17:53:00 -0000 From: uweigand@de.ibm.com To: gdb-patches@sourceware.org Subject: [rfc][37/37] Eliminate builtin_type_ macros: Delete the macros Content-Disposition: inline; filename=diff-type-final 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: 2008-08/txt/msg00693.txt.bz2 Hello, that's it -- after all preceding patches in this series are applied, no further use of the builtin_type_ macros remains in GDB. This patch finally deletes those macros. Also, the builtin_f_type and builtin_m2_type types are now only used in language-specific code, so this patch moves those to the appropriate language-specific header files. Bye, Ulrich ChangeLog: * gdbtypes.h (builtin_type_void_data_ptr, builtin_type_void_func_ptr, builtin_type_CORE_ADDR, builtin_type_char, builtin_type_short, builtin_type_int, builtin_type_long, builtin_type_signed_char, builtin_type_unsigned_char, builtin_type_unsigned_short, builtin_type_unsigned_int, builtin_type_unsigned_long, builtin_type_float, builtin_type_double, builtin_type_long_double, builtin_type_complex, builtin_type_double_complex, builtin_type_string, builtin_type_bool, builtin_type_long_long, builtin_type_unsigned_long_long): Remove macros. (builtin_type_f_character, builtin_type_f_integer, builtin_type_f_integer_s2, builtin_type_f_logical, builtin_type_f_logical_s1, builtin_type_f_logical_s2, builtin_type_f_real, builtin_type_f_real_s8, builtin_type_f_real_s16, builtin_type_f_complex_s8, builtin_type_f_complex_s16, builtin_type_f_complex_s32): Likewise. (builtin_type_m2_char, builtin_type_m2_int, builtin_type_m2_card, builtin_type_m2_real, builtin_type_m2_bool): Likewise. (struct builtin_f_type, builtin_f_type): Move to f-lang.h. (struct builtin_m2_type, builtin_m2_type): Move to m2-lang.h. * f-lang.h (struct builtin_f_type, builtin_f_type): Move here. * m2-lang.h (struct builtin_m2_type, builtin_m2_type): Move here. Index: gdb-head/gdb/f-lang.h =================================================================== --- gdb-head.orig/gdb/f-lang.h +++ gdb-head/gdb/f-lang.h @@ -104,3 +104,27 @@ extern int f77_get_dynamic_lowerbound (s extern void f77_get_dynamic_array_length (struct type *); extern int calc_f77_array_dims (struct type *); + + +/* Fortran (F77) types */ + +struct builtin_f_type +{ + struct type *builtin_character; + struct type *builtin_integer; + struct type *builtin_integer_s2; + struct type *builtin_logical; + struct type *builtin_logical_s1; + struct type *builtin_logical_s2; + struct type *builtin_real; + struct type *builtin_real_s8; + struct type *builtin_real_s16; + struct type *builtin_complex_s8; + struct type *builtin_complex_s16; + struct type *builtin_complex_s32; + struct type *builtin_void; +}; + +/* Return the Fortran type table for the specified architecture. */ +extern const struct builtin_f_type *builtin_f_type (struct gdbarch *gdbarch); + Index: gdb-head/gdb/gdbtypes.h =================================================================== --- gdb-head.orig/gdb/gdbtypes.h +++ gdb-head/gdb/gdbtypes.h @@ -1005,50 +1005,6 @@ struct builtin_type /* Return the type table for the specified architecture. */ extern const struct builtin_type *builtin_type (struct gdbarch *gdbarch); -/* Compatibility macros to access types for the current architecture. */ -#define builtin_type_void_data_ptr \ - (builtin_type (current_gdbarch)->builtin_data_ptr) -#define builtin_type_void_func_ptr \ - (builtin_type (current_gdbarch)->builtin_func_ptr) -#define builtin_type_CORE_ADDR \ - (builtin_type (current_gdbarch)->builtin_core_addr) -#define builtin_type_char \ - (builtin_type (current_gdbarch)->builtin_char) -#define builtin_type_short \ - (builtin_type (current_gdbarch)->builtin_short) -#define builtin_type_int \ - (builtin_type (current_gdbarch)->builtin_int) -#define builtin_type_long \ - (builtin_type (current_gdbarch)->builtin_long) -#define builtin_type_signed_char \ - (builtin_type (current_gdbarch)->builtin_signed_char) -#define builtin_type_unsigned_char \ - (builtin_type (current_gdbarch)->builtin_unsigned_char) -#define builtin_type_unsigned_short \ - (builtin_type (current_gdbarch)->builtin_unsigned_short) -#define builtin_type_unsigned_int \ - (builtin_type (current_gdbarch)->builtin_unsigned_int) -#define builtin_type_unsigned_long \ - (builtin_type (current_gdbarch)->builtin_unsigned_long) -#define builtin_type_float \ - (builtin_type (current_gdbarch)->builtin_float) -#define builtin_type_double \ - (builtin_type (current_gdbarch)->builtin_double) -#define builtin_type_long_double \ - (builtin_type (current_gdbarch)->builtin_long_double) -#define builtin_type_complex \ - (builtin_type (current_gdbarch)->builtin_complex) -#define builtin_type_double_complex \ - (builtin_type (current_gdbarch)->builtin_double_complex) -#define builtin_type_string \ - (builtin_type (current_gdbarch)->builtin_string) -#define builtin_type_bool \ - (builtin_type (current_gdbarch)->builtin_bool) -#define builtin_type_long_long \ - (builtin_type (current_gdbarch)->builtin_long_long) -#define builtin_type_unsigned_long_long \ - (builtin_type (current_gdbarch)->builtin_unsigned_long_long) - /* Explicit sizes - see C9X for naming scheme. The "int0" is for when an architecture needs to describe a register that has @@ -1108,82 +1064,6 @@ extern struct type *builtin_type_true_un extern struct type *builtin_type_error; -/* Modula-2 types */ - -struct builtin_m2_type -{ - struct type *builtin_char; - struct type *builtin_int; - struct type *builtin_card; - struct type *builtin_real; - struct type *builtin_bool; -}; - -/* Return the Modula-2 type table for the specified architecture. */ -extern const struct builtin_m2_type *builtin_m2_type (struct gdbarch *gdbarch); - -/* Compatibility macros to access types for the current architecture. */ -#define builtin_type_m2_char \ - (builtin_m2_type (current_gdbarch)->builtin_char) -#define builtin_type_m2_int \ - (builtin_m2_type (current_gdbarch)->builtin_int) -#define builtin_type_m2_card \ - (builtin_m2_type (current_gdbarch)->builtin_card) -#define builtin_type_m2_real \ - (builtin_m2_type (current_gdbarch)->builtin_real) -#define builtin_type_m2_bool \ - (builtin_m2_type (current_gdbarch)->builtin_bool) - - -/* Fortran (F77) types */ - -struct builtin_f_type -{ - struct type *builtin_character; - struct type *builtin_integer; - struct type *builtin_integer_s2; - struct type *builtin_logical; - struct type *builtin_logical_s1; - struct type *builtin_logical_s2; - struct type *builtin_real; - struct type *builtin_real_s8; - struct type *builtin_real_s16; - struct type *builtin_complex_s8; - struct type *builtin_complex_s16; - struct type *builtin_complex_s32; - struct type *builtin_void; -}; - -/* Return the Fortran type table for the specified architecture. */ -extern const struct builtin_f_type *builtin_f_type (struct gdbarch *gdbarch); - -/* Compatibility macros to access types for the current architecture. */ -#define builtin_type_f_character \ - (builtin_f_type (current_gdbarch)->builtin_character) -#define builtin_type_f_integer \ - (builtin_f_type (current_gdbarch)->builtin_integer) -#define builtin_type_f_integer_s2 \ - (builtin_f_type (current_gdbarch)->builtin_integer_s2) -#define builtin_type_f_logical \ - (builtin_f_type (current_gdbarch)->builtin_logical) -#define builtin_type_f_logical_s1 \ - (builtin_f_type (current_gdbarch)->builtin_logical_s1) -#define builtin_type_f_logical_s2 \ - (builtin_f_type (current_gdbarch)->builtin_logical_s2) -#define builtin_type_f_real \ - (builtin_f_type (current_gdbarch)->builtin_real) -#define builtin_type_f_real_s8 \ - (builtin_f_type (current_gdbarch)->builtin_real_s8) -#define builtin_type_f_real_s16 \ - (builtin_f_type (current_gdbarch)->builtin_real_s16) -#define builtin_type_f_complex_s8 \ - (builtin_f_type (current_gdbarch)->builtin_complex_s8) -#define builtin_type_f_complex_s16 \ - (builtin_f_type (current_gdbarch)->builtin_complex_s16) -#define builtin_type_f_complex_s32 \ - (builtin_f_type (current_gdbarch)->builtin_complex_s32) - - /* RTTI for C++ */ /* extern struct type *builtin_type_cxx_typeinfo; */ Index: gdb-head/gdb/m2-lang.h =================================================================== --- gdb-head.orig/gdb/m2-lang.h +++ gdb-head/gdb/m2-lang.h @@ -35,3 +35,18 @@ extern int m2_val_print (struct type *, extern int get_long_set_bounds (struct type *type, LONGEST *low, LONGEST *high); + +/* Modula-2 types */ + +struct builtin_m2_type +{ + struct type *builtin_char; + struct type *builtin_int; + struct type *builtin_card; + struct type *builtin_real; + struct type *builtin_bool; +}; + +/* Return the Modula-2 type table for the specified architecture. */ +extern const struct builtin_m2_type *builtin_m2_type (struct gdbarch *gdbarch); + -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com