This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Committed: v850: Fix handling of zero-length function arguments
- From: Nick Clifton <nickc at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 24 Nov 2009 15:29:26 +0000
- Subject: Committed: v850: Fix handling of zero-length function arguments
Hi Guys,
I am applying the patch below to fix a small problem recently
uncovered with the v850 port's handling of zero-length function
arguments.
Cheers
Nick
gcc/ChangeLog
2009-11-24 Nick Clifton <nickc@redhat.com>
* config/v850/v850.c (function_arg): Fix handling of zero-length
function arguments.
Index: gcc/config/v850/v850.c
===================================================================
--- gcc/config/v850/v850.c (revision 154500)
+++ gcc/config/v850/v850.c (working copy)
@@ -264,8 +264,9 @@
return size > 8;
}
-/* Return an RTX to represent where a value with mode MODE will be returned
- from a function. If the result is 0, the argument is pushed. */
+/* Return an RTX to represent where an argument with mode MODE
+ and type TYPE will be passed to a function. If the result
+ is NULL_RTX, the argument will be pushed. */
rtx
function_arg (CUMULATIVE_ARGS * cum,
@@ -273,7 +274,7 @@
tree type,
int named)
{
- rtx result = 0;
+ rtx result = NULL_RTX;
int size, align;
if (TARGET_GHS && !named)
@@ -285,7 +286,11 @@
size = GET_MODE_SIZE (mode);
if (size < 1)
- return 0;
+ {
+ /* Once we have stopped using argument registers, do not start up again. */
+ cum->nbytes = 4 * UNITS_PER_WORD;
+ return NULL_RTX;
+ }
if (type)
align = TYPE_ALIGN (type) / BITS_PER_UNIT;
@@ -295,11 +300,11 @@
cum->nbytes = (cum->nbytes + align - 1) &~(align - 1);
if (cum->nbytes > 4 * UNITS_PER_WORD)
- return 0;
+ return NULL_RTX;
if (type == NULL_TREE
&& cum->nbytes + size > 4 * UNITS_PER_WORD)
- return 0;
+ return NULL_RTX;
switch (cum->nbytes / UNITS_PER_WORD)
{
@@ -316,7 +321,7 @@
result = gen_rtx_REG (mode, 9);
break;
default:
- result = 0;
+ result = NULL_RTX;
}
return result;
@@ -340,12 +345,15 @@
else
size = GET_MODE_SIZE (mode);
+ if (size < 1)
+ size = 1;
+
if (type)
align = TYPE_ALIGN (type) / BITS_PER_UNIT;
else
align = size;
- cum->nbytes = (cum->nbytes + align - 1) &~(align - 1);
+ cum->nbytes = (cum->nbytes + align - 1) & ~ (align - 1);
if (cum->nbytes > 4 * UNITS_PER_WORD)
return 0;