*** empty log message ***

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

diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 8f3f6619ff1094dea12686bfce68dec2244078e7..58d82964fbebceb48b80267a27fc536abfc4454a 100644 (file)
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -1,7 +1,7 @@
 /* Target-dependent code for the VAX.
 
    Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -75,7 +75,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 +106,7 @@ vax_regset_from_core_section (struct gdbarch *gdbarch,
   return NULL;
 }
 \f
-/* 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 +114,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 +124,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 +144,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);
@@ -203,16 +203,30 @@ vax_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame)
 
 static enum return_value_convention
 vax_return_value (struct gdbarch *gdbarch, struct type *type,
-                 struct regcache *regcache, void *readbuf,
-                 const void *writebuf)
+                 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 +255,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 *
+static const gdb_byte *
 vax_breakpoint_from_pc (CORE_ADDR *pc, int *len)
 {
-  static unsigned char break_insn[] = { 3 };
+  static gdb_byte break_insn[] = { 3 };
 
   *len = sizeof (break_insn);
   return break_insn;
@@ -256,7 +270,7 @@ vax_breakpoint_from_pc (CORE_ADDR *pc, int *len)
 static CORE_ADDR
 vax_skip_prologue (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 */
@@ -369,19 +383,19 @@ vax_frame_this_id (struct frame_info *next_frame, void **this_cache,
   if (cache->base == 0)
     return;
 
-  (*this_id) = frame_id_build (cache->base, frame_pc_unwind (next_frame));
+  (*this_id) = frame_id_build (cache->base, frame_func_unwind (next_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)
+                        int *realnump, gdb_byte *valuep)
 {
   struct vax_frame_cache *cache = vax_frame_cache (next_frame, this_cache);
 
-  trad_frame_prev_register (next_frame, cache->saved_regs, regnum,
-                           optimizedp, lvalp, addrp, realnump, valuep);
+  trad_frame_get_prev_register (next_frame, cache->saved_regs, regnum,
+                               optimizedp, lvalp, addrp, realnump, valuep);
 }
 
 static const struct frame_unwind vax_frame_unwind =
@@ -429,7 +443,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);
@@ -492,7 +506,7 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   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);