X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..HEAD:/bsd/dev/i386/kern_machdep.c

diff --git a/bsd/dev/i386/kern_machdep.c b/bsd/dev/i386/kern_machdep.c
index bb9851e2e..890c15f25 100644
--- a/bsd/dev/i386/kern_machdep.c
+++ b/bsd/dev/i386/kern_machdep.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple 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
@@ -11,10 +11,10 @@
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -34,40 +34,55 @@
  *	Machine-specific kernel routines.
  */
 
-#include	<sys/types.h>
-#include	<mach/machine.h>
-#include	<kern/cpu_number.h>
-#include	<machine/exec.h>
-#include	<machine/machine_routines.h>
+#include        <sys/types.h>
+#include        <mach/machine.h>
+#include        <kern/cpu_number.h>
+#include        <machine/exec.h>
+#include        <machine/machine_routines.h>
+
+#if __x86_64__
+extern int bootarg_no32exec;    /* bsd_init.c */
+#endif
 
 /**********************************************************************
- * Routine:	grade_binary()
- *
- * Function:	Keep the API the same between PPC and X86; always say
- *		any CPU subtype is OK with us, but only OK CPU types
- *		for which we are actually capable of executing the
- *		binary, either directly or via an imputed interpreter.
- **********************************************************************/
+* Routine:	grade_binary()
+*
+* Function:	Say OK to CPU types that we can actually execute on the given
+*		system. 64-bit binaries have the highest preference, followed
+*		by 32-bit binaries. 0 means unsupported.
+**********************************************************************/
 int
-grade_binary(cpu_type_t exectype, __unused cpu_subtype_t execsubtype)
+grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype, cpu_subtype_t execfeatures __unused, bool allow_simulator_binary __unused)
 {
-	switch(exectype) {
-	case CPU_TYPE_X86:		/* native */
-	case CPU_TYPE_POWERPC:		/* via translator */
+	cpu_subtype_t hostsubtype = cpu_subtype();
+
+	switch (exectype) {
+	case CPU_TYPE_X86_64:           /* native 64-bit */
+		switch (hostsubtype) {
+		case CPU_SUBTYPE_X86_64_H:      /* x86_64h can execute anything */
+			switch (execsubtype) {
+			case CPU_SUBTYPE_X86_64_H:
+				return 3;
+			case CPU_SUBTYPE_X86_64_ALL:
+				return 2;
+			}
+			break;
+		case CPU_SUBTYPE_X86_ARCH1:     /* generic systems can only execute ALL subtype */
+			switch (execsubtype) {
+			case CPU_SUBTYPE_X86_64_ALL:
+				return 2;
+			}
+			break;
+		}
+		break;
+	case CPU_TYPE_X86:              /* native */
+#if __x86_64__
+		if (bootarg_no32exec && !allow_simulator_binary) {
+			return 0;
+		}
+#endif
 		return 1;
-	case CPU_TYPE_X86_64:		/* native 64-bit */
-		return ml_is64bit() ? 2 : 0;
-	default:			/* all other binary types */
-		return 0;
 	}
-}
 
-extern void md_prepare_for_shutdown(int, int, char *);
-
-void
-md_prepare_for_shutdown(
-	__unused int paniced,
-	__unused int howto,
-	__unused char * command)
-{
+	return 0;
 }