cleanup: use macro for gp register get/set

Author: uyjulian

iop/kernel/include/defs.h

@@ -26,7 +26,9 @@ extern "C" {
 #define NULL	((void *)0)
 #endif
 
+#ifndef ALIGN
 #define ALIGN(x, align)	(((x)+((align)-1))&~((align)-1))
+#endif
 
 #define PHYSADDR(a)	(((u32)(a)) & 0x1fffffff)
 

iop/system/loadcore/src/loadcore.c

@@ -12,6 +12,7 @@
 #include "irx_imports.h"
 #include "kerr.h"
 #include "xloadcore.h"
+#include <defs.h>
 
 extern struct irx_export_table _exp_loadcore;
 
@@ -432,7 +433,7 @@ void loadcore_init(boot_params *in_params)
 						next.callback = (void *)*stack_reboot_handlers;
 						if ( i == 3 )
 							next.callback = (void *)*reboot_handler_ptr;
-						__asm__ __volatile__("\tmove $gp, %0\n" : : "r"(reboot_handler_ptr[1]));
+						SetGP((void *)reboot_handler_ptr[1]);
 						((BootupCallback_t)(*reboot_handler_ptr & (~3)))(&next, 1);
 					}
 					reboot_handler_ptr += 2;
@@ -565,12 +566,11 @@ int *QueryBootMode(int mode)
 
 int AddRebootNotifyHandler(BootupCallback_t func, int priority, int *stat)
 {
-	u32 gp_val;
+	void *gp_val;
 	iop_init_entry_t next;
 
 	next.callback = (void *)1;
-	gp_val = 0;
-	__asm__ __volatile__("\tmove %0, $gp\n" : "=r"(gp_val) :);
+	gp_val = GetGP();
 
 	if ( !reboot_handlers )
 	{
@@ -583,7 +583,7 @@ int AddRebootNotifyHandler(BootupCallback_t func, int priority, int *stat)
 	}
 
 	reboot_handlers[0] = (u32)func + (priority & 3);
-	reboot_handlers[1] = gp_val;
+	reboot_handlers[1] = (u32)gp_val;
 	reboot_handlers += 2;
 	reboot_handlers[0] = 0;
 	return 1;

iop/system/threadman/src/include/thcommon.h

@@ -24,6 +24,9 @@
 #define HANDLE_VERIFY(handle, t) (((struct heaptag *)(HANDLE_PTR(handle)))->tag == (t) && \
                                   HANDLE_ID(handle) == ((struct heaptag *)(HANDLE_PTR(handle)))->id)
 
+#ifdef ALIGN
+#undef ALIGN
+#endif
 #define ALIGN(i)     (((i) + 3) & (~3))
 #define ALIGN_256(i) (((i) + 0xff) & (~0xff))
 
@@ -164,7 +167,7 @@ struct thread
     void *entry;
     void *stack_top;
     u32 stack_size;
-    u32 gp;
+    void *gp;
     u32 attr;
     u32 option;
     // nothing seems to use wait_return, would be $ra

iop/system/threadman/src/thbase.c

@@ -7,6 +7,7 @@
 #include "thsemap.h"
 #include "xthbase.h"
 #include "xtimrman.h"
+#include <defs.h>
 
 #include "thcommon.h"
 
@@ -73,9 +74,7 @@ int CreateThread(iop_thread_t *thparam)
     thread->attr          = thparam->attr;
     thread->option        = thparam->option;
     thread->status        = THS_DORMANT;
-
-    __asm__ __volatile__("sw $gp, %0\n"
-                     : "=m"(thread->gp)::);
+    thread->gp            = GetGP();
 
     list_insert(&thctx.thread_list, &thread->thread_list);
 

iop/system/threadman/src/thcommon.c

@@ -8,6 +8,7 @@
 #include "loadcore.h"
 #include "sysclib.h"
 #include "stdio.h"
+#include <defs.h>
 
 #include <limits.h>
 
@@ -205,7 +206,7 @@ int thread_init_and_start(struct thread *thread, int intr_state)
     thread->saved_regs->sp  = (u32)&thread->saved_regs[1];
     thread->saved_regs->fp  = thread->saved_regs->sp;
     thread->saved_regs->ra  = (u32)ExitThread;
-    thread->saved_regs->gp  = thread->gp;
+    thread->saved_regs->gp  = (u32)thread->gp;
     thread->saved_regs->sr  = 0x404;
     thread->saved_regs->sr |= thread->attr & 8;
     thread->saved_regs->pc     = (u32)thread->entry;
@@ -650,13 +651,11 @@ int _start(int argc, char **argv)
     idle->entry         = idle_thread;
     idle->saved_regs    = idle->stack_top + (((idle->stack_size << 2) >> 2) - RESERVED_REGCTX_SIZE);
     memset(idle->saved_regs, 0, RESERVED_REGCTX_SIZE);
-
-    __asm__ __volatile__("sw $gp, %0\n"
-                     : "=m"(idle->gp)::);
+    idle->gp = GetGP();
 
     idle->saved_regs->unk = -2;
     idle->saved_regs->sp  = (u32)&idle->saved_regs[1];
-    idle->saved_regs->gp  = idle->gp;
+    idle->saved_regs->gp  = (u32)idle->gp;
     idle->saved_regs->fp  = idle->saved_regs->sp;
     idle->saved_regs->ra  = (u32)ExitThread;
     idle->saved_regs->sr  = (idle->attr & 0xF0000000) | 0x404;
@@ -679,9 +678,7 @@ int _start(int argc, char **argv)
     current->priority      = 1;
     current->attr          = TH_C;
     current->status        = THS_RUN;
-
-    __asm__ __volatile__("sw $gp, %0\n"
-                     : "=m"(current->gp)::);
+    current->gp            = GetGP();
 
     list_insert(&thctx.thread_list, &current->thread_list);
     thctx.current_thread = current;