From e28fa2f552fd58264ecff1307a1e61818ded080f Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 13 Nov 2023 09:31:37 -0500 Subject: [PATCH 1/2] Fix #418, memory alignment in PCS_malloc stub Correct the round-up memory alignment calculation in the stub "malloc" routine. --- unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c b/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c index d6fbdffe..c8923014 100644 --- a/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c +++ b/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c @@ -143,7 +143,7 @@ void *PCS_malloc(size_t sz) return NULL; } - NextSize = (NextSize + MPOOL_ALIGN - 1) & ~((size_t)MPOOL_ALIGN); + NextSize = (NextSize + MPOOL_ALIGN - 1) & ~((size_t)MPOOL_ALIGN - 1); NextBlock = Rec->BlockAddr + MPOOL_ALIGN; Rec->BlockAddr += NextSize; Rec->Size += NextSize; From 80bc6f6913f7050161a8bb4cc2f9a523646a65af Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 5 Dec 2023 09:08:39 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for v1.6.0-rc4+dev102 --- CHANGELOG.md | 4 ++++ fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 2 +- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aba500a5..bdf2fe81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: v1.6.0-rc4+dev102 +- malloc stub memalign calculation +- See + ## Development Build: v1.6.0-rc4+dev96 - update rtems_sysmon banner - unit test for vxworks sysmon diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index d863371f..d00c32a8 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 96 +#define CFE_PSP_IMPL_BUILD_NUMBER 102 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index d863371f..d00c32a8 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 96 +#define CFE_PSP_IMPL_BUILD_NUMBER 102 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index d863371f..d00c32a8 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 96 +#define CFE_PSP_IMPL_BUILD_NUMBER 102 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /*