moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

x86_64 fixes

This commit is contained in:
Yang Tse 2008-08-24 03:59:43 +00:00
parent 79cbe50894
commit 13f035b905
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/mprintf.c
View File

@ -325,7 +325,13 @@ static long dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos,
int flags; int flags;
long max_param=0; long max_param=0;
long i; long i;
int aux_signed_int;
int va_signed_int;
unsigned int va_unsigned_int;
long va_signed_long;
unsigned long va_unsigned_long;
mp_intmax_t va_signed_long_long;
mp_uintmax_t va_unsigned_long_long;
while(*fmt) { while(*fmt) {
if(*fmt++ == '%') { if(*fmt++ == '%') {
@ -574,34 +580,32 @@ static long dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos,
case FORMAT_INT: case FORMAT_INT:
#ifdef HAVE_LONG_LONG_TYPE #ifdef HAVE_LONG_LONG_TYPE
if((vto[i].flags & FLAGS_LONGLONG) && (vto[i].flags & FLAGS_UNSIGNED)) if((vto[i].flags & FLAGS_LONGLONG) && (vto[i].flags & FLAGS_UNSIGNED)) {
vto[i].data.num.as_unsigned = va_unsigned_long_long = va_arg(arglist, mp_uintmax_t);
(mp_uintmax_t)va_arg(arglist, unsigned LONG_LONG_TYPE); vto[i].data.num.as_unsigned = (mp_uintmax_t)va_unsigned_long_long;
else if(vto[i].flags & FLAGS_LONGLONG) }
vto[i].data.num.as_signed = else if(vto[i].flags & FLAGS_LONGLONG) {
(mp_intmax_t)va_arg(arglist, LONG_LONG_TYPE); va_signed_long_long = va_arg(arglist, mp_intmax_t);
vto[i].data.num.as_signed = (mp_intmax_t)va_signed_long_long;
}
else else
#endif #endif
{ {
if((vto[i].flags & FLAGS_LONG) && (vto[i].flags & FLAGS_UNSIGNED)) if((vto[i].flags & FLAGS_LONG) && (vto[i].flags & FLAGS_UNSIGNED)) {
vto[i].data.num.as_unsigned = va_unsigned_long = va_arg(arglist, unsigned long);
(mp_uintmax_t)va_arg(arglist, unsigned long); vto[i].data.num.as_unsigned = (mp_uintmax_t)va_unsigned_long;
else if(vto[i].flags & FLAGS_LONG) }
vto[i].data.num.as_signed = else if(vto[i].flags & FLAGS_LONG) {
(mp_intmax_t)va_arg(arglist, long); va_signed_long = va_arg(arglist, long);
else if(vto[i].flags & FLAGS_UNSIGNED) vto[i].data.num.as_signed = (mp_intmax_t)va_signed_long;
vto[i].data.num.as_unsigned = }
(mp_uintmax_t)va_arg(arglist, unsigned int); else if(vto[i].flags & FLAGS_UNSIGNED) {
va_unsigned_int = va_arg(arglist, unsigned int);
vto[i].data.num.as_unsigned = (mp_uintmax_t)va_unsigned_int;
}
else { else {
/* va_signed_int = va_arg(arglist, int);
vto[i].data.num.as_signed = vto[i].data.num.as_signed = (mp_intmax_t)va_signed_int;
(mp_intmax_t)va_arg(arglist, int);
*/
aux_signed_int = va_arg(arglist, int);
if(sizeof(mp_intmax_t) > sizeof(long))
vto[i].data.num.as_signed = (mp_intmax_t)aux_signed_int;
else
vto[i].data.num.as_signed = (long)aux_signed_int;
} }
} }
break; break;
@ -776,8 +780,9 @@ static int dprintf_formatf(
if(is_neg) { if(is_neg) {
/* signed_num might fail to hold absolute negative minimum by 1 */ /* signed_num might fail to hold absolute negative minimum by 1 */
signed_num = p->data.num.as_signed + (mp_intmax_t)1; signed_num = p->data.num.as_signed + (mp_intmax_t)1;
num = (mp_uintmax_t)-signed_num; signed_num = -signed_num;
num += (mp_uintmax_t)1; num = (mp_uintmax_t)signed_num;
num += (mp_uintmax_t)0x1;
} }
goto number; goto number;