xnu-1504.7.4.tar.gz

[apple/xnu.git] / osfmk / ppc / machine_routines_asm.s

diff --git a/osfmk/ppc/machine_routines_asm.s b/osfmk/ppc/machine_routines_asm.s
index 938a5e081616550cd73abb130ba8098438515afc..45bfb5b5ee820fd8472243b76189e411dccccd2f 100644 (file)
--- a/osfmk/ppc/machine_routines_asm.s
+++ b/osfmk/ppc/machine_routines_asm.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@
  * 
@@ -762,34 +762,72 @@ LEXT(timer_grab)
 
 ;                      Force a line boundry here
                        .align  5
-                       .globl  EXT(timer_event)
+                       .globl  EXT(thread_timer_event)
  
-LEXT(timer_event)
+LEXT(thread_timer_event)
                        mfsprg  r10,1                                                   ; Get the current activation
                        lwz             r10,ACT_PER_PROC(r10)                   ; Get the per_proc block
                        addi    r10,r10,PP_PROCESSOR
-                       lwz             r11,CURRENT_TIMER(r10)
+                       lwz             r11,THREAD_TIMER(r10)
 
                        lwz             r9,TIMER_LOW(r11)
-                       lwz             r2,TIMER_TSTAMP(r11)
-                       add             r0,r9,r3
-                       subf    r5,r2,r0
-                       cmplw   r5,r9
-                       bge++   0f
+                       lwz             r7,TIMER_TSTAMP(r11)
+                       lwz             r8,TIMER_TSTAMP+4(r11)
+                       subfc   r8,r8,r4
+                       subfe   r7,r7,r3
+                       addc    r8,r8,r9
+                       addze.  r7,r7
+                       beq++   0f
 
                        lwz             r6,TIMER_HIGH(r11)
-                       addi    r6,r6,1
-                       stw             r6,TIMER_HIGHCHK(r11)
+                       add             r7,r7,r6
+                       stw             r7,TIMER_HIGHCHK(r11)
                        eieio
-                       stw             r5,TIMER_LOW(r11)
+                       stw             r8,TIMER_LOW(r11)
                        eieio
-                       stw             r6,TIMER_HIGH(r11)
+                       stw             r7,TIMER_HIGH(r11)
                        b               1f
 
-0:                     stw             r5,TIMER_LOW(r11)
+0:                     stw             r8,TIMER_LOW(r11)
 
-1:                     stw             r4,CURRENT_TIMER(r10)
-                       stw             r3,TIMER_TSTAMP(r4)
+1:                     stw             r5,THREAD_TIMER(r10)
+                       stw             r3,TIMER_TSTAMP(r5)
+                       stw             r4,TIMER_TSTAMP+4(r5)
+                       blr
+
+;                      Force a line boundry here
+                       .align  5
+                       .globl  EXT(state_event)
+ 
+LEXT(state_event)
+                       mfsprg  r10,1                                                   ; Get the current activation
+                       lwz             r10,ACT_PER_PROC(r10)                   ; Get the per_proc block
+                       addi    r10,r10,PP_PROCESSOR
+                       lwz             r11,CURRENT_STATE(r10)
+
+                       lwz             r9,TIMER_LOW(r11)
+                       lwz             r7,TIMER_TSTAMP(r11)
+                       lwz             r8,TIMER_TSTAMP+4(r11)
+                       subfc   r8,r8,r4
+                       subfe   r7,r7,r3
+                       addc    r8,r8,r9
+                       addze.  r7,r7
+                       beq++   0f
+
+                       lwz             r6,TIMER_HIGH(r11)
+                       add             r7,r7,r6
+                       stw             r7,TIMER_HIGHCHK(r11)
+                       eieio
+                       stw             r8,TIMER_LOW(r11)
+                       eieio
+                       stw             r7,TIMER_HIGH(r11)
+                       b               1f
+
+0:                     stw             r8,TIMER_LOW(r11)
+
+1:                     stw             r5,CURRENT_STATE(r10)
+                       stw             r3,TIMER_TSTAMP(r5)
+                       stw             r4,TIMER_TSTAMP+4(r5)
                        blr
 
 /*  Set machine into idle power-saving mode. 
@@ -1975,19 +2013,6 @@ LEXT(current_act)
 
                        mfsprg  r3,1
                        blr
-
-                       .align  5
-                       .globl  EXT(clock_get_uptime)
-LEXT(clock_get_uptime)
-1:                     mftbu   r9
-                       mftb    r0
-                       mftbu   r11
-                       cmpw    r11,r9
-                       bne--   1b
-                       stw             r0,4(r3)
-                       stw             r9,0(r3)
-                       blr
-
                
                        .align  5
                        .globl  EXT(mach_absolute_time)