xnu-792.10.96.tar.gz

[apple/xnu.git] / osfmk / i386 / asm.h

diff --git a/osfmk/i386/asm.h b/osfmk/i386/asm.h
index 62cc04096db6fa43ffe701bc402038f863165369..fcaffc0550068852ab2ad5c41ed4185fd5401b16 100644 (file)
--- a/osfmk/i386/asm.h
+++ b/osfmk/i386/asm.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -70,14 +67,18 @@
 #endif /* MACH_KERNEL || _KERNEL */
 
 
+#define S_PC    0(%esp)
 #define S_ARG0  4(%esp)
 #define S_ARG1  8(%esp)
 #define S_ARG2 12(%esp)
 #define S_ARG3 16(%esp)
+#define S_ARG4 20(%esp)
 
 #define FRAME  pushl %ebp; movl %esp, %ebp
 #define EMARF  leave
 
+#define B_LINK  0(%ebp)
+#define B_PC    4(%ebp)
 #define B_ARG0  8(%ebp)
 #define B_ARG1 12(%ebp)
 #define B_ARG2 16(%ebp)
@@ -85,7 +86,7 @@
 
 /* There is another definition of ALIGN for .c sources */
 #ifdef ASSEMBLER
-#define ALIGN 2,0x90
+#define ALIGN 4,0x90
 #endif /* ASSEMBLER */
 
 #ifndef FALIGN
@@ -154,13 +155,7 @@
                        call *(%eax);
 
 #else  /* !GPROF, !__SHARED__ */
-#define MCOUNT         ; .data;\
-                       .align ALIGN;\
-                       LBc(x, 8) .long 0;\
-                       .text;\
-                       movl LBb(x,8),%edx;\
-                       call *EXT(_mcount_ptr);
-
+#define MCOUNT         ; call mcount;
 #endif /* GPROF */
 
 #ifdef __ELF__