From d6220f618ba6daa043f70e42e421b8fad79e7731 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 25 Apr 2021 13:43:58 +0100 Subject: MIPS: emulate -ffunction-sections with macros in mmu-mips Using a macro to put each function in its own .icode-based section allows us to put the functions in IRAM _and_ have linker GC. This removes a troublesome #ifdef BOOTLOADER_SPL on the X1000 target. Change-Id: Ia7b59778f5c36b7970dee4280547e434a1f4fc5a --- firmware/target/mips/mmu-mips.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'firmware/target/mips/mmu-mips.h') diff --git a/firmware/target/mips/mmu-mips.h b/firmware/target/mips/mmu-mips.h index b54807f060..b8f5ff0143 100644 --- a/firmware/target/mips/mmu-mips.h +++ b/firmware/target/mips/mmu-mips.h @@ -28,33 +28,32 @@ * called safely eg. by the bootloader or RoLo, which need to flush the * cache before jumping to the loaded binary. */ -#ifndef MIPS_CACHEFUNC_ATTR -# define MIPS_CACHEFUNC_ATTR __attribute__((section(".icode"))) -#endif +#define MIPS_CACHEFUNC_API(ret, name, args) \ + ret name args __attribute__((section( ".icode." #name ))) void map_address(unsigned long virtual, unsigned long physical, unsigned long length, unsigned int cache_flags); void mmu_init(void); /* Commits entire DCache */ -void commit_dcache(void) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, commit_dcache, (void)); /* Commit and discard entire DCache, will do writeback */ -void commit_discard_dcache(void) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, commit_discard_dcache, (void)); /* Write DCache back to RAM for the given range and remove cache lines * from DCache afterwards */ -void commit_discard_dcache_range(const void *base, unsigned int size) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, commit_discard_dcache_range, (const void *base, unsigned int size)); /* Write DCache back to RAM for the given range */ -void commit_dcache_range(const void *base, unsigned int size) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, commit_dcache_range, (const void *base, unsigned int size)); /* * Remove cache lines for the given range from DCache * will *NOT* do write back except for buffer edges not on a line boundary */ -void discard_dcache_range(const void *base, unsigned int size) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, discard_dcache_range, (const void *base, unsigned int size)); /* Discards the entire ICache, and commit+discards the entire DCache */ -void commit_discard_idcache(void) MIPS_CACHEFUNC_ATTR; +MIPS_CACHEFUNC_API(void, commit_discard_idcache, (void)); #endif /* __MMU_MIPS_INCLUDE_H */ -- cgit v1.2.3