ARM_FUNC

4 files changed, 31 insertions, 31 deletions

diff --git a/arm9/lib/libnns/src/NNS_FND_allocator.c b/arm9/lib/libnns/src/NNS_FND_allocator.c
index 31d0eb70..c459c3d0 100644
--- a/arm9/lib/libnns/src/NNS_FND_allocator.c
+++ b/arm9/lib/libnns/src/NNS_FND_allocator.c
@@ -2,27 +2,27 @@
 #include "NNS_FND_allocator.h"

 #include "NNS_FND_expheap.h"

 

-void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)

+ARM_FUNC void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)

 {

     return NNS_FndAllocFromExpHeapEx(pAllocator->pHeap, size, pAllocator->heapParam1);

 }

 

-void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)

+ARM_FUNC void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)

 {

     NNS_FndFreeToExpHeap(pAllocator->pHeap, memBlock);

 }

 

-void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)

+ARM_FUNC void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)

 {

     return pAllocator->pFunc->pfAlloc(pAllocator, size);

 }

 

-void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)

+ARM_FUNC void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)

 {

     pAllocator->pFunc->pfFree(pAllocator, memBlock);

 }

 

-void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)

+ARM_FUNC void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)

 {

     static const NNSFndAllocatorFunc pFunc = {AllocatorAllocForExpHeap, AllocatorFreeForExpHeap};

     pAllocator->pFunc = &pFunc;

diff --git a/arm9/lib/libnns/src/NNS_FND_expheap.c b/arm9/lib/libnns/src/NNS_FND_expheap.c
index 15657c43..62a4deb4 100644
--- a/arm9/lib/libnns/src/NNS_FND_expheap.c
+++ b/arm9/lib/libnns/src/NNS_FND_expheap.c
@@ -66,13 +66,13 @@ static inline NNSiFndHeapHead* GetHeapHeadPtrFromExpHeapHead(NNSiFndExpHeapHead*
     return SubU32ToPtr(pEHHead, sizeof(NNSiFndHeapHead));

 }

 

-void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block)

+ARM_FUNC void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block)

 {

     region->start = SubU32ToPtr(block, GetAlignmentForMBlock(block));

     region->end = GetMBlockEndAddr(block);

 }

 

-NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block)

+ARM_FUNC NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block)

 {

     NNSiFndExpHeapMBlockHead* const prev = block->pMBHeadPrev;

     NNSiFndExpHeapMBlockHead* const next = block->pMBHeadNext;

@@ -98,7 +98,7 @@ NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHea
     return prev;

 }

 

-NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev)

+ARM_FUNC NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev)

 {

     NNSiFndExpHeapMBlockHead* next;

     target->pMBHeadPrev = prev;

@@ -125,7 +125,7 @@ NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHea
     return target;

 }

 

-NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature)

+ARM_FUNC NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature)

 {

     NNSiFndExpHeapMBlockHead* block = pRegion->start;

     block->signature = signature;

@@ -141,7 +141,7 @@ static inline NNSiFndExpHeapMBlockHead* InitFreeMBlock(const NNSiMemRegion* regi
     return InitMBlock(region, 0x4652);

 }

 

-NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag)

+ARM_FUNC NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag)

 {

     NNSiFndHeapHead* pHeapHd = (NNSiFndHeapHead*)startAddress;

     NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);

@@ -170,7 +170,7 @@ static inline void AppendMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlock
     (void) InsertMBlock(list, block, list->tail);

 }

 

-void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction)

+ARM_FUNC void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction)

 {

     NNSiMemRegion freeRgnT;

     NNSiMemRegion freeRgnB;

@@ -218,7 +218,7 @@ void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBl
     return mblock;

 }

 

-void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)

+ARM_FUNC void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)

 {

     NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);

     const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0;

@@ -248,7 +248,7 @@ void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
     return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 0);

 }

 

-void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)

+ARM_FUNC void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)

 {

     NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);

     const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0;

@@ -278,7 +278,7 @@ void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
     return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 1);

 }

 

-BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)

+ARM_FUNC BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)

 {

     NNSiFndExpHeapMBlockHead* pBlkPtrFree = NULL;

     NNSiMemRegion freeRgn = *pRegion;

@@ -308,7 +308,7 @@ BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)
     return TRUE;

 }

 

-NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag)

+ARM_FUNC NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag)

 {

     void* endAddress = NNSi_FndRoundDownPtr(AddU32ToPtr(startAddress, size), 4);

     startAddress = NNSi_FndRoundUpPtr(startAddress, 4);

@@ -317,12 +317,12 @@ NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFla
     return InitExpHeap(startAddress, endAddress, optFlag);

 }

 

-void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle)

+ARM_FUNC void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle)

 {

     NNSi_FndFinalizeHeap(handle);

 }

 

-void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment)

+ARM_FUNC void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment)

 {

     if (size == 0)

         size = 1;

@@ -334,7 +334,7 @@ void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment
 }

 

 /*

-u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size)

+ARM_FUNC u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size)

 {

     NNSiFndExpHeapHead* pEHHead;

     NNSiFndExpHeapMBlockHead* pMBHead;

diff --git a/arm9/lib/libnns/src/NNS_FND_heapcommon.c b/arm9/lib/libnns/src/NNS_FND_heapcommon.c
index 07b8e9cf..73646030 100644
--- a/arm9/lib/libnns/src/NNS_FND_heapcommon.c
+++ b/arm9/lib/libnns/src/NNS_FND_heapcommon.c
@@ -5,9 +5,9 @@
 BOOL sRootListInitialized;

 NNSFndList sRootList;

 

-void *NNS_FndGetNextListObject(NNSFndList *, void *);

+ARM_FUNC void *NNS_FndGetNextListObject(NNSFndList *, void *);

 

-static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock)

+ARM_FUNC static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock)

 {

     NNSiFndHeapHead * pHead = NULL;

 

@@ -24,7 +24,7 @@ static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBloc
     return NULL;

 }

 

-static NNSFndList* FindListContainHeap(const void * memBlock)

+ARM_FUNC static NNSFndList* FindListContainHeap(const void * memBlock)

 {

     NNSFndList* ret = &sRootList;

     NNSiFndHeapHead* pHead = FindContainHeap(&sRootList, memBlock);

@@ -33,7 +33,7 @@ static NNSFndList* FindListContainHeap(const void * memBlock)
     return ret;

 }

 

-void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag)

+ARM_FUNC void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag)

 {

     pHead->signature = signature;

     pHead->heapStart = heapStart;

@@ -49,7 +49,7 @@ void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart
     NNS_FndAppendListObject(FindListContainHeap(pHead), pHead);

 }

 

-void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead)

+ARM_FUNC void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead)

 {

     NNS_FndRemoveListObject(FindListContainHeap(pHead), pHead);

 }

diff --git a/arm9/lib/libnns/src/NNS_FND_list.c b/arm9/lib/libnns/src/NNS_FND_list.c
index d4dd7620..fdab8188 100644
--- a/arm9/lib/libnns/src/NNS_FND_list.c
+++ b/arm9/lib/libnns/src/NNS_FND_list.c
@@ -3,7 +3,7 @@
 

 #define OBJ_TO_LINK(list, obj) ((NNSFndLink*)((void*)(obj) + (list)->offset))

 

-void NNS_FndInitList(NNSFndList* list, s32 alignment)

+ARM_FUNC void NNS_FndInitList(NNSFndList* list, s32 alignment)

 {

     list->headObject = NULL;

     list->tailObject = NULL;

@@ -11,7 +11,7 @@ void NNS_FndInitList(NNSFndList* list, s32 alignment)
     list->offset = (u16)alignment;

 }

 

-static void SetFirstObject(NNSFndList* list, void* object)

+ARM_FUNC static void SetFirstObject(NNSFndList* list, void* object)

 {

     NNSFndLink* tail = OBJ_TO_LINK(list, object);

     tail->nextObject = NULL;

@@ -21,7 +21,7 @@ static void SetFirstObject(NNSFndList* list, void* object)
     list->numObjects++;

 }

 

-void NNS_FndAppendListObject(NNSFndList* list, void* object)

+ARM_FUNC void NNS_FndAppendListObject(NNSFndList* list, void* object)

 {

     if (list->headObject == NULL)

     {

@@ -38,7 +38,7 @@ void NNS_FndAppendListObject(NNSFndList* list, void* object)
     }

 }

 

-void NNS_FndPrependListObject(NNSFndList* list, void* object)

+ARM_FUNC void NNS_FndPrependListObject(NNSFndList* list, void* object)

 {

     if (list->headObject == NULL)

     {

@@ -55,7 +55,7 @@ void NNS_FndPrependListObject(NNSFndList* list, void* object)
     }

 }

 

-void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)

+ARM_FUNC void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)

 {

     if (where == NULL)

     {

@@ -79,7 +79,7 @@ void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)
     }

 }

 

-void NNS_FndRemoveListObject(NNSFndList* list, void* object)

+ARM_FUNC void NNS_FndRemoveListObject(NNSFndList* list, void* object)

 {

     NNSFndLink* node = OBJ_TO_LINK(list, object);

     if (node->prevObject == NULL)

@@ -103,7 +103,7 @@ void NNS_FndRemoveListObject(NNSFndList* list, void* object)
     list->numObjects--;

 }

 

-void * NNS_FndGetNextListObject(NNSFndList* list, void* object)

+ARM_FUNC void * NNS_FndGetNextListObject(NNSFndList* list, void* object)

 {

     if (object == NULL)

     {

@@ -115,7 +115,7 @@ void * NNS_FndGetNextListObject(NNSFndList* list, void* object)
     }

 }

 

-void * NNS_FndGetPrevListObject(NNSFndList* list, void* object)

+ARM_FUNC void * NNS_FndGetPrevListObject(NNSFndList* list, void* object)

 {

     if (object == NULL)

     {