diff options
| author | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2020-09-02 15:50:07 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2020-09-03 12:55:32 +0200 |
| commit | 754386c7f558a686420d4646c101706d9020f5d3 (patch) | |
| tree | 2b40e3a34f5e8a414da75e1191bd67ed2d01d719 /newlib/libc/stdlib | |
| parent | a634adda5af00c5936e3e7a5e2950c05c14981d3 (diff) | |
| download | newlib-754386c7f558a686420d4646c101706d9020f5d3.zip newlib-754386c7f558a686420d4646c101706d9020f5d3.tar.gz newlib-754386c7f558a686420d4646c101706d9020f5d3.tar.bz2 | |
Fix warnings when building for msp430-elf
The MSP430 target supports both 16-bit and 20-bit size_t and intptr_t.
Some implicit casts in Newlib expect these types to be
"long", (a 32-bit type on MSP430) which causes warnings during
compilation such as:
"cast from pointer to integer of different size"
Diffstat (limited to 'newlib/libc/stdlib')
| -rw-r--r-- | newlib/libc/stdlib/arc4random.c | 3 | ||||
| -rw-r--r-- | newlib/libc/stdlib/nano-mallocr.c | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/newlib/libc/stdlib/arc4random.c b/newlib/libc/stdlib/arc4random.c index 7632de1..5860d64 100644 --- a/newlib/libc/stdlib/arc4random.c +++ b/newlib/libc/stdlib/arc4random.c @@ -99,7 +99,8 @@ _rs_stir(void) rs->rs_have = 0; memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf)); - rs->rs_count = (SIZE_MAX <= 65535) ? 65000 : 1600000; + rs->rs_count = (SIZE_MAX <= 65535) ? 65000 + : (SIZE_MAX <= 1048575 ? 1048000 : 1600000); } static inline void diff --git a/newlib/libc/stdlib/nano-mallocr.c b/newlib/libc/stdlib/nano-mallocr.c index 6ba0eb7..6dbfba8 100644 --- a/newlib/libc/stdlib/nano-mallocr.c +++ b/newlib/libc/stdlib/nano-mallocr.c @@ -106,8 +106,10 @@ #define sbrk_start __malloc_sbrk_start #define current_mallinfo __malloc_current_mallinfo -#define ALIGN_TO(size, align) \ - (((size) + (align) -1L) & ~((align) -1L)) +#define ALIGN_PTR(ptr, align) \ + (((ptr) + (align) - (intptr_t)1) & ~((align) - (intptr_t)1)) +#define ALIGN_SIZE(size, align) \ + (((size) + (align) - (size_t)1) & ~((align) - (size_t)1)) /* Alignment of allocated block */ #define MALLOC_ALIGN (8U) @@ -214,7 +216,7 @@ static void* sbrk_aligned(RARG malloc_size_t s) if (p == (void *)-1) return p; - align_p = (char*)ALIGN_TO((unsigned long)p, CHUNK_ALIGN); + align_p = (char*)ALIGN_PTR((uintptr_t)p, CHUNK_ALIGN); if (align_p != p) { /* p is not aligned, ask for a few more bytes so that we have s @@ -239,7 +241,7 @@ void * nano_malloc(RARG malloc_size_t s) malloc_size_t alloc_size; - alloc_size = ALIGN_TO(s, CHUNK_ALIGN); /* size of aligned data load */ + alloc_size = ALIGN_SIZE(s, CHUNK_ALIGN); /* size of aligned data load */ alloc_size += MALLOC_PADDING; /* padding */ alloc_size += CHUNK_OFFSET; /* size of chunk head */ alloc_size = MAX(alloc_size, MALLOC_MINCHUNK); @@ -305,7 +307,7 @@ void * nano_malloc(RARG malloc_size_t s) ptr = (char *)r + CHUNK_OFFSET; - align_ptr = (char *)ALIGN_TO((unsigned long)ptr, MALLOC_ALIGN); + align_ptr = (char *)ALIGN_PTR((uintptr_t)ptr, MALLOC_ALIGN); offset = align_ptr - ptr; if (offset) @@ -578,16 +580,16 @@ void * nano_memalign(RARG size_t align, size_t s) if ((align & (align-1)) != 0) return NULL; align = MAX(align, MALLOC_ALIGN); - ma_size = ALIGN_TO(MAX(s, MALLOC_MINSIZE), CHUNK_ALIGN); + ma_size = ALIGN_SIZE(MAX(s, MALLOC_MINSIZE), CHUNK_ALIGN); size_with_padding = ma_size + align - MALLOC_ALIGN; allocated = nano_malloc(RCALL size_with_padding); if (allocated == NULL) return NULL; chunk_p = get_chunk_from_ptr(allocated); - aligned_p = (char *)ALIGN_TO( - (unsigned long)((char *)chunk_p + CHUNK_OFFSET), - (unsigned long)align); + aligned_p = (char *)ALIGN_PTR( + (uintptr_t)((char *)chunk_p + CHUNK_OFFSET), + (uintptr_t)align); offset = aligned_p - ((char *)chunk_p + CHUNK_OFFSET); if (offset) @@ -642,6 +644,6 @@ void * nano_valloc(RARG size_t s) #ifdef DEFINE_PVALLOC void * nano_pvalloc(RARG size_t s) { - return nano_valloc(RCALL ALIGN_TO(s, MALLOC_PAGE_ALIGN)); + return nano_valloc(RCALL ALIGN_SIZE(s, MALLOC_PAGE_ALIGN)); } #endif /* DEFINE_PVALLOC */ |