diff options
| author | Pedro Alves <palves@redhat.com> | 2016-03-09 02:29:39 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-03-09 02:47:40 +0000 |
| commit | b79497cb1cdc9b3053e5f0387bf3056c08c9bbdd (patch) | |
| tree | a203c96dfab366888677ad75977a132ef2036567 /gdb/doublest.c | |
| parent | aacca8a7a9c7f93955fa9dbf796b030ffce1b956 (diff) | |
| download | gdb-b79497cb1cdc9b3053e5f0387bf3056c08c9bbdd.zip gdb-b79497cb1cdc9b3053e5f0387bf3056c08c9bbdd.tar.gz gdb-b79497cb1cdc9b3053e5f0387bf3056c08c9bbdd.tar.bz2 | |
Assert that a floating type's length is at least as long as its format
This would have caught the HP/PA bug fixed in the previous patch:
.../src/gdb/gdbtypes.c:4690: internal-error: arch_float_type: Assertion `len >= floatformat_totalsize_bytes (floatformats[0])' failed.
A problem internal to GDB has been detected,
further debugging may prove unreliable.
Quit this debugging session? (y or n)
Tested on x86-64 Fedora 23, --enable-targets=all.
gdb/ChangeLog:
2016-03-09 Pedro Alves <palves@redhat.com>
* doublest.c (floatformat_totalsize_bytes): New function.
(floatformat_from_type): Assert that the type's length is at least
as long as the floatformat's totalsize.
* doublest.h (floatformat_totalsize_bytes): New declaration.
* gdbtypes.c (arch_float_type): Assert that the type's length is
at least as long as the floatformat's totalsize.
Diffstat (limited to 'gdb/doublest.c')
| -rw-r--r-- | gdb/doublest.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gdb/doublest.c b/gdb/doublest.c index 026cf42..fe06fec 100644 --- a/gdb/doublest.c +++ b/gdb/doublest.c @@ -693,6 +693,15 @@ static const struct floatformat *host_double_format = GDB_HOST_DOUBLE_FORMAT; static const struct floatformat *host_long_double_format = GDB_HOST_LONG_DOUBLE_FORMAT; +/* See doublest.h. */ + +size_t +floatformat_totalsize_bytes (const struct floatformat *fmt) +{ + return ((fmt->totalsize + FLOATFORMAT_CHAR_BIT - 1) + / FLOATFORMAT_CHAR_BIT); +} + void floatformat_to_doublest (const struct floatformat *fmt, const void *in, DOUBLEST *out) @@ -802,12 +811,16 @@ const struct floatformat * floatformat_from_type (const struct type *type) { struct gdbarch *gdbarch = get_type_arch (type); + const struct floatformat *fmt; gdb_assert (TYPE_CODE (type) == TYPE_CODE_FLT); if (TYPE_FLOATFORMAT (type) != NULL) - return TYPE_FLOATFORMAT (type)[gdbarch_byte_order (gdbarch)]; + fmt = TYPE_FLOATFORMAT (type)[gdbarch_byte_order (gdbarch)]; else - return floatformat_from_length (gdbarch, TYPE_LENGTH (type)); + fmt = floatformat_from_length (gdbarch, TYPE_LENGTH (type)); + + gdb_assert (TYPE_LENGTH (type) >= floatformat_totalsize_bytes (fmt)); + return fmt; } /* Extract a floating-point number of type TYPE from a target-order |