[utils] Refactor for consistent use of attributes

Author: salkinium

ext/gcc/new_delete.cpp.in

@@ -33,7 +33,7 @@ void* malloc_traits(std::size_t size, uint32_t)
 template<bool with_traits>
 static inline void*
 %% if with_memory_traits
-new_assert(size_t size, modm_unused modm::MemoryTraits traits = modm::MemoryDefault)
+new_assert(size_t size, [[maybe_unused]] modm::MemoryTraits traits = modm::MemoryDefault)
 %% else
 new_assert(size_t size)
 %% endif
@@ -102,7 +102,7 @@ void* operator new[](std::size_t size, modm::MemoryTraits traits, const std::not
 
 // ----------------------------------------------------------------------------
 extern "C" modm_weak
-void operator_delete(modm_unused void* ptr)
+void operator_delete([[maybe_unused]] void* ptr)
 {
 %% if with_heap
 	free(ptr);

src/modm/architecture/interface/assert.hpp.in

@@ -85,7 +85,7 @@ using AssertionHandler = Abandonment (*)(const AssertionInfo &info);
  *
  * @note This assert is included in all builds!
  */
-modm_noreturn void
+[[noreturn]] void
 modm_assert(bool condition,
 			const char *name, const char *description,
 			uintptr_t context=uintptr_t(-1));
@@ -145,7 +145,7 @@ modm_assert_continue_ignore_debug(bool condition,
 		MODM_ASSERTION_HANDLER(handler)
 #else
 #define MODM_ASSERTION_HANDLER_DEBUG(handler) \
-		static const modm::AssertionHandler modm_unused \
+		static const modm::AssertionHandler [[maybe_unused]] \
 		handler ## _assertion_handler_ptr = handler
 #endif
 

src/modm/driver/display/ili9341.hpp

@@ -11,6 +11,7 @@
 #ifndef MODM_ILI9341_HPP
 #define MODM_ILI9341_HPP
 
+#include <modm/architecture/utils.hpp>
 #include <modm/architecture/interface/delay.hpp>
 #include <modm/architecture/interface/register.hpp>
 #include <modm/math/utils/endianness.hpp>

src/modm/driver/display/ili9341_parallel.hpp

@@ -24,12 +24,12 @@ class Ili9341ParallelInterface: public ili9341
 	Ili9341ParallelInterface(INTERFACE& interface)
 	: interface(interface) {}
 
-	__attribute__((noinline)) void
+	modm_noinline void
 	writeCommand(Command command)
 	{
 		interface.writeIndex(i(command));
 	}
-	__attribute__((noinline)) void
+	modm_noinline void
 	writeCommand(Command command, uint8_t const *args, std::size_t length)
 	{
 		interface.writeIndex(i(command));

src/modm/driver/display/ili9341_spi.hpp

@@ -32,14 +32,14 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 		Dc::setOutput();
 	}
 
-	__attribute__((noinline)) void
+	modm_noinline void
 	writeCommand(Command command)
 	{
 		Dc::reset(); // enable command
 		SPI::transferBlocking(i(command));
 		Dc::set(); // reset to data
 	}
-	__attribute__((noinline)) void
+	modm_noinline void
 	writeCommand(Command command, uint8_t const *args, std::size_t length)
 	{
 		Dc::reset(); // enable command

src/modm/math/filter/fir_impl.hpp

@@ -77,7 +77,7 @@ modm::filter::Fir<T, N, BLOCK_SIZE, ScaleFactor>::append(const T& input)
 		else printf("(%.3f)    ", taps[i]);
 	printf("\n");
 #endif // FIR_DEBUG_APPEND
-	if(modm_likely(taps_index > 0)){
+	if(taps_index > 0) [[likely]] {
 		taps_index--;
 	}
 	else{

src/modm/platform/clock/systick/systick_timer.cpp.in

@@ -38,7 +38,7 @@ static constexpr uint8_t systick_priority{(1ul << __NVIC_PRIO_BITS) - 1ul};
 
 // ----------------------------------------------------------------------------
 void
-modm::platform::SysTickTimer::enable(uint32_t modm_unused reload, bool modm_unused prescaler8)
+modm::platform::SysTickTimer::enable([[maybe_unused]] uint32_t reload, [[maybe_unused]] bool prescaler8)
 {
 %% if not has_freertos
 	// Lower systick interrupt priority to lowest level

src/modm/platform/core/cortex/delay_ns.cpp.in

@@ -17,7 +17,7 @@ namespace modm
 {
 
 // Only call via modm::delay_ns wrapper, since this function clobbers r0, r1, r2!!!
-void __attribute__((naked, aligned(4))) modm_fastcode
+void modm_naked modm_aligned(4) modm_fastcode
 platform::delay_ns(uint32_t)
 {
 	// ns_per_loop = nanoseconds per cycle times cycles per loop

src/modm/platform/core/cortex/heap_table.cpp.in

@@ -19,7 +19,7 @@ struct table_pool_t
 	uint32_t traits;
 	uint8_t *const start;
 	uint8_t *const end;
-} __attribute__((packed));
+} modm_packed;
 
 extern "C" const table_pool_t __table_heap_start[];
 extern "C" const table_pool_t __table_heap_end[];

src/modm/platform/core/cortex/vectors.c.in

@@ -17,7 +17,7 @@ void Undefined_Handler(void);
 /* Provide weak aliases for each Exception handler to Undefined_Handler.
  * As they are weak aliases, any function with the same name will override
  * this definition. */
-void Reset_Handler(void)						__attribute__((noreturn));
+void Reset_Handler(void);
 void NMI_Handler(void)							__attribute__((weak, alias("Undefined_Handler")));
 void HardFault_Handler(void)					__attribute__((weak, alias("Undefined_Handler")));
 %% for pos in range(4 - 16, highest_irq + 1)