From fa2af441f1d7f2daccf40e1e350e8a8bfdcfb9e8 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 2 Sep 2014 15:12:53 -0400 Subject: runtime: convert traceback*.c to Go The two converted files were nearly identical. Instead of continuing that duplication, I merged them into a single traceback.go. Tested on arm, amd64, amd64p32, and 386. LGTM=r R=golang-codereviews, remyoudompheng, dave, r CC=dvyukov, golang-codereviews, iant, khr https://golang.org/cl/134200044 --- src/pkg/runtime/runtime.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pkg/runtime/runtime.h') diff --git a/src/pkg/runtime/runtime.h b/src/pkg/runtime/runtime.h index 25303512b2..f1b3ee83f3 100644 --- a/src/pkg/runtime/runtime.h +++ b/src/pkg/runtime/runtime.h @@ -666,7 +666,7 @@ struct Stkframe uintptr arglen; // number of bytes at argp }; -int32 runtime·gentraceback(uintptr, uintptr, uintptr, G*, int32, uintptr*, int32, bool(*)(Stkframe*, void*), void*, bool); +intgo runtime·gentraceback(uintptr, uintptr, uintptr, G*, intgo, uintptr*, intgo, bool(**)(Stkframe*, void*), void*, bool); void runtime·traceback(uintptr pc, uintptr sp, uintptr lr, G* gp); void runtime·tracebackothers(G*); bool runtime·haszeroargs(uintptr pc); @@ -854,8 +854,8 @@ void runtime·exitsyscall(void); void runtime·entersyscallblock_m(void); G* runtime·newproc1(FuncVal*, byte*, int32, int32, void*); bool runtime·sigsend(int32 sig); -int32 runtime·callers(int32, uintptr*, int32); -int32 runtime·gcallers(G*, int32, uintptr*, int32); +intgo runtime·callers(intgo, uintptr*, intgo); +intgo runtime·gcallers(G*, intgo, uintptr*, intgo); int64 runtime·nanotime(void); // monotonic time int64 runtime·unixnanotime(void); // real time, can skip void runtime·dopanic(int32); @@ -868,7 +868,7 @@ void runtime·setcpuprofilerate(int32); void runtime·usleep(uint32); int64 runtime·cputicks(void); int64 runtime·tickspersecond(void); -void runtime·blockevent(int64, int32); +void runtime·blockevent(int64, intgo); G* runtime·netpoll(bool); void runtime·netpollinit(void); int32 runtime·netpollopen(uintptr, PollDesc*); -- cgit v1.3