X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fvax-tdep.c;h=618befa3f5a8872912f347d2aae0b936611cf9f1;hb=94afd7a6d348a66ea3fb35fdb8234b050ec8c779;hp=8f3f6619ff1094dea12686bfce68dec2244078e7;hpb=0543f3876c21499784e5f3624fd74bee30951874;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 8f3f6619ff..618befa3f5 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -1,13 +1,13 @@
 /* Target-dependent code for the VAX.
 
-   Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000, 2002,
+   2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,13 +16,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
+#include "floatformat.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
@@ -41,7 +40,7 @@
 /* Return the name of register REGNUM.  */
 
 static const char *
-vax_register_name (int regnum)
+vax_register_name (struct gdbarch *gdbarch, int regnum)
 {
   static char *register_names[] =
   {
@@ -75,7 +74,7 @@ static void
 vax_supply_gregset (const struct regset *regset, struct regcache *regcache,
 		    int regnum, const void *gregs, size_t len)
 {
-  const char *regs = gregs;
+  const gdb_byte *regs = gregs;
   int i;
 
   for (i = 0; i < VAX_NUM_REGS; i++)
@@ -106,7 +105,7 @@ vax_regset_from_core_section (struct gdbarch *gdbarch,
   return NULL;
 }
 
-/* The VAX Unix calling convention uses R1 to pass a structure return
+/* The VAX UNIX calling convention uses R1 to pass a structure return
    value address instead of passing it as a first (hidden) argument as
    the VMS calling convention suggests.  */
 
@@ -114,7 +113,7 @@ static CORE_ADDR
 vax_store_arguments (struct regcache *regcache, int nargs,
 		     struct value **args, CORE_ADDR sp)
 {
-  char buf[4];
+  gdb_byte buf[4];
   int count = 0;
   int i;
 
@@ -124,11 +123,11 @@ vax_store_arguments (struct regcache *regcache, int nargs,
   /* Push arguments in reverse order.  */
   for (i = nargs - 1; i >= 0; i--)
     {
-      int len = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[i]));
+      int len = TYPE_LENGTH (value_enclosing_type (args[i]));
 
       sp -= (len + 3) & ~3;
       count += (len + 3) / 4;
-      write_memory (sp, VALUE_CONTENTS_ALL (args[i]), len);
+      write_memory (sp, value_contents_all (args[i]), len);
     }
 
   /* Push argument count.  */
@@ -144,13 +143,13 @@ vax_store_arguments (struct regcache *regcache, int nargs,
 }
 
 static CORE_ADDR
-vax_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
+vax_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
 		     struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
 		     struct value **args, CORE_ADDR sp, int struct_return,
 		     CORE_ADDR struct_addr)
 {
   CORE_ADDR fp = sp;
-  char buf[4];
+  gdb_byte buf[4];
 
   /* Set up the function arguments.  */
   sp = vax_store_arguments (regcache, nargs, args, sp);
@@ -192,27 +191,41 @@ vax_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
 }
 
 static struct frame_id
-vax_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame)
+vax_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
 {
   CORE_ADDR fp;
 
-  fp = frame_unwind_register_unsigned (next_frame, VAX_FP_REGNUM);
-  return frame_id_build (fp, frame_pc_unwind (next_frame));
+  fp = get_frame_register_unsigned (this_frame, VAX_FP_REGNUM);
+  return frame_id_build (fp, get_frame_pc (this_frame));
 }
 
 
 static enum return_value_convention
-vax_return_value (struct gdbarch *gdbarch, struct type *type,
-		  struct regcache *regcache, void *readbuf,
-		  const void *writebuf)
+vax_return_value (struct gdbarch *gdbarch, struct type *func_type,
+		  struct type *type, struct regcache *regcache,
+		  gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   int len = TYPE_LENGTH (type);
-  char buf[8];
+  gdb_byte buf[8];
 
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT
-      || TYPE_CODE (type) == TYPE_CODE_STRUCT
+      || TYPE_CODE (type) == TYPE_CODE_UNION
       || TYPE_CODE (type) == TYPE_CODE_ARRAY)
-    return RETURN_VALUE_STRUCT_CONVENTION;
+    {
+      /* The default on VAX is to return structures in static memory.
+         Consequently a function must return the address where we can
+         find the return value.  */
+
+      if (readbuf)
+	{
+	  ULONGEST addr;
+
+	  regcache_raw_read_unsigned (regcache, VAX_R0_REGNUM, &addr);
+	  read_memory (addr, readbuf, len);
+	}
+
+      return RETURN_VALUE_ABI_RETURNS_ADDRESS;
+    }
 
   if (readbuf)
     {
@@ -241,10 +254,10 @@ vax_return_value (struct gdbarch *gdbarch, struct type *type,
    *LEN and optionally adjust *PC to point to the correct memory
    location for inserting the breakpoint.  */
    
-static const unsigned char *
-vax_breakpoint_from_pc (CORE_ADDR *pc, int *len)
+static const gdb_byte *
+vax_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pc, int *len)
 {
-  static unsigned char break_insn[] = { 3 };
+  static gdb_byte break_insn[] = { 3 };
 
   *len = sizeof (break_insn);
   return break_insn;
@@ -254,9 +267,9 @@ vax_breakpoint_from_pc (CORE_ADDR *pc, int *len)
    to reach some "real" code.  */
 
 static CORE_ADDR
-vax_skip_prologue (CORE_ADDR pc)
+vax_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  unsigned char op = read_memory_unsigned_integer (pc, 1);
+  gdb_byte op = read_memory_unsigned_integer (pc, 1);
 
   if (op == 0x11)
     pc += 2;			/* skip brb */
@@ -298,7 +311,7 @@ struct vax_frame_cache
 };
 
 struct vax_frame_cache *
-vax_frame_cache (struct frame_info *next_frame, void **this_cache)
+vax_frame_cache (struct frame_info *this_frame, void **this_cache)
 {
   struct vax_frame_cache *cache;
   CORE_ADDR addr;
@@ -310,16 +323,16 @@ vax_frame_cache (struct frame_info *next_frame, void **this_cache)
 
   /* Allocate a new cache.  */
   cache = FRAME_OBSTACK_ZALLOC (struct vax_frame_cache);
-  cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+  cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
 
   /* The frame pointer is used as the base for the frame.  */
-  cache->base = frame_unwind_register_unsigned (next_frame, VAX_FP_REGNUM);
+  cache->base = get_frame_register_unsigned (this_frame, VAX_FP_REGNUM);
   if (cache->base == 0)
     return cache;
 
   /* The register save mask and control bits determine the layout of
      the stack frame.  */
-  mask = get_frame_memory_unsigned (next_frame, cache->base + 4, 4) >> 16;
+  mask = get_frame_memory_unsigned (this_frame, cache->base + 4, 4) >> 16;
 
   /* These are always saved.  */
   cache->saved_regs[VAX_PC_REGNUM].addr = cache->base + 16;
@@ -349,7 +362,7 @@ vax_frame_cache (struct frame_info *next_frame, void **this_cache)
          stack address for the arguments that were pushed onto the
          stack.  The return instruction will automatically pop the
          arguments from the stack.  */
-      numarg = get_frame_memory_unsigned (next_frame, addr, 1);
+      numarg = get_frame_memory_unsigned (this_frame, addr, 1);
       addr += 4 + numarg * 4;
     }
 
@@ -360,56 +373,49 @@ vax_frame_cache (struct frame_info *next_frame, void **this_cache)
 }
 
 static void
-vax_frame_this_id (struct frame_info *next_frame, void **this_cache,
+vax_frame_this_id (struct frame_info *this_frame, void **this_cache,
 		   struct frame_id *this_id)
 {
-  struct vax_frame_cache *cache = vax_frame_cache (next_frame, this_cache);
+  struct vax_frame_cache *cache = vax_frame_cache (this_frame, this_cache);
 
   /* This marks the outermost frame.  */
   if (cache->base == 0)
     return;
 
-  (*this_id) = frame_id_build (cache->base, frame_pc_unwind (next_frame));
+  (*this_id) = frame_id_build (cache->base, get_frame_func (this_frame));
 }
 
-static void
-vax_frame_prev_register (struct frame_info *next_frame, void **this_cache,
-			 int regnum, int *optimizedp,
-			 enum lval_type *lvalp, CORE_ADDR *addrp,
-			 int *realnump, void *valuep)
+static struct value *
+vax_frame_prev_register (struct frame_info *this_frame,
+			 void **this_cache, int regnum)
 {
-  struct vax_frame_cache *cache = vax_frame_cache (next_frame, this_cache);
+  struct vax_frame_cache *cache = vax_frame_cache (this_frame, this_cache);
 
-  trad_frame_prev_register (next_frame, cache->saved_regs, regnum,
-			    optimizedp, lvalp, addrp, realnump, valuep);
+  return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum);
 }
 
 static const struct frame_unwind vax_frame_unwind =
 {
   NORMAL_FRAME,
   vax_frame_this_id,
-  vax_frame_prev_register
+  vax_frame_prev_register,
+  NULL,
+  default_frame_sniffer
 };
-
-static const struct frame_unwind *
-vax_frame_sniffer (struct frame_info *next_frame)
-{
-  return &vax_frame_unwind;
-}
 
 
 static CORE_ADDR
-vax_frame_base_address (struct frame_info *next_frame, void **this_cache)
+vax_frame_base_address (struct frame_info *this_frame, void **this_cache)
 {
-  struct vax_frame_cache *cache = vax_frame_cache (next_frame, this_cache);
+  struct vax_frame_cache *cache = vax_frame_cache (this_frame, this_cache);
 
   return cache->base;
 }
 
 static CORE_ADDR
-vax_frame_args_address (struct frame_info *next_frame, void **this_cache)
+vax_frame_args_address (struct frame_info *this_frame, void **this_cache)
 {
-  return frame_unwind_register_unsigned (next_frame, VAX_AP_REGNUM);
+  return get_frame_register_unsigned (this_frame, VAX_AP_REGNUM);
 }
 
 static const struct frame_base vax_frame_base =
@@ -429,7 +435,7 @@ vax_frame_num_args (struct frame_info *frame)
 
   /* Assume that the argument pointer for the outermost frame is
      hosed, as is the case on NetBSD/vax ELF.  */
-  if (get_frame_base (frame) == 0)
+  if (get_frame_base_address (frame) == 0)
     return 0;
 
   args = get_frame_register_unsigned (frame, VAX_AP_REGNUM);
@@ -462,6 +468,11 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   gdbarch = gdbarch_alloc (&info, NULL);
 
+  set_gdbarch_float_format (gdbarch, floatformats_vax_f);
+  set_gdbarch_double_format (gdbarch, floatformats_vax_d);
+  set_gdbarch_long_double_format (gdbarch, floatformats_vax_d);
+  set_gdbarch_long_double_bit (gdbarch, 64);
+
   /* Register info */
   set_gdbarch_num_regs (gdbarch, VAX_NUM_REGS);
   set_gdbarch_register_name (gdbarch, vax_register_name);
@@ -486,13 +497,13 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   /* Call dummy code.  */
   set_gdbarch_push_dummy_call (gdbarch, vax_push_dummy_call);
-  set_gdbarch_unwind_dummy_id (gdbarch, vax_unwind_dummy_id);
+  set_gdbarch_dummy_id (gdbarch, vax_dummy_id);
 
   /* Breakpoint info */
   set_gdbarch_breakpoint_from_pc (gdbarch, vax_breakpoint_from_pc);
 
   /* Misc info */
-  set_gdbarch_function_start_offset (gdbarch, 2);
+  set_gdbarch_deprecated_function_start_offset (gdbarch, 2);
   set_gdbarch_believe_pcc_promotion (gdbarch, 1);
 
   set_gdbarch_print_insn (gdbarch, print_insn_vax);
@@ -504,7 +515,7 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);
 
-  frame_unwind_append_sniffer (gdbarch, vax_frame_sniffer);
+  frame_unwind_append_unwinder (gdbarch, &vax_frame_unwind);
 
   return (gdbarch);
 }