diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-02-21 18:02:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-21 18:02:19 -0800 |
| commit | 61961fb938fa2ff9a6b2391be09ad19d46b7b3d5 (patch) | |
| tree | 7ef814f477dc8cbf5c48d5c52997ef83ffcd604f /src/boot | |
| parent | a96c93d9363c72010eace4e32c053e012afe5b9a (diff) | |
Remove asm-processor in favor of preprocess.sh (#1760)
* Remove asm-processor in favor of preprocess.sh
* Remove duplicate CMD_F
* preprocess_pragmas gitignore
* Mac fixes
* Macos + clang as cc check fixes
* Need quotes for paths with spaces
* Fix bss
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/CIC6105.c | 3 | ||||
| -rw-r--r-- | src/boot/idle.c | 4 | ||||
| -rw-r--r-- | src/boot/z_std_dma.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/boot/CIC6105.c b/src/boot/CIC6105.c index 8f9da8711..73ce74dd5 100644 --- a/src/boot/CIC6105.c +++ b/src/boot/CIC6105.c @@ -1,9 +1,10 @@ -#include "prevent_bss_reordering.h" #include "CIC6105.h" #include "build.h" #include "fault.h" +#pragma increment_block_number "n64-us:200" + s32 gCICAddr1Val; s32 gCICAddr2Val; FaultClient sRomInfoFaultClient; diff --git a/src/boot/idle.c b/src/boot/idle.c index 10ee965ce..c49ba5b59 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -1,5 +1,3 @@ -#include "prevent_bss_reordering.h" - #include "stdbool.h" #include "buffers.h" @@ -11,6 +9,8 @@ #include "z64dma.h" #include "z64thread.h" +#pragma increment_block_number "n64-us:128" + // Variables are put before most headers as a hacky way to bypass bss reordering struct IrqMgr gIrqMgr; STACK(sIrqMgrStack, 0x500); diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 053d460c7..aa26c0b09 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -18,7 +18,6 @@ * There are some additional provisions to ensure that audio DMA is particularly high-speed, the audio data is assumed * to be uncompressed and the request queue and address translation is skipped. */ -#include "prevent_bss_reordering.h" #include "z64dma.h" #include "carthandle.h" |