sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-02-27 01:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test container working, but logic seems wrong

Browse Source
This commit is contained in:
Amit Mahajan
2009-12-09 15:56:21 +05:30
parent 57f157c4a5
commit 54301e8026
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conts/baremetal/test/SConstruct
View File

@@ -61,6 +61,7 @@ env = Environment(CC = config.user_toolchain + 'gcc',
src = Glob('*.[cS]') src = Glob('*.[cS]')
src += Glob('src/*.[cS]') src += Glob('src/*.[cS]')
src += Glob('src/arch/*.[cS]')
objs = env.Object(src) objs = env.Object(src)
prog = env.Program('main.elf', objs) prog = env.Program('main.elf', objs)

4
conts/baremetal/test/src/arch-arm/new_thread.S
View File

@@ -1,11 +1,11 @@
#include <l4lib/arch/asm.h> #include <l4lib/arch/asm.h>
BEGIN_PROC(setup_new_thread) BEGIN_PROC(local_setup_new_thread)
ldr r0, [sp, #-4]! @ Load first argument. ldr r0, [sp, #-4]! @ Load first argument.
mov lr, pc @ Save return address mov lr, pc @ Save return address
ldr pc, [sp, #-4]! @ Load function pointer from stack ldr pc, [sp, #-4]! @ Load function pointer from stack
new_thread_exit: new_thread_exit:
b new_thread_exit @ We infinitely loop for now. b new_thread_exit @ We infinitely loop for now.
END_PROC(setup_new_thread) END_PROC(local_setup_new_thread)

18
conts/baremetal/test/src/captest.c
View File

@@ -15,8 +15,8 @@ int simple_pager_thread(void *arg)
l4_getid(&ids); l4_getid(&ids);
//printf("Thread spawned from pager, " printf("Thread spawned from pager, \
// "trying to create new thread.\n"); trying to create new thread.\n");
err = l4_thread_control(THREAD_CREATE | err = l4_thread_control(THREAD_CREATE |
TC_SHARE_SPACE | TC_SHARE_SPACE |
TC_AS_PAGER, &ids); TC_AS_PAGER, &ids);
@@ -24,8 +24,8 @@ int simple_pager_thread(void *arg)
if (res == 0) if (res == 0)
if (err == -ENOCAP || if (err == -ENOCAP ||
err == -ENOMEM) { err == -ENOMEM) {
//printf("Creation failed with %d " printf("Creation failed with %d "
// "as expected.\n", err); "as expected.\n", err);
testres = 0; testres = 0;
} else { } else {
printf("Creation was supposed to fail " printf("Creation was supposed to fail "
@@ -56,7 +56,6 @@ int simple_pager_thread(void *arg)
int wait_check_test(struct task_ids *ids) int wait_check_test(struct task_ids *ids)
{ {
#if 0
int result; int result;
/* Wait for thread to finish */ /* Wait for thread to finish */
@@ -68,7 +67,7 @@ int wait_check_test(struct task_ids *ids)
printf("Top-level test has failed\n"); printf("Top-level test has failed\n");
} }
/* Else it is a success */ /* Else it is a success */
#endif
return 0; return 0;
} }
@@ -77,7 +76,7 @@ int capability_test(void)
int err; int err;
struct task_ids ids; struct task_ids ids;
int TEST_MUST_FAIL = 0; int TEST_MUST_FAIL = 0;
int TEST_MUST_SUCCEED = 1; //int TEST_MUST_SUCCEED = 1;
/* Read pager capabilities */ /* Read pager capabilities */
caps_read_all(); caps_read_all();
@@ -93,17 +92,17 @@ int capability_test(void)
goto out_err; goto out_err;
} }
printf("waititng for result\n");
/* Wait for test to finish and check result */ /* Wait for test to finish and check result */
if (wait_check_test(&ids) < 0) if (wait_check_test(&ids) < 0)
goto out_err; goto out_err;
#if 0 #if 0
/* Destroy test thread */ /* Destroy test thread */
if ((err = l4_thread_control(THREAD_DESTROY, &ids)) < 0) { if ((err = l4_thread_control(THREAD_DESTROY, &ids)) < 0) {
printf("Destruction of top-level simple_pager failed.\n"); printf("Destruction of top-level simple_pager failed.\n");
BUG(); BUG();
} }
#endif
/* /*
* Share operations with the same thread * Share operations with the same thread
@@ -132,7 +131,6 @@ int capability_test(void)
if (wait_check_test(&ids) < 0) if (wait_check_test(&ids) < 0)
goto out_err; goto out_err;
#if 0
/* Destroy test thread */ /* Destroy test thread */
if ((err = l4_thread_control(THREAD_DESTROY, &ids)) < 0) { if ((err = l4_thread_control(THREAD_DESTROY, &ids)) < 0) {
printf("Destruction of top-level simple_pager failed.\n"); printf("Destruction of top-level simple_pager failed.\n");

8
conts/baremetal/test/src/thread.c
View File

@@ -12,7 +12,7 @@ char *__stack_ptr = &stack[1][0];
char utcb[THREADS_TOTAL][UTCB_SIZE] ALIGN(8); char utcb[THREADS_TOTAL][UTCB_SIZE] ALIGN(8);
char *__utcb_ptr = &utcb[1][0]; char *__utcb_ptr = &utcb[1][0];
extern void setup_new_thread(void); extern void local_setup_new_thread(void);
int thread_create(int (*func)(void *), void *args, unsigned int flags, int thread_create(int (*func)(void *), void *args, unsigned int flags,
struct task_ids *new_ids) struct task_ids *new_ids)
@@ -44,16 +44,16 @@ int thread_create(int (*func)(void *), void *args, unsigned int flags,
return -ENOMEM; return -ENOMEM;
/* First word of new stack is arg */ /* First word of new stack is arg */
((unsigned long *)__stack_ptr)[-1] = (unsigned long)args; *(((unsigned int *)__stack_ptr) -1) = (unsigned int)args;
/* Second word of new stack is function address */ /* Second word of new stack is function address */
((unsigned long *)__stack_ptr)[-2] = (unsigned long)func; *(((unsigned int *)__stack_ptr) -2) = (unsigned int)func;
/* Setup new thread pc, sp, utcb */ /* Setup new thread pc, sp, utcb */
memset(&exregs, 0, sizeof(exregs)); memset(&exregs, 0, sizeof(exregs));
exregs_set_stack(&exregs, (unsigned long)__stack_ptr); exregs_set_stack(&exregs, (unsigned long)__stack_ptr);
exregs_set_utcb(&exregs, (unsigned long)__utcb_ptr); exregs_set_utcb(&exregs, (unsigned long)__utcb_ptr);
exregs_set_pc(&exregs, (unsigned long)setup_new_thread); exregs_set_pc(&exregs, (unsigned long)local_setup_new_thread);
if ((err = l4_exchange_registers(&exregs, ids.tid)) < 0) if ((err = l4_exchange_registers(&exregs, ids.tid)) < 0)
return err; return err;