X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2Finclude%2Fstdlib.h;h=0e6d9e034f8f0380fb6f4378d237591f90f12010;hb=3e29ef3929531865fe4b669b09609baa8158af66;hp=9dd720e71015547760d7cd707b94db2d2a147e35;hpb=71127582530c214c99852fda37f7e5296774a26f;p=tpg%2Facess2.git

diff --git a/Usermode/include/stdlib.h b/Usermode/include/stdlib.h
index 9dd720e7..0e6d9e03 100644
--- a/Usermode/include/stdlib.h
+++ b/Usermode/include/stdlib.h
@@ -1,43 +1,45 @@
 /*
-AcessOS LibC
-
-stdlib.h
-*/
+ * AcessOS LibC
+ * stdlib.h
+ */
 #ifndef __STDLIB_H
 #define __STDLIB_H
 
+#include <stddef.h>
 #include <stdarg.h>
 #include <sys/types.h>
 
-#ifndef NULL
-# define NULL	((void*)0)
-#endif
-
 #define EXIT_FAILURE	1
 #define EXIT_SUCCESS	0
 
-typedef unsigned int	size_t;
-
-// --- Spinlock Macros ---
+/* --- Spinlock Macros --- */
+/* TODO: Support non-x86 architectures */
 #define DEFLOCK(_name)	static int _spinlock_##_name=0;
-//#define LOCK(_name)	__asm__ __volatile__("jmp ._tst;\n\t._lp:call yield;\n\t._tst:lock btsl $1,(%0);\n\tjc ._lp"::"D"(&_spinlock_##_name))
-#define LOCK(_name)	do{int v=1;while(v){__asm__ __volatile__("lock cmpxchgl %%eax, (%1)":"=a"(v):"D"((&_spinlock_##_name)),"a"(1));yield();}}while(0)
+#define LOCK(_name)	do{int v=1;while(v){__asm__ __volatile__("lock cmpxchgl %0, (%1)":"=a"(v):"D"((&_spinlock_##_name)),"a"(1));yield();}}while(0)
 #define UNLOCK(_name) __asm__ __volatile__("lock andl $0, (%0)"::"D"(&_spinlock_##_name))
 
-// --- StdLib ---
+/* --- StdLib --- */
+extern void	_exit(int code) __attribute__((noreturn));	/* NOTE: Also defined in acess/sys.h */
 extern int	atoi(const char *ptr);
 extern void	exit(int status) __attribute__((noreturn));
-extern void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
+extern void	atexit(void (*__func)(void));
+extern void	qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
 
-// --- Environment ---
+/* --- Environment --- */
 extern char	*getenv(const char *name);
 
-// --- Heap ---
-extern void free(void *mem);
-extern void *malloc(unsigned int bytes);
-extern void *realloc(void *oldPos, unsigned int bytes);
+/* --- Heap --- */
+extern void	free(void *mem);
+extern void	*malloc(size_t bytes);
+extern void	*calloc(size_t __nmemb, size_t __size);
+extern void	*realloc(void *__ptr, size_t __size);
 extern int	IsHeap(void *ptr);
 
+/* --- Random --- */
+extern void	srand(unsigned int seed);
+extern int	rand(void);
+extern int	rand_p(unsigned int *seedp);
+
 #ifndef SEEK_CUR
 # define SEEK_CUR	0
 # define SEEK_SET	1