* i386-tdep.c (i386_frame_cache, i386_sigtramp_frame_cache,

i386_extract_struct_value_address, i386_svr4_sigcontext_addr): Use
extract_unsigned_integer instead of extract_address.
* i386bsd-tdep.c (i386bsd_sigcontext_addr): Likewise.
* i386-linux-tdep.c (i386_linux_sigcontext_addr): Likewise.

4 files changed, 16 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5de7d26884b..568600fdf3a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386-tdep.c (i386_frame_cache, i386_sigtramp_frame_cache,
+	i386_extract_struct_value_address, i386_svr4_sigcontext_addr): Use
+	extract_unsigned_integer instead of extract_address.
+	* i386bsd-tdep.c (i386bsd_sigcontext_addr): Likewise.
+	* i386-linux-tdep.c (i386_linux_sigcontext_addr): Likewise.
+
 2003-05-11  Mark Kettenis  <kettenis@gnu.org>
 
 	* i386-tdep.c (i386_frame_p): Move signal trampoline unwinder...
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 30a8e6a4a04..214e76ef5c3 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -250,7 +250,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame)
   char buf[4];
 
   frame_unwind_register (next_frame, SP_REGNUM, buf);
-  sp = extract_address (buf, 4);
+  sp = extract_unsigned_integer (buf, 4);
 
   pc = i386_linux_sigtramp_start (frame_pc_unwind (next_frame));
   if (pc)
@@ -273,7 +273,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame)
 	 pointer to the user context is passed as the third argument
 	 to the signal handler.  */
       read_memory (sp + 8, 4, buf);
-      return extract_address (buf, 4) + 20;
+      return extract_unsigned_integer (buf, 4) + 20;
     }
 
   error ("Couldn't recognize signal trampoline.");
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index c7bd91920d3..22c27c37e53 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -713,7 +713,7 @@ i386_frame_cache (struct frame_info *next_frame, void **this_cache)
    occurred.  */
 
   frame_unwind_register (next_frame, I386_EBP_REGNUM, buf);
-  cache->base = extract_address (buf, 4);
+  cache->base = extract_unsigned_integer (buf, 4);
   if (cache->base == 0)
     return cache;
 
@@ -735,7 +735,7 @@ i386_frame_cache (struct frame_info *next_frame, void **this_cache)
 	 functions this might work too.  */
 
       frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
-      cache->base = extract_address (buf, 4) + cache->sp_offset;
+      cache->base = extract_unsigned_integer (buf, 4) + cache->sp_offset;
     }
 
   /* Now that we have the base address for the stack frame we can
@@ -886,7 +886,7 @@ i386_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
   cache = i386_alloc_frame_cache ();
 
   frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
-  cache->base = extract_address (buf, 4) - 4;
+  cache->base = extract_unsigned_integer (buf, 4) - 4;
 
   addr = tdep->sigcontext_addr (next_frame);
   cache->saved_regs[I386_EIP_REGNUM] = addr + tdep->sc_pc_offset;
@@ -1200,7 +1200,7 @@ i386_extract_struct_value_address (struct regcache *regcache)
   char buf[4];
 
   regcache_cooked_read (regcache, I386_EAX_REGNUM, buf);
-  return extract_address (buf, 4);
+  return extract_unsigned_integer (buf, 4);
 }
 
 
@@ -1478,7 +1478,7 @@ i386_svr4_sigcontext_addr (struct frame_info *next_frame)
   CORE_ADDR sp;
 
   frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
-  sp = extract_address (buf, 4);
+  sp = extract_unsigned_integer (buf, 4);
 
   return read_memory_unsigned_integer (sp + 8, 4);
 }
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index 7fe6b299ed5..d91be26b800 100644
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -51,7 +51,7 @@ i386bsd_sigcontext_addr (struct frame_info *next_frame)
   CORE_ADDR sp;
 
   frame_unwind_register (next_frame, SP_REGNUM, buf);
-  sp = extract_address (buf, 4);
+  sp = extract_unsigned_integer (buf, 4);
 
   return read_memory_unsigned_integer (sp + 8, 4);
 }