atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of Task_data_OP macro

Browse source 
This macro is so annoying. Can we please do away with it?
This commit is contained in:
N 2021-01-16 20:17:57 -05:00
parent 6c91534304
commit 926ef40c52
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/task.c
View file

@ -136,32 +136,17 @@ void TaskDummy(u8 taskId)
{ {
} }
#define TASK_DATA_OP(taskId, offset, op) \ #define TASK_SPACE NUM_TASKS - 2 // So we can insert the two tasks at the last two array elements
{ \
u32 tasksAddr = (u32)gTasks; \
u32 addr = taskId * sizeof(struct Task) + offset; \
u32 dataAddr = tasksAddr + offsetof(struct Task, data); \
addr += dataAddr; \
op; \
}
void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc) void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc)
{ {
TASK_DATA_OP(taskId, 28, *((u16 *)addr) = (u32)followupFunc) gTasks[taskId].data[TASK_SPACE] = (s16)((u32)followupFunc);
TASK_DATA_OP(taskId, 30, *((u16 *)addr) = (u32)followupFunc >> 16) gTasks[taskId].data[TASK_SPACE + 1] = (s16)((u32)followupFunc >> 16);
gTasks[taskId].func = func; gTasks[taskId].func = func;
} }
void SwitchTaskToFollowupFunc(u8 taskId) void SwitchTaskToFollowupFunc(u8 taskId)
{ {
s32 func; gTasks[taskId].func = (TaskFunc)((u16)(gTasks[taskId].data[TASK_SPACE]) | (gTasks[taskId].data[TASK_SPACE + 1] << 16));
gTasks[taskId].func = NULL;
TASK_DATA_OP(taskId, 28, func = *((u16 *)addr))
TASK_DATA_OP(taskId, 30, func |= *((s16 *)addr) << 16)
gTasks[taskId].func = (TaskFunc)func;
} }
bool8 FuncIsActiveTask(TaskFunc func) bool8 FuncIsActiveTask(TaskFunc func)
@ -183,7 +168,7 @@ u8 FindTaskIdByFunc(TaskFunc func)
if (gTasks[i].isActive == TRUE && gTasks[i].func == func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func)
return (u8)i; return (u8)i;
return 0xFF; return TAIL_SENTINEL; //No task found
} }
u8 GetTaskCount(void) u8 GetTaskCount(void)
@ -200,7 +185,7 @@ u8 GetTaskCount(void)
void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value)
{ {
if (dataElem < NUM_TASK_DATA - 1) if (dataElem <= TASK_SPACE)
{ {
gTasks[taskId].data[dataElem] = value; gTasks[taskId].data[dataElem] = value;
gTasks[taskId].data[dataElem + 1] = value >> 16; gTasks[taskId].data[dataElem + 1] = value >> 16;
@ -209,7 +194,7 @@ void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value)
u32 GetWordTaskArg(u8 taskId, u8 dataElem) u32 GetWordTaskArg(u8 taskId, u8 dataElem)
{ {
if (dataElem < NUM_TASK_DATA - 1) if (dataElem <= TASK_SPACE)
return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16); return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16);
else else
return 0; return 0;