diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/arc-tdep.c | 11 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 23 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 6 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 3 | ||||
| -rw-r--r-- | gdb/i386-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/jit.c | 4 |
7 files changed, 23 insertions, 36 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 49481e0..9ca2e8e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2018-04-30 Tom Tromey <tom@tromey.com> + * 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-30 Tom Tromey <tom@tromey.com> + * rust-lang.c (rust_type_alignment): Remove. (rust_composite_type): Use type_align. diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index b0d51ad..286a289 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<ULONGEST> (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 dd7c89d..82ac751 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; @@ -1166,9 +1163,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *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)); fprintf_unfiltered (file, @@ -1639,23 +1633,6 @@ set_gdbarch_long_long_bit (struct gdbarch *gdbarch, } 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) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 3848ec5..b3a15c9 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 bb62e6d..bf12c68 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 fec74ee..b359254 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 @@ -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); |