From 160be0ded9bb9a7ff6287c3b7094327465085874 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Tue, 8 Dec 1992 21:47:49 +0000 Subject: [PATCH] Changes for Amiga Unix from rhealey@ub.d.umn.edu. * config/amix.mh (NAT_FILE): Add, set to nm-sysv4.h. * config/amix.mh (NATDEPFILES): Add. * config/amix.mh (XDEPFILES): Move procfs.o and fork-child.o to NATDEPFILES. * dwarfread.c (decode_subscr_data): Remove spurious test that accepted only integer subscript types. We don't do anything with the type at the moment anyway. --- gdb/ChangeLog | 12 ++++++++++++ gdb/config/amix.mh | 4 +++- gdb/dwarfread.c | 40 ++++++++++++++++------------------------ 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b5068b1829e..6da61c849fa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +Tue Dec 8 13:30:58 1992 Fred Fish (fnf@cygnus.com) + + Changes for Amiga Unix from rhealey@ub.d.umn.edu. + * config/amix.mh (NAT_FILE): Add, set to nm-sysv4.h. + * config/amix.mh (NATDEPFILES): Add. + * config/amix.mh (XDEPFILES): Move procfs.o and fork-child.o + to NATDEPFILES. + + * dwarfread.c (decode_subscr_data): Remove spurious test that + accepted only integer subscript types. We don't do anything + with the type at the moment anyway. + **** start-sanitize-chill **** Fri Dec 4 06:56:56 1992 Fred Fish (fnf@cygnus.com) diff --git a/gdb/config/amix.mh b/gdb/config/amix.mh index 87811564a24..ad3afed0382 100644 --- a/gdb/config/amix.mh +++ b/gdb/config/amix.mh @@ -1,5 +1,7 @@ # Host: Commodore Amiga running SVR4. -XDEPFILES= procfs.o fork-child.o +NAT_FILE= nm-sysv4.h +NATDEPFILES= corelow.o procfs.o fork-child.o +XDEPFILES= XM_FILE= xm-amix.h SYSV_DEFINE=-DSYSV REGEX=regex.o diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c index 1ca2cbc7f4e..df9d72d7692 100644 --- a/gdb/dwarfread.c +++ b/gdb/dwarfread.c @@ -1299,34 +1299,26 @@ decode_subscr_data (scan, end) typep = decode_array_element_type (scan); break; case FMT_FT_C_C: + /* Read the type of the index, but don't do anything with it. + FIXME: This is OK for C since only int's are allowed. + It might not be OK for other languages. */ fundtype = target_to_host (scan, SIZEOF_FMT_FT, GET_UNSIGNED, current_objfile); scan += SIZEOF_FMT_FT; - if (fundtype != FT_integer && fundtype != FT_signed_integer - && fundtype != FT_unsigned_integer) - { - SQUAWK (("array subscripts must be integral types, not type 0x%x", - fundtype)); - } - else + nbytes = TARGET_FT_LONG_SIZE (current_objfile); + lowbound = target_to_host (scan, nbytes, GET_UNSIGNED, current_objfile); + scan += nbytes; + highbound = target_to_host (scan, nbytes, GET_UNSIGNED, current_objfile); + scan += nbytes; + nexttype = decode_subscr_data (scan, end); + if (nexttype != NULL) { - nbytes = TARGET_FT_LONG_SIZE (current_objfile); - lowbound = target_to_host (scan, nbytes, GET_UNSIGNED, - current_objfile); - scan += nbytes; - highbound = target_to_host (scan, nbytes, GET_UNSIGNED, - current_objfile); - scan += nbytes; - nexttype = decode_subscr_data (scan, end); - if (nexttype != NULL) - { - typep = alloc_type (current_objfile); - TYPE_CODE (typep) = TYPE_CODE_ARRAY; - TYPE_LENGTH (typep) = TYPE_LENGTH (nexttype); - TYPE_LENGTH (typep) *= (highbound - lowbound) + 1; - TYPE_TARGET_TYPE (typep) = nexttype; - } - } + typep = alloc_type (current_objfile); + TYPE_CODE (typep) = TYPE_CODE_ARRAY; + TYPE_LENGTH (typep) = TYPE_LENGTH (nexttype); + TYPE_LENGTH (typep) *= (highbound - lowbound) + 1; + TYPE_TARGET_TYPE (typep) = nexttype; + } break; case FMT_FT_C_X: case FMT_FT_X_C: -- 2.30.2