From 538b71077d1f936bbe1700b1db94c700fcff344a Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 1 Mar 2007 23:08:21 +0000 Subject: [PATCH] * spu/sbrk.c (sbrk): Adjust the stack pointer vector correctly so that GCC runtime stack checking works. Handle the backchain, too. --- libgloss/ChangeLog | 5 +++++ libgloss/spu/sbrk.c | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 500ec4f1e..dd3730aba 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2007-03-01 Ben Elliston + + * spu/sbrk.c (sbrk): Adjust the stack pointer vector correctly so + that GCC runtime stack checking works. Handle the backchain, too. + 2007-02-21 Patrick Mansfield * spu/gettimeofday.c: New file which adds SPU gettimeofday. diff --git a/libgloss/spu/sbrk.c b/libgloss/spu/sbrk.c index c95a7e8cd..b0528c395 100644 --- a/libgloss/spu/sbrk.c +++ b/libgloss/spu/sbrk.c @@ -32,6 +32,7 @@ Author: Andreas Neukoetter (ti95neuk@de.ibm.com) #include #include +#include extern int errno; @@ -44,20 +45,39 @@ sbrk (ptrdiff_t increment) { static caddr_t heap_ptr = NULL; caddr_t base; + vector unsigned int sp_reg, sp_delta; + vector unsigned int *sp_ptr; + /* The stack pointer register. */ + volatile register vector unsigned int sp_r1 __asm__("1"); + if (heap_ptr == NULL) - { - heap_ptr = (caddr_t) & _end; - } + heap_ptr = (caddr_t) & _end; + if (((RAMSIZE - STACKSIZE) - (int) heap_ptr) >= increment) { - base = heap_ptr; - heap_ptr += increment; - return (base); + base = heap_ptr; + heap_ptr += increment; + + sp_delta = (vector unsigned int) spu_insert (increment, spu_splats (0), 1); + + /* Subtract sp_delta from the SP limit (word 1). */ + sp_r1 = spu_sub (sp_r1, sp_delta); + + /* Fix-up backchain. */ + sp_ptr = (vector unsigned int *) spu_extract (sp_r1, 0); + do + { + sp_reg = *sp_ptr; + *sp_ptr = (vector unsigned int) spu_sub (sp_reg, sp_delta); + } + while ((sp_ptr = (vector unsigned int *) spu_extract (sp_reg, 0))); + + return (base); } else { - errno = ENOMEM; - return ((void *) -1); + errno = ENOMEM; + return ((void *) -1); } }