From patchwork Fri Apr 27 14:01:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27003 Received: (qmail 30506 invoked by alias); 27 Apr 2018 14:01:54 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 30276 invoked by uid 89); 27 Apr 2018 14:01:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=claimed, 1756, 5307 X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.47.109) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 27 Apr 2018 14:01:44 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 6A64482B0 for ; Fri, 27 Apr 2018 09:01:43 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id C3wVf7zwUWCOCC3wVf2Bli; Fri, 27 Apr 2018 09:01:43 -0500 X-Authority-Reason: nr=8 Received: from 97-122-176-117.hlrn.qwest.net ([97.122.176.117]:54910 helo=pokyo.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fC3wV-000h2v-7p; Fri, 27 Apr 2018 09:01:43 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 6/6] Remove long_long_align_bit gdbarch attribute Date: Fri, 27 Apr 2018 08:01:39 -0600 Message-Id: <20180427140139.7957-7-tom@tromey.com> In-Reply-To: <20180427140139.7957-1-tom@tromey.com> References: <20180427140139.7957-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fC3wV-000h2v-7p X-Source-Sender: 97-122-176-117.hlrn.qwest.net (pokyo.Home) [97.122.176.117]:54910 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This removes the long_long_align_bit gdbarch attribute in favor of type_align. This uncovered two possible issues. First, arc-tdep.c claimed that long long alignment was 32 bits, but as discussed on the list, ARC has a maximum alignment of 32 bits, so I've added an arc_type_align function to account for this. Second, jit.c, the sole user of long_long_align_bit, was confusing "long long" with uint64_t. The relevant structure is defined in the JIT API part of the manual as: struct jit_code_entry { struct jit_code_entry *next_entry; struct jit_code_entry *prev_entry; const char *symfile_addr; uint64_t symfile_size; }; I've changed this code to use uint64_t. 2018-04-27 Tom Tromey * jit.c (jit_read_code_entry): Use type_align. * i386-tdep.c (i386_gdbarch_init): Don't call set_gdbarch_long_long_align_bit. * gdbarch.sh: Remove long_long_align_bit. * gdbarch.c, gdbarch.h: Rebuild. * arc-tdep.c (arc_type_align): New function. (arc_gdbarch_init): Use arc_type_align. Don't call set_gdbarch_long_long_align_bit. --- gdb/ChangeLog | 11 +++++++++++ gdb/arc-tdep.c | 11 ++++++++++- gdb/gdbarch.c | 23 ----------------------- gdb/gdbarch.h | 6 ------ gdb/gdbarch.sh | 3 --- gdb/i386-tdep.c | 1 - gdb/jit.c | 4 ++-- 7 files changed, 23 insertions(+), 36 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8aa0fc655e..bfe89e18df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2018-04-27 Tom Tromey + + * jit.c (jit_read_code_entry): Use type_align. + * i386-tdep.c (i386_gdbarch_init): Don't call + set_gdbarch_long_long_align_bit. + * gdbarch.sh: Remove long_long_align_bit. + * gdbarch.c, gdbarch.h: Rebuild. + * arc-tdep.c (arc_type_align): New function. + (arc_gdbarch_init): Use arc_type_align. Don't call + set_gdbarch_long_long_align_bit. + 2018-04-27 Tom Tromey * rust-lang.c (rust_type_alignment): Remove. diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index b0d51addd3..286a289a06 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -1957,6 +1957,15 @@ arc_tdesc_init (struct gdbarch_info info, const struct target_desc **tdesc, return TRUE; } +/* Implement the type_align gdbarch function. */ + +static ULONGEST +arc_type_align (struct gdbarch *gdbarch, struct type *type) +{ + type = check_typedef (type); + return std::min (4, TYPE_LENGTH (type)); +} + /* Implement the "init" gdbarch method. */ static struct gdbarch * @@ -1982,7 +1991,7 @@ arc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_int_bit (gdbarch, 32); set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_long_long_bit (gdbarch, 64); - set_gdbarch_long_long_align_bit (gdbarch, 32); + set_gdbarch_type_align (gdbarch, arc_type_align); set_gdbarch_float_bit (gdbarch, 32); set_gdbarch_float_format (gdbarch, floatformats_ieee_single); set_gdbarch_double_bit (gdbarch, 64); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index dd7c89d948..82ac751913 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -175,7 +175,6 @@ struct gdbarch int int_bit; int long_bit; int long_long_bit; - int long_long_align_bit; int half_bit; const struct floatformat ** half_format; int float_bit; @@ -389,7 +388,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->int_bit = 4*TARGET_CHAR_BIT; gdbarch->long_bit = 4*TARGET_CHAR_BIT; gdbarch->long_long_bit = 2*gdbarch->long_bit; - gdbarch->long_long_align_bit = 2*gdbarch->long_bit; gdbarch->half_bit = 2*TARGET_CHAR_BIT; gdbarch->float_bit = 4*TARGET_CHAR_BIT; gdbarch->double_bit = 8*TARGET_CHAR_BIT; @@ -530,7 +528,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of int_bit, invalid_p == 0 */ /* Skip verify of long_bit, invalid_p == 0 */ /* Skip verify of long_long_bit, invalid_p == 0 */ - /* Skip verify of long_long_align_bit, invalid_p == 0 */ /* Skip verify of half_bit, invalid_p == 0 */ if (gdbarch->half_format == 0) gdbarch->half_format = floatformats_ieee_half; @@ -1165,9 +1162,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: long_double_format = %s\n", pformat (gdbarch->long_double_format)); - fprintf_unfiltered (file, - "gdbarch_dump: long_long_align_bit = %s\n", - plongest (gdbarch->long_long_align_bit)); fprintf_unfiltered (file, "gdbarch_dump: long_long_bit = %s\n", plongest (gdbarch->long_long_bit)); @@ -1638,23 +1632,6 @@ set_gdbarch_long_long_bit (struct gdbarch *gdbarch, gdbarch->long_long_bit = long_long_bit; } -int -gdbarch_long_long_align_bit (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of long_long_align_bit, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_long_long_align_bit called\n"); - return gdbarch->long_long_align_bit; -} - -void -set_gdbarch_long_long_align_bit (struct gdbarch *gdbarch, - int long_long_align_bit) -{ - gdbarch->long_long_align_bit = long_long_align_bit; -} - int gdbarch_half_bit (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 3848ec50c7..b3a15c9898 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -147,12 +147,6 @@ extern void set_gdbarch_long_bit (struct gdbarch *gdbarch, int long_bit); extern int gdbarch_long_long_bit (struct gdbarch *gdbarch); extern void set_gdbarch_long_long_bit (struct gdbarch *gdbarch, int long_long_bit); -/* Alignment of a long long or unsigned long long for the target - machine. */ - -extern int gdbarch_long_long_align_bit (struct gdbarch *gdbarch); -extern void set_gdbarch_long_long_align_bit (struct gdbarch *gdbarch, int long_long_align_bit); - /* The ABI default bit-size and format for "half", "float", "double", and "long double". These bit/format pairs should eventually be combined into a single object. For the moment, just initialize them as a pair. diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index bb62e6d620..bf12c68487 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -360,9 +360,6 @@ v;int;long_bit;;;8 * sizeof (long);4*TARGET_CHAR_BIT;;0 # Number of bits in a long long or unsigned long long for the target # machine. v;int;long_long_bit;;;8 * sizeof (LONGEST);2*gdbarch->long_bit;;0 -# Alignment of a long long or unsigned long long for the target -# machine. -v;int;long_long_align_bit;;;8 * sizeof (LONGEST);2*gdbarch->long_bit;;0 # The ABI default bit-size and format for "half", "float", "double", and # "long double". These bit/format pairs should eventually be combined diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index fec74ee6c8..b359254c75 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -8429,7 +8429,6 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->record_regmap = i386_record_regmap; - set_gdbarch_long_long_align_bit (gdbarch, 32); set_gdbarch_type_align (gdbarch, i386_type_align); /* The format used for `long double' on almost all i386 targets is diff --git a/gdb/jit.c b/gdb/jit.c index 2f23c058a0..8cd645cb66 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -413,8 +413,8 @@ jit_read_code_entry (struct gdbarch *gdbarch, ptr_type = builtin_type (gdbarch)->builtin_data_ptr; ptr_size = TYPE_LENGTH (ptr_type); - /* Figure out where the longlong value will be. */ - align_bytes = gdbarch_long_long_align_bit (gdbarch) / 8; + /* Figure out where the uint64_t value will be. */ + align_bytes = type_align (builtin_type (gdbarch)->builtin_uint64); off = 3 * ptr_size; off = (off + (align_bytes - 1)) & ~(align_bytes - 1);