These files removed.

[deliverable/binutils-gdb.git] / gdb / ppc-sysv-tdep.c

diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index eea2287219c1e058faee1574a084fa4f137a60a8..669165fc447f0d864a845d8e5caa7e3661255a12 100644 (file)
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -805,9 +805,9 @@ do_ppc_sysv_return_value (struct gdbarch *gdbarch, struct type *type,
 }
 
 enum return_value_convention
-ppc_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
-                          struct regcache *regcache, gdb_byte *readbuf,
-                          const gdb_byte *writebuf)
+ppc_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *func_type,
+                          struct type *valtype, struct regcache *regcache,
+                          gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   return do_ppc_sysv_return_value (gdbarch, valtype, regcache, readbuf,
                                   writebuf, 0);
@@ -815,6 +815,7 @@ ppc_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
 
 enum return_value_convention
 ppc_sysv_abi_broken_return_value (struct gdbarch *gdbarch,
+                                 struct type *func_type,
                                  struct type *valtype,
                                  struct regcache *regcache,
                                  gdb_byte *readbuf, const gdb_byte *writebuf)
@@ -938,7 +939,7 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
        {
          /* During the first pass, GPARAM and VPARAM are more like
             offsets (start address zero) than addresses.  That way
-            the accumulate the total stack space each region
+            they accumulate the total stack space each region
             requires.  */
          gparam = 0;
          vparam = 0;
@@ -1148,7 +1149,10 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
            }
          else if ((TYPE_CODE (type) == TYPE_CODE_INT
                    || TYPE_CODE (type) == TYPE_CODE_ENUM
-                   || TYPE_CODE (type) == TYPE_CODE_PTR)
+                   || TYPE_CODE (type) == TYPE_CODE_BOOL
+                   || TYPE_CODE (type) == TYPE_CODE_CHAR
+                   || TYPE_CODE (type) == TYPE_CODE_PTR
+                   || TYPE_CODE (type) == TYPE_CODE_REF)
                   && TYPE_LENGTH (type) <= 8)
            {
              /* Scalars and Pointers get sign[un]extended and go in
@@ -1160,11 +1164,18 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
                  /* Convert any function code addresses into
                     descriptors.  */
                  if (TYPE_CODE (type) == TYPE_CODE_PTR
-                     && TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC)
+                     || TYPE_CODE (type) == TYPE_CODE_REF)
                    {
-                     CORE_ADDR desc = word;
-                     convert_code_addr_to_desc_addr (word, &desc);
-                     word = desc;
+                     struct type *target_type;
+                     target_type = check_typedef (TYPE_TARGET_TYPE (type));
+
+                     if (TYPE_CODE (target_type) == TYPE_CODE_FUNC
+                         || TYPE_CODE (target_type) == TYPE_CODE_METHOD)
+                       {
+                         CORE_ADDR desc = word;
+                         convert_code_addr_to_desc_addr (word, &desc);
+                         word = desc;
+                       }
                    }
                  if (greg <= 10)
                    regcache_cooked_write_unsigned (regcache,
@@ -1205,14 +1216,20 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
                  greg++;
                }
              if (write_pass)
-               /* WARNING: cagney/2003-09-21: Strictly speaking, this
-                  isn't necessary, unfortunately, GCC appears to get
-                  "struct convention" parameter passing wrong putting
-                  odd sized structures in memory instead of in a
-                  register.  Work around this by always writing the
-                  value to memory.  Fortunately, doing this
-                  simplifies the code.  */
-               write_memory (gparam, val, TYPE_LENGTH (type));
+               {
+                 /* WARNING: cagney/2003-09-21: Strictly speaking, this
+                    isn't necessary, unfortunately, GCC appears to get
+                    "struct convention" parameter passing wrong putting
+                    odd sized structures in memory instead of in a
+                    register.  Work around this by always writing the
+                    value to memory.  Fortunately, doing this
+                    simplifies the code.  */
+                 int len = TYPE_LENGTH (type);
+                 if (len < tdep->wordsize)
+                   write_memory (gparam + tdep->wordsize - len, val, len);
+                 else
+                   write_memory (gparam, val, len);
+               }
              if (freg <= 13
                  && TYPE_CODE (type) == TYPE_CODE_STRUCT
                  && TYPE_NFIELDS (type) == 1
@@ -1322,9 +1339,9 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
    location; when READBUF is non-NULL, fill the buffer from the
    corresponding register return-value location.  */
 enum return_value_convention
-ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
-                            struct regcache *regcache, gdb_byte *readbuf,
-                            const gdb_byte *writebuf)
+ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *func_type,
+                            struct type *valtype, struct regcache *regcache,
+                            gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
@@ -1355,7 +1372,9 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
                                           writebuf);
   /* Integers in r3.  */
   if ((TYPE_CODE (valtype) == TYPE_CODE_INT
-       || TYPE_CODE (valtype) == TYPE_CODE_ENUM)
+       || TYPE_CODE (valtype) == TYPE_CODE_ENUM
+       || TYPE_CODE (valtype) == TYPE_CODE_CHAR
+       || TYPE_CODE (valtype) == TYPE_CODE_BOOL)
       && TYPE_LENGTH (valtype) <= 8)
     {
       if (writebuf != NULL)
@@ -1376,7 +1395,8 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
       return RETURN_VALUE_REGISTER_CONVENTION;
     }
   /* All pointers live in r3.  */
-  if (TYPE_CODE (valtype) == TYPE_CODE_PTR)
+  if (TYPE_CODE (valtype) == TYPE_CODE_PTR
+      || TYPE_CODE (valtype) == TYPE_CODE_REF)
     {
       /* All pointers live in r3.  */
       if (writebuf != NULL)