* expression.h (enum exp_code): Added OP_NAME.

[binutils-gdb.git] / gdb / scm-valprint.c

diff --git a/gdb/scm-valprint.c b/gdb/scm-valprint.c
index ef2ba67674b8627dcf2ce1de955fc78530568ed6..de59220de5f9d0c4a67a0d607e922105f1c1f286 100644 (file)
--- a/gdb/scm-valprint.c
+++ b/gdb/scm-valprint.c
@@ -128,7 +128,7 @@ scm_ipruk (hdr, ptr, stream)
      GDB_FILE *stream;
 {
   fprintf_filtered (stream, "#<unknown-%s", hdr);
-#define SCM_SIZE (SCM_TYPE ? TYPE_LENGTH (SCM_TYPE) : sizeof (void*))
+#define SCM_SIZE TYPE_LENGTH (builtin_type_scm)
   if (SCM_CELLP (ptr))
     fprintf_filtered (stream, " (0x%lx . 0x%lx) @",
                      (long) SCM_CAR (ptr), (long) SCM_CDR (ptr));
@@ -372,7 +372,7 @@ scm_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
 {
   if (is_scmvalue_type (type))
     {
-      LONGEST svalue = unpack_long (type, valaddr);
+      LONGEST svalue = extract_signed_integer (valaddr, TYPE_LENGTH (type));
       if (scm_inferior_print (svalue, stream, format,
                              deref_ref, recurse, pretty) >= 0)
        {