devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added stack overflow check

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1358 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-07-15 22:21:18 +00:00
parent 76b4096be7
commit 09153dd82a
2 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

48
firmware/thread.c
View file

@ -17,6 +17,7 @@
* *
****************************************************************************/ ****************************************************************************/
#include "thread.h" #include "thread.h"
#include "panic.h"
struct regs struct regs
{ {
@ -28,9 +29,16 @@ struct regs
void* pr; /* Procedure register */ void* pr; /* Procedure register */
}; };
static int num_threads; int num_threads;
static int current_thread; static int current_thread;
static struct regs thread_contexts[MAXTHREADS]; static struct regs thread_contexts[MAXTHREADS];
char *thread_name[MAXTHREADS];
void *thread_stack[MAXTHREADS];
int thread_stack_size[MAXTHREADS];
static char main_thread_name[] = "main";
extern int stackbegin[];
extern int stackend[];
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
* Store non-volatile context. * Store non-volatile context.
@ -83,6 +91,7 @@ void switch_thread(void)
{ {
int current; int current;
int next; int next;
unsigned int *stackptr;
next = current = current_thread; next = current = current_thread;
if (++next >= num_threads) if (++next >= num_threads)
@ -90,6 +99,11 @@ void switch_thread(void)
current_thread = next; current_thread = next;
store_context(&thread_contexts[current]); store_context(&thread_contexts[current]);
load_context(&thread_contexts[next]); load_context(&thread_contexts[next]);
stackptr = thread_stack[next];
if(stackptr[0] != 0xdeadbeef)
panicf("Stkov %s", thread_name[next]);
} }
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
@ -97,11 +111,12 @@ void switch_thread(void)
* Return 0 if context area could be allocated, else -1. * Return 0 if context area could be allocated, else -1.
*--------------------------------------------------------------------------- *---------------------------------------------------------------------------
*/ */
int create_thread(void* function, void* stack, int stack_size) int create_thread(void* function, void* stack, int stack_size, char *name)
{ {
unsigned int i; unsigned int i;
unsigned int stacklen; unsigned int stacklen;
unsigned int *stackptr; unsigned int *stackptr;
struct regs *regs;
if (num_threads >= MAXTHREADS) if (num_threads >= MAXTHREADS)
return -1; return -1;
@ -115,9 +130,13 @@ int create_thread(void* function, void* stack, int stack_size)
stackptr[i] = 0xdeadbeef; stackptr[i] = 0xdeadbeef;
} }
struct regs* regs = &thread_contexts[num_threads++]; /* Store interesting information */
thread_name[num_threads] = name;
thread_stack[num_threads] = stack;
thread_stack_size[num_threads] = stack_size;
regs = &thread_contexts[num_threads++];
store_context(regs); store_context(regs);
/* Subtract 4 to leave room for the PR push in ldctx() /* Subtract 4 to leave room for the PR push in load_context()
Align it on an even 32 bit boundary */ Align it on an even 32 bit boundary */
regs->sp = (void*)(((unsigned int)stack + stack_size - 4) & ~3); regs->sp = (void*)(((unsigned int)stack + stack_size - 4) & ~3);
regs->sr = 0; regs->sr = 0;
@ -130,4 +149,25 @@ void init_threads(void)
{ {
num_threads = 1; /* We have 1 thread to begin with */ num_threads = 1; /* We have 1 thread to begin with */
current_thread = 0; /* The current thread is number 0 */ current_thread = 0; /* The current thread is number 0 */
thread_name[0] = main_thread_name;
thread_stack[0] = stackbegin;
thread_stack_size[0] = (int)stackend - (int)stackbegin;
}
int thread_stack_usage(int threadnum)
{
unsigned int i;
unsigned int *stackptr = thread_stack[threadnum];
if(threadnum >= num_threads)
return -1;
for(i = 0;i < thread_stack_size[threadnum]/sizeof(int);i++)
{
if(stackptr[i] != 0xdeadbeef)
break;
}
return ((thread_stack_size[threadnum] - i * 4) * 100) /
thread_stack_size[threadnum];
} }

4
firmware/thread.h
View file

@ -20,9 +20,11 @@
#define THREAD_H #define THREAD_H
#define MAXTHREADS 16 #define MAXTHREADS 16
#define DEFAULT_STACK_SIZE 0x800 /* Bytes */
int create_thread(void* function, void* stack, int stack_size); int create_thread(void* function, void* stack, int stack_size, char *name);
void switch_thread(void); void switch_thread(void);
void init_threads(void); void init_threads(void);
int thread_stack_usage(int threadnum);
#endif #endif