* scm-lang.c: Moved Scheme value printing code to ...

	* scm-valprint.c:  ... this new file.
	Also major improvements in support for printing SCM values.
	* scm-lang.h:  New file.
	* scm-tags.h:  New file.
	* Makefile.in:  Note new scm-valprint.{c,o}.

7 files changed, 874 insertions, 150 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 972b9a4..6c377c3 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -287,6 +287,9 @@ rs6000-tdep.c
 rom68k-rom.c
 saber.suppress
 scm-lang.c
+scm-lang.h
+scm-tags.h
+scm-valprint.c
 ser-e7kpc.c
 ser-go32.c
 ser-mac.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 023aa25..5a3010f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep 30 16:13:36 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* scm-lang.c:  Moved Scheme value printing code to ...
+	* scm-valprint.c:  ... this new file.
+	Also major improvements in support for printing SCM values.
+	* scm-lang.h:  New file.
+	* scm-tags.h:  New file.
+	* Makefile.in:  Note new scm-valprint.{c,o}.
+
 Sat Sep 30 09:35:02 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 	* configure.in: X_INCDIR and X_LIBDIR added.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 98bae40..60d5e81 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -355,7 +355,7 @@ SFILES = blockframe.c breakpoint.c buildsym.c callback.c c-exp.y c-lang.c \
 	gdbtypes.c infcmd.c inflow.c infrun.c language.c \
 	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
 	mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c parse.c \
-	printcmd.c remote.c remote-nrom.c scm-lang.c \
+	printcmd.c remote.c remote-nrom.c scm-lang.c scm-valprint.c \
 	source.c stabsread.c stack.c symfile.c symmisc.c \
 	symtab.c target.c thread.c top.c \
 	typeprint.c utils.c valarith.c valops.c \
@@ -466,7 +466,7 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
 	exec.o objfiles.o minsyms.o maint.o demangle.o \
 	dbxread.o coffread.o elfread.o \
 	dwarfread.o mipsread.o stabsread.o core.o \
-	c-lang.o ch-lang.o f-lang.o m2-lang.o scm-lang.o \
+	c-lang.o ch-lang.o f-lang.o m2-lang.o scm-lang.o scm-valprint.o \
 	complaints.o typeprint.o \
 	c-typeprint.o ch-typeprint.o f-typeprint.o m2-typeprint.o \
 	c-valprint.o cp-valprint.o ch-valprint.o f-valprint.o m2-valprint.o \
diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index f3d2df4..0a97c08 100644
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -23,8 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "expression.h"
 #include "parser-defs.h"
 #include "language.h"
-#include "c-lang.h"
 #include "value.h"
+#include "c-lang.h"
+#include "scm-lang.h"
+#include "scm-tags.h"
 
 extern struct type ** const (c_builtin_types[]);
 extern value_ptr value_allocate_space_in_inferior PARAMS ((int));
@@ -32,6 +34,8 @@ extern value_ptr find_function_in_inferior PARAMS ((char*));
 
 static void scm_lreadr ();
 
+struct type *SCM_TYPE = NULL;
+
 static void
 scm_read_token (c, weird)
      int c;
@@ -276,7 +280,7 @@ scm_parse ()
   return 0;
 }
 
-static void
+void
 scm_printchar (c, stream)
      int c;
      GDB_FILE *stream;
@@ -295,159 +299,33 @@ scm_printstr (stream, string, length, force_ellipses)
 }
 
 int
-is_object_type (type)
-     struct type *type;
-{
-  /* FIXME - this should test for the SCM type, but we can't do that ! */
-  return TYPE_CODE (type) == TYPE_CODE_INT
-    && TYPE_NAME (type)
-#if 1
-    && strcmp (TYPE_NAME (type), "SCM") == 0;
-#else
-    && TYPE_LENGTH (type) == TYPE_LENGTH (builtin_type_long)
-    && strcmp (TYPE_NAME (type), "long int") == 0;
-#endif
-}
-
-/* Prints the SCM value VALUE by invoking the inferior, if appropraite.
-   Returns >= 0 on succes;  retunr -1 if the inferior cannot/should not
-   print VALUE. */
-
-int
-scm_inferior_print (value, stream, format, deref_ref, recurse, pretty)
-     LONGEST value;
-     GDB_FILE *stream;
-     int format;
-     int deref_ref;
-     int recurse;
-     enum val_prettyprint pretty;
-{
-  return -1;
-}
-
-#define SCM_ITAG8_DATA(X)	((X)>>8)
-#define SCM_ICHR(x)	((unsigned char)SCM_ITAG8_DATA(x))
-#define SCM_ICHRP(x)    (SCM_ITAG8(x) == scm_tc8_char)
-#define scm_tc8_char 0xf4
-#define SCM_IFLAGP(n)            ((0x87 & (int)(n))==4)
-#define SCM_ISYMNUM(n)           ((int)((n)>>9))
-#define SCM_ISYMCHARS(n)         (scm_isymnames[SCM_ISYMNUM(n)])
-#define SCM_ILOCP(n)             ((0xff & (int)(n))==0xfc)
-#define SCM_ITAG8(X)             ((int)(X) & 0xff)
-
-/* {Names of immediate symbols}
- * This table must agree with the declarations in scm.h: {Immediate Symbols}.*/
-
-static char *scm_isymnames[] =
-{
-  /* This table must agree with the declarations */
-  "#@and",
-  "#@begin",
-  "#@case",
-  "#@cond",
-  "#@do",
-  "#@if",
-  "#@lambda",
-  "#@let",
-  "#@let*",
-  "#@letrec",
-  "#@or",
-  "#@quote",
-  "#@set!",
-  "#@define",
-#if 0
-  "#@literal-variable-ref",
-  "#@literal-variable-set!",
-#endif
-  "#@apply",
-  "#@call-with-current-continuation",
-
- /* user visible ISYMS */
- /* other keywords */
- /* Flags */
-
-  "#f",
-  "#t",
-  "#<undefined>",
-  "#<eof>",
-  "()",
-  "#<unspecified>"
-};
-
-int
-scm_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
-	     pretty)
+is_scmvalue_type (type)
      struct type *type;
-     char *valaddr;
-     CORE_ADDR address;
-     GDB_FILE *stream;
-     int format;
-     int deref_ref;
-     int recurse;
-     enum val_prettyprint pretty;
 {
-  if (is_object_type (type))
+  if (TYPE_CODE (type) == TYPE_CODE_INT
+      && TYPE_NAME (type) && strcmp (TYPE_NAME (type), "SCM") == 0)
     {
-      LONGEST svalue = unpack_long (type, valaddr);
-      if (scm_inferior_print (svalue, stream, format,
-			      deref_ref, recurse, pretty) >= 0)
-	{
-	}
-      else
-	{
-	  switch (7 & svalue)
-	    {
-	    case 2:
-	    case 6:
-	      print_longest (stream, format ? format : 'd', 1, svalue >> 2);
-	      break;
-	    case 4:
-	      if (SCM_ICHRP (svalue))
-		{
-		  svalue = SCM_ICHR (svalue);
-		  scm_printchar (svalue, stream);
-		  break;
-		}
-	      else if (SCM_IFLAGP (svalue)
-	       && (SCM_ISYMNUM (svalue)
-		   < (sizeof scm_isymnames / sizeof (char *))))
-		{
-		  fputs_filtered (SCM_ISYMCHARS (svalue), stream);
-		  break;
-		}
-	      else if (SCM_ILOCP (svalue))
-		{
-#if 0
-		  fputs_filtered ("#@", stream);
-		  scm_intprint ((long) IFRAME (exp), 10, port);
-		  scm_putc (ICDRP (exp) ? '-' : '+', port);
-		  scm_intprint ((long) IDIST (exp), 10, port);
-		  break;
-#endif
-		}
-	    default:
-	      fprintf_filtered (stream, "#<%lX>", svalue);
-	    }
-	}
-      gdb_flush (stream);
-      return (0);
-    }
-  else
-    {
-      return c_val_print (type, valaddr, address, stream, format,
-			  deref_ref, recurse, pretty);
+      SCM_TYPE = type;
+      return 1;
     }
+  return 0;
 }
 
-int
-scm_value_print (val, stream, format, pretty)
-     value_ptr val;
-     GDB_FILE *stream;
-     int format;
-     enum val_prettyprint pretty;
+/* Get the INDEX'th SCM value, assuming SVALUE is the address
+   of the 0'th one.  */
+
+LONGEST
+scm_get_field (svalue, index)
+     LONGEST svalue;
+     int index;
 {
-  return (val_print (VALUE_TYPE (val), VALUE_CONTENTS (val),
-		     VALUE_ADDRESS (val), stream, format, 1, 0, pretty));
+  value_ptr val;
+  char buffer[20];
+  if (SCM_TYPE == NULL)
+    error ("internal error - no SCM type");
+  read_memory (SCM2PTR (svalue) + index * TYPE_LENGTH (SCM_TYPE),
+	       buffer, TYPE_LENGTH (SCM_TYPE));
+  return unpack_long (SCM_TYPE, buffer);
 }
 
 static value_ptr
diff --git a/gdb/scm-lang.h b/gdb/scm-lang.h
new file mode 100644
index 0000000..2f3f451
--- /dev/null
+++ b/gdb/scm-lang.h
@@ -0,0 +1,44 @@
+#define SICP
+#include "scm-tags.h"
+#undef SCM_NCELLP
+#define SCM_NCELLP(x) 	((SCM_SIZE-1) & (int)(x))
+#define SCM_ITAG8_DATA(X)	((X)>>8)
+#define SCM_ICHR(x)	((unsigned char)SCM_ITAG8_DATA(x))
+#define SCM_ICHRP(x)    (SCM_ITAG8(x) == scm_tc8_char)
+#define scm_tc8_char 0xf4
+#define SCM_IFLAGP(n)            ((0x87 & (int)(n))==4)
+#define SCM_ISYMNUM(n)           ((int)((n)>>9))
+#define SCM_ISYMCHARS(n)         (scm_isymnames[SCM_ISYMNUM(n)])
+#define SCM_ILOCP(n)             ((0xff & (int)(n))==0xfc)
+#define SCM_ITAG8(X)             ((int)(X) & 0xff)
+#define SCM_TYP7(x)              (0x7f & (int)SCM_CAR(x))
+#define SCM_LENGTH(x) (((unsigned long)SCM_CAR(x))>>8)
+#define SCM_NCONSP(x) (1 & (int)SCM_CAR(x))
+#define SCM_NECONSP(x) (SCM_NCONSP(x) && (1 != SCM_TYP3(x)))
+#define SCM_CAR(x) scm_get_field (x, 0)
+#define SCM_CDR(x) scm_get_field (x, 1)
+#define SCM_VELTS(x) ((SCM *)SCM_CDR(x))
+#define SCM_CLOSCAR(x) (SCM_CAR(x)-scm_tc3_closure)
+#define SCM_CODE(x) SCM_CAR(SCM_CLOSCAR (x))
+
+#ifdef __STDC__		/* Forward decls for prototypes */
+struct value;
+#endif
+
+extern int scm_value_print PARAMS ((struct value *, GDB_FILE*,
+				    int, enum val_prettyprint));
+
+extern int scm_val_print PARAMS ((struct type*, char*, CORE_ADDR, GDB_FILE*,
+				 int, int, int, enum val_prettyprint));
+
+extern LONGEST scm_get_field PARAMS ((LONGEST, int));
+
+extern int scm_scmval_print PARAMS ((LONGEST, GDB_FILE *,
+				     int, int, int, enum val_prettyprint));
+
+extern int is_scmvalue_type PARAMS ((struct type*));
+
+extern void scm_printchar PARAMS ((int, GDB_FILE*));
+
+struct type *SCM_TYPE;
+
diff --git a/gdb/scm-tags.h b/gdb/scm-tags.h
new file mode 100644
index 0000000..27fc34e
--- /dev/null
+++ b/gdb/scm-tags.h
@@ -0,0 +1,385 @@
+/* This is a minimally edited version of Guile's tags.h. */
+/* classes: h_files */
+
+#ifndef TAGSH
+#define TAGSH
+/*	Copyright (C) 1995 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * As a special exception, the Free Software Foundation gives permission
+ * for additional uses of the text contained in its release of GUILE.
+ *
+ * The exception is that, if you link the GUILE library with other files
+ * to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the GUILE library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the
+ * Free Software Foundation under the name GUILE.  If you copy
+ * code from other Free Software Foundation releases into a copy of
+ * GUILE, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for GUILE, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.  
+ */
+
+
+/** This file defines the format of SCM values and cons pairs.  
+ ** It is here that tag bits are assigned for various purposes.
+ **/
+
+
+/* Three Bit Tags
+ *
+ * 000 -- a non-immediate value.  Points into the pair heap.  
+ *
+ * 001 -- a gloc (i.e., a resolved global variable in a CAR in a code graph)
+ *	  or the CAR of an object handle (i.e., the tagged pointer to the
+ *	  vtable part of a user-defined object).
+ *
+ *        If X has this tag, the value at CDAR(X - 1) distinguishes
+ *	  glocs from object handles.  The distinction only needs
+ *	  to be made in a few places.  Only a few parts of the code know
+ *	  about glocs.  In most cases, when a value in the CAR of a pair
+ *	  has the tag 001, it means that the pair is an object handle.
+ *
+ * 010 -- the tag for immediate, exact integers. 
+ *
+ * 011 -- in the CAR of a pair, this tag indicates that the pair is a closure.
+ *	  The remaining bits of the CAR are a pointer into the pair heap
+ * 	  to the code graph for the closure.
+ *
+ * 1xy -- an extension tag which means that there is a five or six bit
+ *	  tag to the left of the low three bits.  See the nice diagrams
+ *	  in ../doc/code.doc if you want to know what the bits mean.
+ */
+
+
+
+
+
+#define scm_tc3_cons		0
+#define scm_tc3_cons_gloc	1
+#define scm_tc3_closure		3
+
+#define scm_tc7_ssymbol		5
+#define scm_tc7_msymbol		7
+#define scm_tc7_string		13
+#define scm_tc7_bvect		15
+#define scm_tc7_vector		21
+#define scm_tc7_lvector		23
+#define scm_tc7_ivect		29
+#define scm_tc7_uvect		31
+/* spare 37 39 */
+#define scm_tc7_fvect		45
+#define scm_tc7_dvect		47
+#define scm_tc7_cvect		53
+#define scm_tc7_port		55
+#define scm_tc7_contin		61
+#define scm_tc7_cclo		63
+/* spare 69 71 77 79 */
+#define scm_tc7_subr_0		85
+#define scm_tc7_subr_1		87
+#define scm_tc7_cxr		93
+#define scm_tc7_subr_3		95
+#define scm_tc7_subr_2		101
+#define scm_tc7_asubr		103
+#define scm_tc7_subr_1o		109
+#define scm_tc7_subr_2o		111
+#define scm_tc7_lsubr_2		117
+#define scm_tc7_lsubr		119
+#define scm_tc7_rpsubr		125
+
+#define scm_tc7_smob		127
+#define scm_tc_free_cell	127
+
+#define scm_tc16_flo		0x017f
+#define scm_tc_flo		0x017fL
+
+#define SCM_REAL_PART		(1L<<16)
+#define SCM_IMAG_PART		(2L<<16)
+#define scm_tc_dblr		(scm_tc16_flo|REAL_PART)
+#define scm_tc_dblc		(scm_tc16_flo|REAL_PART|IMAG_PART)
+
+#define scm_tc16_bigpos		0x027f
+#define scm_tc16_bigneg		0x037f
+
+#define scm_tc16_fport 		(scm_tc7_port + 0*256L)
+#define scm_tc16_pipe 		(scm_tc7_port + 1*256L)
+#define scm_tc16_strport	(scm_tc7_port + 2*256L)
+#define scm_tc16_sfport 	(scm_tc7_port + 3*256L)
+
+
+
+/* For cons pairs with immediate values in the CAR */
+#define scm_tcs_cons_imcar 2:case 4:case 6:case 10:\
+ case 12:case 14:case 18:case 20:\
+ case 22:case 26:case 28:case 30:\
+ case 34:case 36:case 38:case 42:\
+ case 44:case 46:case 50:case 52:\
+ case 54:case 58:case 60:case 62:\
+ case 66:case 68:case 70:case 74:\
+ case 76:case 78:case 82:case 84:\
+ case 86:case 90:case 92:case 94:\
+ case 98:case 100:case 102:case 106:\
+ case 108:case 110:case 114:case 116:\
+ case 118:case 122:case 124:case 126
+
+/* For cons pairs with non-immediate values in the CAR */
+#define scm_tcs_cons_nimcar 0:case 8:case 16:case 24:\
+ case 32:case 40:case 48:case 56:\
+ case 64:case 72:case 80:case 88:\
+ case 96:case 104:case 112:case 120
+
+/* A CONS_GLOC occurs in code.  It's CAR is a pointer to the
+ * CDR of a variable.  The low order bits of the CAR are 001.
+ * The CDR of the gloc is the code continuation.
+ */
+#define scm_tcs_cons_gloc 1:case 9:case 17:case 25:\
+ case 33:case 41:case 49:case 57:\
+ case 65:case 73:case 81:case 89:\
+ case 97:case 105:case 113:case 121
+
+#define scm_tcs_closures   3:case 11:case 19:case 27:\
+ case 35:case 43:case 51:case 59:\
+ case 67:case 75:case 83:case 91:\
+ case 99:case 107:case 115:case 123
+
+#define scm_tcs_subrs scm_tc7_asubr:case scm_tc7_subr_0:case scm_tc7_subr_1:case scm_tc7_cxr:\
+ case scm_tc7_subr_3:case scm_tc7_subr_2:case scm_tc7_rpsubr:case scm_tc7_subr_1o:\
+ case scm_tc7_subr_2o:case scm_tc7_lsubr_2:case scm_tc7_lsubr
+
+#define scm_tcs_symbols scm_tc7_ssymbol:case scm_tc7_msymbol
+
+#define scm_tcs_bignums tc16_bigpos:case tc16_bigneg
+
+
+
+/* References to objects are of type SCM.  Values may be non-immediate
+ * (pointers) or immediate (encoded, immutable, scalar values that fit
+ * in an SCM variable).
+ */
+
+typedef long SCM;
+
+/* Cray machines have pointers that are incremented once for each word,
+ * rather than each byte, the 3 most significant bits encode the byte
+ * within the word.  The following macros deal with this by storing the
+ * native Cray pointers like the ones that looks like scm expects.  This
+ * is done for any pointers that might appear in the car of a scm_cell, pointers
+ * to scm_vector elts, functions, &c are not munged.
+ */
+#ifdef _UNICOS
+# define SCM2PTR(x) ((int)(x) >> 3)
+# define PTR2SCM(x) (((SCM)(x)) << 3)
+# define SCM_POINTERS_MUNGED
+#else
+# define SCM2PTR(x) (x)
+# define PTR2SCM(x) ((SCM)(x))
+#endif /* def _UNICOS */
+
+
+
+/* Immediate? Predicates 
+ */
+#define SCM_IMP(x) 	(6 & (int)(x))
+#define SCM_NIMP(x) 	(!SCM_IMP(x))
+
+
+
+enum scm_tags
+{
+  scm_tc8_char = 0xf4,
+};
+
+#define SCM_ITAG8(X)		((int)(X) & 0xff)
+#define SCM_MAKE_ITAG8(X, TAG)	(((X)<<8) + TAG)
+#define SCM_ITAG8_DATA(X)	((X)>>8)
+
+
+
+/* Local Environment Structure
+ */
+#define SCM_ILOCP(n)		((0xff & (int)(n))==0xfc)
+#define SCM_ILOC00		(0x000000fcL)
+#define SCM_IDINC		(0x00100000L)
+#define SCM_ICDR		(0x00080000L)
+#define SCM_IFRINC		(0x00000100L)
+#define SCM_IDSTMSK		(-SCM_IDINC)
+#define SCM_IFRAME(n) 		((int)((SCM_ICDR-SCM_IFRINC)>>8) & ((int)(n)>>8))
+#define SCM_IDIST(n) 		(((unsigned long)(n))>>20)
+#define SCM_ICDRP(n) 		(SCM_ICDR & (n))
+
+
+/* Immediate Symbols, Special Symbols, Flags (various constants).
+ */
+
+/* ISYMP tests for ISPCSYM and ISYM */
+#define SCM_ISYMP(n) 		((0x187 & (int)(n))==4)
+
+/* IFLAGP tests for ISPCSYM, ISYM and IFLAG */
+#define SCM_IFLAGP(n) 		((0x87 & (int)(n))==4)
+#define SCM_ISYMNUM(n) 		((int)((n)>>9))
+#define SCM_ISYMCHARS(n) 	(scm_isymnames[SCM_ISYMNUM(n)])
+#define SCM_MAKSPCSYM(n) 	(((n)<<9)+((n)<<3)+4L)
+#define SCM_MAKISYM(n) 		(((n)<<9)+0x74L)
+#define SCM_MAKIFLAG(n) 	(((n)<<9)+0x174L)
+
+/* This table must agree with the declarations 
+ * in repl.c: {Names of immediate symbols}.
+ *
+ * These are used only in eval but their values
+ * have to be allocated here.
+ *
+ */
+
+#define SCM_IM_AND		SCM_MAKSPCSYM(0)
+#define SCM_IM_BEGIN		SCM_MAKSPCSYM(1)
+#define SCM_IM_CASE		SCM_MAKSPCSYM(2)
+#define SCM_IM_COND		SCM_MAKSPCSYM(3)
+#define SCM_IM_DO		SCM_MAKSPCSYM(4)
+#define SCM_IM_IF		SCM_MAKSPCSYM(5)
+#define SCM_IM_LAMBDA		SCM_MAKSPCSYM(6)
+#define SCM_IM_LET		SCM_MAKSPCSYM(7)
+#define SCM_IM_LETSTAR		SCM_MAKSPCSYM(8)
+#define SCM_IM_LETREC		SCM_MAKSPCSYM(9)
+#define SCM_IM_OR		SCM_MAKSPCSYM(10)
+#define SCM_IM_QUOTE		SCM_MAKSPCSYM(11)
+#define SCM_IM_SET		SCM_MAKSPCSYM(12)
+#define SCM_IM_DEFINE		SCM_MAKSPCSYM(13)
+#define SCM_IM_APPLY		SCM_MAKISYM(14)
+#define SCM_IM_CONT		SCM_MAKISYM(15)
+#define SCM_NUM_ISYMS 16
+
+/* Important immediates
+ */
+
+#define SCM_BOOL_F		SCM_MAKIFLAG(SCM_NUM_ISYMS+0)
+#define SCM_BOOL_T 		SCM_MAKIFLAG(SCM_NUM_ISYMS+1)
+#define SCM_UNDEFINED	 	SCM_MAKIFLAG(SCM_NUM_ISYMS+2)
+#define SCM_EOF_VAL 		SCM_MAKIFLAG(SCM_NUM_ISYMS+3)
+
+#ifdef SICP
+#define SCM_EOL 		SCM_BOOL_F
+#else
+#define SCM_EOL			SCM_MAKIFLAG(SCM_NUM_ISYMS+4)
+#endif
+
+#define SCM_UNSPECIFIED		SCM_MAKIFLAG(SCM_NUM_ISYMS+5)
+
+
+
+/* Heap Pairs and the Empty List Predicates
+ */
+#define SCM_NULLP(x) 	(SCM_EOL == (x))
+#define SCM_NNULLP(x) 	(SCM_EOL != (x))
+#define SCM_CELLP(x) 	(!SCM_NCELLP(x))
+#define SCM_NCELLP(x) 	((sizeof(scm_cell)-1) & (int)(x))
+
+
+
+#define SCM_UNBNDP(x) 	(SCM_UNDEFINED==(x))
+
+
+
+/* Testing and Changing GC Marks in Various Standard Positions
+ */
+#define SCM_GCMARKP(x) 		(1 & (int)SCM_CDR(x))
+#define SCM_GC8MARKP(x) 	(0x80 & (int)SCM_CAR(x))
+#define SCM_SETGCMARK(x) 	(SCM_CDR(x) |= 1)
+#define SCM_CLRGCMARK(x) 	(SCM_CDR(x) &= ~1L)
+#define SCM_SETGC8MARK(x) 	(SCM_CAR(x) |= 0x80)
+#define SCM_CLRGC8MARK(x) 	(SCM_CAR(x) &= ~0x80L)
+
+
+/* Extracting Tag Bits, With or Without GC Safety and Optional Bits
+ */
+#define SCM_TYP3(x) 		(7 & (int)SCM_CAR(x))
+#define SCM_TYP7(x) 		(0x7f & (int)SCM_CAR(x))
+#define SCM_TYP7S(x) 		(0x7d & (int)SCM_CAR(x))
+#define SCM_TYP16(x) 		(0xffff & (int)SCM_CAR(x))
+#define SCM_TYP16S(x) 		(0xfeff & (int)SCM_CAR(x))
+#define SCM_GCTYP16(x) 		(0xff7f & (int)SCM_CAR(x))
+
+
+/* Two slightly extensible types: smobs and ptobs.
+ *
+ */
+#define SCM_SMOBNUM(x) (0x0ff & (CAR(x)>>8));
+#define SCM_PTOBNUM(x) (0x0ff & (CAR(x)>>8));
+
+
+
+
+#define SCM_DIRP(x) (SCM_NIMP(x) && (TYP16(x)==(scm_tc16_dir)))
+#define SCM_OPDIRP(x) (SCM_NIMP(x) && (CAR(x)==(scm_tc16_dir | OPN)))
+
+
+
+/* Lvectors 
+ */
+#define SCM_LVECTORP(x) (TYP7(x)==tc7_lvector)
+
+
+#if 0
+
+/* Sockets 
+ */
+#define tc_socket (tc7_port | OPN)
+#define SCM_SOCKP(x) (((0x7f | OPN | RDNG | WRTNG) & CAR(x))==(tc_socket))
+#define SCM_SOCKTYP(x) (CAR(x)>>24)
+
+
+
+extern int scm_tc16_key_vector;
+#define SCM_KEYVECP(X)   (scm_tc16_key_vector == TYP16 (X))
+#define SCM_KEYVECLEN(OBJ) (((unsigned long)CAR (obj)) >> 16)
+
+
+#define SCM_MALLOCDATA(obj) ((char *)CDR(obj))
+#define SCM_MALLOCLEN(obj) (((unsigned long)CAR (obj)) >> 16)
+#define SCM_WORDDATA(obj)  (CDR (obj))
+
+
+#define SCM_BYTECODEP(X) ((TYP7 (X) == tc7_cclo) && (CCLO_SUBR (X) == rb_proc))
+#define SCM_BYTECODE_CONSTANTS(X) (VELTS(X)[1])
+#define SCM_BYTECODE_CODE(X) (VELTS(X)[2])
+#define SCM_BYTECODE_NAME(X) (VELTS(X)[3])
+#define SCM_BYTECODE_BCODE(X) (VELTS(X)[4])
+#define SCM_BYTECODE_ELTS 5
+
+
+#define SCM_FREEP(x) (CAR(x)==tc_free_cell)
+#define SCM_NFREEP(x) (!FREEP(x))
+
+#endif /* 0*/
+
+#ifdef __STDC__
+
+#else /* STDC */
+
+#endif /* STDC */
+
+
+#endif  /* TAGSH */
diff --git a/gdb/scm-valprint.c b/gdb/scm-valprint.c
new file mode 100644
index 0000000..ef2ba67
--- /dev/null
+++ b/gdb/scm-valprint.c
@@ -0,0 +1,405 @@
+/* Scheme/Guile language support routines for GDB, the GNU debugger.
+   Copyright 1995 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "parser-defs.h"
+#include "language.h"
+#include "value.h"
+#include "scm-lang.h"
+#include "valprint.h"
+
+/* Prints the SCM value VALUE by invoking the inferior, if appropraite.
+   Returns >= 0 on succes;  retunr -1 if the inferior cannot/should not
+   print VALUE. */
+
+int
+scm_inferior_print (value, stream, format, deref_ref, recurse, pretty)
+     LONGEST value;
+     GDB_FILE *stream;
+     int format;
+     int deref_ref;
+     int recurse;
+     enum val_prettyprint pretty;
+{
+  return -1;
+}
+
+/* {Names of immediate symbols}
+ * This table must agree with the declarations in scm.h: {Immediate Symbols}.*/
+
+static char *scm_isymnames[] =
+{
+  /* This table must agree with the declarations */
+  "#@and",
+  "#@begin",
+  "#@case",
+  "#@cond",
+  "#@do",
+  "#@if",
+  "#@lambda",
+  "#@let",
+  "#@let*",
+  "#@letrec",
+  "#@or",
+  "#@quote",
+  "#@set!",
+  "#@define",
+#if 0
+  "#@literal-variable-ref",
+  "#@literal-variable-set!",
+#endif
+  "#@apply",
+  "#@call-with-current-continuation",
+
+ /* user visible ISYMS */
+ /* other keywords */
+ /* Flags */
+
+  "#f",
+  "#t",
+  "#<undefined>",
+  "#<eof>",
+  "()",
+  "#<unspecified>"
+};
+
+static int
+scm_scmlist_print (svalue, stream, format, deref_ref, recurse, pretty)
+     LONGEST svalue;
+     GDB_FILE *stream;
+     int format;
+     int deref_ref;
+     int recurse;
+     enum val_prettyprint pretty;
+{
+  unsigned int more = print_max;
+  if (recurse > 6)
+    {
+      fputs_filtered ("...", stream);
+      return 0;
+    }
+  scm_scmval_print (SCM_CAR (svalue), stream, format,
+		    deref_ref, recurse + 1, pretty);
+  svalue = SCM_CDR (svalue);
+  for (; SCM_NIMP (svalue); svalue = SCM_CDR (svalue))
+    {
+      if (SCM_NECONSP (svalue))
+	break;
+      fputs_filtered (" ", stream);
+      if (--more == 0)
+	{
+	  fputs_filtered ("...", stream);
+	  return;
+	}
+      scm_scmval_print (SCM_CAR (svalue), stream, format,
+			deref_ref, recurse + 1, pretty);
+    }
+  if (SCM_NNULLP (svalue))
+    {
+      fputs_filtered (" . ", stream);
+      scm_scmval_print (svalue, stream, format,
+			deref_ref, recurse + 1, pretty);
+    }
+}
+
+static void
+scm_ipruk (hdr, ptr, stream)
+     char *hdr;
+     LONGEST ptr;
+     GDB_FILE *stream;
+{
+  fprintf_filtered (stream, "#<unknown-%s", hdr);
+#define SCM_SIZE (SCM_TYPE ? TYPE_LENGTH (SCM_TYPE) : sizeof (void*))
+  if (SCM_CELLP (ptr))
+    fprintf_filtered (stream, " (0x%lx . 0x%lx) @",
+		      (long) SCM_CAR (ptr), (long) SCM_CDR (ptr));
+  fprintf_filtered (stream, " 0x%x>", ptr);
+}
+
+int
+scm_scmval_print (svalue, stream, format, deref_ref, recurse, pretty)
+     LONGEST svalue;
+     GDB_FILE *stream;
+     int format;
+     int deref_ref;
+     int recurse;
+     enum val_prettyprint pretty;
+{
+ taloop:
+  switch (7 & svalue)
+    {
+    case 2:
+    case 6:
+      print_longest (stream, format ? format : 'd', 1, svalue >> 2);
+      break;
+    case 4:
+      if (SCM_ICHRP (svalue))
+	{
+	  svalue = SCM_ICHR (svalue);
+	  scm_printchar (svalue, stream);
+	  break;
+	}
+      else if (SCM_IFLAGP (svalue)
+	       && (SCM_ISYMNUM (svalue)
+		   < (sizeof scm_isymnames / sizeof (char *))))
+	{
+	  fputs_filtered (SCM_ISYMCHARS (svalue), stream);
+	  break;
+	}
+      else if (SCM_ILOCP (svalue))
+	{
+	  fprintf_filtered (stream, "#@%ld%c%ld",
+			    (long) SCM_IFRAME (svalue),
+			    SCM_ICDRP (svalue) ? '-' : '+',
+			    (long) SCM_IDIST (svalue));
+	  break;
+	}
+      else
+	goto idef;
+      break;
+    case 1:
+      /* gloc */
+      fputs_filtered ("#@", stream);
+      svalue = SCM_CAR (svalue - 1);
+      goto taloop;
+    default:
+    idef:
+      scm_ipruk ("immediate", svalue, stream);
+      break;
+    case 0:
+
+      switch (SCM_TYP7 (svalue))
+	{
+	case scm_tcs_cons_gloc:
+	  if (SCM_CDR (SCM_CAR (svalue) - 1L) == 0)
+	    {
+	      SCM name;
+	      fputs_filtered ("#<latte ", stream);
+#if 1
+	      fputs_filtered ("???", stream);
+#else
+	      name = ((SCM n*)(STRUCT_TYPE( exp)))[struct_i_name];
+	      scm_lfwrite (CHARS (name),
+			   (sizet) sizeof (char),
+			   (sizet) LENGTH (name),
+			   port);
+#endif
+	      fprintf_filtered (stream, " #X%lX>", svalue);
+	      break;
+	    }
+	case scm_tcs_cons_imcar:
+	case scm_tcs_cons_nimcar:
+	  fputs_filtered ("(", stream);
+	  scm_scmlist_print (svalue, stream, format,
+			     deref_ref, recurse + 1, pretty);
+	  fputs_filtered (")", stream);
+	  break;
+	case scm_tcs_closures:
+	  fputs_filtered ("#<CLOSURE ", stream);
+	  scm_scmlist_print (SCM_CODE (svalue), stream, format,
+			     deref_ref, recurse + 1, pretty);
+	  fputs_filtered (">", stream);
+	  break;
+	case scm_tc7_string:
+	  {
+	    int len = SCM_LENGTH (svalue);
+	    CORE_ADDR addr = (CORE_ADDR) SCM_CDR (svalue);
+	    int i;
+	    int done = 0;
+	    int buf_size;
+	    char buffer[64];
+	    int truncate = print_max && len > (int) print_max;
+	    if (truncate)
+	      len = print_max;
+	    fputs_filtered ("\"", stream);
+	    for (; done < len; done += buf_size)
+	      {
+		buf_size = min (len - done, 64);
+		read_memory (addr + done, buffer, buf_size);
+		
+		for (i = 0; i < buf_size; ++i)
+		  switch (buffer[i])
+		    {
+		    case '\"':
+		    case '\\':
+		      fputs_filtered ("\\", stream);
+		    default:
+		      fprintf_filtered (stream, "%c", buffer[i]);
+		    }
+	      }
+	    fputs_filtered (truncate ? "...\"" : "\"", stream);
+	    break;
+	  }
+	  break;
+	case scm_tcs_symbols:
+	  {
+	    int len = SCM_LENGTH (svalue);
+
+	    char * str = (char*) alloca (len);
+	    read_memory (SCM_CDR (svalue), str, len + 1);
+	    /* Should handle weird characters FIXME */
+	    str[len] = '\0';
+	    fputs_filtered (str, stream);
+	    break;
+	  }
+	case scm_tc7_vector:
+	  {
+	    int len = SCM_LENGTH (svalue);
+	    int i;
+	    LONGEST elements = SCM_CDR(svalue);
+	    fputs_filtered ("#(", stream);
+	    for (i = 0; i < len; ++i)
+	      {
+		if (i > 0)
+		  fputs_filtered (" ", stream);
+		scm_scmval_print (scm_get_field (elements, i), stream, format,
+				  deref_ref, recurse + 1, pretty);
+	      }
+	    fputs_filtered (")", stream);
+	  }
+	  break;
+#if 0
+	case tc7_lvector:
+	  {
+	    SCM result;
+	    SCM hook;
+	    hook = scm_get_lvector_hook (exp, LV_PRINT_FN);
+	    if (hook == BOOL_F)
+	      {
+		scm_puts ("#<locked-vector ", port);
+		scm_intprint(CDR(exp), 16, port);
+		scm_puts (">", port);
+	      }
+	    else
+	      {
+		result
+		  = scm_apply (hook,
+			       scm_listify (exp, port, (writing ? BOOL_T : BOOL_F),
+					    SCM_UNDEFINED),
+			       EOL);
+		if (result == BOOL_F)
+		  goto punk;
+	      }
+	    break;
+	  }
+	  break;
+	case tc7_bvect:
+	case tc7_ivect:
+	case tc7_uvect:
+	case tc7_fvect:
+	case tc7_dvect:
+	case tc7_cvect:
+	  scm_raprin1 (exp, port, writing);
+	  break;
+#endif
+	case scm_tcs_subrs:
+	  {
+	    int index = SCM_CAR (svalue) >> 8;
+#if 1
+	    char str[20];
+	    sprintf (str, "#%d", index);
+#else
+	    char *str = index ? SCM_CHARS (scm_heap_org+index) : "";
+#define SCM_CHARS(x) ((char *)(SCM_CDR(x)))
+	    char *str = CHARS (SNAME (exp));
+#endif
+	    fprintf_filtered (stream, "#<primitive-procedure %s>",
+			      str);
+	  }
+	  break;
+#if 0
+#ifdef CCLO
+	case tc7_cclo:
+	  scm_puts ("#<compiled-closure ", port);
+	  scm_iprin1 (CCLO_SUBR (exp), port, writing);
+	  scm_putc ('>', port);
+	  break;
+#endif
+	case tc7_contin:
+	  fprintf_filtered (stream, "#<continuation %d @ #X%lx >",
+			    LENGTH (svalue),
+			    (long) CHARS (svalue));
+	  break;
+	case tc7_port:
+	  i = PTOBNUM (exp);
+	  if (i < scm_numptob && scm_ptobs[i].print && (scm_ptobs[i].print) (exp, port, writing))
+	    break;
+	  goto punk;
+	case tc7_smob:
+	  i = SMOBNUM (exp);
+	  if (i < scm_numsmob && scm_smobs[i].print
+	      && (scm_smobs[i].print) (exp, port, writing))
+	    break;
+	  goto punk;
+#endif
+	default:
+	punk:scm_ipruk ("type", svalue, stream);
+	}
+      break;
+    }
+}
+
+int
+scm_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
+	     pretty)
+     struct type *type;
+     char *valaddr;
+     CORE_ADDR address;
+     GDB_FILE *stream;
+     int format;
+     int deref_ref;
+     int recurse;
+     enum val_prettyprint pretty;
+{
+  if (is_scmvalue_type (type))
+    {
+      LONGEST svalue = unpack_long (type, valaddr);
+      if (scm_inferior_print (svalue, stream, format,
+			      deref_ref, recurse, pretty) >= 0)
+	{
+	}
+      else
+	{
+	  scm_scmval_print (svalue, stream, format,
+			      deref_ref, recurse, pretty);
+	}
+
+      gdb_flush (stream);
+      return (0);
+    }
+  else
+    {
+      return c_val_print (type, valaddr, address, stream, format,
+			  deref_ref, recurse, pretty);
+    }
+}
+
+int
+scm_value_print (val, stream, format, pretty)
+     value_ptr val;
+     GDB_FILE *stream;
+     int format;
+     enum val_prettyprint pretty;
+{
+  return (val_print (VALUE_TYPE (val), VALUE_CONTENTS (val),
+		     VALUE_ADDRESS (val), stream, format, 1, 0, pretty));
+}