deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* Workaround for bug in msp430-ld where __bss_end is sometimes

Browse source 
misaligned.

* Indent trailing brace properly.
This commit is contained in:
bg- 2007-01-30 20:01:45 +00:00
parent 44f81a5625
commit 394992b99f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cpu/msp430/msp430.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: msp430.c,v 1.3 2006/11/17 13:30:45 bg- Exp $ * @(#)$Id: msp430.c,v 1.4 2007/01/30 20:01:45 bg- Exp $
*/ */
#include <io.h> #include <io.h>
#include <signal.h> #include <signal.h>
@ -150,6 +150,9 @@ init_ports(void)
P2IE = 0; P2IE = 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* __bss_end is int but msp430-ld may align it incorrectly. Fix below. */
static char *cur_break = (char *)(&__bss_end + 1);
void void
msp430_cpu_init(void) msp430_cpu_init(void)
{ {
@ -157,12 +160,13 @@ msp430_cpu_init(void)
init_ports(); init_ports();
msp430_init_dco(); msp430_init_dco();
eint(); eint();
if((uintptr_t)cur_break & 1) /* Workaround for msp430-ld bug! */
cur_break++;
} }
#define asmv(arg) __asm__ __volatile__(arg) #define asmv(arg) __asm__ __volatile__(arg)
#define STACK_EXTRA 32 #define STACK_EXTRA 32
static char *cur_break = (char *)(&__bss_end + 1);
/* /*
* Allocate memory from the heap. Check that we don't collide with the * Allocate memory from the heap. Check that we don't collide with the
@ -186,7 +190,8 @@ sbrk(int incr)
* If the stack was never here then [old_break .. cur_break] should * If the stack was never here then [old_break .. cur_break] should
* be filled with zeros. * be filled with zeros.
*/ */
return old_break; } return old_break;
}
/* /*
* Mask all interrupts that can be masked. * Mask all interrupts that can be masked.