* defs.h: Move definitions of TARGET_*_BIT after include of tm.h.

	The old way (using #undef in tm.h) was ugly and asking for
	trouble, because it makes it possible for some file to use the
	wrong definition.  Move definition of HOST_CHAR_BIT after definition
	of TARGET_CHAR_BIT.
	* config/alpha/tm-alpha.h, config/h8300/tm-h8300.h,
	config/h8500/tm-h8500.h, config/z8k/tm-z8k.h: Don't undef TARGET_*_BIT
	before defining them.

1 files changed, 122 insertions, 101 deletions

diff --git a/gdb/defs.h b/gdb/defs.h
index 35749d0..8508f27 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -28,7 +28,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "ansidecl.h"
 
 /* An address in the program being debugged.  Host byte order.  */
+#ifndef CORE_ADDR_TYPE
 typedef unsigned int CORE_ADDR;
+#else
+typedef CORE_ADDR_TYPE CORE_ADDR;
+#endif
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
@@ -217,16 +221,40 @@ wrap_here PARAMS ((char *));
 extern void
 reinitialize_more_filter PARAMS ((void));
 
+typedef FILE GDB_FILE;
+#define gdb_stdout stdout
+#define gdb_stderr stderr
+
 extern int
-print_insn PARAMS ((CORE_ADDR, FILE *));
+print_insn PARAMS ((CORE_ADDR, GDB_FILE *));
+
+extern void
+gdb_flush PARAMS ((GDB_FILE *));
+
+extern GDB_FILE *
+gdb_fopen PARAMS ((char * name, char * mode));
+
+extern void
+fputs_filtered PARAMS ((const char *, GDB_FILE *));
+
+extern void
+fputs_unfiltered PARAMS ((const char *, GDB_FILE *));
 
 extern void
-fputs_filtered PARAMS ((const char *, FILE *));
+fputc_unfiltered PARAMS ((int, GDB_FILE *));
+
+extern void
+putc_unfiltered PARAMS ((int));
+
+#define putchar_unfiltered(C)  putc_unfiltered(C)
 
 extern void
 puts_filtered PARAMS ((char *));
 
 extern void
+puts_unfiltered PARAMS ((char *));
+
+extern void
 vprintf_filtered ();
 
 extern void
@@ -245,19 +273,31 @@ extern void
 printfi_filtered ();
 
 extern void
-print_spaces PARAMS ((int, FILE *));
+vprintf_unfiltered ();
+
+extern void
+vfprintf_unfiltered ();
+
+extern void
+fprintf_unfiltered ();
 
 extern void
-print_spaces_filtered PARAMS ((int, FILE *));
+printf_unfiltered ();
+
+extern void
+print_spaces PARAMS ((int, GDB_FILE *));
+
+extern void
+print_spaces_filtered PARAMS ((int, GDB_FILE *));
 
 extern char *
 n_spaces PARAMS ((int));
 
 extern void
-gdb_printchar PARAMS ((int, FILE *, int));
+gdb_printchar PARAMS ((int, GDB_FILE *, int));
 
 extern void
-fprintf_symbol_filtered PARAMS ((FILE *, char *, enum language, int));
+fprintf_symbol_filtered PARAMS ((GDB_FILE *, char *, enum language, int));
 
 extern void
 perror_with_name PARAMS ((char *));
@@ -303,10 +343,10 @@ extern void
 set_next_address PARAMS ((CORE_ADDR));
 
 extern void
-print_address_symbolic PARAMS ((CORE_ADDR, FILE *, int, char *));
+print_address_symbolic PARAMS ((CORE_ADDR, GDB_FILE *, int, char *));
 
 extern void
-print_address PARAMS ((CORE_ADDR, FILE *));
+print_address PARAMS ((CORE_ADDR, GDB_FILE *));
 
 /* From source.c */
 
@@ -462,62 +502,6 @@ enum val_prettyprint
 #define	LONG_MAX ((long)(ULONG_MAX >> 1))	/* 0x7FFFFFFF for 32-bits */
 #endif
 
-/* Number of bits in a char or unsigned char for the target machine.
-   Just like CHAR_BIT in <limits.h> but describes the target machine.  */
-#if !defined (TARGET_CHAR_BIT)
-#define TARGET_CHAR_BIT 8
-#endif
-
-/* Number of bits in a short or unsigned short for the target machine. */
-#if !defined (TARGET_SHORT_BIT)
-#define TARGET_SHORT_BIT (sizeof (short) * TARGET_CHAR_BIT)
-#endif
-
-/* Number of bits in an int or unsigned int for the target machine. */
-#if !defined (TARGET_INT_BIT)
-#define TARGET_INT_BIT (sizeof (int) * TARGET_CHAR_BIT)
-#endif
-
-/* Number of bits in a long or unsigned long for the target machine. */
-#if !defined (TARGET_LONG_BIT)
-#define TARGET_LONG_BIT (sizeof (long) * TARGET_CHAR_BIT)
-#endif
-
-/* Number of bits in a long long or unsigned long long for the target machine. */
-#if !defined (TARGET_LONG_LONG_BIT)
-#define TARGET_LONG_LONG_BIT (2 * TARGET_LONG_BIT)
-#endif
-
-/* Number of bits in a float for the target machine. */
-#if !defined (TARGET_FLOAT_BIT)
-#define TARGET_FLOAT_BIT (sizeof (float) * TARGET_CHAR_BIT)
-#endif
-
-/* Number of bits in a double for the target machine. */
-#if !defined (TARGET_DOUBLE_BIT)
-#define TARGET_DOUBLE_BIT (sizeof (double) * TARGET_CHAR_BIT)
-#endif
-
-/* Number of bits in a long double for the target machine. */
-#if !defined (TARGET_LONG_DOUBLE_BIT)
-#define TARGET_LONG_DOUBLE_BIT (2 * TARGET_DOUBLE_BIT)
-#endif
-
-/* Number of bits in a "complex" for the target machine. */
-#if !defined (TARGET_COMPLEX_BIT)
-#define TARGET_COMPLEX_BIT (2 * TARGET_FLOAT_BIT)
-#endif
-
-/* Number of bits in a "double complex" for the target machine. */
-#if !defined (TARGET_DOUBLE_COMPLEX_BIT)
-#define TARGET_DOUBLE_COMPLEX_BIT (2 * TARGET_DOUBLE_BIT)
-#endif
-
-/* Number of bits in a pointer for the target machine */
-#if !defined (TARGET_PTR_BIT)
-#define TARGET_PTR_BIT TARGET_INT_BIT
-#endif
-
 /* Default to support for "long long" if the host compiler being used is gcc.
    Config files must define CC_HAS_LONG_LONG to use other host compilers
    that are capable of supporting "long long", and to cause gdb to use that
@@ -562,17 +546,6 @@ enum val_prettyprint
 #  endif
 #endif
 
-/* If we picked up a copy of CHAR_BIT from a configuration file
-   (which may get it by including <limits.h>) then use it to set
-   the number of bits in a host char.  If not, use the same size
-   as the target. */
-
-#if defined (CHAR_BIT)
-#define HOST_CHAR_BIT CHAR_BIT
-#else
-#define HOST_CHAR_BIT TARGET_CHAR_BIT
-#endif
-
 /* Assorted functions we can declare, now that const and volatile are 
    defined.  */
 
@@ -719,7 +692,7 @@ psignal PARAMS ((unsigned, const char *));
 #endif
 
 extern int
-fclose PARAMS ((FILE *stream));				/* 4.9.5.1 */
+fclose PARAMS ((GDB_FILE *stream));				/* 4.9.5.1 */
 
 extern void
 perror PARAMS ((const char *));				/* 4.9.10.4 */
@@ -809,6 +782,73 @@ strerror PARAMS ((int));				/* 4.11.6.2 */
 
 #include "tm.h"
 
+/* Number of bits in a char or unsigned char for the target machine.
+   Just like CHAR_BIT in <limits.h> but describes the target machine.  */
+#if !defined (TARGET_CHAR_BIT)
+#define TARGET_CHAR_BIT 8
+#endif
+
+/* Number of bits in a short or unsigned short for the target machine. */
+#if !defined (TARGET_SHORT_BIT)
+#define TARGET_SHORT_BIT (2 * TARGET_CHAR_BIT)
+#endif
+
+/* Number of bits in an int or unsigned int for the target machine. */
+#if !defined (TARGET_INT_BIT)
+#define TARGET_INT_BIT (4 * TARGET_CHAR_BIT)
+#endif
+
+/* Number of bits in a long or unsigned long for the target machine. */
+#if !defined (TARGET_LONG_BIT)
+#define TARGET_LONG_BIT (4 * TARGET_CHAR_BIT)
+#endif
+
+/* Number of bits in a long long or unsigned long long for the target machine. */
+#if !defined (TARGET_LONG_LONG_BIT)
+#define TARGET_LONG_LONG_BIT (2 * TARGET_LONG_BIT)
+#endif
+
+/* Number of bits in a float for the target machine. */
+#if !defined (TARGET_FLOAT_BIT)
+#define TARGET_FLOAT_BIT (4 * TARGET_CHAR_BIT)
+#endif
+
+/* Number of bits in a double for the target machine. */
+#if !defined (TARGET_DOUBLE_BIT)
+#define TARGET_DOUBLE_BIT (8 * TARGET_CHAR_BIT)
+#endif
+
+/* Number of bits in a long double for the target machine.  */
+#if !defined (TARGET_LONG_DOUBLE_BIT)
+#define TARGET_LONG_DOUBLE_BIT (2 * TARGET_DOUBLE_BIT)
+#endif
+
+/* Number of bits in a "complex" for the target machine. */
+#if !defined (TARGET_COMPLEX_BIT)
+#define TARGET_COMPLEX_BIT (2 * TARGET_FLOAT_BIT)
+#endif
+
+/* Number of bits in a "double complex" for the target machine. */
+#if !defined (TARGET_DOUBLE_COMPLEX_BIT)
+#define TARGET_DOUBLE_COMPLEX_BIT (2 * TARGET_DOUBLE_BIT)
+#endif
+
+/* Number of bits in a pointer for the target machine */
+#if !defined (TARGET_PTR_BIT)
+#define TARGET_PTR_BIT TARGET_INT_BIT
+#endif
+
+/* If we picked up a copy of CHAR_BIT from a configuration file
+   (which may get it by including <limits.h>) then use it to set
+   the number of bits in a host char.  If not, use the same size
+   as the target. */
+
+#if defined (CHAR_BIT)
+#define HOST_CHAR_BIT CHAR_BIT
+#else
+#define HOST_CHAR_BIT TARGET_CHAR_BIT
+#endif
+
 /* The bit byte-order has to do just with numbering of bits in
    debugging symbols and such.  Conceptually, it's quite separate
    from byte/word byte order.  */
@@ -823,27 +863,6 @@ strerror PARAMS ((int));				/* 4.11.6.2 */
 #endif /* Little endian.  */
 #endif /* BITS_BIG_ENDIAN not defined.  */
 
-/* Swap LEN bytes at BUFFER between target and host byte-order.  This is
-   the wrong way to do byte-swapping because it assumes that you have a way
-   to have a host variable of exactly the right size.
-   extract_* are the right way.  */
-#if TARGET_BYTE_ORDER == HOST_BYTE_ORDER
-#define SWAP_TARGET_AND_HOST(buffer,len)
-#else /* Target and host byte order differ.  */
-#define SWAP_TARGET_AND_HOST(buffer,len) \
-  {	       	       	       	       	       	       	       	       	 \
-    char tmp;								 \
-    char *p = (char *)(buffer);						 \
-    char *q = ((char *)(buffer)) + len - 1;		   		 \
-    for (; p < q; p++, q--)				 		 \
-      {									 \
-        tmp = *q;							 \
-        *q = *p;							 \
-        *p = tmp;							 \
-      }									 \
-  }
-#endif /* Target and host byte order differ.  */
-
 /* In findvar.c.  */
 LONGEST extract_signed_integer PARAMS ((void *, int));
 unsigned LONGEST extract_unsigned_integer PARAMS ((void *, int));
@@ -852,19 +871,21 @@ CORE_ADDR extract_address PARAMS ((void *, int));
 void store_signed_integer PARAMS ((void *, int, LONGEST));
 void store_unsigned_integer PARAMS ((void *, int, unsigned LONGEST));
 void store_address PARAMS ((void *, int, CORE_ADDR));
+
+double extract_floating PARAMS ((void *, int));
+void store_floating PARAMS ((void *, int, double));
 
 /* On some machines there are bits in addresses which are not really
    part of the address, but are used by the kernel, the hardware, etc.
    for special purposes.  ADDR_BITS_REMOVE takes out any such bits
    so we get a "real" address such as one would find in a symbol
-   table.  ADDR_BITS_SET sets those bits the way the system wants
-   them.  This is used only for addresses of instructions, and even then
+   table.  This is used only for addresses of instructions, and even then
    I'm not sure it's used in all contexts.  It exists to deal with there
    being a few stray bits in the PC which would mislead us, not as some sort
-   of generic thing to handle alignment or segmentation.  */
+   of generic thing to handle alignment or segmentation (it's possible it
+   should be in TARGET_READ_PC instead).  */
 #if !defined (ADDR_BITS_REMOVE)
 #define ADDR_BITS_REMOVE(addr) (addr)
-#define ADDR_BITS_SET(addr) (addr)
 #endif /* No ADDR_BITS_REMOVE.  */
 
 /* From valops.c */