shithub: riscv

Info  •  Files  •  Log  •  Branches

malloc: change malloc and realloc tag types to uintptr

--- a/sys/include/libc.h

+++ b/sys/include/libc.h

@@ -97,10 +97,10 @@

 extern	void*	mallocalign(ulong, ulong, long, ulong);

 extern	void*	calloc(ulong, ulong);

 extern	void*	realloc(void*, ulong);

-extern	void	setmalloctag(void*, ulong);

-extern	void	setrealloctag(void*, ulong);

-extern	ulong	getmalloctag(void*);

-extern	ulong	getrealloctag(void*);

+extern	void	setmalloctag(void*, uintptr);

+extern	void	setrealloctag(void*, uintptr);

+extern	uintptr	getmalloctag(void*);

+extern	uintptr	getrealloctag(void*);

 extern	void*	malloctopoolblock(void*);

 /*

--- a/sys/src/9/port/alloc.c

+++ b/sys/src/9/port/alloc.c

@@ -135,7 +135,7 @@

 /* - except the code for smalloc(), which lives only in the kernel. */

 /*

- * Npadlong is the number of 32-bit longs to leave at the beginning of 

+ * Npadlong is the number of uintptr's to leave at the beginning of 

  * each allocated buffer for our own bookkeeping.  We return to the callers

  * a pointer that points immediately after our bookkeeping area.  Incoming pointers

  * must be decremented by that much, and outgoing pointers incremented.

@@ -171,7 +171,7 @@

 	void *v;

 	for(;;) {

-		v = poolalloc(mainmem, size+Npadlong*sizeof(ulong));

+		v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr));

 		if(v != nil)

 			break;

 		if(!waserror()){

@@ -180,7 +180,7 @@

 		}

 	}

 	if(Npadlong){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 	}

 	memset(v, 0, size);

@@ -192,11 +192,11 @@

 {

 	void *v;

-	v = poolalloc(mainmem, size+Npadlong*sizeof(ulong));

+	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr));

 	if(v == nil)

 		return nil;

 	if(Npadlong){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -209,9 +209,9 @@

 {

 	void *v;

-	v = poolalloc(mainmem, size+Npadlong*sizeof(ulong));

+	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr));

 	if(Npadlong && v != nil){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -225,9 +225,9 @@

 {

 	void *v;

-	v = poolallocalign(mainmem, size+Npadlong*sizeof(ulong), align, offset-Npadlong*sizeof(ulong), span);

+	v = poolallocalign(mainmem, size+Npadlong*sizeof(uintptr), align, offset-Npadlong*sizeof(uintptr), span);

 	if(Npadlong && v != nil){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -240,7 +240,7 @@

 free(void *v)

 {

 	if(v != nil)

-		poolfree(mainmem, (ulong*)v-Npadlong);

+		poolfree(mainmem, (uintptr*)v-Npadlong);

 }

 void*

@@ -249,12 +249,12 @@

 	void *nv;

 	if(v != nil)

-		v = (ulong*)v-Npadlong;

+		v = (uintptr*)v-Npadlong;

 	if(Npadlong !=0 && size != 0)

-		size += Npadlong*sizeof(ulong);

+		size += Npadlong*sizeof(uintptr);

 	if(nv = poolrealloc(mainmem, v, size)){

-		nv = (ulong*)nv+Npadlong;

+		nv = (uintptr*)nv+Npadlong;

 		setrealloctag(nv, getcallerpc(&v));

 		if(v == nil)

 			setmalloctag(nv, getcallerpc(&v));

@@ -265,7 +265,7 @@

 ulong

 msize(void *v)

 {

-	return poolmsize(mainmem, (ulong*)v-Npadlong)-Npadlong*sizeof(ulong);

+	return poolmsize(mainmem, (uintptr*)v-Npadlong)-Npadlong*sizeof(uintptr);

 }

 void*

@@ -278,9 +278,9 @@

 }

 void

-setmalloctag(void *v, ulong pc)

+setmalloctag(void *v, uintptr pc)

 {

-	ulong *u;

+	uintptr *u;

 	USED(v, pc);

 	if(Npadlong <= MallocOffset || v == nil)

 		return;

@@ -289,9 +289,9 @@

 }

 void

-setrealloctag(void *v, ulong pc)

+setrealloctag(void *v, uintptr pc)

 {

-	ulong *u;

+	uintptr *u;

 	USED(v, pc);

 	if(Npadlong <= ReallocOffset || v == nil)

 		return;

@@ -299,20 +299,20 @@

 	u[-Npadlong+ReallocOffset] = pc;

 }

-ulong

+uintptr

 getmalloctag(void *v)

 {

 	USED(v);

 	if(Npadlong <= MallocOffset)

 		return ~0;

-	return ((ulong*)v)[-Npadlong+MallocOffset];

+	return ((uintptr*)v)[-Npadlong+MallocOffset];

 }

-ulong

+uintptr

 getrealloctag(void *v)

 {

 	USED(v);

 	if(Npadlong <= ReallocOffset)

-		return ((ulong*)v)[-Npadlong+ReallocOffset];

+		return ((uintptr*)v)[-Npadlong+ReallocOffset];

 	return ~0;

 }

--- a/sys/src/libc/port/malloc.c

+++ b/sys/src/libc/port/malloc.c

@@ -170,7 +170,7 @@

 /* - except the code for malloc(), which alternately doesn't clear or does. - */

 /*

- * Npadlong is the number of 32-bit longs to leave at the beginning of 

+ * Npadlong is the number of uintptr's to leave at the beginning of 

  * each allocated buffer for our own bookkeeping.  We return to the callers

  * a pointer that points immediately after our bookkeeping area.  Incoming pointers

  * must be decremented by that much, and outgoing pointers incremented.

@@ -204,9 +204,9 @@

 {

 	void *v;

-	v = poolalloc(mainmem, size+Npadlong*sizeof(ulong));

+	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr));

 	if(Npadlong && v != nil) {

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -218,9 +218,9 @@

 {

 	void *v;

-	v = poolalloc(mainmem, size+Npadlong*sizeof(ulong));

+	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr));

 	if(Npadlong && v != nil){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -234,9 +234,9 @@

 {

 	void *v;

-	v = poolallocalign(mainmem, size+Npadlong*sizeof(ulong), align, offset-Npadlong*sizeof(ulong), span);

+	v = poolallocalign(mainmem, size+Npadlong*sizeof(uintptr), align, offset-Npadlong*sizeof(uintptr), span);

 	if(Npadlong && v != nil){

-		v = (ulong*)v+Npadlong;

+		v = (uintptr*)v+Npadlong;

 		setmalloctag(v, getcallerpc(&size));

 		setrealloctag(v, 0);

 	}

@@ -247,7 +247,7 @@

 free(void *v)

 {

 	if(v != nil)

-		poolfree(mainmem, (ulong*)v-Npadlong);

+		poolfree(mainmem, (uintptr*)v-Npadlong);

 }

 void*

@@ -261,11 +261,11 @@

 	}

 	if(v)

-		v = (ulong*)v-Npadlong;

-	size += Npadlong*sizeof(ulong);

+		v = (uintptr*)v-Npadlong;

+	size += Npadlong*sizeof(uintptr);

 	if(nv = poolrealloc(mainmem, v, size)){

-		nv = (ulong*)nv+Npadlong;

+		nv = (uintptr*)nv+Npadlong;

 		setrealloctag(nv, getcallerpc(&v));

 		if(v == nil)

 			setmalloctag(nv, getcallerpc(&v));

@@ -276,7 +276,7 @@

 ulong

 msize(void *v)

 {

-	return poolmsize(mainmem, (ulong*)v-Npadlong)-Npadlong*sizeof(ulong);

+	return poolmsize(mainmem, (uintptr*)v-Npadlong)-Npadlong*sizeof(uintptr);

 }

 void*

@@ -292,9 +292,9 @@

 }

 void

-setmalloctag(void *v, ulong pc)

+setmalloctag(void *v, uintptr pc)

 {

-	ulong *u;

+	uintptr *u;

 	USED(v, pc);

 	if(Npadlong <= MallocOffset || v == nil)

 		return;

@@ -303,9 +303,9 @@

 }

 void

-setrealloctag(void *v, ulong pc)

+setrealloctag(void *v, uintptr pc)

 {

-	ulong *u;

+	uintptr *u;

 	USED(v, pc);

 	if(Npadlong <= ReallocOffset || v == nil)

 		return;

@@ -313,21 +313,21 @@

 	u[-Npadlong+ReallocOffset] = pc;

 }

-ulong

+uintptr

 getmalloctag(void *v)

 {

 	USED(v);

 	if(Npadlong <= MallocOffset)

 		return ~0;

-	return ((ulong*)v)[-Npadlong+MallocOffset];

+	return ((uintptr*)v)[-Npadlong+MallocOffset];

 }

-ulong

+uintptr

 getrealloctag(void *v)

 {

 	USED(v);

 	if(Npadlong <= ReallocOffset)

-		return ((ulong*)v)[-Npadlong+ReallocOffset];

+		return ((uintptr*)v)[-Npadlong+ReallocOffset];

 	return ~0;

 }

@@ -337,5 +337,5 @@

 	if(v == nil)

 		return nil;

-	return &((ulong*)v)[-Npadlong];

+	return &((uintptr*)v)[-Npadlong];

 }

-- 

⑨