Commit 2b39e418 authored by Anthony Martin's avatar Anthony Martin

all: clean up C function prototypes

R=minux.ma, rsc, akumar, bradfitz
CC=golang-dev
https://golang.org/cl/7313070
parent fa625fb3
...@@ -852,7 +852,8 @@ xprintf(char *fmt, ...) ...@@ -852,7 +852,8 @@ xprintf(char *fmt, ...)
} }
void void
errprintf(char *fmt, ...) { errprintf(char *fmt, ...)
{
va_list arg; va_list arg;
char *p; char *p;
DWORD n, w; DWORD n, w;
......
...@@ -1936,7 +1936,8 @@ writeinfo(void) ...@@ -1936,7 +1936,8 @@ writeinfo(void)
* because we need die->offs and infoo/infosize; * because we need die->offs and infoo/infosize;
*/ */
static int static int
ispubname(DWDie *die) { ispubname(DWDie *die)
{
DWAttr *a; DWAttr *a;
switch(die->abbrev) { switch(die->abbrev) {
...@@ -1949,7 +1950,8 @@ ispubname(DWDie *die) { ...@@ -1949,7 +1950,8 @@ ispubname(DWDie *die) {
} }
static int static int
ispubtype(DWDie *die) { ispubtype(DWDie *die)
{
return die->abbrev >= DW_ABRV_NULLTYPE; return die->abbrev >= DW_ABRV_NULLTYPE;
} }
......
...@@ -172,7 +172,8 @@ amd64_uregPC(void) ...@@ -172,7 +172,8 @@ amd64_uregPC(void)
} }
uvlong uvlong
amd64_uregSP(void) { amd64_uregSP(void)
{
return ureg_amd64.sp; return ureg_amd64.sp;
} }
......
...@@ -30,7 +30,9 @@ THE SOFTWARE. ...@@ -30,7 +30,9 @@ THE SOFTWARE.
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
static void crashhandler(int sig) { static void
crashhandler(int sig)
{
USED(sig); USED(sig);
fprint(2, "%s: internal fatal error.\n", argv0); fprint(2, "%s: internal fatal error.\n", argv0);
exit(1); exit(1);
......
...@@ -247,7 +247,8 @@ bad: ...@@ -247,7 +247,8 @@ bad:
} }
int int
isvalidcharntorune(const char* str, int length, Rune* rune, int* consumed) { isvalidcharntorune(const char* str, int length, Rune* rune, int* consumed)
{
*consumed = charntorune(rune, str, length); *consumed = charntorune(rune, str, length);
return *rune != Runeerror || *consumed == 3; return *rune != Runeerror || *consumed == 3;
} }
......
...@@ -5,22 +5,26 @@ ...@@ -5,22 +5,26 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
int fork() int
fork(void)
{ {
return -1; return -1;
} }
int p9rfork(int flags) int
p9rfork(int flags)
{ {
return -1; return -1;
} }
Waitmsg *p9wait() Waitmsg*
p9wait(void)
{ {
return 0; return 0;
} }
int p9waitpid() int
p9waitpid(void)
{ {
return -1; return -1;
} }
...@@ -591,7 +591,8 @@ lookup(char *fn, char *var, Symbol *s) ...@@ -591,7 +591,8 @@ lookup(char *fn, char *var, Symbol *s)
* strcmp, but allow '_' to match center dot (rune 00b7 == bytes c2 b7) * strcmp, but allow '_' to match center dot (rune 00b7 == bytes c2 b7)
*/ */
int int
cdotstrcmp(char *sym, char *user) { cdotstrcmp(char *sym, char *user)
{
for (;;) { for (;;) {
while (*sym == *user) { while (*sym == *user) {
if (*sym++ == '\0') if (*sym++ == '\0')
......
...@@ -18,7 +18,10 @@ static void *threadentry(void*); ...@@ -18,7 +18,10 @@ static void *threadentry(void*);
void __aeabi_read_tp(void) __attribute__((naked)); void __aeabi_read_tp(void) __attribute__((naked));
void cgo_tls_set_gm(void) __attribute__((naked)); void cgo_tls_set_gm(void) __attribute__((naked));
void cgo_tls_get_gm(void) __attribute__((naked)); void cgo_tls_get_gm(void) __attribute__((naked));
void __aeabi_read_tp(void) {
void
__aeabi_read_tp(void)
{
// read @ 0xffff1000 // read @ 0xffff1000
__asm__ __volatile__ ( __asm__ __volatile__ (
"ldr r0, =0xffff1000\n\t" "ldr r0, =0xffff1000\n\t"
...@@ -26,8 +29,11 @@ void __aeabi_read_tp(void) { ...@@ -26,8 +29,11 @@ void __aeabi_read_tp(void) {
"mov pc, lr\n\t" "mov pc, lr\n\t"
); );
} }
// g (R10) at 8(TP), m (R9) at 12(TP) // g (R10) at 8(TP), m (R9) at 12(TP)
void cgo_tls_get_gm(void) { void
cgo_tls_get_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -36,7 +42,10 @@ void cgo_tls_get_gm(void) { ...@@ -36,7 +42,10 @@ void cgo_tls_get_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
void cgo_tls_set_gm(void) {
void
cgo_tls_set_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -45,6 +54,7 @@ void cgo_tls_set_gm(void) { ...@@ -45,6 +54,7 @@ void cgo_tls_set_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
// both cgo_tls_{get,set}_gm can be called from runtime // both cgo_tls_{get,set}_gm can be called from runtime
void (*cgo_load_gm)(void) = cgo_tls_get_gm; void (*cgo_load_gm)(void) = cgo_tls_get_gm;
void (*cgo_save_gm)(void) = cgo_tls_set_gm; void (*cgo_save_gm)(void) = cgo_tls_set_gm;
......
...@@ -18,7 +18,10 @@ static void *threadentry(void*); ...@@ -18,7 +18,10 @@ static void *threadentry(void*);
void __aeabi_read_tp(void) __attribute__((naked)); void __aeabi_read_tp(void) __attribute__((naked));
void cgo_tls_set_gm(void) __attribute__((naked)); void cgo_tls_set_gm(void) __attribute__((naked));
void cgo_tls_get_gm(void) __attribute__((naked)); void cgo_tls_get_gm(void) __attribute__((naked));
void __aeabi_read_tp(void) {
void
__aeabi_read_tp(void)
{
// b __kuser_get_tls @ 0xffff0fe0 // b __kuser_get_tls @ 0xffff0fe0
__asm__ __volatile__ ( __asm__ __volatile__ (
"mvn r0, #0xf000\n\t" "mvn r0, #0xf000\n\t"
...@@ -26,8 +29,11 @@ void __aeabi_read_tp(void) { ...@@ -26,8 +29,11 @@ void __aeabi_read_tp(void) {
"nop\n\tnop\n\t" "nop\n\tnop\n\t"
); );
} }
// g (R10) at 8(TP), m (R9) at 12(TP) // g (R10) at 8(TP), m (R9) at 12(TP)
void cgo_tls_get_gm(void) { void
cgo_tls_get_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -36,7 +42,10 @@ void cgo_tls_get_gm(void) { ...@@ -36,7 +42,10 @@ void cgo_tls_get_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
void cgo_tls_set_gm(void) {
void
cgo_tls_set_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -45,6 +54,7 @@ void cgo_tls_set_gm(void) { ...@@ -45,6 +54,7 @@ void cgo_tls_set_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
// both cgo_tls_{get,set}_gm can be called from runtime // both cgo_tls_{get,set}_gm can be called from runtime
void (*cgo_load_gm)(void) = cgo_tls_get_gm; void (*cgo_load_gm)(void) = cgo_tls_get_gm;
void (*cgo_save_gm)(void) = cgo_tls_set_gm; void (*cgo_save_gm)(void) = cgo_tls_set_gm;
......
...@@ -20,7 +20,10 @@ static void *threadentry(void*); ...@@ -20,7 +20,10 @@ static void *threadentry(void*);
void __aeabi_read_tp(void) __attribute__((naked)); void __aeabi_read_tp(void) __attribute__((naked));
void cgo_tls_set_gm(void) __attribute__((naked)); void cgo_tls_set_gm(void) __attribute__((naked));
void cgo_tls_get_gm(void) __attribute__((naked)); void cgo_tls_get_gm(void) __attribute__((naked));
void __aeabi_read_tp(void) {
void
__aeabi_read_tp(void)
{
// this function is only allowed to clobber r0 // this function is only allowed to clobber r0
__asm__ __volatile__ ( __asm__ __volatile__ (
"mrc p15, 0, r0, c13, c0, 3\n\t" "mrc p15, 0, r0, c13, c0, 3\n\t"
...@@ -32,8 +35,11 @@ void __aeabi_read_tp(void) { ...@@ -32,8 +35,11 @@ void __aeabi_read_tp(void) {
"mov pc, lr\n\t" "mov pc, lr\n\t"
); );
} }
// g (R10) at 8(TP), m (R9) at 12(TP) // g (R10) at 8(TP), m (R9) at 12(TP)
void cgo_tls_get_gm(void) { void
cgo_tls_get_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -42,7 +48,10 @@ void cgo_tls_get_gm(void) { ...@@ -42,7 +48,10 @@ void cgo_tls_get_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
void cgo_tls_set_gm(void) {
void
cgo_tls_set_gm(void)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"push {lr}\n\t" "push {lr}\n\t"
"bl __aeabi_read_tp\n\t" "bl __aeabi_read_tp\n\t"
...@@ -51,6 +60,7 @@ void cgo_tls_set_gm(void) { ...@@ -51,6 +60,7 @@ void cgo_tls_set_gm(void) {
"pop {pc}\n\t" "pop {pc}\n\t"
); );
} }
// both cgo_tls_{get,set}_gm can be called from runtime // both cgo_tls_{get,set}_gm can be called from runtime
void (*cgo_load_gm)(void) = cgo_tls_get_gm; void (*cgo_load_gm)(void) = cgo_tls_get_gm;
void (*cgo_save_gm)(void) = cgo_tls_set_gm; void (*cgo_save_gm)(void) = cgo_tls_set_gm;
......
...@@ -115,7 +115,9 @@ static uintptr eod[3] = {0, 1, 0}; ...@@ -115,7 +115,9 @@ static uintptr eod[3] = {0, 1, 0};
// LostProfileData is a no-op function used in profiles // LostProfileData is a no-op function used in profiles
// to mark the number of profiling stack traces that were // to mark the number of profiling stack traces that were
// discarded due to slow data writers. // discarded due to slow data writers.
static void LostProfileData(void) { static void
LostProfileData(void)
{
} }
// SetCPUProfileRate sets the CPU profiling rate. // SetCPUProfileRate sets the CPU profiling rate.
......
...@@ -128,6 +128,6 @@ runtime·racegostart(void *pc) ...@@ -128,6 +128,6 @@ runtime·racegostart(void *pc)
} }
void void
runtime·racegoend() runtime·racegoend(void)
{ {
} }
...@@ -184,7 +184,8 @@ runtime·checkgoarm(void) ...@@ -184,7 +184,8 @@ runtime·checkgoarm(void)
#pragma textflag 7 #pragma textflag 7
int64 int64
runtime·cputicks() { runtime·cputicks(void)
{
// Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1(). // Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1().
// runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler. // runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler.
// TODO: need more entropy to better seed fastrand1. // TODO: need more entropy to better seed fastrand1.
......
...@@ -232,7 +232,8 @@ runtime·setup_auxv(int32 argc, void *argv_list) ...@@ -232,7 +232,8 @@ runtime·setup_auxv(int32 argc, void *argv_list)
#pragma textflag 7 #pragma textflag 7
int64 int64
runtime·cputicks() { runtime·cputicks(void)
{
// Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1(). // Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1().
// runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler. // runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler.
// runtime·randomNumber provides better seeding of fastrand1. // runtime·randomNumber provides better seeding of fastrand1.
......
...@@ -170,7 +170,9 @@ static symbol_key sym_keys[] = { ...@@ -170,7 +170,9 @@ static symbol_key sym_keys[] = {
{ (byte*)"__vdso_clock_gettime", &runtime·__vdso_clock_gettime_sym }, { (byte*)"__vdso_clock_gettime", &runtime·__vdso_clock_gettime_sym },
}; };
static void vdso_init_from_sysinfo_ehdr(struct vdso_info *vdso_info, Elf64_Ehdr* hdr) { static void
vdso_init_from_sysinfo_ehdr(struct vdso_info *vdso_info, Elf64_Ehdr* hdr)
{
uint64 i; uint64 i;
bool found_vaddr = false; bool found_vaddr = false;
...@@ -237,7 +239,9 @@ static void vdso_init_from_sysinfo_ehdr(struct vdso_info *vdso_info, Elf64_Ehdr* ...@@ -237,7 +239,9 @@ static void vdso_init_from_sysinfo_ehdr(struct vdso_info *vdso_info, Elf64_Ehdr*
vdso_info->valid = true; vdso_info->valid = true;
} }
static int32 vdso_find_version(struct vdso_info *vdso_info, version_key* ver) { static int32
vdso_find_version(struct vdso_info *vdso_info, version_key* ver)
{
if(vdso_info->valid == false) { if(vdso_info->valid == false) {
return 0; return 0;
} }
...@@ -259,7 +263,9 @@ static int32 vdso_find_version(struct vdso_info *vdso_info, version_key* ver) { ...@@ -259,7 +263,9 @@ static int32 vdso_find_version(struct vdso_info *vdso_info, version_key* ver) {
return 0; return 0;
} }
static void vdso_parse_symbols(struct vdso_info *vdso_info, int32 version) { static void
vdso_parse_symbols(struct vdso_info *vdso_info, int32 version)
{
int32 i, j; int32 i, j;
if(vdso_info->valid == false) if(vdso_info->valid == false)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment