summaryrefslogtreecommitdiff
path: root/src/runtime/array.c
diff options
context:
space:
mode:
authorKen Thompson <ken@golang.org>2008-12-17 12:13:19 -0800
committerKen Thompson <ken@golang.org>2008-12-17 12:13:19 -0800
commitb28713ef02d580ed43448c01cf51a6b06384edd0 (patch)
tree4dd5a058d5185245aad3a62133822ab2c88ae863 /src/runtime/array.c
parentda5d1c08819a487218639f8423cd3fb6835170d8 (diff)
downloadgolang-b28713ef02d580ed43448c01cf51a6b06384edd0.tar.gz
small bug
new printarray R=r OCL=21429 CL=21429
Diffstat (limited to 'src/runtime/array.c')
-rw-r--r--src/runtime/array.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/src/runtime/array.c b/src/runtime/array.c
index a67deb00c..26a54ab2e 100644
--- a/src/runtime/array.c
+++ b/src/runtime/array.c
@@ -23,7 +23,7 @@ sys·newarray(uint32 nel, uint32 cap, uint32 width, Array* ret)
d->array = d->b;
ret = d;
- FLUSH(&d);
+ FLUSH(&ret);
if(debug) {
prints("newarray: nel=");
@@ -33,7 +33,7 @@ sys·newarray(uint32 nel, uint32 cap, uint32 width, Array* ret)
prints("; width=");
sys·printint(width);
prints("; ret=");
- sys·printpointer(ret);
+ sys·printarray(ret);
prints("\n");
}
}
@@ -85,11 +85,11 @@ sys·arraysliced(Array* old, uint32 lb, uint32 hb, uint32 width, Array* ret)
d->array = old->array + lb*width;
ret = d;
- FLUSH(&d);
+ FLUSH(&ret);
if(debug) {
prints("sys·arrayslices: old=");
- sys·printpointer(old);
+ sys·printarray(old);
prints("; lb=");
sys·printint(lb);
prints("; hb=");
@@ -97,7 +97,7 @@ sys·arraysliced(Array* old, uint32 lb, uint32 hb, uint32 width, Array* ret)
prints("; width=");
sys·printint(width);
prints("; ret=");
- sys·printpointer(ret);
+ sys·printarray(ret);
prints("\n");
}
}
@@ -132,7 +132,7 @@ sys·arrayslices(byte* old, uint32 nel, uint32 lb, uint32 hb, uint32 width, Arra
d->array = old + lb*width;
ret = d;
- FLUSH(&d);
+ FLUSH(&ret);
if(debug) {
prints("sys·arrayslices: old=");
@@ -146,7 +146,7 @@ sys·arrayslices(byte* old, uint32 nel, uint32 lb, uint32 hb, uint32 width, Arra
prints("; width=");
sys·printint(width);
prints("; ret=");
- sys·printpointer(ret);
+ sys·printarray(ret);
prints("\n");
}
}
@@ -164,15 +164,24 @@ sys·arrays2d(byte* old, uint32 nel, Array* ret)
d->array = old;
ret = d;
- FLUSH(&d);
+ FLUSH(&ret);
if(debug) {
prints("sys·arrays2d: old=");
sys·printpointer(old);
- prints("; nel=");
- sys·printint(nel);
prints("; ret=");
- sys·printpointer(ret);
+ sys·printarray(ret);
prints("\n");
}
}
+
+void
+sys·printarray(Array *a)
+{
+ prints("[");
+ sys·printint(a->nel);
+ prints(",");
+ sys·printint(a->cap);
+ prints("]");
+ sys·printpointer(a->array);
+}