Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move D_80097508 out of system_heap.c #1779

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/libc64/fixed_point.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

#include "ultra64.h"

extern f32 gPositiveInfinity;
extern f32 gNegativeInfinity;
extern f32 gPositiveZero;
extern f32 gNegativeZero;
extern f32 qNaN0x3FFFFF;
extern f32 qNaN0x10000;
extern f32 sNaN0x3FFFFF;
Expand Down
5 changes: 0 additions & 5 deletions src/boot/libu64/system_heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ void* sInitFuncs = NULL;

char sNew[] = "";

UNK_TYPE1 D_80097508[] = {
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;
Expand Down
2 changes: 1 addition & 1 deletion tools/disasm/disasm.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ def format_f32(f_wd):
return ".float 3.4028235e+38"

f = as_float(struct.pack(">I", f_wd))
if math.isnan(f):
if math.isnan(f) or math.isinf(f):
return f".word 0x{f_wd:08X}"
return f".float {reduce_float(repr(f))}"

Expand Down
2 changes: 1 addition & 1 deletion tools/disasm/files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
0x80096C40 : "stackcheck",
0x80096C50 : "gfxprint",
0x80097500 : "system_heap",
0x80097520 : "fp",
0x80097510 : "fp",
0x80097530 : "qrand",
0x80097540 : "vimodentschpf1",
0x80097590 : "vimodepallan1",
Expand Down
5 changes: 4 additions & 1 deletion tools/disasm/variables.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
0x80096CF8:("sGfxPrintFontData","u8","[0x800]",0x800),
0x80097500:("sInitFuncs","void*","",0x4),
0x80097504:("sNew","char","[4]",0x4),
0x80097508:("D_80097508","[24]","",0x18),
0x80097510:("gPositiveInfinity","f32","",0x4),
0x80097514:("gNegativeInfinity","f32","",0x4),
0x80097518:("gPositiveZero","f32","",0x4),
0x8009751C:("gNegativeZero","f32","",0x4),
0x80097520:("qNaN0x3FFFFF","f32","",0x4),
0x80097524:("qNaN0x10000","f32","",0x4),
0x80097528:("sNaN0x3FFFFF","f32","",0x4),
Expand Down