reactiveate threads. allow user space access to framebuffer

6 files changed, 76 insertions, 29 deletions

diff --git a/grubiso/boot/grub/grub.cfg b/grubiso/boot/grub/grub.cfg
index 692138a..b9fa2ac 100644
--- a/grubiso/boot/grub/grub.cfg
+++ b/grubiso/boot/grub/grub.cfg
@@ -1,4 +1,4 @@
-set timeout=0 //seconds
+set timeout=1 //seconds
 
 if loadfont ${prefix}/fonts/unicode.pf2
 
diff --git a/kernel/kernel.h b/kernel/kernel.h
index a296b18..5546071 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -80,6 +80,7 @@ REFERENCES
 #define VMEM_USER_NEWLIB     0xF5000000 // 1    page           / newlib reentrancy struct. 1 per thread
 
 #define VMEM_FRAMEBUFFER     0xF6000000 // 8192 pages (32megs) / identity mapped 
+#define VMEM_FRAMEBUFFER_PAGES (1024*8) 
 #define VMEM_EXT2_RAMIMAGE   0xF8000000 // 8192 pages (32megs) / identity mapped
 
 #endif
diff --git a/kernel/scheduler.c b/kernel/scheduler.c
index 20b69ed..0c24f94 100644
--- a/kernel/scheduler.c
+++ b/kernel/scheduler.c
@@ -35,6 +35,7 @@ static uint32_t nextPID()
 
 // we hold this stuff per cpu
 static volatile uint32_t current_task[SMP_MAX_PROC];
+static volatile uint32_t last_task[SMP_MAX_PROC]; // last non ring1 task
 
 // we hold this stuff per cpu
 static volatile struct task_list_struct
@@ -69,6 +70,7 @@ volatile void scheduler_init(uint32_t cpu, void *dir)
     }
 
     current_task[cpu]=0;
+    last_task[cpu]=0;
    
     // need to make space on the esp stacks for pushing vals vias task_pusha
     
@@ -117,6 +119,8 @@ static uint32_t scheduler_schedule(uint32_t idx)
 	uint32_t cpu=smp_get(SMP_APIC_ID);
 	if(task_list[cpu][idx].active && !task_list[cpu][idx].syscall)
 	{
+            if(current_task[cpu]!=0)last_task[cpu]=current_task[cpu];
+
 	    current_task[cpu]=idx;
 	    install_tss(cpu,task_list[cpu][idx].esp0);
 	    x86_set_page_directory(task_list[cpu][idx].vmem);
@@ -150,19 +154,21 @@ volatile uint32_t scheduler_run(uint32_t oldesp,uint32_t preference)
 
     uint32_t esp;
     esp=scheduler_schedule(preference); // try preference
+
     if(esp)return esp;
 
     for(int i=0;i<MAX_TASKS;i++)
     {
-	int idx=(current_task[cpu]+1+i)%MAX_TASKS; // schedule round robin style
-	if(idx==2)continue;// skip sleeper here
+	int idx=(last_task[cpu]+1+i)%MAX_TASKS; // schedule round robin style
 
-	esp=scheduler_schedule(idx); // try preference
-	if(esp)return esp;
+	if(idx==preference||idx==2)continue;// skip sleeper and preferred tasks here.
 
+	esp=scheduler_schedule(idx);
+
+	if(esp)return esp;
     }
 
-    // force the sleeper task
+    // force the sleeper task...
     return scheduler_schedule(2);
 
 }
@@ -455,5 +461,5 @@ void task_exit(uint32_t pid)
            task_list[cpu][i].active=false;
     }
 
-    vmem_free_space_dir(task_list[cpu][idx].vmem,false);
+    vmem_free_space_dir(task_list[cpu][idx].vmem,task_list[cpu][idx].thread);
 }
diff --git a/kernel/syscalls.c b/kernel/syscalls.c
index d289121..01bc7a5 100644
--- a/kernel/syscalls.c
+++ b/kernel/syscalls.c
@@ -302,7 +302,16 @@ uint32_t syscall_fork(int none1, int none2, int none3, int pid)
 
 uint32_t syscall_clone(int none1, int none2, int none3, int pid)
 {
-    return task_clone(pid);
+    uint32_t newpid=task_clone(pid);
+
+    for(int i=0;i<MAX_FD;i++) // TODO: use same pid and use same list maybe?
+    {
+	if(!open_fd[pid][i])continue;
+	fds[newpid][i]=fd_dupl(&fds[pid][i]);
+	open_fd[newpid][i]=true;
+    }
+
+    return newpid;
 }
 
 uint32_t syscall_wait(int none1, int none2, int none3, int pid)
diff --git a/kernel/vmem.c b/kernel/vmem.c
index 0c751b8..4af596d 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -299,7 +299,8 @@ pdirectory* vmem_kernel_dir()
     vmem_add_identity(dir,0,1024*8,false);//identity map first 32 megs... 
     vmem_add_identity(dir,e1000_addr,32,false);//identity map 32 pages for e1000
 
-    vmem_add_remap(dir,fb_addr,VMEM_FRAMEBUFFER,1024*8,false);//32megs should be enough for 4k (think about pitch)
+    vmem_add_remap(dir,fb_addr,VMEM_FRAMEBUFFER,VMEM_FRAMEBUFFER_PAGES,true);//32megs should be enough for 4k (think about pitch)
+
     vmem_add_remap(dir,local_apic_addr,VMEM_LAPIC,1,false); //apic addr should be at pagestart, right? TODO: check.
     vmem_add_remap(dir,io_apic_addr,VMEM_IOAPIC,1,false); 
     vmem_add_remap(dir,mod_start,VMEM_EXT2_RAMIMAGE,1024*8,false);//32megs for ramimage: TODO: check if enough? 
@@ -321,6 +322,8 @@ void vmem_free_space_dir(pdirectory *dir,bool stack_only)
     fixme("stack_only version too!");
     klog("free page directory at: 0x%X",dir);
 
+    if(stack_only)kpanic("not implemented yet!");
+
     //free user pages
     uint32_t virt=0;
     for(int i=0;i<1024;i++)
@@ -333,6 +336,7 @@ void vmem_free_space_dir(pdirectory *dir,bool stack_only)
 
 	    for(int j=0;j<1024;j++)
 	    {
+                if(virt>=VMEM_FRAMEBUFFER&&virt<VMEM_FRAMEBUFFER+VMEM_FRAMEBUFFER_PAGES*4096)continue; // skip framebuffer pls
 		uint32_t src_pd=src_table->m_entries[j];
 	        uint32_t src_phys=pd_entry_get_frame(&src_pd);
 
@@ -340,6 +344,7 @@ void vmem_free_space_dir(pdirectory *dir,bool stack_only)
 		{
 		    mem_free_block(src_phys);
 		}
+
 		virt+=4096;
 	    }
 	}
@@ -360,13 +365,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
 	if(!pt_entry_is_user(src_pt))dir->m_entries [i]=src_pt;
     }
 
-    // threads share this //
-    if(stack_only)
-    {
-	// TODO
-	kpanic("not impl!");
-    }
-    else
+    if(!stack_only)
     {
 	vmem_add_alloc(dir,VMEM_USER_PROG,VMEM_USER_PROG_PAGES,true); 
 	vmem_add_alloc(dir,VMEM_USER_ENV,1,true); 
@@ -392,6 +391,8 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
 
 	    for(int j=0;j<1024;j++)
 	    {
+                if(virt>=VMEM_FRAMEBUFFER&&virt<VMEM_FRAMEBUFFER+VMEM_FRAMEBUFFER_PAGES*4096)continue; // skip framebuffer pls
+
 		uint32_t src_pd=src_table->m_entries[j];
 		uint32_t dst_pd=dst_table->m_entries[j];
 
@@ -400,24 +401,36 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
 
 		if(src_pd)
 		{
-		    //klog("copy virt: %x / phys: %x -> %x",virt,src_phys,dst_phys);
-		   
-		    vmem_clear_one(mydir,VMEM_COPY_PAGE);
-		    vmem_clear_one(mydir,VMEM_COPY_PAGE+4096);
-
-		    vmem_add_remap(mydir,src_phys,VMEM_COPY_PAGE,1,false);
-		    vmem_add_remap(mydir,dst_phys,VMEM_COPY_PAGE+4096,1,false);
-
-		    x86_invlpg(VMEM_COPY_PAGE); // refresh TLB 
-		    x86_invlpg(VMEM_COPY_PAGE+4096); // refresh TLB 
-
-		    memcpy(VMEM_COPY_PAGE+4096,VMEM_COPY_PAGE,4096);
-		}
+                    if(stack_only&&(virt==VMEM_USER_ENV||(virt>=VMEM_USER_PROG&&virt<VMEM_USER_PROG+VMEM_USER_PROG_PAGES*4096)))
+                    {
+                        // threads share this //
+                        vmem_add_remap(dir,src_phys,virt,1,true);
+                    }
+                    else
+                    {
+                    
+                        //klog("copy virt: %x / phys: %x -> %x",virt,src_phys,dst_phys);
+                    
+                        vmem_clear_one(mydir,VMEM_COPY_PAGE);
+                        vmem_clear_one(mydir,VMEM_COPY_PAGE+4096);
+
+                        vmem_add_remap(mydir,src_phys,VMEM_COPY_PAGE,1,false);
+                        vmem_add_remap(mydir,dst_phys,VMEM_COPY_PAGE+4096,1,false);
+
+                        x86_invlpg(VMEM_COPY_PAGE); // refresh TLB 
+                        x86_invlpg(VMEM_COPY_PAGE+4096); // refresh TLB 
+
+                        memcpy(VMEM_COPY_PAGE+4096,VMEM_COPY_PAGE,4096);
+                    }
+                }
 		virt+=4096;
 	    }
 	}
 	else virt+=4096*1024;
     }
+
+    vmem_add_remap(dir,fb_addr,VMEM_FRAMEBUFFER,VMEM_FRAMEBUFFER_PAGES,true);//32megs should be enough for 4k (think about pitch)
+
     return dir;
 }
 
diff --git a/userspace/threading.c b/userspace/threading.c
new file mode 100644
index 0000000..2ceaad3
--- /dev/null
+++ b/userspace/threading.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include "newcalls.h"
+
+int main()
+{
+    int thread=_clone(); // we want two threads
+
+    if(thread!=0) // thread 1
+    {
+      while(1) printf("a\n");
+    }
+    else // thread2
+    {
+      while(1) printf("b\n");
+    }
+
+}
+