From 2149d893363119e5368a495d9658acd1a5ea7668 Mon Sep 17 00:00:00 2001 From: wangmingrong1 Date: Tue, 7 Jan 2025 20:15:39 +0800 Subject: [PATCH] macro/align: Use ALIGN_UP and ALIGN_DOWN uniformly Signed-off-by: wangmingrong1 --- arch/arm/src/imx9/imx9_lpi2c.c | 2 +- arch/arm/src/imxrt/imxrt_lpi2c.c | 2 +- arch/arm/src/s32k1xx/s32k1xx_lpi2c.c | 2 +- arch/arm/src/s32k3xx/s32k3xx_lpi2c.c | 2 +- arch/arm64/src/imx9/imx9_lpi2c.c | 2 +- binfmt/binfmt_copyactions.c | 15 ++++-------- libs/libbuiltin/libgcc/profile.c | 22 +++++++---------- mm/iob/iob.h | 2 -- mm/iob/iob_alloc.c | 7 +++--- mm/iob/iob_initialize.c | 11 +++++---- sched/misc/coredump.c | 36 +++++++++++++--------------- 11 files changed, 46 insertions(+), 57 deletions(-) diff --git a/arch/arm/src/imx9/imx9_lpi2c.c b/arch/arm/src/imx9/imx9_lpi2c.c index 1766b706e8..2026bd62a8 100644 --- a/arch/arm/src/imx9/imx9_lpi2c.c +++ b/arch/arm/src/imx9/imx9_lpi2c.c @@ -1103,7 +1103,7 @@ static void imx9_lpi2c_setclock(struct imx9_lpi2c_priv_s *priv, &src_freq); /* LPI2C output frequency = (Source Clock (Hz)/ 2^prescale) / - * (CLKLO + 1 + CLKHI + 1 + ROUNDDOWN((2 + FILTSCL) / 2^prescale) + * (CLKLO + 1 + CLKHI + 1 + ALIGN_DOWN((2 + FILTSCL)/2^prescale) * * Assume CLKLO = 2 * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI / 2 */ diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c index 595eb56853..0535470fb3 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.c +++ b/arch/arm/src/imxrt/imxrt_lpi2c.c @@ -1161,7 +1161,7 @@ static void imxrt_lpi2c_setclock(struct imxrt_lpi2c_priv_s *priv, #endif /* LPI2C output frequency = (Source Clock (Hz)/ 2^prescale) / - * (CLKLO + 1 + CLKHI + 1 + ROUNDDOWN((2 + FILTSCL) / 2^prescale) + * (CLKLO + 1 + CLKHI + 1 + ALIGN_DOWN((2 + FILTSCL)/2^prescale) * * Assume CLKLO = 2 * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI / 2 */ diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c index da8e4c0344..67781f5179 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c +++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c @@ -1010,7 +1010,7 @@ static void s32k1xx_lpi2c_setclock(struct s32k1xx_lpi2c_priv_s *priv, DEBUGASSERT(src_freq != 0); /* LPI2C output frequency = (Source Clock (Hz)/ 2^prescale) / - * (CLKLO + 1 + CLKHI + 1 + ROUNDDOWN((2 + FILTSCL) / 2^prescale) + * (CLKLO + 1 + CLKHI + 1 + ALIGN_DOWN((2 + FILTSCL)/2^prescale) * * Assume CLKLO = 2 * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI / 2 */ diff --git a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c index 8250ab4683..4807b909be 100644 --- a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c +++ b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c @@ -990,7 +990,7 @@ static void s32k3xx_lpi2c_setclock(struct s32k3xx_lpi2c_priv_s *priv, DEBUGASSERT(src_freq != 0); /* LPI2C output frequency = (Source Clock (Hz)/ 2^prescale) / - * (CLKLO + 1 + CLKHI + 1 + ROUNDDOWN((2 + FILTSCL) / 2^prescale) + * (CLKLO + 1 + CLKHI + 1 + ALIGN_DOWN((2 + FILTSCL)/2^prescale) * * Assume CLKLO = 2 * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI / 2 */ diff --git a/arch/arm64/src/imx9/imx9_lpi2c.c b/arch/arm64/src/imx9/imx9_lpi2c.c index 04585a6f63..0a66428c63 100644 --- a/arch/arm64/src/imx9/imx9_lpi2c.c +++ b/arch/arm64/src/imx9/imx9_lpi2c.c @@ -1122,7 +1122,7 @@ static void imx9_lpi2c_setclock(struct imx9_lpi2c_priv_s *priv, imx9_get_rootclock(priv->config->clk_root, &src_freq); /* LPI2C output frequency = (Source Clock (Hz)/ 2^prescale) / - * (CLKLO + 1 + CLKHI + 1 + ROUNDDOWN((2 + FILTSCL) / 2^prescale) + * (CLKLO + 1 + CLKHI + 1 + ALIGN_DOWN((2 + FILTSCL)/2^prescale) * * Assume CLKLO = 2 * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI / 2 */ diff --git a/binfmt/binfmt_copyactions.c b/binfmt/binfmt_copyactions.c index 36af683e8a..b87d4c7946 100644 --- a/binfmt/binfmt_copyactions.c +++ b/binfmt/binfmt_copyactions.c @@ -31,18 +31,13 @@ #include #include +#include #include #include "binfmt.h" #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) && !defined(CONFIG_BINFMT_DISABLE) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#define ROUNDUP(x, y) (((x) + (y) - 1) / (y) * (y)) - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -98,8 +93,8 @@ int binfmt_copyactions(FAR const posix_spawn_file_actions_t **copy, case SPAWN_FILE_ACTION_OPEN: open = (FAR struct spawn_open_file_action_s *)entry; - size += ROUNDUP(SIZEOF_OPEN_FILE_ACTION_S(strlen(open->path)), - sizeof(FAR void *)); + size += ALIGN_UP(SIZEOF_OPEN_FILE_ACTION_S(strlen(open->path)), + sizeof(FAR void *)); break; default: @@ -155,8 +150,8 @@ int binfmt_copyactions(FAR const posix_spawn_file_actions_t **copy, strcpy(open->path, tmp->path); buffer = (FAR char *)buffer + - ROUNDUP(SIZEOF_OPEN_FILE_ACTION_S(strlen(tmp->path)), - sizeof(FAR void *)); + ALIGN_UP(SIZEOF_OPEN_FILE_ACTION_S(strlen(tmp->path)), + sizeof(FAR void *)); break; default: diff --git a/libs/libbuiltin/libgcc/profile.c b/libs/libbuiltin/libgcc/profile.c index 5d2e82750c..ad8b37a2bb 100644 --- a/libs/libbuiltin/libgcc/profile.c +++ b/libs/libbuiltin/libgcc/profile.c @@ -35,6 +35,7 @@ #include #include #include +#include #include /**************************************************************************** @@ -112,11 +113,6 @@ #define MAXARCS (1 << 20) -/* General rounding functions. */ - -#define ROUNDDOWN(x, y) (((x) / (y)) * (y)) -#define ROUNDUP(x, y) ((((x) + (y) - 1) / (y)) * (y)) - /* See profil(2) where this is described (incorrectly) */ #define SCALE_1_TO_1 0x10000 @@ -288,13 +284,13 @@ void moncontrol(int mode) if (mode) { - uintptr_t lowpc = ROUNDDOWN((uintptr_t)&_stext, + uintptr_t lowpc = ALIGN_DOWN((uintptr_t)&_stext, HISTFRACTION * sizeof(HISTCOUNTER)); - uintptr_t highpc = ROUNDUP((uintptr_t)&_etext, - HISTFRACTION * sizeof(HISTCOUNTER)); + uintptr_t highpc = ALIGN_UP((uintptr_t)&_etext, + HISTFRACTION * sizeof(HISTCOUNTER)); size_t textsize = highpc - lowpc; - size_t kcountsize = ROUNDUP(textsize / HISTFRACTION, - sizeof(*p->kcount)); + size_t kcountsize = ALIGN_UP(textsize / HISTFRACTION, + sizeof(*p->kcount)); int scale = kcountsize >= textsize ? SCALE_1_TO_1 : (float)kcountsize / textsize * SCALE_1_TO_1; FAR unsigned short *kcount = kmm_zalloc(kcountsize); @@ -370,10 +366,10 @@ void monstartup(unsigned long lowpc, unsigned long highpc) * so the rest of the scaling (here and in gprof) stays in ints. */ - lowpc = ROUNDDOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER)); - highpc = ROUNDUP(highpc, HISTFRACTION * sizeof(HISTCOUNTER)); + lowpc = ALIGN_DOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER)); + highpc = ALIGN_UP(highpc, HISTFRACTION * sizeof(HISTCOUNTER)); textsize = highpc - lowpc; - fromssize = ROUNDUP(textsize / HASHFRACTION, sizeof(*p->froms)); + fromssize = ALIGN_UP(textsize / HASHFRACTION, sizeof(*p->froms)); tolimit = textsize * ARCDENSITY / 100; if (tolimit < MINARCS) diff --git a/mm/iob/iob.h b/mm/iob/iob.h index 1cd0e9e595..525622bea7 100644 --- a/mm/iob/iob.h +++ b/mm/iob/iob.h @@ -41,8 +41,6 @@ * Pre-processor Definitions ****************************************************************************/ -#define ROUNDUP(x, y) (((x) + (y) - 1) / (y) * (y)) - #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG) # define ioberr _err # define iobwarn _warn diff --git a/mm/iob/iob_alloc.c b/mm/iob/iob_alloc.c index b3821f0635..a0fb94ec52 100644 --- a/mm/iob/iob_alloc.c +++ b/mm/iob/iob_alloc.c @@ -35,6 +35,7 @@ #ifdef CONFIG_IOB_ALLOC # include #endif +#include #include #include "iob.h" @@ -333,7 +334,7 @@ FAR struct iob_s *iob_alloc_dynamic(uint16_t size) FAR struct iob_s *iob; size_t alignsize; - alignsize = ROUNDUP(sizeof(struct iob_s), CONFIG_IOB_ALIGNMENT) + size; + alignsize = ALIGN_UP(sizeof(struct iob_s), CONFIG_IOB_ALIGNMENT) + size; iob = kmm_memalign(CONFIG_IOB_ALIGNMENT, alignsize); if (iob) @@ -344,8 +345,8 @@ FAR struct iob_s *iob_alloc_dynamic(uint16_t size) iob->io_bufsize = size; /* Total length of the iob buffer */ iob->io_pktlen = 0; /* Total length of the packet */ iob->io_free = iob_free_dynamic; /* Customer free callback */ - iob->io_data = (FAR uint8_t *)ROUNDUP((uintptr_t)(iob + 1), - CONFIG_IOB_ALIGNMENT); + iob->io_data = (FAR uint8_t *)ALIGN_UP((uintptr_t)(iob + 1), + CONFIG_IOB_ALIGNMENT); } return iob; diff --git a/mm/iob/iob_initialize.c b/mm/iob/iob_initialize.c index e4049384e3..930473c2bd 100644 --- a/mm/iob/iob_initialize.c +++ b/mm/iob/iob_initialize.c @@ -28,6 +28,7 @@ #include +#include #include #include "iob.h" @@ -39,10 +40,10 @@ /* Fix the I/O Buffer size with specified alignment size */ #ifdef CONFIG_IOB_ALLOC -# define IOB_ALIGN_SIZE ROUNDUP(sizeof(struct iob_s) + CONFIG_IOB_BUFSIZE, \ - CONFIG_IOB_ALIGNMENT) +# define IOB_ALIGN_SIZE ALIGN_UP(sizeof(struct iob_s) + CONFIG_IOB_BUFSIZE, \ + CONFIG_IOB_ALIGNMENT) #else -# define IOB_ALIGN_SIZE ROUNDUP(sizeof(struct iob_s), CONFIG_IOB_ALIGNMENT) +# define IOB_ALIGN_SIZE ALIGN_UP(sizeof(struct iob_s), CONFIG_IOB_ALIGNMENT) #endif #define IOB_BUFFER_SIZE (IOB_ALIGN_SIZE * CONFIG_IOB_NBUFFERS + \ @@ -137,8 +138,8 @@ void iob_initialize(void) * aligned to the CONFIG_IOB_ALIGNMENT memory boundary */ - buf = ROUNDUP((uintptr_t)g_iob_buffer + offsetof(struct iob_s, io_data), - CONFIG_IOB_ALIGNMENT) - offsetof(struct iob_s, io_data); + buf = ALIGN_UP((uintptr_t)g_iob_buffer + offsetof(struct iob_s, io_data), + CONFIG_IOB_ALIGNMENT) - offsetof(struct iob_s, io_data); /* Get I/O buffer instance from the start address and add each I/O buffer * to the free list diff --git a/sched/misc/coredump.c b/sched/misc/coredump.c index e3c7e12e68..26ddaf20aa 100644 --- a/sched/misc/coredump.c +++ b/sched/misc/coredump.c @@ -32,6 +32,7 @@ #include #include +#include #include #include "sched/sched.h" @@ -54,9 +55,6 @@ #define PROGRAM_ALIGNMENT 64 -#define ROUNDUP(x, y) ((x + (y - 1)) / (y)) * (y) -#define ROUNDDOWN(x ,y) (((x) / (y)) * (y)) - /**************************************************************************** * Private Types ****************************************************************************/ @@ -166,8 +164,8 @@ static int elf_emit(FAR struct elf_dumpinfo_s *cinfo, static int elf_emit_align(FAR struct elf_dumpinfo_s *cinfo) { - off_t align = ROUNDUP(cinfo->stream->nput, - ELF_PAGESIZE) - cinfo->stream->nput; + off_t align = ALIGN_UP(cinfo->stream->nput, + ELF_PAGESIZE) - cinfo->stream->nput; unsigned char null[256]; off_t total = align; off_t ret = 0; @@ -258,10 +256,10 @@ static int elf_get_note_size(int stksegs) { int total; - total = stksegs * (sizeof(Elf_Nhdr) + ROUNDUP(CONFIG_TASK_NAME_SIZE, 8) + - sizeof(elf_prstatus_t)); - total += stksegs * (sizeof(Elf_Nhdr) + ROUNDUP(CONFIG_TASK_NAME_SIZE, 8) + - sizeof(elf_prpsinfo_t)); + total = stksegs * (sizeof(Elf_Nhdr) + ALIGN_UP(CONFIG_TASK_NAME_SIZE, 8) + + sizeof(elf_prstatus_t)); + total += stksegs * (sizeof(Elf_Nhdr) + ALIGN_UP(CONFIG_TASK_NAME_SIZE, 8) + + sizeof(elf_prpsinfo_t)); return total; } @@ -276,7 +274,7 @@ static int elf_get_note_size(int stksegs) static void elf_emit_tcb_note(FAR struct elf_dumpinfo_s *cinfo, FAR struct tcb_s *tcb) { - char name[ROUNDUP(CONFIG_TASK_NAME_SIZE, 8)]; + char name[ALIGN_UP(CONFIG_TASK_NAME_SIZE, 8)]; elf_prstatus_t status; elf_prpsinfo_t info; FAR uintptr_t *regs; @@ -414,8 +412,8 @@ static void elf_emit_tcb_stack(FAR struct elf_dumpinfo_s *cinfo, (tcb->stack_base_ptr - tcb->stack_alloc_ptr); } - sp = ROUNDDOWN(buf, PROGRAM_ALIGNMENT); - len = ROUNDUP(len + (buf - sp), PROGRAM_ALIGNMENT); + sp = ALIGN_DOWN(buf, PROGRAM_ALIGNMENT); + len = ALIGN_UP(len + (buf - sp), PROGRAM_ALIGNMENT); buf = sp; elf_emit(cinfo, (FAR void *)buf, len); @@ -546,17 +544,17 @@ static void elf_emit_tcb_phdr(FAR struct elf_dumpinfo_s *cinfo, (tcb->stack_base_ptr - tcb->stack_alloc_ptr); } - sp = ROUNDDOWN(phdr->p_vaddr, PROGRAM_ALIGNMENT); - phdr->p_filesz = ROUNDUP(phdr->p_filesz + - (phdr->p_vaddr - sp), PROGRAM_ALIGNMENT); + sp = ALIGN_DOWN(phdr->p_vaddr, PROGRAM_ALIGNMENT); + phdr->p_filesz = ALIGN_UP(phdr->p_filesz + + (phdr->p_vaddr - sp), PROGRAM_ALIGNMENT); phdr->p_vaddr = sp; phdr->p_type = PT_LOAD; - phdr->p_offset = ROUNDUP(*offset, ELF_PAGESIZE); + phdr->p_offset = ALIGN_UP(*offset, ELF_PAGESIZE); phdr->p_paddr = phdr->p_vaddr; phdr->p_memsz = phdr->p_filesz; phdr->p_flags = PF_X | PF_W | PF_R; - *offset += ROUNDUP(phdr->p_memsz, ELF_PAGESIZE); + *offset += ALIGN_UP(phdr->p_memsz, ELF_PAGESIZE); elf_emit(cinfo, phdr, sizeof(*phdr)); } @@ -608,13 +606,13 @@ static void elf_emit_phdr(FAR struct elf_dumpinfo_s *cinfo, for (i = 0; i < memsegs; i++) { phdr.p_type = PT_LOAD; - phdr.p_offset = ROUNDUP(offset, ELF_PAGESIZE); + phdr.p_offset = ALIGN_UP(offset, ELF_PAGESIZE); phdr.p_vaddr = cinfo->regions[i].start; phdr.p_paddr = phdr.p_vaddr; phdr.p_filesz = cinfo->regions[i].end - cinfo->regions[i].start; phdr.p_memsz = phdr.p_filesz; phdr.p_flags = cinfo->regions[i].flags; - offset += ROUNDUP(phdr.p_memsz, ELF_PAGESIZE); + offset += ALIGN_UP(phdr.p_memsz, ELF_PAGESIZE); elf_emit(cinfo, &phdr, sizeof(phdr)); } }