xnu-792.17.14.tar.gz

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

diff --git a/osfmk/i386/asm.h b/osfmk/i386/asm.h
index 6f2928ccf035be145a5cbfebd29194cc3ba13c1d..20d579ef576813782a15de30a56af6b2f2fb0204 100644 (file)
--- a/osfmk/i386/asm.h
+++ b/osfmk/i386/asm.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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_COPYRIGHT@
@@ -70,6 +73,7 @@
 #endif /* MACH_KERNEL || _KERNEL */
 
 
+#define S_PC    0(%esp)
 #define S_ARG0  4(%esp)
 #define S_ARG1  8(%esp)
 #define S_ARG2 12(%esp)
@@ -78,6 +82,8 @@
 #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 +91,7 @@
 
 /* There is another definition of ALIGN for .c sources */
 #ifdef ASSEMBLER
-#define ALIGN 2
+#define ALIGN 2,0x90
 #endif /* ASSEMBLER */
 
 #ifndef FALIGN
@@ -154,13 +160,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__