summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2024-12-26 07:33:00 -0800
committerGitHub <noreply@github.com>2024-12-26 08:33:00 -0700
commit7ba4585497a63eb64e7ca33aa53ca22695760739 (patch)
treea381133813b0f292e2d74f792e576123eb2bd6ee
parentb73a19dd984550595575f946db7366bcc488a41b (diff)
Move D_8003C568_jp from system_heap (#231)
-rw-r--r--include/libc64/fp.h4
-rw-r--r--linker_scripts/jp/symbol_addrs_boot.txt6
-rw-r--r--src/boot/O2/system_heap.c5
-rw-r--r--yamls/jp/boot.yaml2
4 files changed, 9 insertions, 8 deletions
diff --git a/include/libc64/fp.h b/include/libc64/fp.h
index aab022e..0bc47ec 100644
--- a/include/libc64/fp.h
+++ b/include/libc64/fp.h
@@ -28,6 +28,10 @@ f64 round(f64 x);
s32 lroundf(f32 x);
s32 lround(f64 x);
+extern f32 gPositiveInfinity;
+extern f32 gNegativeInfinity;
+extern f32 gPositiveZero;
+extern f32 gNegativeZero;
extern f32 qNaN0x3FFFFF;
extern f32 qNaN0x10000;
extern f32 sNaN0x3FFFFF;
diff --git a/linker_scripts/jp/symbol_addrs_boot.txt b/linker_scripts/jp/symbol_addrs_boot.txt
index 488fcf2..3bf0bff 100644
--- a/linker_scripts/jp/symbol_addrs_boot.txt
+++ b/linker_scripts/jp/symbol_addrs_boot.txt
@@ -288,9 +288,11 @@ gfxprint_font = 0x8003BD58; // type:u8 size:0x800
sInitFuncs = 0x8003C560; //
sNew = 0x8003C564; //
-D_8003C568_jp = 0x8003C568; //
-
+gPositiveInfinity = 0x8003C570; // type:f32 size:0x4
+gNegativeInfinity = 0x8003C574; // type:f32 size:0x4
+gPositiveZero = 0x8003C578; // type:f32 size:0x4
+gNegativeZero = 0x8003C57C; // type:f32 size:0x4
qNaN0x3FFFFF = 0x8003C580; // type:f32 size:0x4
qNaN0x10000 = 0x8003C584; // type:f32 size:0x4
sNaN0x3FFFFF = 0x8003C588; // type:f32 size:0x4
diff --git a/src/boot/O2/system_heap.c b/src/boot/O2/system_heap.c
index 19a0d6a..f25a01a 100644
--- a/src/boot/O2/system_heap.c
+++ b/src/boot/O2/system_heap.c
@@ -27,11 +27,6 @@ void* sInitFuncs = NULL;
char sNew[] = "";
-UNK_TYPE1 D_8003C568_jp[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00,
- 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
-
void* SystemHeap_Malloc(size_t size) {
if (size == 0) {
size = 1;
diff --git a/yamls/jp/boot.yaml b/yamls/jp/boot.yaml
index f8dc92f..63353ed 100644
--- a/yamls/jp/boot.yaml
+++ b/yamls/jp/boot.yaml
@@ -231,7 +231,7 @@
- [0x017960, .data, boot/O2/system_heap]
# libc64
- - [0x017980, data, boot/libc64/fp]
+ - [0x017970, data, boot/libc64/fp]
- [0x017990, .data, boot/libc64/qrand]
# libultra