1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00

Rename dequeuethread.c to thread.c, move data from createthread.c to thread.c (#1464)

This commit is contained in:
Tharo 2022-12-13 03:12:28 +00:00 committed by GitHub
parent 880e7c937c
commit 0aff024c01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

2
spec
View file

@ -36,7 +36,7 @@ beginseg
include "build/src/libultra/os/initialize.o" include "build/src/libultra/os/initialize.o"
include "build/src/libultra/libc/ll.o" include "build/src/libultra/libc/ll.o"
include "build/src/libultra/os/exceptasm.o" include "build/src/libultra/os/exceptasm.o"
include "build/src/libultra/os/dequeuethread.o" include "build/src/libultra/os/thread.o"
include "build/src/libultra/os/destroythread.o" include "build/src/libultra/os/destroythread.o"
include "build/src/libultra/libc/bzero.o" include "build/src/libultra/libc/bzero.o"
include "build/src/libultra/os/parameters.o" include "build/src/libultra/os/parameters.o"

View file

@ -1,12 +1,6 @@
#include "global.h" #include "global.h"
#include "ultra64/asm.h" #include "ultra64/asm.h"
__OSThreadTail __osThreadTail = { NULL, OS_PRIORITY_THREADTAIL };
OSThread* __osRunQueue = (OSThread*)&__osThreadTail;
OSThread* __osActiveQueue = (OSThread*)&__osThreadTail;
OSThread* __osRunningThread = NULL;
OSThread* __osFaultedThread = NULL;
void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) { void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) {
register u32 prevInt; register u32 prevInt;
OSIntMask mask; OSIntMask mask;

View file

@ -1,5 +1,11 @@
#include "global.h" #include "global.h"
__OSThreadTail __osThreadTail = { NULL, OS_PRIORITY_THREADTAIL };
OSThread* __osRunQueue = (OSThread*)&__osThreadTail;
OSThread* __osActiveQueue = (OSThread*)&__osThreadTail;
OSThread* __osRunningThread = NULL;
OSThread* __osFaultedThread = NULL;
void __osDequeueThread(OSThread** queue, OSThread* thread) { void __osDequeueThread(OSThread** queue, OSThread* thread) {
register OSThread** a2 = queue; register OSThread** a2 = queue;
register OSThread* a3 = *a2; register OSThread* a3 = *a2;