catfood/BigOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simple fix for fork

Browse Source
This commit is contained in:
catfood 2022-12-29 15:56:54 +08:00
parent b3f160accf
commit 1a5b096b94
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/exec.c
View File

@ -11,6 +11,7 @@
#include "elf.h" #include "elf.h"
#include "fs.h" //added by mingxuan 2019-5-19 #include "fs.h" //added by mingxuan 2019-5-19
#include "vfs.h" #include "vfs.h"
#include "stdio.h"
@ -168,15 +169,17 @@ static u32 exec_load(u32 fd,const Elf32_Ehdr* Echo_Ehdr,const Elf32_Phdr Echo_Ph
{//最后一个program {//最后一个program
break; break;
} }
if( Echo_Phdr[ph_num].p_flags == 0x5 || Echo_Phdr[ph_num].p_flags == 0x4) //101，只读 if( Echo_Phdr[ph_num].p_flags == 0x5) //101，R E
{//.text {//.text
exec_elfcpy(fd,Echo_Phdr[ph_num],PG_P | PG_USU | PG_RWR);//进程代码段 exec_elfcpy(fd,Echo_Phdr[ph_num],PG_P | PG_USU | PG_RWR);//进程代码段
// kprintf("text lin base: 0x%08x\n", Echo_Phdr[ph_num].p_vaddr);
p_proc_current->task.memmap.text_lin_base = Echo_Phdr[ph_num].p_vaddr; p_proc_current->task.memmap.text_lin_base = Echo_Phdr[ph_num].p_vaddr;
p_proc_current->task.memmap.text_lin_limit = Echo_Phdr[ph_num].p_vaddr + Echo_Phdr[ph_num].p_memsz; p_proc_current->task.memmap.text_lin_limit = Echo_Phdr[ph_num].p_vaddr + Echo_Phdr[ph_num].p_memsz;
} }
else if(Echo_Phdr[ph_num].p_flags == 0x6)//110，读写 else if(Echo_Phdr[ph_num].p_flags == 0x4)//110，R
{//.data {//.data
exec_elfcpy(fd,Echo_Phdr[ph_num],PG_P | PG_USU | PG_RWW);//进程数据段 exec_elfcpy(fd,Echo_Phdr[ph_num],PG_P | PG_USU | PG_RWW);//进程数据段
// kprintf("data lin base: 0x%08x\n", Echo_Phdr[ph_num].p_vaddr);
p_proc_current->task.memmap.data_lin_base = Echo_Phdr[ph_num].p_vaddr; p_proc_current->task.memmap.data_lin_base = Echo_Phdr[ph_num].p_vaddr;
p_proc_current->task.memmap.data_lin_limit = Echo_Phdr[ph_num].p_vaddr + Echo_Phdr[ph_num].p_memsz; p_proc_current->task.memmap.data_lin_limit = Echo_Phdr[ph_num].p_vaddr + Echo_Phdr[ph_num].p_memsz;
} }
@ -199,7 +202,7 @@ static int exec_pcb_init(char* path)
char* p_regs; //point to registers in the new kernel stack, added by xw, 17/12/11 char* p_regs; //point to registers in the new kernel stack, added by xw, 17/12/11
//名称 状态 特权级 寄存器 //名称 状态 特权级 寄存器
strcpy(p_proc_current->task.p_name, path); //名称 strncpy(p_proc_current->task.p_name, path, sizeof(p_proc_current->task.p_name)-1); //名称
p_proc_current->task.stat = READY; //状态 p_proc_current->task.stat = READY; //状态
p_proc_current->task.ldts[0].attr1 = DA_C | PRIVILEGE_USER << 5;//特权级修改为用户级 p_proc_current->task.ldts[0].attr1 = DA_C | PRIVILEGE_USER << 5;//特权级修改为用户级
p_proc_current->task.ldts[1].attr1 = DA_DRW | PRIVILEGE_USER << 5;//特权级修改为用户级 p_proc_current->task.ldts[1].attr1 = DA_DRW | PRIVILEGE_USER << 5;//特权级修改为用户级