diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-22 16:43:51 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-22 16:43:51 +0100 |
| commit | c4aa91d9d58a47eb90798ae1ae6647953d3745a2 (patch) | |
| tree | 2745079a8d62c2d414720775d073cb95106a95cc /kernel | |
| parent | 795b1f7df203ae33e1d0eb13612f0ba2abf4351e (diff) | |
support for ELF (with 1*text and 1*data)!
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/syscalls.c | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/kernel/syscalls.c b/kernel/syscalls.c index eb11f1b..1be1053 100644 --- a/kernel/syscalls.c +++ b/kernel/syscalls.c @@ -144,11 +144,11 @@ int syscall_execve(char *name, char **argv, char **env) //load binary ext2_check(EXT2_RAM_ADDRESS); - ext2_inode_content(EXT2_RAM_ADDRESS,name,0x800000-0x1000,0x100000); + ext2_inode_content(EXT2_RAM_ADDRESS,name,0x800000,0x100000); Elf32_Ehdr *elf; - elf=0x800000-0x1000; + elf=0x800000; if(elf->e_ident[0]!=0x7f||elf->e_ident[1]!='E'||elf->e_ident[2]!='L'||elf->e_ident[3]!='F') panic(FOOLOS_MODULE_NAME,"ELF mismatch!?"); @@ -183,24 +183,40 @@ int syscall_execve(char *name, char **argv, char **env) // iterate over section headers for(int phidx=0;phidx<elf->e_phnum;phidx++) { - Elf32_Phdr *phdr=0x800000-0x1000+elf->e_phoff+phidx*elf->e_phentsize; - /* - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"-- PROGRAMM HEADER %d --",phidx+1); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-type: %d",phdr->p_type); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-offset: 0x%08X",phdr->p_offset); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-vaddr: 0x%08X",phdr->p_vaddr); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-filesz: 0x%08X",phdr->p_filesz); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-memsz: 0x%08X",phdr->p_memsz); - */ - - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+phdr->p_memsz); - - // let's zero init bss and set alloc (heap) just right after it! - for(uint32_t *addr=phdr->p_vaddr+phdr->p_filesz; addr<=phdr->p_vaddr+phdr->p_memsz; addr++) + + if(phidx==1) { - *addr=0; + + Elf32_Phdr *phdr=0x800000+elf->e_phoff+phidx*elf->e_phentsize; + + /* + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"-- PROGRAMM HEADER %d --",phidx+1); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-type: %d",phdr->p_type); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-offset: 0x%08X",phdr->p_offset); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-vaddr: 0x%08X",phdr->p_vaddr); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-filesz: 0x%08X",phdr->p_filesz); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-memsz: 0x%08X",phdr->p_memsz); + */ + + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"data: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+phdr->p_memsz); + + // let's copy the rw- data block + uint32_t *data=0x800000+phdr->p_offset; + for(uint32_t *addr=phdr->p_vaddr; addr<=phdr->p_vaddr+phdr->p_filesz; addr++) + { + *addr=*data; + data++; + } + + // let's zero init bss and set alloc (heap) just right after it! + for(uint32_t *addr=phdr->p_vaddr+phdr->p_filesz; addr<=phdr->p_vaddr+phdr->p_memsz; addr++) + { + *addr=0; + } + + alloc=phdr->p_vaddr+phdr->p_memsz; } - alloc=phdr->p_vaddr+phdr->p_memsz; } @@ -222,7 +238,7 @@ int syscall_execve(char *name, char **argv, char **env) // autorun "user-space" prog asm("push $10");//argv TODO: addresse asm("push $20"); //argc TODO: real number of params! - asm("push $0x800000"); + asm("push $0x800080"); asm("ret"); while(1); |