cmd/8c, cmd/8g, cmd/8l: fix Plan 9 warnings

warning: src/cmd/8c/list.c:124 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:134 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:142 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:152 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:156 format mismatch d VLONG, arg 4
warning: src/cmd/8c/list.c:160 format mismatch d VLONG, arg 4
warning: src/cmd/8c/list.c:165 format mismatch d VLONG, arg 4
warning: src/cmd/8c/list.c:167 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:172 format mismatch d VLONG, arg 4
warning: src/cmd/8c/list.c:174 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:178 format mismatch d VLONG, arg 3
warning: src/cmd/8c/list.c:184 format mismatch d VLONG, arg 3

warning: src/cmd/8g/list.c:91 format mismatch d VLONG, arg 4
warning: src/cmd/8g/list.c:100 format mismatch d VLONG, arg 4
warning: src/cmd/8g/list.c:114 format mismatch d VLONG, arg 5
warning: src/cmd/8g/list.c:118 format mismatch d VLONG, arg 5
warning: src/cmd/8g/list.c:122 format mismatch d VLONG, arg 5
warning: src/cmd/8g/list.c:126 format mismatch d VLONG, arg 5
warning: src/cmd/8g/list.c:136 format mismatch d VLONG, arg 4

warning: src/cmd/8l/list.c:107 format mismatch d VLONG, arg 4
warning: src/cmd/8l/list.c:125 format mismatch ux VLONG, arg 4
warning: src/cmd/8l/list.c:128 format mismatch ux VLONG, arg 4
warning: src/cmd/8l/list.c:130 format mismatch d VLONG, arg 4
warning: src/cmd/8l/list.c:134 format mismatch d VLONG, arg 5
warning: src/cmd/8l/list.c:138 format mismatch d VLONG, arg 6
warning: src/cmd/8l/list.c:143 format mismatch d VLONG, arg 5
warning: src/cmd/8l/list.c:148 format mismatch d VLONG, arg 5
warning: src/cmd/8l/list.c:150 format mismatch d VLONG, arg 4
warning: src/cmd/8l/list.c:154 format mismatch d VLONG, arg 4
warning: src/cmd/8l/list.c:158 format mismatch d VLONG, arg 4
warning: src/cmd/8l/obj.c:132 format mismatch ux VLONG, arg 2

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/39710043

diff --git a/src/cmd/8c/list.c b/src/cmd/8c/list.c
index aa764350557ba1e29466d7cd0755f2107438c405..98aebce5311f86d1f17f834e4efe269e02933a6e 100644 (file)
--- a/src/cmd/8c/list.c
+++ b/src/cmd/8c/list.c
@@ -121,7 +121,7 @@ Dconv(Fmt *fp)
 
        if(fp->flags & FmtLong) {
                if(i == D_CONST2)
-                       sprint(str, "$%d-%d", a->offset, a->offset2);
+                       sprint(str, "$%lld-%d", a->offset, a->offset2);
                else {
                        // ATEXT dst is not constant
                        sprint(str, "!!%D", a);
@@ -131,7 +131,7 @@ Dconv(Fmt *fp)
 
        if(i >= D_INDIR) {
                if(a->offset)
-                       sprint(str, "%d(%R)", a->offset, i-D_INDIR);
+                       sprint(str, "%lld(%R)", a->offset, i-D_INDIR);
                else
                        sprint(str, "(%R)", i-D_INDIR);
                goto brk;
@@ -139,7 +139,7 @@ Dconv(Fmt *fp)
        switch(i) {
        default:
                if(a->offset)
-                       sprint(str, "$%d,%R", a->offset, i);
+                       sprint(str, "$%lld,%R", a->offset, i);
                else
                        sprint(str, "%R", i);
                break;
@@ -149,39 +149,39 @@ Dconv(Fmt *fp)
                break;
 
        case D_BRANCH:
-               sprint(str, "%d", a->offset);
+               sprint(str, "%lld", a->offset);
                break;
 
        case D_EXTERN:
-               sprint(str, "%s+%d(SB)", a->sym->name, a->offset);
+               sprint(str, "%s+%lld(SB)", a->sym->name, a->offset);
                break;
 
        case D_STATIC:
-               sprint(str, "%s<>+%d(SB)", a->sym->name, a->offset);
+               sprint(str, "%s<>+%lld(SB)", a->sym->name, a->offset);
                break;
 
        case D_AUTO:
                if(a->sym)
-                       sprint(str, "%s+%d(SP)", a->sym->name, a->offset);
+                       sprint(str, "%s+%lld(SP)", a->sym->name, a->offset);
                else
-                       sprint(str, "%d(SP)", a->offset);
+                       sprint(str, "%lld(SP)", a->offset);
                break;
 
        case D_PARAM:
                if(a->sym)
-                       sprint(str, "%s+%d(FP)", a->sym->name, a->offset);
+                       sprint(str, "%s+%lld(FP)", a->sym->name, a->offset);
                else
-                       sprint(str, "%d(FP)", a->offset);
+                       sprint(str, "%lld(FP)", a->offset);
                break;
 
        case D_CONST:
-               sprint(str, "$%d", a->offset);
+               sprint(str, "$%lld", a->offset);
                break;
 
        case D_CONST2:
                if(!(fp->flags & FmtLong)) {
                        // D_CONST2 outside of ATEXT should not happen
-                       sprint(str, "!!$%d-%d", a->offset, a->offset2);
+                       sprint(str, "!!$%lld-%d", a->offset, a->offset2);
                }
                break;
 

diff --git a/src/cmd/8g/list.c b/src/cmd/8g/list.c
index d4a86e47335877ad13faac7518e127ec6f1e4e28..96954d4bb3a87fe089e7b20a9c747eff4945c6a9 100644 (file)
--- a/src/cmd/8g/list.c
+++ b/src/cmd/8g/list.c
@@ -88,7 +88,7 @@ Dconv(Fmt *fp)
        i = a->type;
        if(i >= D_INDIR) {
                if(a->offset)
-                       snprint(str, sizeof(str), "%d(%R)", a->offset, i-D_INDIR);
+                       snprint(str, sizeof(str), "%lld(%R)", a->offset, i-D_INDIR);
                else
                        snprint(str, sizeof(str), "(%R)", i-D_INDIR);
                goto brk;
@@ -97,7 +97,7 @@ Dconv(Fmt *fp)
 
        default:
                if(a->offset)
-                       snprint(str, sizeof(str), "$%d,%R", a->offset, i);
+                       snprint(str, sizeof(str), "$%lld,%R", a->offset, i);
                else
                        snprint(str, sizeof(str), "%R", i);
                break;
@@ -111,19 +111,19 @@ Dconv(Fmt *fp)
                break;
 
        case D_EXTERN:
-               snprint(str, sizeof(str), "%lS+%d(SB)", a->sym, a->offset);
+               snprint(str, sizeof(str), "%lS+%lld(SB)", a->sym, a->offset);
                break;
 
        case D_STATIC:
-               snprint(str, sizeof(str), "%lS<>+%d(SB)", a->sym, a->offset);
+               snprint(str, sizeof(str), "%lS<>+%lld(SB)", a->sym, a->offset);
                break;
 
        case D_AUTO:
-               snprint(str, sizeof(str), "%lS+%d(SP)", a->sym, a->offset);
+               snprint(str, sizeof(str), "%lS+%lld(SP)", a->sym, a->offset);
                break;
 
        case D_PARAM:
-               snprint(str, sizeof(str), "%lS+%d(FP)", a->sym, a->offset);
+               snprint(str, sizeof(str), "%lS+%lld(FP)", a->sym, a->offset);
                break;
 
        case D_CONST:
@@ -133,7 +133,7 @@ Dconv(Fmt *fp)
                        snprint(str, sizeof(str), "$%lud-%lud", (ulong)d1, (ulong)d2);
                        break;
                }
-               snprint(str, sizeof(str), "$%d", a->offset);
+               snprint(str, sizeof(str), "$%lld", a->offset);
                break;
 
        case D_FCONST:

diff --git a/src/cmd/8l/list.c b/src/cmd/8l/list.c
index 8e57b4af1c951934dd3d18cefb72b23aafdbb40d..b6df665e351afbadb8317fb0fcfdf75a983adb0e 100644 (file)
--- a/src/cmd/8l/list.c
+++ b/src/cmd/8l/list.c
@@ -104,7 +104,7 @@ Dconv(Fmt *fp)
        i = a->type;
        if(i >= D_INDIR && i < 2*D_INDIR) {
                if(a->offset)
-                       snprint(str, sizeof str, "%d(%R)", a->offset, i-D_INDIR);
+                       snprint(str, sizeof str, "%lld(%R)", a->offset, i-D_INDIR);
                else
                        snprint(str, sizeof str, "(%R)", i-D_INDIR);
                goto brk;
@@ -122,40 +122,40 @@ Dconv(Fmt *fp)
        case D_BRANCH:
                if(bigP != P && bigP->pcond != P)
                        if(a->sym != S)
-                               snprint(str, sizeof str, "%ux+%s", bigP->pcond->pc,
+                               snprint(str, sizeof str, "%llux+%s", bigP->pcond->pc,
                                        a->sym->name);
                        else
-                               snprint(str, sizeof str, "%ux", bigP->pcond->pc);
+                               snprint(str, sizeof str, "%llux", bigP->pcond->pc);
                else
-                       snprint(str, sizeof str, "%d(PC)", a->offset);
+                       snprint(str, sizeof str, "%lld(PC)", a->offset);
                break;
 
        case D_EXTERN:
-               snprint(str, sizeof str, "%s+%d(SB)", xsymname(a->sym), a->offset);
+               snprint(str, sizeof str, "%s+%lld(SB)", xsymname(a->sym), a->offset);
                break;
 
        case D_STATIC:
-               snprint(str, sizeof str, "%s<%d>+%d(SB)", xsymname(a->sym),
+               snprint(str, sizeof str, "%s<%d>+%lld(SB)", xsymname(a->sym),
                        a->sym->version, a->offset);
                break;
 
        case D_AUTO:
-               snprint(str, sizeof str, "%s+%d(SP)", xsymname(a->sym), a->offset);
+               snprint(str, sizeof str, "%s+%lld(SP)", xsymname(a->sym), a->offset);
                break;
 
        case D_PARAM:
                if(a->sym)
-                       snprint(str, sizeof str, "%s+%d(FP)", a->sym->name, a->offset);
+                       snprint(str, sizeof str, "%s+%lld(FP)", a->sym->name, a->offset);
                else
-                       snprint(str, sizeof str, "%d(FP)", a->offset);
+                       snprint(str, sizeof str, "%lld(FP)", a->offset);
                break;
 
        case D_CONST:
-               snprint(str, sizeof str, "$%d", a->offset);
+               snprint(str, sizeof str, "$%lld", a->offset);
                break;
 
        case D_CONST2:
-               snprint(str, sizeof str, "$%d-%d", a->offset, a->offset2);
+               snprint(str, sizeof str, "$%lld-%d", a->offset, a->offset2);
                break;
 
        case D_FCONST:

diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c
index e588060bee277f924a177638434219b951520901..2a5c222a0488fb1eb7acc003de65167ccc37ed54 100644 (file)
--- a/src/cmd/8l/obj.c
+++ b/src/cmd/8l/obj.c
@@ -129,6 +129,6 @@ archinit(void)
                break;
        }
        if(INITDAT != 0 && INITRND != 0)
-               print("warning: -D0x%ux is ignored because of -R0x%ux\n",
+               print("warning: -D0x%llux is ignored because of -R0x%ux\n",
                        INITDAT, INITRND);
 }