[src/trunk]: src/sys/arch/sandpoint/stand/altboot fix a failure in the sign e...

[nisimura <nisimura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca8a93b627f8
branches:  trunk
changeset: 761293:ca8a93b627f8
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Sun Jan 23 02:08:24 2011 +0000

description:
fix a failure in the sign extension consideration.

diffstat:

 sys/arch/sandpoint/stand/altboot/printf.c |  33 +++++++++++++++---------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diffs (73 lines):

diff -r 9259bebffd14 -r ca8a93b627f8 sys/arch/sandpoint/stand/altboot/printf.c
--- a/sys/arch/sandpoint/stand/altboot/printf.c Sun Jan 23 01:32:08 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/printf.c Sun Jan 23 02:08:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.2 2011/01/23 01:32:08 nisimura Exp $ */
+/* $NetBSD: printf.c,v 1.3 2011/01/23 02:08:24 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -96,7 +96,8 @@
        int length, fmax, fmin, leading;
        int leftjust, llflag;
        char fill, sign;
-       long long v;
+       long long d;
+       unsigned long long v;
 
        outcnt = 0;
        while ((i = *fmt++) != '\0') {
@@ -160,39 +161,39 @@
 
                case 'd':
                        if (llflag)
-                               v = va_arg(ap, long long);
+                               d = va_arg(ap, long long);
                        else
-                               v = va_arg(ap, int);
-                       if (v < 0) {
-                               sign = '-' ; v = -v;
+                               d = va_arg(ap, int);
+                       if (d < 0) {
+                               sign = '-' ; d = -d;
                        }
-                       mkdigit((unsigned long long)v, 10, str);
+                       mkdigit((unsigned long long)d, 10, str);
                        break;
 
                case 'u':
                        if (llflag)
-                               v = va_arg(ap, long long);
+                               v = va_arg(ap, unsigned long long);
                        else
-                               v = va_arg(ap, int);
-                       mkdigit((unsigned long long)v, 10, str);
+                               v = va_arg(ap, unsigned int);
+                       mkdigit(v, 10, str);
                        break;
 
                case 'o':
                        if (llflag)
-                               v = va_arg(ap, long long);
+                               v = va_arg(ap, unsigned long long);
                        else
-                               v = va_arg(ap, int);
-                       mkdigit((unsigned long long)v, 8, str);
+                               v = va_arg(ap, unsigned int);
+                       mkdigit(v, 8, str);
                        fmax = 0;
                        break;
 
                case 'X':
                case 'x':
                        if (llflag)
-                               v = va_arg(ap, long long);
+                               v = va_arg(ap, unsigned long long);
                        else
-                               v = va_arg(ap, int);
-                       mkdigit((unsigned long long)v, 16, str);
+                               v = va_arg(ap, unsigned int);
+                       mkdigit(v, 16, str);
                        fmax = 0;
                        break;