* [PATCH] Fix complex float on sparc
@ 2011-09-28 6:32 David Miller
2011-09-28 17:09 ` Mark Kettenis
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2011-09-28 6:32 UTC (permalink / raw)
To: gdb-patches
Lots of testcase failures have crept into the sparc targets,
I'll try to fix as many as I can.
This gets the complex float cases of callfuncs.exp passing
again for both 32-bit and 64-bit.
For sparc32 it's pass in memory, return in float regs.
For sparc64 it's pass in float regs (<= 16 bytes) or memory (> 16
bytes), always return in float regs.
Ok to commit?
gdb/
2011-09-27 David S. Miller <davem@davemloft.net>
* sparc-tdep.h (SPARC_F2_REGNUM, SPARC_F3_REGNUM, SPARC_F4_REGNUM,
SPARC_F5_REGNUM, SPARC_F6_REGNUM, SPARC_F7_REGNUM): New enums.
* sparc-tdep.c (sparc_complex_floating_p): New function.
(sparc32_store_arguments): Handle complex floats.
(sparc32_extract_return_value): Likewise.
(sparc32_store_return_value): Likewise.
(sparc32_stabs_argument_has_addr): Likewise.
* sparc64-tdep.c (sparc64_complex_floating_p): New function.
(sparc64_store_floating_fields): Handle complex floats.
(sparc64_store_arguments): Likewise.
(sparc64_store_return_value): Likewise.
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index faa7b3a..8541a31 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -221,6 +221,25 @@ sparc_floating_p (const struct type *type)
return 0;
}
+/* Check whether TYPE is "Complex Floating". */
+
+static int
+sparc_complex_floating_p (const struct type *type)
+{
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_COMPLEX:
+ {
+ int len = TYPE_LENGTH (type);
+ return (len == 8 || len == 16 || len == 32);
+ }
+ default:
+ break;
+ }
+
+ return 0;
+}
+
/* Check whether TYPE is "Structure or Union".
In terms of Ada subprogram calls, arrays are treated the same as
@@ -454,7 +473,8 @@ sparc32_store_arguments (struct regcache *regcache, int nargs,
int len = TYPE_LENGTH (type);
if (sparc_structure_or_union_p (type)
- || (sparc_floating_p (type) && len == 16))
+ || (sparc_floating_p (type) && len == 16)
+ || sparc_complex_floating_p (type))
{
/* Structure, Union and Quad-Precision Arguments. */
sp -= len;
@@ -1238,12 +1258,25 @@ sparc32_extract_return_value (struct type *type, struct regcache *regcache,
gdb_assert (!sparc_structure_or_union_p (type));
gdb_assert (!(sparc_floating_p (type) && len == 16));
- if (sparc_floating_p (type))
+ if (sparc_floating_p (type)
+ || sparc_complex_floating_p (type))
{
/* Floating return values. */
regcache_cooked_read (regcache, SPARC_F0_REGNUM, buf);
if (len > 4)
regcache_cooked_read (regcache, SPARC_F1_REGNUM, buf + 4);
+ if (len > 8)
+ {
+ regcache_cooked_read (regcache, SPARC_F2_REGNUM, buf + 8);
+ regcache_cooked_read (regcache, SPARC_F3_REGNUM, buf + 12);
+ }
+ if (len > 16)
+ {
+ regcache_cooked_read (regcache, SPARC_F4_REGNUM, buf + 16);
+ regcache_cooked_read (regcache, SPARC_F5_REGNUM, buf + 20);
+ regcache_cooked_read (regcache, SPARC_F6_REGNUM, buf + 24);
+ regcache_cooked_read (regcache, SPARC_F7_REGNUM, buf + 28);
+ }
memcpy (valbuf, buf, len);
}
else
@@ -1281,13 +1314,26 @@ sparc32_store_return_value (struct type *type, struct regcache *regcache,
gdb_assert (!(sparc_floating_p (type) && len == 16));
gdb_assert (len <= 8);
- if (sparc_floating_p (type))
+ if (sparc_floating_p (type)
+ || sparc_complex_floating_p (type))
{
/* Floating return values. */
memcpy (buf, valbuf, len);
regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf);
if (len > 4)
regcache_cooked_write (regcache, SPARC_F1_REGNUM, buf + 4);
+ if (len > 8)
+ {
+ regcache_cooked_write (regcache, SPARC_F2_REGNUM, buf + 8);
+ regcache_cooked_write (regcache, SPARC_F3_REGNUM, buf + 12);
+ }
+ if (len > 16)
+ {
+ regcache_cooked_write (regcache, SPARC_F4_REGNUM, buf + 16);
+ regcache_cooked_write (regcache, SPARC_F5_REGNUM, buf + 20);
+ regcache_cooked_write (regcache, SPARC_F6_REGNUM, buf + 24);
+ regcache_cooked_write (regcache, SPARC_F7_REGNUM, buf + 28);
+ }
}
else
{
@@ -1351,7 +1397,8 @@ static int
sparc32_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type)
{
return (sparc_structure_or_union_p (type)
- || (sparc_floating_p (type) && TYPE_LENGTH (type) == 16));
+ || (sparc_floating_p (type) && TYPE_LENGTH (type) == 16)
+ || sparc_complex_floating_p (type));
}
static int
diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h
index d4e8b06..92b4705 100644
--- a/gdb/sparc-tdep.h
+++ b/gdb/sparc-tdep.h
@@ -114,6 +114,12 @@ enum sparc_regnum
SPARC_I7_REGNUM, /* %i7 */
SPARC_F0_REGNUM, /* %f0 */
SPARC_F1_REGNUM,
+ SPARC_F2_REGNUM,
+ SPARC_F3_REGNUM,
+ SPARC_F4_REGNUM,
+ SPARC_F5_REGNUM,
+ SPARC_F6_REGNUM,
+ SPARC_F7_REGNUM,
SPARC_F31_REGNUM /* %f31 */
= SPARC_F0_REGNUM + 31
};
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 0430ecf..097f658 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -103,6 +103,26 @@ sparc64_floating_p (const struct type *type)
return 0;
}
+/* Check whether TYPE is "Complex Floating". */
+
+static int
+sparc64_complex_floating_p (const struct type *type)
+{
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_COMPLEX:
+ {
+ int len = TYPE_LENGTH (type);
+ gdb_assert (len == 8 || len == 16 || len == 32);
+ }
+ return 1;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
/* Check whether TYPE is "Structure or Union".
In terms of Ada subprogram calls, arrays are treated the same as
@@ -622,11 +642,13 @@ static void
sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
const gdb_byte *valbuf, int element, int bitpos)
{
+ int len = TYPE_LENGTH (type);
+
gdb_assert (element < 16);
- if (sparc64_floating_p (type))
+ if (sparc64_floating_p (type)
+ || (sparc64_complex_floating_p (type) && len <= 16))
{
- int len = TYPE_LENGTH (type);
int regnum;
if (len == 16)
@@ -886,7 +908,8 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
if (element < 16)
sparc64_store_floating_fields (regcache, type, valbuf, element, 0);
}
- else if (sparc64_floating_p (type))
+ else if (sparc64_floating_p (type)
+ || sparc64_complex_floating_p (type))
{
/* Floating arguments. */
if (len == 16)
@@ -1067,7 +1090,8 @@ sparc64_store_return_value (struct type *type, struct regcache *regcache,
if (TYPE_CODE (type) != TYPE_CODE_UNION)
sparc64_store_floating_fields (regcache, type, buf, 0, 0);
}
- else if (sparc64_floating_p (type))
+ else if (sparc64_floating_p (type)
+ || sparc64_complex_floating_p (type))
{
/* Floating return values. */
memcpy (buf, valbuf, len);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix complex float on sparc
2011-09-28 6:32 [PATCH] Fix complex float on sparc David Miller
@ 2011-09-28 17:09 ` Mark Kettenis
2011-09-28 17:50 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Mark Kettenis @ 2011-09-28 17:09 UTC (permalink / raw)
To: davem; +Cc: gdb-patches
> Date: Wed, 28 Sep 2011 01:20:27 -0400 (EDT)
> From: David Miller <davem@davemloft.net>
>
> Lots of testcase failures have crept into the sparc targets,
> I'll try to fix as many as I can.
>
> This gets the complex float cases of callfuncs.exp passing
> again for both 32-bit and 64-bit.
>
> For sparc32 it's pass in memory, return in float regs.
>
> For sparc64 it's pass in float regs (<= 16 bytes) or memory (> 16
> bytes), always return in float regs.
>
> Ok to commit?
Looks good. Just a small request inline...
> gdb/
>
> 2011-09-27 David S. Miller <davem@davemloft.net>
>
> * sparc-tdep.h (SPARC_F2_REGNUM, SPARC_F3_REGNUM, SPARC_F4_REGNUM,
> SPARC_F5_REGNUM, SPARC_F6_REGNUM, SPARC_F7_REGNUM): New enums.
> * sparc-tdep.c (sparc_complex_floating_p): New function.
> (sparc32_store_arguments): Handle complex floats.
> (sparc32_extract_return_value): Likewise.
> (sparc32_store_return_value): Likewise.
> (sparc32_stabs_argument_has_addr): Likewise.
> * sparc64-tdep.c (sparc64_complex_floating_p): New function.
> (sparc64_store_floating_fields): Handle complex floats.
> (sparc64_store_arguments): Likewise.
> (sparc64_store_return_value): Likewise.
>
> diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
> index faa7b3a..8541a31 100644
> --- a/gdb/sparc-tdep.c
> +++ b/gdb/sparc-tdep.c
> @@ -1238,12 +1258,25 @@ sparc32_extract_return_value (struct type *type, struct regcache *regcache,
> gdb_assert (!sparc_structure_or_union_p (type));
> gdb_assert (!(sparc_floating_p (type) && len == 16));
>
> - if (sparc_floating_p (type))
> + if (sparc_floating_p (type)
> + || sparc_complex_floating_p (type))
I would have put both conditions on the same line, since this is
wasting a bit of vertical space. Don't see this list growing in the
near future and I don't think there's a significant difference in
readability that way.
> @@ -1281,13 +1314,26 @@ sparc32_store_return_value (struct type *type, struct regcache *regcache,
> gdb_assert (!(sparc_floating_p (type) && len == 16));
> gdb_assert (len <= 8);
>
> - if (sparc_floating_p (type))
> + if (sparc_floating_p (type)
> + || sparc_complex_floating_p (type))
Same here.
> diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
> index 0430ecf..097f658 100644
> --- a/gdb/sparc64-tdep.c
> +++ b/gdb/sparc64-tdep.c
> @@ -622,11 +642,13 @@ static void
> sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
> const gdb_byte *valbuf, int element, int bitpos)
> {
> + int len = TYPE_LENGTH (type);
> +
> gdb_assert (element < 16);
>
> - if (sparc64_floating_p (type))
> + if (sparc64_floating_p (type)
> + || (sparc64_complex_floating_p (type) && len <= 16))
Here.
> @@ -886,7 +908,8 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
> if (element < 16)
> sparc64_store_floating_fields (regcache, type, valbuf, element, 0);
> }
> - else if (sparc64_floating_p (type))
> + else if (sparc64_floating_p (type)
> + || sparc64_complex_floating_p (type))
Here.
> @@ -1067,7 +1090,8 @@ sparc64_store_return_value (struct type *type, struct regcache *regcache,
> if (TYPE_CODE (type) != TYPE_CODE_UNION)
> sparc64_store_floating_fields (regcache, type, buf, 0, 0);
> }
> - else if (sparc64_floating_p (type))
> + else if (sparc64_floating_p (type)
> + || sparc64_complex_floating_p (type))
And here.
Would appreciate it if you could change this.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix complex float on sparc
2011-09-28 17:09 ` Mark Kettenis
@ 2011-09-28 17:50 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-09-28 17:50 UTC (permalink / raw)
To: mark.kettenis; +Cc: gdb-patches
From: Mark Kettenis <mark.kettenis@xs4all.nl>
Date: Wed, 28 Sep 2011 11:39:28 +0200 (CEST)
> I would have put both conditions on the same line, since this is
> wasting a bit of vertical space. Don't see this list growing in the
> near future and I don't think there's a significant difference in
> readability that way.
...
> Would appreciate it if you could change this.
Will do before committing, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-28 17:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-28 6:32 [PATCH] Fix complex float on sparc David Miller
2011-09-28 17:09 ` Mark Kettenis
2011-09-28 17:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox