patch-2.1.43 linux/arch/sparc64/kernel/entry.S

Next file: linux/arch/sparc64/kernel/etrap.S
Previous file: linux/arch/sparc64/config.in
Back to the patch index
Back to the overall index
Lines: 623
Date: Thu Jun 12 16:22:05 1997
Orig file: v2.1.42/linux/arch/sparc64/kernel/entry.S
Orig date: Thu May 29 21:53:04 1997

diff -u --recursive --new-file v2.1.42/linux/arch/sparc64/kernel/entry.S linux/arch/sparc64/kernel/entry.S
@@ -1,4 +1,4 @@
-/* $Id: entry.S,v 1.27 1997/05/27 19:30:11 jj Exp $
+/* $Id: entry.S,v 1.31 1997/06/02 06:33:25 davem Exp $
  * arch/sparc64/kernel/entry.S:  Sparc64 trap low-level entry points.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -18,7 +18,7 @@
 #include <asm/signal.h>
 #include <asm/pgtable.h>
 
-/* define SYSCALL_TRACING */
+/* #define SYSCALL_TRACING */
 
 #define curptr      g6
 
@@ -39,82 +39,84 @@
 	 * it will not get updated properly.
 	 */
 sparc64_dtlb_prot_catch:
-	wr	%g0, ASI_DMMU, %asi
-	rdpr	%pstate, %g1
-	wrpr	%g1, PSTATE_AG|PSTATE_MG, %pstate
-	rdpr	%tl, %g2
-	ldxa	[%g0 + TLB_TAG_ACCESS] %asi, %g5
-	ldxa	[%g0 + TLB_SFSR] %asi, %g4
-	cmp	%g2, 1
-	stxa	%g0, [%g0 + TLB_SFSR] %asi
-	bgu,a	%icc, winfix_trampoline
-	 rdpr	%tpc, %g5
-	ba,pt	%xcc, etrap
-	 rd	%pc, %g7
-	b,a,pt	%xcc, 1f
+	wr		%g0, ASI_DMMU, %asi
+	rdpr		%pstate, %g1
+	wrpr		%g1, PSTATE_AG|PSTATE_MG, %pstate
+	rdpr		%tl, %g3
+	ldxa		[%g0 + TLB_TAG_ACCESS] %asi, %g5
+	ldxa		[%g0 + TLB_SFSR] %asi, %g4
+	cmp		%g3, 1
+	stxa		%g0, [%g0 + TLB_SFSR] %asi
+	bgu,a,pn	%icc, winfix_trampoline
+	 rdpr		%tpc, %g3
+	ba,pt		%xcc, etrap
+	 rd		%pc, %g7
+	b,a,pt		%xcc, 1f
 
 sparc64_dtlb_refbit_catch:
-	srlx	%g5, 9, %g4
-	and	%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9), %g4
-	cmp	%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9)
-	be,a,pt	%xcc, 2f
-	 mov	1, %g4
-	wr	%g0, ASI_DMMU, %asi
-	rdpr	%pstate, %g1
-	wrpr	%g1, PSTATE_AG|PSTATE_MG, %pstate
-	rdpr	%tl, %g2
-	ldxa	[%g0 + TLB_TAG_ACCESS] %asi, %g5
-	cmp	%g2, 1
-	clr	%g4				! sfsr not updated for tlb misses
-	bgu,a	%icc, winfix_trampoline
-	 rdpr	%tpc, %g5
-	ba,pt	%xcc, etrap
-	 rd	%pc, %g7
+	srlx		%g5, 9, %g4
+	and		%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9), %g4
+	cmp		%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9)
+	be,a,pt		%xcc, 2f
+	 mov		1, %g4
+	wr		%g0, ASI_DMMU, %asi
+	rdpr		%pstate, %g1
+	wrpr		%g1, PSTATE_AG|PSTATE_MG, %pstate
+	rdpr		%tl, %g3
+	ldxa		[%g0 + TLB_TAG_ACCESS] %asi, %g5
+	cmp		%g3, 1
+	clr		%g4			! sfsr not updated for tlb misses
+	bgu,a,pn	%icc, winfix_trampoline
+	 rdpr		%tpc, %g3
+	ba,pt		%xcc, etrap
+	 rd		%pc, %g7
 1:
-	mov	%l5, %o4				! raw tag access
-	mov	%l4, %o5				! raw sfsr
-	srlx	%l5, PAGE_SHIFT, %o3
-	clr	%o1					! text_fault == 0
-	sllx	%o3, PAGE_SHIFT, %o3			! address
-	and	%l4, 0x4, %o2				! write == sfsr.W
-	call	do_sparc64_fault
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0	! pt_regs ptr
-	ba,a,pt	%xcc, rtrap
+	mov		%l5, %o4		! raw tag access
+	mov		%l4, %o5		! raw sfsr
+	srlx		%l5, PAGE_SHIFT, %o3
+	clr		%o1			! text_fault == 0
+	sllx		%o3, PAGE_SHIFT, %o3	! address
+	and		%l4, 0x4, %o2		! write == sfsr.W
+	call		do_sparc64_fault
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0	! pt_regs ptr
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 
 sparc64_itlb_refbit_catch:
-	srlx	%g5, 9, %g4
-	and	%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9), %g4
-	cmp	%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9)
-	be,a,pt	%xcc, 3f
-	 mov	1, %g4
-	rdpr	%pstate, %g1
-	wrpr	%g1, PSTATE_AG|PSTATE_MG, %pstate
-	ba,pt	%xcc, etrap
-	 rd	%pc, %g7
-
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC], %o3
-	mov	1, %o1					! text_fault == 1
-	clr	%o2					! write == 0
-	clr	%o4					! tag access (N/A)
-	clr	%o5					! raw sfsr (N/A)
-	call	do_sparc64_fault
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0	! pt_regs ptr
-	ba,a,pt	%xcc, rtrap
+	srlx		%g5, 9, %g4
+	and		%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9), %g4
+	cmp		%g4, ((_PAGE_PRESENT | _PAGE_READ) >> 9)
+	be,a,pt		%xcc, 3f
+	 mov		1, %g4
+	rdpr		%pstate, %g1
+	wrpr		%g1, PSTATE_AG|PSTATE_MG, %pstate
+	ba,pt		%xcc, etrap
+	 rd		%pc, %g7
+
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC], %o3
+	mov		1, %o1					! text_fault == 1
+	clr		%o2					! write == 0
+	clr		%o4					! tag access (N/A)
+	clr		%o5					! raw sfsr (N/A)
+	call		do_sparc64_fault
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0	! pt_regs ptr
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 
 2:
-	sllx	%g4, 63, %g4				! _PAGE_VALID
-	or	%g5, _PAGE_ACCESSED, %g5
-	or	%g5, %g4, %g5
-	stxa	%g5, [%g3 + %g1] ASI_PHYS_USE_EC	! store new PTE
-	stxa	%g5, [%g0] ASI_DTLB_DATA_IN		! TLB load
+	sllx		%g4, 63, %g4				! _PAGE_VALID
+	or		%g5, _PAGE_ACCESSED, %g5
+	or		%g5, %g4, %g5
+	stxa		%g5, [%g3 + %g1] ASI_PHYS_USE_EC	! store new PTE
+	stxa		%g5, [%g0] ASI_DTLB_DATA_IN		! TLB load
 	retry
 
 3:
-	sllx	%g4, 63, %g4				! _PAGE_VALID
-	or	%g5, _PAGE_ACCESSED, %g5
-	or	%g5, %g4, %g5
-	stxa	%g5, [%g3 + %g1] ASI_PHYS_USE_EC	! store new PTE
-	stxa	%g5, [%g0] ASI_ITLB_DATA_IN		! TLB load
+	sllx		%g4, 63, %g4				! _PAGE_VALID
+	or		%g5, _PAGE_ACCESSED, %g5
+	or		%g5, %g4, %g5
+	stxa		%g5, [%g3 + %g1] ASI_PHYS_USE_EC	! store new PTE
+	stxa		%g5, [%g0] ASI_ITLB_DATA_IN		! TLB load
 	retry
 
 	/* Note check out head.h, this code isn't even used for UP,
@@ -131,268 +133,285 @@
 	.align	4
 	.globl	do_ivec
 do_ivec:
-	ldxa	[%g0] ASI_INTR_RECEIVE, %g1
-	andcc	%g1, 0x20, %g0
-	be,pn	%xcc, do_ivec_return
-	 mov	0x40, %g2
+	ldxa		[%g0] ASI_INTR_RECEIVE, %g1
+	andcc		%g1, 0x20, %g0
+	be,pn		%xcc, do_ivec_return
+	 mov		0x40, %g2
 
 	/* Load up Interrupt Vector Data 0 register. */
-	sethi	%uhi(ivector_to_mask), %g4
-	ldxa	[%g2] ASI_UDB_INTR_R, %g3
-	or	%g4, %ulo(ivector_to_mask), %g4
-	and	%g3, 0x7ff, %g3
-	sllx	%g4, 32, %g4
-	sethi	%hi(ivector_to_mask), %g5
-	sllx	%g3, 3, %g3
-	or	%g5, %lo(ivector_to_mask), %g5
-	add	%g5, %g4, %g4
-	ldx	[%g4 + %g3], %g2
-	brz,pn	%g2, do_ivec_spurious
+	sethi		%uhi(ivector_to_mask), %g4
+	ldxa		[%g2] ASI_UDB_INTR_R, %g3
+	or		%g4, %ulo(ivector_to_mask), %g4
+	and		%g3, 0x7ff, %g3
+	sllx		%g4, 32, %g4
+	sethi		%hi(ivector_to_mask), %g5
+	sllx		%g3, 3, %g3
+	or		%g5, %lo(ivector_to_mask), %g5
+	add		%g5, %g4, %g4
+	ldx		[%g4 + %g3], %g2
+	brz,pn		%g2, do_ivec_spurious
 	 nop
 
 	/* No branches, worse case we don't know about this interrupt
 	 * yet, so we would just write a zero into the softint register
 	 * which is completely harmless.
 	 */
-	wr	%g2, 0x0, %set_softint
+	wr		%g2, 0x0, %set_softint
 
 do_ivec_return:
 	/* Acknowledge the UPA */
-	stxa	%g0, [%g0] ASI_INTR_RECEIVE
-	membar	#Sync
+	stxa		%g0, [%g0] ASI_INTR_RECEIVE
+	membar		#Sync
 	retry
 
 do_ivec_spurious:
-	stxa	%g0, [%g0] ASI_INTR_RECEIVE
-	rdpr	%pstate, %g1
-	wrpr	%g1, PSTATE_IG | PSTATE_AG, %pstate
-	ba,pt	%xcc, etrap
-	 rd	%pc, %g7
-	call	report_spurious_ivec
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
-	ba,pt	%xcc, rtrap
-	 nop
+	stxa		%g0, [%g0] ASI_INTR_RECEIVE
+	rdpr		%pstate, %g1
+	wrpr		%g1, PSTATE_IG | PSTATE_AG, %pstate
+	ba,pt		%xcc, etrap
+	 rd		%pc, %g7
+	call		report_spurious_ivec
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
+	ba,pt		%xcc, rtrap
+	 clr		%l6
+
+	.globl	do_mna
+do_mna:
+	rdpr		%tl, %g3
+	cmp		%g3, 1
+	bgu,a,pn	%icc, winfix_mna
+	 rdpr		%tpc, %g3
+	ba,pt		%xcc, etrap
+	 rd		%pc, %g7
+	call		mem_address_unaligned
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 
-breakpoint_t:
-	.asciz	"Breakpoint Trap %lx\n"
-	.align	4
 	.globl	breakpoint_trap
 breakpoint_trap:
-	mov	%o0, %o1
-	sethi	%hi(breakpoint_t), %o0
-	or	%o0, %lo(breakpoint_t), %o0
-	call	prom_printf
-	 add	%o0, %g4, %o0
-	call	prom_cmdline
+	call		sparc_breakpoint
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
+	ba,pt		%xcc, rtrap
 	 nop
-	ba,a,pt	%xcc, rtrap
 
 	.globl	sys_pipe, sys_execve, sys_sigpause, sys_nis_syscall
 	.globl	sys_sigsuspend, sys_sigreturn
 	.globl	sys32_execve, sys_ptrace
 
 sys_pipe:
-	sethi	%hi(sparc_pipe), %g1
-	add	%g1, %g4, %g1
-	jmpl	%g1 + %lo(sparc_pipe), %g0
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	sethi		%hi(sparc_pipe), %g1
+	add		%g1, %g4, %g1
+	jmpl		%g1 + %lo(sparc_pipe), %g0
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 
 sys_nis_syscall:
-	sethi	%hi(c_sys_nis_syscall), %g1
-	add	%g1, %g4, %g1
-	jmpl	%g1 + %lo(c_sys_nis_syscall), %g0
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	sethi		%hi(c_sys_nis_syscall), %g1
+	add		%g1, %g4, %g1
+	jmpl		%g1 + %lo(c_sys_nis_syscall), %g0
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 
 sys_execve:
-	sethi	%hi(sparc_execve), %g1
-	add	%g1, %g4, %g1
-	jmpl	%g1 + %lo(sparc_execve), %g0
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	sethi		%hi(sparc_execve), %g1
+	add		%g1, %g4, %g1
+	jmpl		%g1 + %lo(sparc_execve), %g0
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 
 sys32_execve:
-	sethi	%hi(sparc32_execve), %g1
-	add	%g1, %g4, %g1
-	jmpl	%g1 + %lo(sparc32_execve), %g0
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	sethi		%hi(sparc32_execve), %g1
+	add		%g1, %g4, %g1
+	jmpl		%g1 + %lo(sparc32_execve), %g0
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 
 sys_sigpause:
 	/* NOTE: %o0 has a correct value already */
-	call	do_sigpause
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o1
+	call		do_sigpause
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o1
 	
-	ld	[%curptr + AOFF_task_flags], %l5
-	andcc	%l5, 0x20, %g0
-	be,pt	%icc, rtrap
+	ld		[%curptr + AOFF_task_flags], %l5
+	andcc		%l5, 0x20, %g0
+	be,pt		%icc, rtrap
+	 clr		%l6
+	call		syscall_trace
 	 nop
-	call	syscall_trace
-	 nop
-	ba,a,pt	%xcc, rtrap
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 
 sys_sigsuspend:
-	call	do_sigsuspend
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	call		do_sigsuspend
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 	
-	ld	[%curptr + AOFF_task_flags], %l5
-	andcc	%l5, 0x20, %g0
-	be,pt	%icc, rtrap
-	 nop
-	call	syscall_trace
+	ld		[%curptr + AOFF_task_flags], %l5
+	andcc		%l5, 0x20, %g0
+	be,pt		%icc, rtrap
+	 clr		%l6
+	call		syscall_trace
 	 nop
-	ba,a,pt	%xcc, rtrap
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 	
 sys_sigreturn:
-	call	do_sigreturn
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	call		do_sigreturn
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 	
-	ld	[%curptr + AOFF_task_flags], %l5
-	andcc	%l5, 0x20, %g0
-	be,pt	%icc, rtrap
+	ld		[%curptr + AOFF_task_flags], %l5
+	andcc		%l5, 0x20, %g0
+	be,pt		%icc, rtrap
+	 clr		%l6
+	call		syscall_trace
 	 nop
-	call	syscall_trace
-	 nop
-	ba,a,pt	%xcc, rtrap
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 
 sys_ptrace:
-	call	do_ptrace
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	call		do_ptrace
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o0
 	
-	ld	[%curptr + AOFF_task_flags], %l5
-	andcc	%l5, 0x20, %g0
-	be,pt	%icc, rtrap
-	 nop
-	call	syscall_trace
+	ld		[%curptr + AOFF_task_flags], %l5
+	andcc		%l5, 0x20, %g0
+	be,pt		%icc, rtrap
+	 clr		%l6
+	call		syscall_trace
 	 nop
-	ba,a,pt	%xcc, rtrap
+	ba,pt		%xcc, rtrap
+	 clr		%l6
 	
-	/* This is how fork() was meant to be done, 10 instruction entry. -DaveM */
+	/* This is how fork() was meant to be done, 12 instruction entry. -DaveM */
 	.globl	sys_fork, sys_vfork, sys_clone
 sys_fork:
 sys_vfork:
-	mov	SIGCHLD, %o0
-	clr	%o1
+	mov		SIGCHLD, %o0
+	clr		%o1
 sys_clone:
-	mov	%o7, %l5
+	mov		%o7, %l5
+	save		%sp, -REGWIN_SZ, %sp
 	flushw
-	rdpr	%cwp, %o4
-	add	%sp, STACK_BIAS + REGWIN_SZ, %o2
-	movrz	%o1, %fp, %o1
+	restore		%g0, %g0, %g0
+	rdpr		%cwp, %o4
+	add		%sp, STACK_BIAS + REGWIN_SZ, %o2
+	movrz		%o1, %fp, %o1
 
 	/* Don't try this at home. */
-	stx	%o4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G0]
-	call	do_fork
-	 mov	%l5, %o7
+	stx		%o4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G0]
+	call		do_fork
+	 mov		%l5, %o7
 
 linux_sparc_ni_syscall:
-	sethi	%hi(sys_ni_syscall), %l7
-	or	%l7, %lo(sys_ni_syscall), %l7
-	ba,pt	%xcc,syscall_is_too_hard
-	 add	%l7, %g4, %l7
+	sethi		%hi(sys_ni_syscall), %l7
+	or		%l7, %lo(sys_ni_syscall), %l7
+	ba,pt		%xcc,syscall_is_too_hard
+	 add		%l7, %g4, %l7
 
 linux_fast_syscall:
-	andn	%l7, 3, %l7
-	mov	%i0, %o0
-	mov	%i1, %o1
-	mov 	%i2, %o2
-	jmpl	%l7 + %g0, %g0
-	 mov	%i3, %o3
+	andn		%l7, 3, %l7
+	mov		%i0, %o0
+	mov		%i1, %o1
+	mov		%i2, %o2
+	jmpl		%l7 + %g0, %g0
+	 mov		%i3, %o3
 
 linux_syscall_trace:
-	call	syscall_trace
+	call		syscall_trace
 	 nop
-	mov	%i0, %o0
-	mov	%i1, %o1
-	mov	%i2, %o2
-	mov	%i3, %o3
-	ba,pt	%xcc, 2f
-	 mov	%i4, %o4
+	mov		%i0, %o0
+	mov		%i1, %o1
+	mov		%i2, %o2
+	mov		%i3, %o3
+	ba,pt		%xcc, 2f
+	 mov		%i4, %o4
 
 	.globl	ret_from_syscall
 ret_from_syscall:
-	ba,pt	%xcc, ret_sys_call
-	 ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %o0
+	ba,pt		%xcc, ret_sys_call
+	 ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %o0
 
 	/* Linux native and SunOS system calls enter here... */
 	.align	4
 	.globl	linux_sparc_syscall
 linux_sparc_syscall:
 	/* Direct access to user regs, must faster. */
-	cmp	%g1, NR_SYSCALLS
-	add	%l7, %g4, %l7
-	bgeu,pn	%xcc, linux_sparc_ni_syscall
-	 sll	%g1, 3, %l4
-	ldx	[%l7 + %l4], %l7
-	andcc	%l7, 1, %g0
-	bne,pn	%icc, linux_fast_syscall
+	cmp		%g1, NR_SYSCALLS
+	add		%l7, %g4, %l7
+	bgeu,pn		%xcc, linux_sparc_ni_syscall
+	 sll		%g1, 3, %l4
+	ldx		[%l7 + %l4], %l7
+	andcc		%l7, 1, %g0
+	bne,pn		%icc, linux_fast_syscall
 	 /* Just do the next insn in the delay slot */
 
 	.globl	syscall_is_too_hard
 syscall_is_too_hard:
 #ifdef SYSCALL_TRACING	/* Debugging... */
-	mov	%g1, %o0				! o0=scall, o1=ptregs
-	call	syscall_trace_entry
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o1
+	mov		%g1, %o0				! o0=scall, o1=ptregs
+	call		syscall_trace_entry
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o1
 #endif
-	mov	%i0, %o0
-	mov	%i1, %o1
-	mov	%i2, %o2
-
-	ldx	[%curptr + AOFF_task_flags], %l5
-	mov	%i3, %o3
-	mov	%i4, %o4
-	andcc	%l5, 0x20, %g0
-	bne,pn	%icc, linux_syscall_trace
-	 mov	%i0, %l5
+	mov		%i0, %o0
+	mov		%i1, %o1
+	mov		%i2, %o2
+
+	ldx		[%curptr + AOFF_task_flags], %l5
+	mov		%i3, %o3
+	mov		%i4, %o4
+	andcc		%l5, 0x20, %g0
+	bne,pn		%icc, linux_syscall_trace
+	 mov		%i0, %l5
 2:
-	call	%l7
-	 mov	%i5, %o5
+	call		%l7
+	 mov		%i5, %o5
 
 #ifdef SYSCALL_TRACING	/* Debugging... */
-	call	syscall_trace_exit			! o0=sysret, o1=ptregs
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o1
+	call		syscall_trace_exit			! o0=sysret, o1=ptregs
+	 add		%sp, STACK_BIAS + REGWIN_SZ, %o1
 #endif
-	stx	%o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+	stx		%o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
 
 	.globl	ret_sys_call
 ret_sys_call:
-	ldx	[%curptr + AOFF_task_flags], %l6
-	mov	%ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %g3
-	cmp	%o0, -ENOIOCTLCMD
-	sllx	%g2, 32, %g2
-	bgeu,pn	%xcc, 1f
-	 andcc	%l6, 0x20, %l6	
+	ldx		[%curptr + AOFF_task_flags], %l6
+	ldx		[%curptr + AOFF_task_tss + AOFF_thread_flags], %l2
+	mov		%ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
+	and		%l2, SPARC_FLAG_32BIT, %l2
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %g3
+	brnz,a,pn	%l2, 1f
+	 sra		%o0, 0, %o0
+1:
+	cmp		%o0, -ENOIOCTLCMD
+	sllx		%g2, 32, %g2
+	bgeu,pn		%xcc, 1f
+	 andcc		%l6, 0x20, %l6	
 
 	/* System call success, clear Carry condition code. */
-	andn	%g3, %g2, %g3
-	clr	%l6
-	stx	%g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]	
-	bne,pn	%icc, linux_syscall_trace2
-	 ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 /* pc = npc */
-	add	%l1, 0x4, %l2				      /* npc = npc+4 */
-	stx	%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-	ba,pt	%xcc, rtrap
-	 stx	%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+	andn		%g3, %g2, %g3
+	clr		%l6
+	stx		%g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]	
+	bne,pn		%icc, linux_syscall_trace2
+	 ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 ! pc = npc
+	add		%l1, 0x4, %l2				         !npc = npc+4
+	stx		%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+	ba,pt		%xcc, rtrap
+	 stx		%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
 1:
 	/* System call failure, set Carry condition code.
 	 * Also, get abs(errno) to return to the process.
 	 */
-	sub	%g0, %o0, %o0
-	or	%g3, %g2, %g3
-	stx	%o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-	mov	1, %l6
-	stx	%g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]
-	bne,pn	%icc, linux_syscall_trace2
-	 ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 /* pc = npc */
-	add	%l1, 0x4, %l2				      /* npc = npc+4 */
-	stx	%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-	ba,pt	%xcc, rtrap
-	 stx	%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+	sub		%g0, %o0, %o0
+	or		%g3, %g2, %g3
+	stx		%o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+	mov		1, %l6
+	stx		%g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]
+	bne,pn		%icc, linux_syscall_trace2
+	 ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 ! pc = npc
+	add		%l1, 0x4, %l2				         !npc = npc+4
+	stx		%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+	ba,pt		%xcc, rtrap
+	 stx		%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
 
 linux_syscall_trace2:
-	call	syscall_trace
-	 add	%l1, 0x4, %l2			/* npc = npc+4 */
-	stx	%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-	ba,pt	%xcc, rtrap
-	 stx	%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+	call		syscall_trace
+	 add		%l1, 0x4, %l2			/* npc = npc+4 */
+	stx		%l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+	ba,pt		%xcc, rtrap
+	 stx		%l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
 
 /* End of entry.S */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov