sort nix/k10/fns.h more sensibly Reference: /n/atom/patch/applied/k10fnssort Date: Sun Sep 20 18:47:46 CES 2015 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/k10/fns.h Sun Sep 20 18:47:36 2015 +++ /sys/src/nix/k10/fns.h Sun Sep 20 18:47:37 2015 @@ -31,8 +31,8 @@ void fpuprocrestore(Proc*); void fpuprocsave(Proc*); void fpusysprocsetup(Proc*); -void fpusysrforkchild(Proc*, Proc*); void fpusysrfork(Ureg*); +void fpusysrforkchild(Proc*, Proc*); void gdtget(void*); void gdtput(int, u64int, u16int); char* getconf(char*); @@ -54,8 +54,8 @@ void idtput(int, u64int); int inb(int); u32int inl(int); -void insb(int, void*, int); ushort ins(int); +void insb(int, void*, int); void insl(int, void*, int); void inss(int, void*, int); int intrdisable(void*); @@ -93,14 +93,15 @@ void optionsinit(char*); void outb(int, int); void outl(int, u32int); -void outsb(int, void*, int); void outs(int, ushort); +void outsb(int, void*, int); void outsl(int, void*, int); void outss(int, void*, int); uintmem PADDR(void*); void pause(void); void physallocdump(void); void printcpufreq(void); +#define PTR2UINT(p) ((uintptr)(p)) void putcr0(u64int); void putcr3(u64int); void putcr4(u64int); @@ -110,33 +111,32 @@ int screenprint(char*, ...); /* debugging */ void sfence(void); void sipi(void); +void syscall(uint, Ureg*); void syscallentry(void); void syscallreturn(void); -void syscall(uint, Ureg*); void sysrforkret(void); void* tmpmap(uintmem); void tmpunmap(void*); void touser(uintptr); +void trap(Ureg*); void trapenable(int, void (*)(Ureg*, void*), void*, char*); void trapinit(void); -void trap(Ureg*); void trput(u64int); void tssrsp0(u64int); +#define UINT2PTR(i) ((void*)(i)) void umeminit(void); int userureg(Ureg*); #define validalign(adr, sz) /* x86 doesn't care */ void vctlinit(Vctl*); void* vintrenable(Vctl*, char*); +void* vmap(uintmem, usize); void* vmapoverlap(uintmem, usize); void* vmappat(uintmem, usize, uint); int vmapsync(uintptr); -void* vmap(uintmem, usize); void vsvminit(int); void vunmap(void*, usize); void writeconf(void); void wrmsr(u32int, u64int); -#define PTR2UINT(p) ((uintptr)(p)) -#define UINT2PTR(i) ((void*)(i)) int ainc8(void*); int cas32(void*, u32int, u32int); @@ -146,10 +146,10 @@ int tas32(void*); #define cas(p, e, n) cas32((p), (u32int)(e), (u32int)(n)) -#define casp(p, e, n) cas64((p), (u64int)(e), (u64int)(n)) +#define casp(p, e, n) cas64((p), (u64int)(e), (u64int)(n)) #define fas(p, v) ((int)fas32((u32int*)(p), (u32int)(v))) #define fasp(p, v) ((void*)fas64((u64int*)(p), (u64int)(v))) -#define tas(p) tas32(p) +#define tas(p) tas32(p) #define monmwait(v, o) ((int)monmwait32((u32int*)(v), (u32int)(o))) u32int (*monmwait32)(u32int*, u32int);