implement __getreent syscall (#151)

* use getreent syscall
* use global reent macro

also fixes libogc build

Author: WinterMute

Makefile

@@ -146,7 +146,7 @@ OGCOBJ		:=	\
 			gx.o gu.o gu_psasm.o audio.o cache.o decrementer.o			\
 			message.o card.o aram.o depackrnc.o decrementer_handler.o	\
 			depackrnc1.o dsp.o si.o tpl.o ipc.o ogc_crt0.o \
-			console_font_8x16.o timesupp.o lock_supp.o newlibc.o usbgecko.o usbmouse.o \
+			console_font_8x16.o timesupp.o lock_supp.o usbgecko.o usbmouse.o \
 			sbrk.o malloc_lock.o kprintf.o stm.o aes.o sha.o ios.o es.o isfs.o usb.o network_common.o \
 			sdgecko_io.o sdgecko_buf.o gcsd.o argv.o network_wii.o wiisd.o conf.o usbstorage.o \
 			texconv.o wiilaunch.o

gc/ogc/lwp_threads.h

@@ -66,7 +66,6 @@ extern vu32 _context_switch_want;
 extern vu32 _thread_dispatch_disable_level;
 
 extern wd_cntrl _lwp_wd_timeslice;
-extern void **__lwp_thr_libc_reent;
 extern lwp_queue _lwp_thr_ready[];
 
 void __thread_dispatch();

libogc/lwp_threads.c

@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/iosupport.h>
+
 #include "asm.h"
 #include "processor.h"
 #include "lwp_stack.h"
@@ -35,7 +37,6 @@ vu32 _thread_dispatch_disable_level;
 
 wd_cntrl _lwp_wd_timeslice;
 u32 _lwp_ticks_per_timeslice = 0;
-void **__lwp_thr_libc_reent = NULL;
 lwp_queue _lwp_thr_ready[LWP_MAXPRIORITIES];
 
 static void (*_lwp_exitfunc)(void);
@@ -47,10 +48,6 @@ extern void _cpu_context_restore(void *);
 extern void _cpu_context_save_fp(void *);
 extern void _cpu_context_restore_fp(void *);
 
-extern int __libc_create_hook(lwp_cntrl *,lwp_cntrl *);
-extern int __libc_start_hook(lwp_cntrl *,lwp_cntrl *);
-extern int __libc_delete_hook(lwp_cntrl *, lwp_cntrl *);
-
 extern void kprintf(const char *str, ...);
 
 #ifdef _LWPTHREADS_DEBUG
@@ -80,6 +77,13 @@ void __lwp_dumpcontext_fp(lwp_cntrl *thrA,lwp_cntrl *thrB)
 }
 #endif
 
+struct _reent* __SYSCALL(getreent)()
+{
+	if ( _thr_executing == NULL || _thr_executing->libc_reent == NULL) return _GLOBAL_REENT;
+
+	return _thr_executing->libc_reent;
+}
+
 /*
 void __lwp_getthreadlist(lwp_obj **thrs)
 {
@@ -193,10 +197,6 @@ void __thread_dispatch(void)
 		_thr_executing = heir;
 		_CPU_ISR_Restore(level);
 
-		if(__lwp_thr_libc_reent) {
-			exec->libc_reent = *__lwp_thr_libc_reent;
-			*__lwp_thr_libc_reent = heir->libc_reent;
-		}
 #ifdef _DEBUG
 		_cpu_context_switch_ex((void*)&exec->context,(void*)&heir->context);
 #else
@@ -617,7 +617,7 @@ u32 __lwp_thread_init(lwp_cntrl *thethread,void *stack_area,u32 stack_size,u32 p
 	thethread->res_cnt = 0;
 	__lwp_thread_setpriority(thethread,prio);
 
-	__libc_create_hook(_thr_executing,thethread);
+	thethread->libc_reent = NULL;
 
 	return 1;
 }
@@ -646,7 +646,10 @@ void __lwp_thread_close(lwp_cntrl *thethread)
 	thethread->budget_algo = LWP_CPU_BUDGET_ALGO_NONE;
 	_CPU_ISR_Restore(level);
 
-	__libc_delete_hook(_thr_executing,thethread);
+	struct _reent *ptr = thethread->libc_reent;
+	_reclaim_reent(ptr);
+	free(ptr);
+	thethread->libc_reent = NULL;
 
 	if(__lwp_thread_isallocatedfp(thethread))
 		__lwp_thread_deallocatefp();
@@ -701,7 +704,12 @@ u32 __lwp_thread_start(lwp_cntrl *thethread,void* (*entry)(void*),void *arg)
 		thethread->arg = arg;
 		__lwp_thread_loadenv(thethread);
 		__lwp_thread_ready(thethread);
-		__libc_start_hook(_thr_executing,thethread);
+		struct _reent *ptr= (struct _reent*)calloc(1,sizeof(struct _reent));
+		if(!ptr) abort();
+
+		_REENT_INIT_PTR((ptr));
+
+		thethread->libc_reent = ptr;
 		return 1;
 	}
 	return 0;

libogc/lwp_threads.inl

@@ -60,16 +60,6 @@ static __inline__ void __lwp_thread_unblock(lwp_cntrl *thethread)
 	__lwp_thread_clearstate(thethread,LWP_STATES_BLOCKED);
 }
 
-static __inline__ void** __lwp_thread_getlibcreent(void)
-{
-	return __lwp_thr_libc_reent;
-}
-
-static __inline__ void __lwp_thread_setlibcreent(void **libc_reent)
-{
-	__lwp_thr_libc_reent = libc_reent;
-}
-
 static __inline__ bool __lwp_thread_isswitchwant(void)
 {
 

libogc/newlibc.c

@@ -186,7 +186,6 @@ extern void __irq_init(void);
 extern void __lwp_start_multitasking(void);
 extern void __timesystem_init(void);
 extern void __memlock_init(void);
-extern void __libc_init(int);
 
 extern void __libogc_malloc_lock( struct _reent *ptr );
 extern void __libogc_malloc_unlock( struct _reent *ptr );
@@ -1102,7 +1101,6 @@ void SYS_Init(void)
 	IRQ_Request(IRQ_PI_RSW,__RSWHandler,NULL);
 	__MaskIrq(IRQMASK(IRQ_PI_RSW));
 #endif
-	__libc_init(1);
 	__lwp_thread_startmultitasking();
 	_CPU_ISR_Restore(level);
 }