diff options
| author | Russ Cox <rsc@golang.org> | 2013-07-18 10:43:22 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-07-18 10:43:22 -0400 |
| commit | c3de91bb15cf23bd1757c63c581f9da4b7e14598 (patch) | |
| tree | 9f8961feeff7ba913cf70e00c464acc12560925e /src/pkg/runtime/traceback_arm.c | |
| parent | 08ce3c313376b6d600c08b977103d6c51350b3f6 (diff) | |
| download | go-c3de91bb15cf23bd1757c63c581f9da4b7e14598.tar.xz | |
cmd/ld, runtime: use new contiguous pcln table
R=golang-dev, r, dave
CC=golang-dev
https://golang.org/cl/11494043
Diffstat (limited to 'src/pkg/runtime/traceback_arm.c')
| -rw-r--r-- | src/pkg/runtime/traceback_arm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/runtime/traceback_arm.c b/src/pkg/runtime/traceback_arm.c index 6cd924da0d..43dcd1cf8c 100644 --- a/src/pkg/runtime/traceback_arm.c +++ b/src/pkg/runtime/traceback_arm.c @@ -88,7 +88,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, frame.lr = *(uintptr*)frame.sp; flr = runtime·findfunc(frame.lr); if(flr == nil) { - runtime·printf("runtime: unexpected return pc for %S called from %p", *f->name, frame.lr); + runtime·printf("runtime: unexpected return pc for %s called from %p\n", runtime·funcname(f), frame.lr); runtime·throw("unknown caller pc"); } } @@ -110,8 +110,8 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, else if((i = runtime·funcarglen(flr, frame.lr)) >= 0) frame.arglen = i; else { - runtime·printf("runtime: unknown argument frame size for %S called from %p [%S]\n", - *f->name, frame.lr, flr ? *flr->name : unknown); + runtime·printf("runtime: unknown argument frame size for %s called from %p [%s]\n", + runtime·funcname(f), frame.lr, flr ? runtime·funcname(flr) : "?"); if(!printing) runtime·throw("invalid stack"); frame.arglen = 0; @@ -130,7 +130,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, frame.varlen = frame.fp - frame.sp; } else { if(f->locals > frame.fp - frame.sp) { - runtime·printf("runtime: inconsistent locals=%p frame=%p fp=%p sp=%p for %S\n", (uintptr)f->locals, (uintptr)f->frame, frame.fp, frame.sp, *f->name); + runtime·printf("runtime: inconsistent locals=%p frame=%p fp=%p sp=%p for %s\n", (uintptr)f->locals, (uintptr)f->frame, frame.fp, frame.sp, runtime·funcname(f)); runtime·throw("invalid stack"); } frame.varp = (byte*)frame.fp - f->locals; @@ -155,7 +155,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, tracepc = frame.pc; // back up to CALL instruction for funcline. if(n > 0 && frame.pc > f->entry && !waspanic) tracepc -= sizeof(uintptr); - runtime·printf("%S(", *f->name); + runtime·printf("%s(", runtime·funcname(f)); for(i = 0; i < frame.arglen/sizeof(uintptr); i++) { if(i >= 5) { runtime·prints(", ..."); @@ -220,7 +220,7 @@ printcreatedby(G *gp) if((pc = gp->gopc) != 0 && (f = runtime·findfunc(pc)) != nil && runtime·showframe(f, gp) && gp->goid != 1) { - runtime·printf("created by %S\n", *f->name); + runtime·printf("created by %s\n", runtime·funcname(f)); tracepc = pc; // back up to CALL instruction for funcline. if(pc > f->entry) tracepc -= sizeof(uintptr); |