ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve build/type cast errors

pull/9571/head
Deepika 2019-02-07 16:47:32 -06:00 committed by deepikabhavnani
parent 462f339d47
commit 537b3646d3
4 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
platform/mbed_retarget.cpp
View File

@ -918,22 +918,22 @@ __asm(".global __use_no_semihosting\n\t");
#endif
#if !defined(ISR_STACK_START)
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[];
#define ISR_STACK_START Image$$ARM_LIB_STACK$$ZI$$Base
#define ISR_STACK_SIZE Image$$ARM_LIB_STACK$$ZI$$Length
#endif
#if !defined(HEAP_START)
// Heap here is considered starting after ZI ends to Stack start
extern uint32_t Image$$RW_IRAM1$$ZI$$Limit[];
extern uint32_t Image$$RW_IRAM1$$ZI$$Limit[];
#define HEAP_START Image$$RW_IRAM1$$ZI$$Limit
#define HEAP_SIZE ((uint32_t)(ISR_STACK_START - HEAP_START))
#define HEAP_SIZE ((uint32_t)((uint32_t)ISR_STACK_START - (uint32_t)HEAP_START))
#endif
#define HEAP_LIMIT (HEAP_START + HEAP_SIZE)
#define HEAP_LIMIT ((uint32_t)((uint32_t)HEAP_START + (uint32_t)HEAP_SIZE))
extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3)
extern "C" MBED_WEAK __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3)
{
uint32_t heap_base = (uint32_t)HEAP_START;
struct __initial_stackheap r;
@ -946,7 +946,7 @@ extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uin
return r;
}
extern "C" extern __value_in_regs struct __argc_argv $Super$$__rt_lib_init(unsigned heapbase, unsigned heaptop);
extern "C" __value_in_regs struct __argc_argv $Super$$__rt_lib_init(unsigned heapbase, unsigned heaptop);
extern "C" __value_in_regs struct __argc_argv $Sub$$__rt_lib_init(unsigned heapbase, unsigned heaptop)
{
@ -1243,10 +1243,10 @@ extern "C" WEAK void __cxa_pure_virtual(void)
#if !defined(HEAP_START)
/* Defined by linker script */
extern uint32_t __end__;
extern uint32_t __HeapLimit;
#define HEAP_START (__end__)
#define HEAP_LIMIT (__HeapLimit)
extern "C" uint32_t __end__;
extern "C" uint32_t __HeapLimit;
#define HEAP_START __end__
#define HEAP_LIMIT __HeapLimit
#else
#define HEAP_LIMIT ((uint32_t)(HEAP_START + HEAP_SIZE))
#endif
@ -1258,17 +1258,16 @@ extern "C" int errno;
// Weak attribute allows user to override, e.g. to use external RAM for dynamic memory.
extern "C" WEAK caddr_t _sbrk(int incr)
{
static uint32_t heap = (uint32_t) &HEAP_START;
uint32_t prev_heap = heap;
uint32_t new_heap = heap + incr;
static unsigned char *heap = (unsigned char *) &HEAP_START;
unsigned char *prev_heap = heap;
unsigned char *new_heap = heap + incr;
/* __HeapLimit is end of heap section */
if (new_heap >= (uint32_t) &HEAP_LIMIT) {
if (new_heap >= (unsigned char *) &HEAP_LIMIT) {
errno = ENOMEM;
return (caddr_t) -1;
}
heap = new_heap;
return (caddr_t) prev_heap;
}
#endif

8
rtos/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
View File

@ -28,17 +28,17 @@ __value_in_regs struct __argc_argv __rt_lib_init(unsigned heapbase, unsigned hea
void _platform_post_stackheap_init(void);
#if !defined(ISR_STACK_START)
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[];
#define ISR_STACK_START Image$$ARM_LIB_STACK$$ZI$$Base
#define ISR_STACK_SIZE Image$$ARM_LIB_STACK$$ZI$$Length
#endif
#if !defined(HEAP_START)
// Heap here is considered starting after ZI ends to Stack start
extern uint32_t Image$$RW_IRAM1$$ZI$$Limit[];
extern uint32_t Image$$RW_IRAM1$$ZI$$Limit[];
#define HEAP_START Image$$RW_IRAM1$$ZI$$Limit
#define HEAP_SIZE ((uint32_t)(ISR_STACK_START - HEAP_START))
#define HEAP_SIZE ((uint32_t)((uint32_t)ISR_STACK_START - (uint32_t)HEAP_START))
#endif
/*

14
rtos/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
View File

@ -32,17 +32,17 @@ static osMutexAttr_t env_mutex_attr;
#if !defined(ISR_STACK_SIZE)
extern uint32_t __StackLimit;
extern uint32_t __StackTop;
#define ISR_STACK_START (__StackLimit)
#define ISR_STACK_SIZE ((uint32_t)(__StackTop - __StackLimit))
#define ISR_STACK_START __StackLimit
#define ISR_STACK_SIZE ((uint32_t)((uint32_t)__StackTop - (uint32_t)__StackLimit))
#endif
#if !defined(HEAP_START)
/* Defined by linker script */
extern uint32_t __end__;
extern uint32_t __HeapLimit;
#define HEAP_START (__end__)
#define HEAP_LIMIT (__HeapLimit)
#define HEAP_SIZE ((uint32_t)(HEAP_LIMIT - HEAP_START))
#define HEAP_START __end__
#define HEAP_LIMIT __HeapLimit
#define HEAP_SIZE ((uint32_t)((uint32_t)HEAP_LIMIT - (uint32_t)HEAP_START))
#endif
extern void __libc_init_array(void);
@ -54,9 +54,9 @@ extern void __libc_init_array(void);
*/
void software_init_hook(void)
{
mbed_stack_isr_start = (unsigned char *) &ISR_STACK_START;
mbed_stack_isr_start = (unsigned char *)ISR_STACK_START;
mbed_stack_isr_size = (uint32_t) ISR_STACK_SIZE;
mbed_heap_start = (unsigned char *) &HEAP_START;
mbed_heap_start = (unsigned char *) HEAP_START;
mbed_heap_size = (uint32_t) HEAP_SIZE;
mbed_init();

4
targets/TARGET_RENESAS/mbed_rtx.h
View File

@ -25,10 +25,10 @@
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit[];
extern uint32_t Image$$ARM_LIB_HEAP$$Base[];
#define ISR_STACK_START Image$$ARM_LIB_STACK$$Base
#define ISR_STACK_SIZE (uint32_t)(Image$$ARM_LIB_STACK$$ZI$$Limit - Image$$ARM_LIB_STACK$$Base)
#define ISR_STACK_SIZE (uint32_t)((uint32_t)Image$$ARM_LIB_STACK$$ZI$$Limit - (uint32_t)Image$$ARM_LIB_STACK$$Base)
#define INITIAL_SP Image$$ARM_LIB_STACK$$ZI$$Limit
#define HEAP_START Image$$ARM_LIB_HEAP$$Base
#define HEAP_SIZE (uint32_t)(ISR_STACK_START - HEAP_START)
#define HEAP_SIZE (uint32_t)((uint32_t)ISR_STACK_START - (uint32_t)HEAP_START)
#elif defined(__GNUC__)
#define INITIAL_SP (&__StackTop)
#elif defined(__ICCARM__)