Revert "Add #ifdef declarations for NON_MATCHING code"

This reverts commit 42807160cf.

It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.
This commit is contained in:
Léo Lam
2022-02-27 12:48:28 +01:00
parent a564186002
commit df36d65665
52 changed files with 93 additions and 257 deletions
+2 -6
View File
@@ -16,8 +16,7 @@ OverlayArena::~OverlayArena() {
destroy();
}
// branching at the end (csel instead of a branch)
#ifdef NON_MATCHING
// NON_MATCHING: branching at the end (csel instead of a branch)
bool OverlayArena::init(const OverlayArena::InitArg& arg) {
if (!arg.heap) {
res::stubbedLogFunction();
@@ -60,7 +59,6 @@ bool OverlayArena::init(const OverlayArena::InitArg& arg) {
return true;
}
#endif
void OverlayArena::stubbed() {}
@@ -128,8 +126,7 @@ bool OverlayArena::checkIsOom() const {
// FIXME: figure out what sead function this is
bool seadCheckPointer(void* ptr);
// branching
#ifdef NON_MATCHING
// NON_MATCHING: branching
util::DualHeap* OverlayArena::makeDualHeap(u32 size, const sead::SafeString& name,
sead::Heap::HeapDirection direction,
res::ResourceUnit* unit, bool) {
@@ -160,7 +157,6 @@ util::DualHeap* OverlayArena::makeDualHeap(u32 size, const sead::SafeString& nam
mFlags.set(Flag::_4);
return heap;
}
#endif
void OverlayArena::addSize(s32 size) {
mSize += size;