[PATCH]: Convert FRAME_CHAIN into a function for i386
Mark Kettenis
kettenis@wins.uva.nl
Mon Apr 16 06:05:00 GMT 2001
Another step towards multi-arch.
Mark
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* i386-tdep.c (i386_frame_chain): New function.
* config/i386/tm-i386.h (FRAME_CHAIN): Redefine in terms of
i386_frame_chain.
(i386_frame_chain): New prototype.
Index: i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.26
diff -u -p -r1.26 i386-tdep.c
--- i386-tdep.c 2001/04/04 15:09:46 1.26
+++ i386-tdep.c 2001/04/16 13:02:09
@@ -349,6 +349,22 @@ i386_get_frame_setup (CORE_ADDR pc)
return (-1);
}
+/* Return the chain-pointer for FRAME. In the case of the i386, the
+ frame's nominal address is the address of a 4-byte word containing
+ the calling frame's address. */
+
+CORE_ADDR
+i386_frame_chain (struct frame_info *frame)
+{
+ if (frame->signal_handler_caller)
+ return frame->frame;
+
+ if (! inside_entry_file (frame->pc))
+ return read_memory_unsigned_integer (frame->frame, 4);
+
+ return 0;
+}
+
/* Return number of args passed to a frame.
Can return -1, meaning no way to tell. */
Index: config/i386/tm-i386.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/tm-i386.h,v
retrieving revision 1.14
diff -u -p -r1.14 tm-i386.h
--- config/i386/tm-i386.h 2001/04/01 12:39:52 1.14
+++ config/i386/tm-i386.h 2001/04/16 13:02:09
@@ -323,17 +323,12 @@ extern CORE_ADDR i386_extract_struct_val
from the sigcontext structure which is pushed by the kernel on the
user stack, along with a pointer to it. */
-/* FRAME_CHAIN takes a frame's nominal address and produces the frame's
- chain-pointer.
- In the case of the i386, the frame's nominal address
- is the address of a 4-byte word containing the calling frame's address. */
+/* Return the chain-pointer for FRAME. In the case of the i386, the
+ frame's nominal address is the address of a 4-byte word containing
+ the calling frame's address. */
-#define FRAME_CHAIN(thisframe) \
- ((thisframe)->signal_handler_caller \
- ? (thisframe)->frame \
- : (!inside_entry_file ((thisframe)->pc) \
- ? read_memory_unsigned_integer ((thisframe)->frame, 4) \
- : 0))
+#define FRAME_CHAIN(frame) i386_frame_chain ((frame))
+extern CORE_ADDR i386_frame_chain (struct frame_info *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
More information about the Gdb-patches
mailing list