X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/a3d08fcd5120d2aa8303b6349ca8b14e3f284af3..c331a0bec715536613c8dd5f34a4e115d5b15824:/osfmk/ppc/Firmware.s

diff --git a/osfmk/ppc/Firmware.s b/osfmk/ppc/Firmware.s
index d07ed62e8..d5f687f34 100644
--- a/osfmk/ppc/Firmware.s
+++ b/osfmk/ppc/Firmware.s
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_FREE_COPYRIGHT@
@@ -36,7 +42,6 @@
 
 */
 
-#include <cpus.h>
 #include <ppc/asm.h>
 #include <ppc/proc_reg.h>
 #include <ppc/spec_reg.h>
@@ -333,6 +338,7 @@ LEXT(xLoadIBATsLL)
 
 /*
  *			This is the glue to call the CutTrace firmware call
+ *			dbgTrace(id, p1, p2, p3, p4)
  */
  			
 			.align	5
@@ -340,8 +346,13 @@ LEXT(xLoadIBATsLL)
 
 LEXT(dbgTrace)
 			
+			mr		r2,r3
+			mr		r3,r4
 			lis		r0,HIGH_ADDR(CutTrace)			/* Top half of CreateFakeIO firmware call number */
+			mr		r4,r5
+			mr		r5,r6
 			ori		r0,r0,LOW_ADDR(CutTrace)		/* Bottom half */
+			mr		r6,r7
 			sc										/* Do it to it */
 			blr										/* Bye bye, Birdie... */
 
@@ -2179,7 +2190,7 @@ LEXT(stSpecrs)
 
 			mfmsr	r0								; Save the MSR
 			andc	r0,r0,r2						; Turn off VEC and FP
-			andc	r4,r0,r4						; And EE
+			andc	r4,r0,r4			; And EE
 			mtmsr	r4
 			isync
 			
@@ -2234,7 +2245,7 @@ LEXT(stSpecrs)
 			
 			mfsdr1	r4
 			stw		r4,88(r3)
-
+			
 			la		r4,92(r3)
 			li		r5,0
 			
@@ -2244,7 +2255,7 @@ stSnsr:		mfsrin	r6,r5
 			mr.		r5,r5
 			addi	r4,r4,4
 			bne+	stSnsr
-			
+
 			cmplwi	r12,PROCESSOR_VERSION_750
 			mfspr	r4,hid0
 			stw		r4,(39*4)(r3)
@@ -2342,7 +2353,6 @@ stsslbm:	slbmfee	r6,r5
 			cmplwi	r5,64
 			addi	r4,r4,16
 			blt		stsslbm
-
 			
 			mtmsr	r0
 			isync