Patch from David Mosberger.

[deliverable/binutils-gdb.git] / gdb / z8k-tdep.c

diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c
index 257962e8b71c1c49859ed2eaf0c6c524b80c77db..5b309402d166653da1183efbb2ce7fbb08571ce4 100644 (file)
--- a/gdb/z8k-tdep.c
+++ b/gdb/z8k-tdep.c
@@ -1,7 +1,7 @@
 /* Target-machine dependent code for Zilog Z8000, for GDB.
 
    Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-   2002 Free Software Foundation, Inc.
+   2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -159,19 +159,13 @@ read_memory_pointer (CORE_ADDR x)
 CORE_ADDR
 z8k_frame_chain (struct frame_info *thisframe)
 {
-  if (!inside_entry_file (thisframe->pc))
+  if (!inside_entry_file (get_frame_pc (thisframe)))
     {
       return read_memory_pointer (thisframe->frame);
     }
   return 0;
 }
 
-void
-init_frame_pc (void)
-{
-  internal_error (__FILE__, __LINE__, "failed internal consistency check");
-}
-
 /* Put here the code to store, into a struct frame_saved_regs,
    the addresses of the saved registers of frame described by FRAME_INFO.
    This includes special registers such as pc and fp saved in special
@@ -185,7 +179,7 @@ z8k_frame_init_saved_regs (struct frame_info *frame_info)
   int w;
 
   frame_saved_regs_zalloc (frame_info);
-  pc = get_pc_function_start (frame_info->pc);
+  pc = get_pc_function_start (get_frame_pc (frame_info));
 
   /* wander down the instruction stream */
   examine_frame (pc, frame_info->saved_regs, frame_info->frame);
@@ -246,10 +240,10 @@ frame_find_saved_regs (struct frame_info *fip, struct frame_saved_regs *fsrp)
 
   memset (fsrp, 0, sizeof *fsrp);
 
-  pc = skip_adjust (get_pc_function_start (fip->pc), &locals);
+  pc = skip_adjust (get_pc_function_start (get_frame_pc (fip)), &locals);
 
   {
-    adr = FRAME_FP (fip) - locals;
+    adr = get_frame_base (fip) - locals;
     for (i = 0; i < 8; i++)
       {
        int word = read_memory_short (pc);
@@ -309,7 +303,8 @@ write_return_value (struct type *type, char *valbuf)
   int len;
 
   for (len = 0; len < TYPE_LENGTH (type); len += 2)
-    write_register_bytes (REGISTER_BYTE (len / 2 + 2), valbuf + len, 2);
+    deprecated_write_register_bytes (REGISTER_BYTE (len / 2 + 2),
+                                    valbuf + len, 2);
 }
 
 void
@@ -326,8 +321,8 @@ z8k_print_register_hook (int regno)
     {
       unsigned char l[4];
 
-      frame_register_read (selected_frame, regno, l + 0);
-      frame_register_read (selected_frame, regno + 1, l + 2);
+      frame_register_read (deprecated_selected_frame, regno, l + 0);
+      frame_register_read (deprecated_selected_frame, regno + 1, l + 2);
       printf_unfiltered ("\t");
       printf_unfiltered ("0x%02x%02x%02x%02x", l[0], l[1], l[2], l[3]);
     }
@@ -336,10 +331,10 @@ z8k_print_register_hook (int regno)
     {
       unsigned char l[8];
 
-      frame_register_read (selected_frame, regno, l + 0);
-      frame_register_read (selected_frame, regno + 1, l + 2);
-      frame_register_read (selected_frame, regno + 2, l + 4);
-      frame_register_read (selected_frame, regno + 3, l + 6);
+      frame_register_read (deprecated_selected_frame, regno, l + 0);
+      frame_register_read (deprecated_selected_frame, regno + 1, l + 2);
+      frame_register_read (deprecated_selected_frame, regno + 2, l + 4);
+      frame_register_read (deprecated_selected_frame, regno + 3, l + 6);
 
       printf_unfiltered ("\t");
       printf_unfiltered ("0x%02x%02x%02x%02x%02x%02x%02x%02x",
@@ -350,7 +345,7 @@ z8k_print_register_hook (int regno)
       unsigned short rval;
       int i;
 
-      frame_register_read (selected_frame, regno, (char *) (&rval));
+      frame_register_read (deprecated_selected_frame, regno, (char *) (&rval));
 
       printf_unfiltered ("\n");
       for (i = 0; i < 10; i += 2)
@@ -468,8 +463,8 @@ z8k_print_registers_info (struct gdbarch *gdbarch,
 void
 z8k_do_registers_info (int regnum, int all)
 {
-  z8k_print_registers_info (current_gdbarch, gdb_stdout, selected_frame,
-                           regnum, all);
+  z8k_print_registers_info (current_gdbarch, gdb_stdout,
+                           deprecated_selected_frame, regnum, all);
 }
 
 void