build nits

R=r
DELTA=8  (0 added, 6 deleted, 2 changed)
OCL=25045
CL=25045

diff --git a/src/run.bash b/src/run.bash
index 90c9a7af1a9cab7bcde598a274222cf5cc128a80..64a6170617aad16d574ee8681de5e94308cf296e 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -52,12 +52,6 @@ time make
 make smoketest
 ) || exit $?
 
-# (xcd ../usr/gri/gosrc
-# make clean
-# time make
-# # make test
-# ) || exit $?
-
 (xcd ../doc/progs
 time ./run
 ) || exit $?

diff --git a/src/runtime/malloc.c b/src/runtime/malloc.c
index 2bee17608704ec0fb507fd6802ba08e44582302e..0a1ab280416ac167367ba1f6efdc59b536a7f567 100644 (file)
--- a/src/runtime/malloc.c
+++ b/src/runtime/malloc.c
@@ -162,9 +162,9 @@ mlookup(void *v, byte **base, uintptr *size, uint32 **ref)
                *size = n;
        nobj = (s->npages << PageShift) / (n + RefcountOverhead);
        if((byte*)s->gcref < p || (byte*)(s->gcref+nobj) > p+(s->npages<<PageShift)) {
-               printf("odd span state=%d span=%p base=%p sizeclass=%d n=%d size=%d npages=%d\n",
+               printf("odd span state=%d span=%p base=%p sizeclass=%d n=%D size=%D npages=%D\n",
                        s->state, s, p, s->sizeclass, nobj, n, s->npages);
-               printf("s->base sizeclass %d v=%p base=%p gcref=%p blocksize=%D nobj=%d size=%D end=%p end=%p\n",
+               printf("s->base sizeclass %d v=%p base=%p gcref=%p blocksize=%D nobj=%D size=%D end=%p end=%p\n",
                        s->sizeclass, v, p, s->gcref, s->npages<<PageShift,
                        nobj, n, s->gcref + nobj, p+(s->npages<<PageShift));
                throw("bad gcref");