[Kernelloader-cvs] linux/linux-2.6.35.4-mipsel-ps2/arch/mips/kernel scall32-n32.S, 1.3, 1.4

[Mega M. <kl...@us...>]

Update of /cvsroot/kernelloader/linux/linux-2.6.35.4-mipsel-ps2/arch/mips/kernel
In directory vz-cvs-3.sog:/tmp/cvs-serv18339/arch/mips/kernel

Modified Files:
	scall32-n32.S 
Log Message:
Fixed handling of syscall parameters 5 - 8.
t4/t0 was overwritten by STI macro.


Index: scall32-n32.S
===================================================================
RCS file: /cvsroot/kernelloader/linux/linux-2.6.35.4-mipsel-ps2/arch/mips/kernel/scall32-n32.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scall32-n32.S	17 Jun 2012 21:57:23 -0000	1.3
--- scall32-n32.S	18 Jun 2012 13:24:03 -0000	1.4
***************
*** 45,50 ****
  	SAVE_STATIC
  					# N32 callers expect a4/t0 to be saved.
! 	TRACE_IRQS_ON_RELOAD
! 	STI
  	.set	at
  
--- 45,50 ----
  	SAVE_STATIC
  					# N32 callers expect a4/t0 to be saved.
! 	TRACE_IRQS_ON_RELOAD		# Caution: This can overwrite a4/t0.
! 	STI				# Caution: This overwrites a4/t0.
  	.set	at
  
***************
*** 136,139 ****
--- 136,140 ----
  	 * load or store arguments 6-8.
  	 */
+ 	LONGD_L	a4, PT_R8(sp)
  	la	t5, 1f			# load up to 3 arguments
  	subu	t5, t7
***************
*** 144,149 ****
--- 145,153 ----
  	.set    noreorder
  	.set	nomacro
+ 	LONGD_L	a7, PT_R11(sp)
  	sw	a7, 28(sp)		# argument #8 to ksp
+ 	LONGD_L	a6, PT_R10(sp)
  	sw	a6, 24(sp)		# argument #7 to ksp
+ 	LONGD_L	a5, PT_R9(sp)
  	sw	a5, 20(sp)		# argument #6 to ksp
  1:
***************
*** 161,165 ****
  	.macro  sys function, nargs
  	PTR	\function
! 	LONG	(\nargs << 2) - (5 << 2)
  	.endm
  
--- 165,169 ----
  	.macro  sys function, nargs
  	PTR	\function
! 	LONG	(\nargs << 3) - (5 << 3)
  	.endm