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=997487e2af0437f9b3451cf1911579325e23f7b9;hb=00929a1561b0f510a582f9876affa96e4fccb72a;hpb=1ac390fe1e18444008857b056c947710be9621a8

diff --git a/kernel/arch/x86/entry.S b/kernel/arch/x86/entry.S
index 997487e..8d4ede4 100644
--- a/kernel/arch/x86/entry.S
+++ b/kernel/arch/x86/entry.S
@@ -14,7 +14,7 @@
 
 #include <arch/addrs.h>
 
-#define ROSHARED_PTR(x) (x - x86_syscall_ptr + 0x7fff0000)
+#define ROSHARED_PTR(x) (x - roshared + 0x7fff0000)
 
 	.org 0
 	.code32
@@ -406,19 +406,7 @@ arch_new_user_thread:
 	iret
 
 	.section ".roshared","ax"
-	.align 4096
-	
-	// The vsyscall table must be the first thing in roshared 
-	// (at vaddr 0x7fff0000).
-	
-	.global x86_syscall_ptr
-x86_syscall_ptr:
-	.long	ROSHARED_PTR(x86_shared_int98)
-
-	.global	x86_sysret_ptr
-x86_sysret_ptr:
-	.long	ROSHARED_PTR(x86_shared_int99)
-
+roshared:
 x86_shared_int98:
 	// FIXME: This must be unpreemptible by traps
 	pushl	%gs
@@ -437,12 +425,12 @@ x86_shared_int98_ret:
 	popl	%gs
 	ret
 
+	. = roshared + 0x80
 x86_shared_int99:
 	int	$0x99
 	ret
 
 	.global test_user_ptr
-	.align 4
 test_user_ptr:
 	.long	ROSHARED_PTR(test_user)
 	
@@ -459,7 +447,8 @@ test_objlist:
 	
 test_user:
 	movl	$ROSHARED_PTR(test_pib), %eax
-	call	*0x7fff0000
+	movl	$0x7fff0000, %ecx
+	call	*%ecx
 1:	jmp	1b
 
 	.section ".rwshared","a"