diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-08-17 09:32:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-17 09:32:56 -0700 |
| commit | be86fa2c2f2a0fdf1918428a650da6179acff83e (patch) | |
| tree | abd07dfc0c7edb546f06fcb0fbed77a1a5ee1f18 | |
| parent | e5f9a888e6f4424fe6da280175c3c1e64d948e33 (diff) | |
getcurrentms (0073A0) OK (#59)
* func_8002BFA0_jp OK
* rename
* format
* PR
| -rw-r--r-- | include/boot_functions.h | 2 | ||||
| -rw-r--r-- | include/getcurrentms.h | 8 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_boot.txt | 2 | ||||
| -rw-r--r-- | src/boot/O2/getcurrentms.c | 6 | ||||
| -rw-r--r-- | src/boot/O2/loadfragment2.c | 2 | ||||
| -rw-r--r-- | src/boot/boot_main.c | 2 | ||||
| -rw-r--r-- | yamls/jp/boot.yaml | 2 |
7 files changed, 18 insertions, 6 deletions
diff --git a/include/boot_functions.h b/include/boot_functions.h index 0716d54..26177fa 100644 --- a/include/boot_functions.h +++ b/include/boot_functions.h @@ -16,8 +16,6 @@ // void func_8002BF08_jp(); // void func_8002BF78_jp(); -// void func_8002BFA0_jp(); - // void func_8003B960_jp(); // void func_8003B9B0_jp(); // void func_8003B9E0_jp(); diff --git a/include/getcurrentms.h b/include/getcurrentms.h new file mode 100644 index 0000000..84782cc --- /dev/null +++ b/include/getcurrentms.h @@ -0,0 +1,8 @@ +#ifndef GET_CURRENT_MS_H +#define GET_CURRENT_MS_H + +#include "ultra64.h" + +u32 GetCurrentMilliseconds(void); + +#endif diff --git a/linker_scripts/jp/symbol_addrs_boot.txt b/linker_scripts/jp/symbol_addrs_boot.txt index 1d97817..dca47b7 100644 --- a/linker_scripts/jp/symbol_addrs_boot.txt +++ b/linker_scripts/jp/symbol_addrs_boot.txt @@ -168,7 +168,7 @@ func_8002BE6C_jp = 0x8002BE6C; // type:func func_8002BF08_jp = 0x8002BF08; // type:func func_8002BF78_jp = 0x8002BF78; // type:func -func_8002BFA0_jp = 0x8002BFA0; // type:func +GetCurrentMilliseconds = 0x8002BFA0; // type:func PadSetup_Init = 0x8002BFF0; // type:func diff --git a/src/boot/O2/getcurrentms.c b/src/boot/O2/getcurrentms.c new file mode 100644 index 0000000..c7f0bd4 --- /dev/null +++ b/src/boot/O2/getcurrentms.c @@ -0,0 +1,6 @@ +#include "getcurrentms.h" + +// original name unknown +u32 GetCurrentMilliseconds(void) { + return (osGetTime() * 1000ULL) / OS_CPU_COUNTER; +} diff --git a/src/boot/O2/loadfragment2.c b/src/boot/O2/loadfragment2.c index f9fe629..fdb6938 100644 --- a/src/boot/O2/loadfragment2.c +++ b/src/boot/O2/loadfragment2.c @@ -12,7 +12,7 @@ void DoRelocation(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart); -// Unknown original name +// original name unknown s32 Overlay_Load(RomOffset vromStart, RomOffset vromEnd, void* ovlStart, void* ovlEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs) { OverlayRelocationSection* ovl = ovlRelocs; diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index d2167ba..9269248 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -13,7 +13,7 @@ StackEntry sBootStackInfo; OSThread sIdleThread; STACK(sBootStack, 0x400); -// Unknown original name +// original name unknown void bootclear(void) { s32 size = (uintptr_t)bootclear - BOOT_ADDRESS_ULTRA; diff --git a/yamls/jp/boot.yaml b/yamls/jp/boot.yaml index d0c65db..65f220e 100644 --- a/yamls/jp/boot.yaml +++ b/yamls/jp/boot.yaml @@ -28,7 +28,7 @@ - [0x007000, asm, boot/libu64/debug] - [0x007060, asm, boot/007060] - - [0x0073A0, asm, boot/0073A0] + - [0x0073A0, c, boot/O2/getcurrentms] - [0x0073F0, c, boot/O2/padsetup] # libc64 |