Skip to content

Remove unused Indy code, make sure debug code isn't being included in ROM version builds #24

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.

Sign up for GitHub

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

Merged
someone2639 merged 17 commits into from
Nov 3, 2025
Merged

Remove unused Indy code, make sure debug code isn't being included in ROM version builds #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3df37b5
Remove outdated code from errorasm/exceptasm
CrashOveride95 Sep 7, 2025
55096b8
Merge branch 'main' of https://github.com/ModernN64SDK/hackerlibultra…
CrashOveride95 Nov 2, 2025
434fb48
Delete osAckRamromWrite and osAckRamromRead, old unused stubs
CrashOveride95 Nov 2, 2025
3c9c1be
Remove osDriveRomInit, as this is old OS2.0I code that's not supposed…
CrashOveride95 Nov 2, 2025
10b4542
Remove error.c as this was removed in 2.0J and duplicates other code
CrashOveride95 Nov 2, 2025
7bdc32e
Remove old libleo code which was only in 2.0I
CrashOveride95 Nov 2, 2025
032b259
Remove mtxutil and mtxcatl as these are duplicate of functions rewrit…
CrashOveride95 Nov 2, 2025
8c5d7a4
Remove dump_gbi as it's literally all #if 0
CrashOveride95 Nov 2, 2025
b78b25d
Remove GIO functions as they're leftover Indy board code
CrashOveride95 Nov 2, 2025
d166297
Remove leftover Partner-N64 code
CrashOveride95 Nov 2, 2025
5698e94
Prevent debug code from being included in ROM version
CrashOveride95 Nov 2, 2025
9648062
Remove testhost due to being a stub file with nothing in it
CrashOveride95 Nov 2, 2025
7035ebc
Remove osExit as it's indy board code useless on non-indy
CrashOveride95 Nov 2, 2025
5e79d24
Add ifdef _FINALROM to dumpturbo
CrashOveride95 Nov 2, 2025
5e3f4a4
All debug code included in non ROM builds checked and #ifndef _FINALR…
CrashOveride95 Nov 2, 2025
b981bd7
Add missing ifdef and endlines
CrashOveride95 Nov 2, 2025
6824ae5
Restore libleo code (will be taken care of in a seperate PR)
CrashOveride95 Nov 3, 2025
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
1 change: 0 additions & 1 deletion include/PR/os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include <PR/os_cache.h>
#include <PR/os_debug.h>
#include <PR/os_error.h>
#include <PR/os_gio.h>
#include <PR/os_reg.h>
#include <PR/os_system.h>
#include <PR/os_eeprom.h>
Expand Down
81 changes: 0 additions & 81 deletions include/PR/os_gio.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion include/PR/os_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ extern "C" {
#include "os_internal_si.h"
#include "os_internal_rsp.h"
#include "os_internal_error.h"
#include "os_internal_gio.h"
#include "os_internal_thread.h"
#include "os_internal_debug.h"
#include "os_internal_host.h"
Expand Down
44 changes: 0 additions & 44 deletions include/PR/os_internal_gio.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion include/PR/os_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ extern OSIntMask __OSGlobalIntMask; /* global interrupt mask */
*/

extern void osInitialize(void);
extern void osExit(void);
extern u32 osGetMemSize(void);

/* pre-NMI */
Expand Down
2 changes: 2 additions & 0 deletions src/debug/threadprofile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifndef _FINALROM
#include "osint_debug.h"

#include "PRinternal/macros.h"
Expand All @@ -20,3 +21,4 @@ void osThreadProfileCallback(OSThread* osthread) {
__osThprofCount++;
__osThprofLastTimer = now_time;
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofileclear.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifndef _FINALROM
#include "osint_debug.h"

void osThreadProfileClear(OSId id) {
Expand All @@ -9,3 +10,4 @@ void osThreadProfileClear(OSId id) {

__osRestoreInt(saveMask);
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofileinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifndef _FINALROM
#include "osint_debug.h"

void osThreadProfileInit(void) {
Expand All @@ -14,3 +15,4 @@ void osThreadProfileInit(void) {
osThreadProfileClear(i);
}
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofilereadcount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifndef _FINALROM
#include "osint_debug.h"

u32 osThreadProfileReadCount(OSId id) {
Expand Down Expand Up @@ -37,3 +38,4 @@ u32 osThreadProfileReadCountTh(OSThread* thread) {
}
return thprof[id].count;
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofilereadtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifndef _FINALROM
#include "osint_debug.h"

OSTime osThreadProfileReadTime(OSId id) {
Expand Down Expand Up @@ -49,3 +50,4 @@ OSTime osThreadProfileReadTimeTh(OSThread* thread) {
}
return thprof[id].time + adjust;
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofilestart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "osint_debug.h"
#ifndef _FINALROM

void osThreadProfileStart(void) {
register u32 saveMask;
Expand All @@ -20,3 +21,4 @@ void osThreadProfileStart(void) {
__osThprofFunc = osThreadProfileCallback;
__osRestoreInt(saveMask);
}
#endif
2 changes: 2 additions & 0 deletions src/debug/threadprofilestop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "osint_debug.h"
#ifndef _FINALROM

void osThreadProfileStop(void) {
register u32 saveMask;
Expand Down Expand Up @@ -36,3 +37,4 @@ void osThreadProfileStop(void) {
}
__osRestoreInt(saveMask);
}
#endif
30 changes: 0 additions & 30 deletions src/error/error.c
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/error/errorasm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,9 @@
#include "PR/os_version.h"

LEAF(__osError)
#if BUILD_VERSION < VERSION_J
lw t0, __osErrorHandler
beqz t0, 1f
jr t0
#elif BUILD_VERSION < VERSION_K
lw t0, __kmc_pt_mode
bnez t0, _kmc_mode

lw t0, __osErrorHandler
beqz t0, 1f
jr t0
_kmc_mode:
lw t0, __kmcErrorHandler
beqz t0, 1f
jr t0
#else
lw t0, __osCommonHandler
beqz t0, 1f
jr t0
#endif
1:
j ra
END(__osError)
Expand Down
8 changes: 0 additions & 8 deletions src/gio/giointerrupt.c
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/gio/giorawinterrupt.c
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/gt/dumpturbo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*
*/

#ifndef _FINALROM

#include <ultra64.h>
#include <gt.h>
#include "PRinternal/macros.h"
Expand Down Expand Up @@ -220,3 +222,4 @@ void gtDumpTurbo(OSTask* tp, u8 flags) {
*
*/
}
#endif
Loading