* config/i386/tm-i386v.h: Don't include "regcache.h".

(EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, FRAME_CHAIN,
FRAMELESS_FUNCTION_INVOCATION, FRAME_SAVED_PC, FRAME_NUM_ARGS):
Remove macros.  The versions from "tm-i386.h" should work fine
(and in most cases even better).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c3649b9..8335659 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-21  Mark Kettenis  <kettenis@gnu.org>
+
+       * config/i386/tm-i386v.h: Don't include "regcache.h".
+       (EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, FRAME_CHAIN,
+       FRAMELESS_FUNCTION_INVOCATION, FRAME_SAVED_PC, FRAME_NUM_ARGS):
+       Remove macros.  The versions from "tm-i386.h" should work fine
+       (and in most cases even better).
+
 2001-10-30  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-tdep.c (i386_extract_return_value): Use

diff --git a/gdb/config/i386/tm-i386v.h b/gdb/config/i386/tm-i386v.h
index 57e3d8a..d524652 100644 (file)
--- a/gdb/config/i386/tm-i386v.h
+++ b/gdb/config/i386/tm-i386v.h
@@ -24,7 +24,6 @@
 
 /* First pick up the generic *86 target file. */
 
-#include "regcache.h"
 #include "i386/tm-i386.h"
 
 /* Number of traps that happen between exec'ing the shell to run an
@@ -34,51 +33,4 @@
 #undef  START_INFERIOR_TRAPS_EXPECTED
 #define START_INFERIOR_TRAPS_EXPECTED 4
 
-/* Extract from an array REGBUF containing the (raw) register state
-   a function return value of type TYPE, and copy that, in virtual format,
-   into VALBUF.  */
-
-#undef  EXTRACT_RETURN_VALUE
-#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
-  memcpy ((VALBUF), (REGBUF), TYPE_LENGTH (TYPE))
-
-/* Write into appropriate registers a function return value
-   of type TYPE, given in virtual format.  */
-
-#undef  STORE_RETURN_VALUE
-#define STORE_RETURN_VALUE(TYPE,VALBUF) \
-  write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE))
-\f
-
-/* Describe the pointer in each stack frame to the previous stack frame
-   (its caller).  */
-
-/* FRAME_CHAIN takes a frame's nominal address
-   and produces the frame's chain-pointer. */
-
-#undef  FRAME_CHAIN
-#define FRAME_CHAIN(thisframe) \
-  (!inside_entry_file ((thisframe)->pc) ? \
-   read_memory_integer ((thisframe)->frame, 4) :\
-   0)
-
-/* Define other aspects of the stack frame.  */
-
-/* A macro that tells us whether the function invocation represented
-   by FI does not have a frame on the stack associated with it.  If it
-   does not, FRAMELESS is set to 1, else 0.  */
-
-#undef  FRAMELESS_FUNCTION_INVOCATION
-#define FRAMELESS_FUNCTION_INVOCATION(FI) \
-  (frameless_look_for_prologue (FI))
-
-#undef  FRAME_SAVED_PC
-#define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4))
-
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell.  */
-
-#undef  FRAME_NUM_ARGS
-#define FRAME_NUM_ARGS(fi) (-1)
-
 #endif /* ifndef TM_I386V_H */