X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Farch%2Fx86%2Fentry.S;h=8d4ede48ad2309d117979c0533b7095ca29ff99b;hp=3483893d93f4c9c642d7244bc493eff25cff6cf2;hb=00929a1561b0f510a582f9876affa96e4fccb72a;hpb=0601614ebbcc48b961a2f0613281e6e629af29b1

diff --git a/kernel/arch/x86/entry.S b/kernel/arch/x86/entry.S
index 3483893..8d4ede4 100644
--- a/kernel/arch/x86/entry.S
+++ b/kernel/arch/x86/entry.S
@@ -14,10 +14,12 @@
 
 #include <arch/addrs.h>
 
+#define ROSHARED_PTR(x) (x - roshared + 0x7fff0000)
+
 	.org 0
 	.code32
 	.global _start
-.align	4
+	.align	4
 multiboot_hdr:
 	.long	0x1badb002		// Multi-boot magic
 	
@@ -102,8 +104,9 @@ using_our_gdt:
 	
 	movl	$0x87, x86_init_ptbl_l2 + 0x800 - KERNEL_START
 	ljmp	$0x10, $paging_on - KERNEL_START
+	
 
-paging_on:	
+paging_on:
 	lgdt	x86_gdtr + 6
 	movl	%esi, x86_boot_info_phys
 	
@@ -299,22 +302,23 @@ x86_int98_entry:
 
 	.global x86_int99_entry
 x86_int99_entry:
-	pushl	%ecx
+	pushl	%edx
 	pushl	%eax
 	enterkernel %edx
 
 	pushl	%esp
 	call	x86_return_from_method
 	addl	$4, %esp
-
+	
 	exitkernel
 	popl	%eax
-	popl	%ecx
-	xorl	%edx, %edx
+ 	xorl	%ecx, %ecx
+	popl	%edx
 	xorl	%ebx, %ebx
 	xorl	%ebp, %ebp
 	xorl	%esi, %esi
 	xorl	%edi, %edi
+	movl	$ROSHARED_PTR(x86_shared_int98_ret), (%esp)
 	iret
 
 	.global	x86_irq
@@ -378,26 +382,31 @@ x86_new_thread:
 	xorl	%edi, %edi
 	
 	call	sched_new_thread
-	pop	%eax
+	popl	%eax
 	call	*%eax
 	call	exit_thread
 	ud2a
-
-	.section ".roshared","x"
 	
-	// The vsyscall table must be the first thing in roshared (at
-	// vaddr 0x7fff0000).
-
-#define PTR(x) (x - x86_syscall_ptr + 0x7fff0000)
+	.global arch_new_user_thread
+arch_new_user_thread:
+	movl	4(%esp), %eax	// arg1: user entry
+	movl	8(%esp), %ecx	// arg2: user stack
+	pushl	$0x23		// SS
+	pushl	%ecx		// ESP
+	pushl	$0x202		// EFLAGS
+	pushl	$0x2b		// CS
+	pushl	%eax		// EIP
 	
-	.global x86_syscall_ptr
-x86_syscall_ptr:
-	.long	PTR(x86_shared_int98)
-
-	.global	x86_sysret_ptr
-x86_sysret_ptr:
-	.long	PTR(x86_shared_int99)
+	movl	$0x23, %ebx
+	movl	%ebx, %ds
+	movl	%ebx, %es
+	
+	xorl	%eax, %eax
+	xorl	%ecx, %ecx
+	iret
 
+	.section ".roshared","ax"
+roshared:
 x86_shared_int98:
 	// FIXME: This must be unpreemptible by traps
 	pushl	%gs
@@ -407,6 +416,7 @@ x86_shared_int98:
 	pushl	%esi
 	pushl	%ebx
 	int	$0x98
+x86_shared_int98_ret:
 	popl	%ebx
 	popl	%esi
 	popl	%edi
@@ -415,11 +425,34 @@ x86_shared_int98:
 	popl	%gs
 	ret
 
+	. = roshared + 0x80
 x86_shared_int99:
 	int	$0x99
 	ret
 
-	.section ".rwshared",""
+	.global test_user_ptr
+test_user_ptr:
+	.long	ROSHARED_PTR(test_user)
+	
+test_pib:
+	.long	0
+	.long	0
+	.long	ROSHARED_PTR(test_objlist)
+	.long	1
+	.long	0
+
+test_objlist:
+	.long	0
+	.space	128
+	
+test_user:
+	movl	$ROSHARED_PTR(test_pib), %eax
+	movl	$0x7fff0000, %ecx
+	call	*%ecx
+1:	jmp	1b
+
+	.section ".rwshared","a"
+	.align 4096
 
 	// Userspace must set this to an appropriate entry point
 	// prior to registering objects with the kernel.  It should