From 58614720c3ee1a8579da3d3400fd379988c5b5b3 Mon Sep 17 00:00:00 2001 From: Alwin Berger Date: Fri, 15 Aug 2025 08:24:04 +0000 Subject: [PATCH] fix macros --- FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/main_polycopter.c | 1 + FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/util_macros.h | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/main_polycopter.c b/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/main_polycopter.c index dc6b2c14..c6796da8 100644 --- a/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/main_polycopter.c +++ b/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/main_polycopter.c @@ -8,6 +8,7 @@ 1 // Multiplier to increase all waiting periods to make the schedule more // tight and force preemptions #define NUM_TASKS 15 +#define MACRO_ONLY 1 #include "fuzzhelper.c" #include "polynomic_functions.h" diff --git a/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/util_macros.h b/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/util_macros.h index 0377b75d..06315151 100644 --- a/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/util_macros.h +++ b/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/util_macros.h @@ -30,7 +30,6 @@ #define __UTIL_RNG_C 12345ull #define RNG_FROM(X) ((__UTIL_RNG_A*(X)+__UTIL_RNG_C) % __UTIL_RNG_M) -#define IF_ELSE(X,Y,Z) ((X) ? (Y) : (Z)) // Challanges ======= #define CHANCE_1_IN_POWOF2(X,Y) (RNG_FROM(X)<(__UTIL_RNG_M>>Y)) // assume the type of x has more than y bits @@ -100,8 +99,8 @@ static inline int32_t valley_i32(int32_t x, int32_t off, int32_t h, int32_t w) { #define CHECKED_SQUARE(X) IF_ELSE((X)<=0x0000B504,SQUARE(X), INT_MAX) // int32_t safe #define LIN(X,N,D,C) (C+((N)*((X)/(D)))) -#define HILL(X, OFF, H, W) (CLAMP_FLOOR(SSUB(h,CHECKED_SQUARE(ABS_DIFF(x,off)/w)),0)) -#define VALLEY(X, OFF, H, W) (CLAMP_CEILING(SADD(h,CHECKED_SQUARE(ABS_DIFF(x,off)/w)),0)) +#define HILL(X, OFF, H, W) (CLAMP_FLOOR(SSUB(H,CHECKED_SQUARE(ABS_DIFF(X,OFF)/W)),0)) +#define VALLEY(X, OFF, H, W) (CLAMP_CEILING(SADD(H,CHECKED_SQUARE(ABS_DIFF(X,OFF)/W)),0)) #else