* ch-typeprint.c (chill_type_print_base): Make TYPE_CODE_RANGE

	case more robust.
This fixes PR 5016.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d0a3052093bef9391e1b76f6f42b23bf343147d..a4ec0612cda0ccea64425d084dc0848f06be62a4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  5 14:46:41 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+       * ch-typeprint.c (chill_type_print_base):  Make TYPE_CODE_RANGE
+       case more robust.
+
 Sun Sep  4 16:06:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * i960-tdep.c (signal.h): Don't include.

diff --git a/gdb/ch-typeprint.c b/gdb/ch-typeprint.c
index 9bc4303e58f8704dc2ce1f58eb08d83160c7c805..3311e1f92004f9ab3c3641d87248dda8a10dbac8 100644 (file)
--- a/gdb/ch-typeprint.c
+++ b/gdb/ch-typeprint.c
@@ -243,25 +243,23 @@ chill_type_print_base (type, stream, show, level)
        break;
 
       case TYPE_CODE_RANGE:
-       if (TYPE_DUMMY_RANGE (type))
-         chill_type_print_base (TYPE_TARGET_TYPE (type),
-                                stream, show, level);
-       else if (TYPE_TARGET_TYPE (type))
+       if (TYPE_DUMMY_RANGE (type) > 0)
+         chill_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
+       else
          {
-           chill_type_print_base (TYPE_TARGET_TYPE (type),
-                                  stream, show, level);
+           struct type *target = TYPE_TARGET_TYPE (type);
+           if (target && TYPE_NAME (target))
+             fputs_filtered (TYPE_NAME (target), stream);
+           else
+             fputs_filtered ("RANGE", stream);
+           if (target == NULL)
+             target = builtin_type_long;
            fputs_filtered (" (", stream);
-           print_type_scalar (TYPE_TARGET_TYPE (type),
-                              TYPE_FIELD_BITPOS (type, 0), stream);
+           print_type_scalar (target, TYPE_LOW_BOUND (type), stream);
            fputs_filtered (":", stream);
-           print_type_scalar (TYPE_TARGET_TYPE (type),
-                              TYPE_FIELD_BITPOS (type, 1), stream);
+           print_type_scalar (target, TYPE_HIGH_BOUND (type), stream);
            fputs_filtered (")", stream);
          }
-       else
-         fprintf_filtered (stream, "RANGE? (%s : %d)",
-                           TYPE_FIELD_BITPOS (type, 0),
-                           TYPE_FIELD_BITPOS (type, 1));
        break;
 
       case TYPE_CODE_ENUM: