Index: /branches/ia32/lisp-kernel/x86-macros.s
===================================================================
--- /branches/ia32/lisp-kernel/x86-macros.s	(revision 8359)
+++ /branches/ia32/lisp-kernel/x86-macros.s	(revision 8360)
@@ -244,7 +244,7 @@
 	movl %ebp,catch_frame.ebp(%imm0)
         movd %rcontext:tcr.foreign_sp,%stack_temp
+	movd %stack_temp,catch_frame.foreign_sp(%imm0)
 	movd %mm1,catch_frame.db_link(%imm0)
 	movl %imm0,catch_frame.xframe(%imm0)
-	movd %stack_temp,catch_frame.foreign_sp(%imm0)
 	movl %xfn,catch_frame.pc(%imm0)
 	movl %imm0,%rcontext:tcr.catch_top
@@ -419,5 +419,5 @@
 	
 define([set_nargs],[
-	movw [$]$1<<fixnumshift,%nargs
+	movl [$]$1<<fixnumshift,%nargs
 ])
 
@@ -603,5 +603,5 @@
 define([push_argregs],[
 	new_macro_labels()
-	cmpw [$]1*node_size,%nargs
+	cmpl [$]1*node_size,%nargs
 	jb macro_label(done)
 	je macro_label(z)