X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=bios%2Fvmxassist%2Ftrap.S;h=d5ece3e1434049fc7057c9cfdab8f58e3f4993b0;hp=468da0a5db5125d020579c1c70560abfaf572015;hb=61597ea2c5ccace036d8a65e429e32b8f8a7ed4a;hpb=f3eb8bbb7c58c98b03797f2188e6c1d2a7610c15

diff --git a/bios/vmxassist/trap.S b/bios/vmxassist/trap.S
index 468da0a..d5ece3e 100644
--- a/bios/vmxassist/trap.S
+++ b/bios/vmxassist/trap.S
@@ -100,13 +100,9 @@ trap_handlers:
 	.code32
 	.align	16
 common_trap:				/* common trap handler */
-	pushl	%gs
-	pushl	%fs
-	pushl	%ds
-	pushl	%es
 	pushal
 
-	movl	$DATA_SELECTOR, %eax	/* make sure these are sane */
+	movl	$(DATA_SELECTOR), %eax	/* make sure these are sane */
 	movl	%eax, %ds
 	movl	%eax, %es
 	movl	%eax, %fs
@@ -114,17 +110,13 @@ common_trap:				/* common trap handler */
 	movl	%esp, %ebp
 
 	pushl	%ebp
-	pushl	52(%ebp)
-	pushl	48(%ebp)
+	pushl	36(%ebp)
+	pushl	32(%ebp)
 	call	trap			/* trap(trapno, errno, regs) */
 	addl	$12, %esp
 
 trap_return:
 	popal
-	popl	%es
-	popl	%ds
-	popl	%fs
-	popl	%gs
 	addl	$8, %esp		/* skip trapno, errno */
 	iret
 	/* NOT REACHED */
@@ -152,10 +144,6 @@ switch_to_real_mode:
 	pushl	oldctx+VMX_ASSIST_CTX_EIP
 	pushl	$-1			/* trapno, errno */
 	pushl	$-1
-	pushl	%gs
-	pushl	%fs
-	pushl	%ds
-	pushl	%es
 	pushal
 
 	movl	%esp, %ebp