Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
software: enable -Wmissing-prototypes
  • Loading branch information
Sebastien Bourdeauducq committed Feb 7, 2012
1 parent 63f6dec commit fb22edc
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 16 deletions.
1 change: 1 addition & 0 deletions software/bios/isr.c
Expand Up @@ -20,6 +20,7 @@
#include <irq.h>
#include <uart.h>

void isr(void);
void isr(void)
{
unsigned int irqs;
Expand Down
3 changes: 1 addition & 2 deletions software/include.mak
Expand Up @@ -38,9 +38,8 @@ endif
INCLUDES_NOLIBC ?= -nostdinc -I$(M2DIR)/software/include/base
INCLUDES = $(INCLUDES_NOLIBC) -I$(M2DIR)/software/include -I$(M2DIR)/tools
ASFLAGS = $(INCLUDES) -nostdinc
# later: -Wmissing-prototypes
CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \
-fsigned-char $(INCLUDES)
-Wmissing-prototypes -fsigned-char $(INCLUDES)
LDFLAGS = -nostdlib -nodefaultlibs

# compile and generate dependencies, based on
Expand Down
2 changes: 2 additions & 0 deletions software/libbase/divsi3.c
Expand Up @@ -19,6 +19,7 @@

#define exitdiv(sign, res) if (sign) { res = - res;} return res;

long __divsi3 (long numerator, long denominator);
long __divsi3 (long numerator, long denominator)
{
int sign;
Expand All @@ -30,6 +31,7 @@ long __divsi3 (long numerator, long denominator)
exitdiv(sign, dividend);
}

long __modsi3 (long numerator, long denominator);
long __modsi3 (long numerator, long denominator)
{
int sign;
Expand Down
30 changes: 23 additions & 7 deletions software/libbase/softfloat-glue.c
Expand Up @@ -15,13 +15,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "milieu.h"
#include "softfloat.h"

/*
* 'Equal' wrapper. This returns 0 if the numbers are equal, or (1 | -1)
* otherwise. So we need to invert the output.
*/
int __eqsf2(float32 a, float32 b)
flag __eqsf2(float32 a, float32 b);
flag __eqsf2(float32 a, float32 b)
{
return !float32_eq(a, b);
}
Expand All @@ -32,7 +34,8 @@ int __eqsf2(float32 a, float32 b)
* to use an 'equal' call and invert the result. The result is already
* inverted though! Confusing?!
*/
int __nesf2(float32 a, float32 b)
flag __nesf2(float32 a, float32 b);
flag __nesf2(float32 a, float32 b)
{
return !float32_eq(a, b);
}
Expand All @@ -44,7 +47,8 @@ int __nesf2(float32 a, float32 b)
* make up our mind. This means that we can call 'less than or equal' and
* invert the result.
*/
int __gtsf2(float32 a, float32 b)
flag __gtsf2(float32 a, float32 b);
flag __gtsf2(float32 a, float32 b)
{
return !float32_le(a, b);
}
Expand All @@ -53,23 +57,26 @@ int __gtsf2(float32 a, float32 b)
* 'Greater Than or Equal' wrapper. We emulate this by inverting the result
* of a 'less than' call.
*/
int __gesf2(float32 a, float32 b)
flag __gesf2(float32 a, float32 b);
flag __gesf2(float32 a, float32 b)
{
return !float32_lt(a, b);
}

/*
* 'Less Than' wrapper.
*/
int __ltsf2(float32 a, float32 b)
flag __ltsf2(float32 a, float32 b);
flag __ltsf2(float32 a, float32 b)
{
return float32_lt(a, b);
}

/*
* 'Less Than or Equal' wrapper. A 0 must turn into a 1, and a 1 into a 0.
*/
int __lesf2(float32 a, float32 b)
flag __lesf2(float32 a, float32 b);
flag __lesf2(float32 a, float32 b)
{
return !float32_le(a, b);
}
Expand All @@ -80,6 +87,7 @@ int __lesf2(float32 a, float32 b)
* position in the registers of arguments, the double precision version can
* go here too ;-)
*/
float32 __negsf2(float32 x);
float32 __negsf2(float32 x)
{
return x ^ 0x80000000;
Expand All @@ -88,42 +96,50 @@ float32 __negsf2(float32 x)
/*
* 32-bit operations.
*/
float32 __addsf3(float32 a, float32 b);
float32 __addsf3(float32 a, float32 b)
{
return float32_add(a, b);
}

float32 __subsf3(float32 a, float32 b);
float32 __subsf3(float32 a, float32 b)
{
return float32_sub(a, b);
}

float32 __mulsf3(float32 a, float32 b);
float32 __mulsf3(float32 a, float32 b)
{
return float32_mul(a, b);
}

float32 __divsf3(float32 a, float32 b);
float32 __divsf3(float32 a, float32 b)
{
return float32_div(a, b);
}

float32 __floatsisf(int x);
float32 __floatsisf(int x)
{
return int32_to_float32(x);
}

int __fixsfsi(float32 x);
int __fixsfsi(float32 x)
{
return float32_to_int32_round_to_zero(x);
}

unsigned int __fixunssfsi(float32 x);
unsigned int __fixunssfsi(float32 x)
{
return float32_to_int32_round_to_zero(x); // XXX
}

int __unordsf2(float32 a, float32 b)
flag __unordsf2(float32 a, float32 b);
flag __unordsf2(float32 a, float32 b)
{
/*
* The comparison is unordered if either input is a NaN.
Expand Down
15 changes: 8 additions & 7 deletions software/libbase/softfloat.h
Expand Up @@ -109,11 +109,12 @@ float32 float32_mul( float32, float32 );
float32 float32_div( float32, float32 );
float32 float32_rem( float32, float32 );
float32 float32_sqrt( float32 );
int float32_eq( float32, float32 );
int float32_le( float32, float32 );
int float32_lt( float32, float32 );
int float32_eq_signaling( float32, float32 );
int float32_le_quiet( float32, float32 );
int float32_lt_quiet( float32, float32 );
int float32_is_signaling_nan( float32 );
flag float32_eq( float32, float32 );
flag float32_le( float32, float32 );
flag float32_lt( float32, float32 );
flag float32_eq_signaling( float32, float32 );
flag float32_le_quiet( float32, float32 );
flag float32_lt_quiet( float32, float32 );
flag float32_is_nan( float32 a );
flag float32_is_signaling_nan( float32 );

0 comments on commit fb22edc

Please sign in to comment.