X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..4a3eedf9ecc9bbe3f3a5c6ce5e53ad199d639d32:/osfmk/ppc/hw_exception.s?ds=sidebyside

diff --git a/osfmk/ppc/hw_exception.s b/osfmk/ppc/hw_exception.s
index 411972ea6..ab77e1774 100644
--- a/osfmk/ppc/hw_exception.s
+++ b/osfmk/ppc/hw_exception.s
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -161,9 +161,26 @@ tvecoff:	stw		r26,FM_BACKPTR(r1)				; Link back to the previous frame
 #endif /* DEBUG */
 
 			mr		r30,r4
-			lwz		r3,SAVtime+4(r4)
-			addi	r4,r13,SYSTEM_TIMER
-			bl		EXT(timer_event)
+			lwz		r3,SAVtime(r4)
+			lwz		r4,SAVtime+4(r4)
+			addi	r5,r13,SYSTEM_TIMER
+			bl		EXT(thread_timer_event)
+			addi	r5,r25,SYSTEM_STATE
+			bl		EXT(state_event)
+
+			lwz		r7,ACT_TASK(r13)
+			lwz		r8,TASK_VTIMERS(r7)
+			cmpwi	r8,0
+			beq++	0f
+
+			lwz		r7,ACT_PER_PROC(r13)
+			li		r4,AST_BSD
+			lwz		r8,PP_PENDING_AST(r7)
+			or		r8,r8,r4
+			stw		r8,PP_PENDING_AST(r7)
+			addi	r3,r13,ACT_AST
+			bl		EXT(hw_atomic_or)
+0:
 
 /* call trap handler proper, with
  *   ARG0 = type
@@ -364,9 +381,26 @@ noassist:	cmplwi	r15,0x7000						; Do we have a fast path trap?
 			stw		r0,ACT_MACT_KSP(r13)			; Mark stack as busy with 0 val 
 			stw		r15,FM_BACKPTR(r1)				; Link stack frame backwards
 
-			lwz		r3,SAVtime+4(r30)
-			addi	r4,r13,SYSTEM_TIMER
-			bl		EXT(timer_event)
+			lwz		r3,SAVtime(r30)
+			lwz		r4,SAVtime+4(r30)
+			addi	r5,r13,SYSTEM_TIMER
+			bl		EXT(thread_timer_event)
+			addi	r5,r25,SYSTEM_STATE
+			bl		EXT(state_event)
+		
+			lwz		r7,ACT_TASK(r13)
+			lwz		r8,TASK_VTIMERS(r7)
+			cmpwi	r8,0
+			beq++	0f
+
+			lwz		r7,ACT_PER_PROC(r13)
+			li		r4,AST_BSD
+			lwz		r8,PP_PENDING_AST(r7)
+			or		r8,r8,r4
+			stw		r8,PP_PENDING_AST(r7)
+			addi	r3,r13,ACT_AST
+			bl		EXT(hw_atomic_or)
+0:
 		
 #if	DEBUG
 /* If debugging, we need two frames, the first being a dummy
@@ -566,11 +600,11 @@ ksystrace:
 			ori		r8,r8,lo16(EXT(kdebug_enable))	; Get bottom of kdebug_enable 
 			lwz		r8,0(r8)						; Get kdebug_enable 
 
-			lwz		r7,TASK_SYSCALLS_MACH(r10)		; Get the current count
-			neg		r31,r0							; Make this positive
-			mr 		r3,r31							; save it
-			slwi	r27,r3,4						; multiply by 16
-			slwi	r3,r3,2							; and the original by 4
+			lwz		r7,TASK_SYSCALLS_MACH(r10)	; Get the current count
+			neg		r31,r0						; Make this positive
+			mr 		r3,r31						; save it
+			slwi	r27,r3,4					; multiply by 16
+			slwi	r3,r3,2						; and the original by 4
 			ori		r28,r28,lo16(EXT(mach_trap_table))	; Get address of table
 			add		r27,r27,r3						; for a total of 20x (5 words/entry)
 			addi	r7,r7,1							; Bump TASK_SYSCALLS_MACH count
@@ -592,10 +626,10 @@ ksystrace:
 .L_kernel_syscall_munge:
 			cmplwi	r0,0							; test for null munger
 			mtctr	r0								; Set the function call address
-			addi	r3,r30,saver3					; Pointer to args from save area
-			addi	r4,r1,FM_ARG0+ARG_SIZE			; Pointer for munged args
-			beq--	.L_kernel_syscall_trapcall		; null munger - skip to trap call
-			bctrl									; Call the munge function
+			addi	r3,r30,saver3						; Pointer to args from save area
+			addi	r4,r1,FM_ARG0+ARG_SIZE				; Pointer for munged args
+			beq--	.L_kernel_syscall_trapcall		;   null munger - skip to trap call
+			bctrl								; Call the munge function
 
 .L_kernel_syscall_trapcall:		
 			lwz		r0,MACH_TRAP_FUNCTION(r31)		; Pick up the function address
@@ -955,29 +989,46 @@ ihbootnover:										; (TEST/DEBUG)
 			mr		r31,r3
 			mr		r30,r4
 
-			lwz		r3,SAVtime+4(r4)
-			addi	r4,r13,SYSTEM_TIMER
-			bl		EXT(timer_event)
+			lwz		r3,SAVtime(r4)
+			lwz		r4,SAVtime+4(r4)
+			addi	r5,r25,PP_PROCESSOR
+			lwz		r5,KERNEL_TIMER(r5)
+			bl		EXT(thread_timer_event)
+			addi	r6,r25,PP_PROCESSOR
+			lwz		r5,CURRENT_STATE(r6)
+			addi	r7,r6,USER_STATE
+			cmplw	r5,r7
+			bne		0f
+			addi	r5,r6,SYSTEM_STATE
+			bl		EXT(state_event)
+0:
+
+			lwz		r7,ACT_TASK(r13)
+			lwz		r8,TASK_VTIMERS(r7)
+			cmpwi	r8,0
+			beq++	0f
+
+			lwz		r7,ACT_PER_PROC(r13)
+			li		r4,AST_BSD
+			lwz		r8,PP_PENDING_AST(r7)
+			or		r8,r8,r4
+			stw		r8,PP_PENDING_AST(r7)
+			addi	r3,r13,ACT_AST
+			bl		EXT(hw_atomic_or)
+0:
 
 			mr		r3,r31
 			mr		r4,r30
 			lwz		r5,savedsisr(r30)				; Get the DSISR
 			lwz		r6,savedar+4(r30)				; Get the DAR 
-			
+
 #if FPFLOOD
 			stfd	f31,emfp31(r25)					; (TEST/DEBUG)
 #endif
 
 			bl	EXT(interrupt)
 
-
-/* interrupt() returns a pointer to the saved state in r3
- *
- * Ok, back from C. Disable interrupts while we restore things
- */
-			.globl EXT(ihandler_ret)
-
-LEXT(ihandler_ret)									; Marks our return point from debugger entry
+/* interrupt() returns a pointer to the saved state in r3 */
 
 			lis		r10,hi16(MASK(MSR_VEC))			; Get the vector enable
 			mfmsr	r0								; Get our MSR
@@ -1429,13 +1480,19 @@ segtb:		mftbu	r20								; Get the upper time base
 			
 			mtdec	r13								; Set our value
 
-chkifuser:	addi	r4,r28,SYSTEM_TIMER
-			mftb	r3
+chkifuser:	bl		EXT(mach_absolute_time)
+			lwz		r5,ACT_PER_PROC(r28)
+			addi	r6,r5,PP_PROCESSOR
+			lwz		r5,KERNEL_TIMER(r6)
+			lwz		r29,CURRENT_STATE(r6)
 			beq--	cr7,chkifuser1					; Skip this if we are going to kernel...
 			stw		r18,umwSpace(r28)				; Half-invalidate to force MapUserAddressWindow to reload SRs
-			addi	r4,r28,USER_TIMER
+			addi	r5,r28,USER_TIMER
+			addi	r29,r6,USER_STATE
 
-chkifuser1:	bl		EXT(timer_event)
+chkifuser1:	bl		EXT(thread_timer_event)
+			mr		r5,r29
+			bl		EXT(state_event)
 
 chkenax: