buff up ancient interfaces, even if they are not able to handle usize != ulong. Reference: /n/atom/patch/applied/9usize Date: Sun Aug 16 05:30:17 CES 2015 Signed-off-by: quanstro@quanstro.net --- /sys/src/9/port/alloc.c Sun Aug 16 05:29:52 2015 +++ /sys/src/9/port/alloc.c Sun Aug 16 05:29:53 2015 @@ -166,7 +166,7 @@ void* -smalloc(ulong size) +smalloc(usize size) { void *v; @@ -186,7 +186,7 @@ } void* -malloc(ulong size) +malloc(usize size) { void *v; @@ -203,7 +203,7 @@ } void* -mallocz(ulong size, int clr) +mallocz(usize size, int clr) { void *v; @@ -219,7 +219,7 @@ } void* -mallocalign(ulong size, ulong align, long offset, ulong span) +mallocalign(usize size, usize align, long offset, usize span) { void *v; @@ -242,7 +242,7 @@ } void* -realloc(void *v, ulong size) +realloc(void *v, usize size) { void *nv; @@ -260,14 +260,14 @@ return nv; } -ulong +usize msize(void *v) { return poolmsize(mainmem, (ulong*)v-Npadlong)-Npadlong*sizeof(ulong); } void* -calloc(ulong n, ulong szelem) +calloc(usize n, usize szelem) { void *v; if(v = mallocz(n*szelem, 1)) @@ -275,8 +275,8 @@ return v; } -void -setmalloctag(void *v, ulong pc) +uintptr +setmalloctag(void *v, uintptr pc) { ulong *u; USED(v, pc); @@ -287,7 +287,7 @@ } void -setrealloctag(void *v, ulong pc) +setrealloctag(void *v, uintptr pc) { ulong *u; USED(v, pc); @@ -297,7 +297,7 @@ u[-Npadlong+ReallocOffset] = pc; } -ulong +uintptr getmalloctag(void *v) { USED(v); @@ -306,7 +306,7 @@ return ((ulong*)v)[-Npadlong+MallocOffset]; } -ulong +uintptr getrealloctag(void *v) { USED(v); --- /sys/src/9/port/debugalloc.c Sun Aug 16 05:29:56 2015 +++ /sys/src/9/port/debugalloc.c Sun Aug 16 05:29:57 2015 @@ -372,12 +372,12 @@ Lock pcxlock; struct { - ulong n; - ulong pc; + usize n; + uintptr pc; } pcx[1024]; static void -remember(ulong pc, void *v) +remember(uintptr pc, void *v) { Bhdr *b; int i; @@ -419,7 +419,7 @@ } void* -malloc(ulong size) +malloc(usize size) { void *v; @@ -431,7 +431,7 @@ } void* -smalloc(ulong size) +smalloc(usize size) { void *v; @@ -447,7 +447,7 @@ } void* -mallocz(ulong size, int clr) +mallocz(usize size, int clr) { void *v; @@ -471,7 +471,7 @@ } void* -realloc(void *v, ulong size) +realloc(void *v, usize size) { Bhdr *b; void *nv; @@ -495,7 +495,7 @@ return nv; } -int +usize msize(void *v) { Bhdr *b; @@ -505,7 +505,7 @@ } void* -calloc(ulong n, ulong szelem) +calloc(usize n, usize szelem) { return malloc(n*szelem); } @@ -596,7 +596,7 @@ } void -poolsetparam(char *name, ulong maxsize, int quanta, int chunk) +poolsetparam(char *name, usize maxsize, int quanta, int chunk) { Pool *p; int i; --- /sys/src/9/port/qmalloc.c Sun Aug 16 05:29:59 2015 +++ /sys/src/9/port/qmalloc.c Sun Aug 16 05:30:01 2015 @@ -351,7 +351,7 @@ rover = q; } -ulong +usize msize(void* ap) { Header *p; @@ -499,7 +499,7 @@ } void* -malloc(ulong size) +malloc(usize size) { void* v; @@ -510,7 +510,7 @@ } void* -mallocz(ulong size, int clr) +mallocz(usize size, int clr) { void *v; @@ -521,7 +521,7 @@ } void* -mallocalign(ulong nbytes, ulong align, long offset, ulong span) +mallocalign(usize nbytes, usize align, long offset, usize span) { void *v; @@ -542,7 +542,7 @@ } void* -smalloc(ulong size) +smalloc(usize size) { void *v; @@ -554,7 +554,7 @@ } void* -realloc(void* ap, ulong size) +realloc(void* ap, usize size) { void *v; Header *p; --- /sys/src/9/port/xalloc.c Sun Aug 16 05:30:03 2015 +++ /sys/src/9/port/xalloc.c Sun Aug 16 05:30:04 2015 @@ -93,7 +93,7 @@ } void* -xspanalloc(ulong size, int align, ulong span) +xspanalloc(usize size, int align, usize span) { ulong a, v, t; @@ -120,7 +120,7 @@ } void* -xallocz(ulong size, int zero) +xallocz(usize size, int zero) { Xhdr *p; Hole *h, **l; @@ -206,7 +206,7 @@ } void -xhole(ulong addr, ulong size) +xhole(usize addr, usize size) { ulong top; Hole *h, *c, **l;