Eliminate u64, s64, u32.

This commit is contained in:
Ralf Corsepius
2005-05-10 02:51:58 +00:00
parent eea20674dc
commit bbe76aaf0f

View File

@@ -47,10 +47,6 @@ void pfree(void *);
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#endif #endif
typedef unsigned long long u64;
typedef long long s64;
typedef unsigned int u32;
#ifndef __BOOT__ #ifndef __BOOT__
BSP_output_char_function_type BSP_output_char = debug_putc_onlcr; BSP_output_char_function_type BSP_output_char = debug_putc_onlcr;
#endif #endif
@@ -912,7 +908,7 @@ int printk(const char *fmt, ...) {
/* Necessary to avoid including a library, and GCC won't do this inline. */ /* Necessary to avoid including a library, and GCC won't do this inline. */
#define div10(num, rmd) \ #define div10(num, rmd) \
do { u32 t1, t2, t3; \ do { uint32_t t1, t2, t3; \
asm("lis %4,0xcccd; " \ asm("lis %4,0xcccd; " \
"addi %4,%4,0xffffcccd; " /* Build 0xcccccccd */ \ "addi %4,%4,0xffffcccd; " /* Build 0xcccccccd */ \
"mulhwu %3,%0+1,%4; " /* (num.l*cst.l).h */ \ "mulhwu %3,%0+1,%4; " /* (num.l*cst.l).h */ \
@@ -950,7 +946,7 @@ do { u32 t1, t2, t3; \
#define LLONG 128 /* 64 bit argument */ #define LLONG 128 /* 64 bit argument */
#if defined(__BOOT__) #if defined(__BOOT__)
static char * number(char * str, int size, int type, u64 num) static char * number(char * str, int size, int type, uint64_t num)
{ {
char fill,sign,tmp[24]; char fill,sign,tmp[24];
const char *digits="0123456789abcdef"; const char *digits="0123456789abcdef";
@@ -961,7 +957,7 @@ static char * number(char * str, int size, int type, u64 num)
fill = (type & ZEROPAD) ? '0' : ' '; fill = (type & ZEROPAD) ? '0' : ' ';
sign = 0; sign = 0;
if (type & SIGN) { if (type & SIGN) {
if ((s64)num <0) { if ((int64_t)num <0) {
sign = '-'; sign = '-';
num = -num; num = -num;
size--; size--;
@@ -999,7 +995,7 @@ static char * number(char * str, int size, int type, u64 num)
int k_vsprintf(char *buf, const char *fmt, va_list args) int k_vsprintf(char *buf, const char *fmt, va_list args)
{ {
int len; int len;
u64 num; uint64_t num;
int i; int i;
char * str; char * str;
const char *s; const char *s;