X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..7e4a7d3939db04e70062ae6c7bf24b8c8b2f5a7c:/bsd/dev/i386/kern_machdep.c

diff --git a/bsd/dev/i386/kern_machdep.c b/bsd/dev/i386/kern_machdep.c
index f10b03c56..c77af1d8b 100644
--- a/bsd/dev/i386/kern_machdep.c
+++ b/bsd/dev/i386/kern_machdep.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
  */
 /*
  *	Copyright (C) 1990,  NeXT, Inc.
@@ -32,92 +37,29 @@
 #include	<sys/types.h>
 #include	<mach/machine.h>
 #include	<kern/cpu_number.h>
+#include	<machine/exec.h>
+#include	<machine/machine_routines.h>
 
-extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
+extern int bootarg_no64exec;	/* bsd_init.c */
 
 /**********************************************************************
  * Routine:	grade_binary()
  *
- * Function:	Return a relative preference for exectypes and
- *		execsubtypes in fat executable files.  The higher the
- *		grade, the higher the preference.  A grade of 0 means
- *		not acceptable.
+ * 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.
  **********************************************************************/
 int
-grade_binary(__unused cpu_type_t exectype, cpu_subtype_t execsubtype)
+grade_binary(cpu_type_t exectype, __unused cpu_subtype_t execsubtype)
 {
-	int		cpusubtype = cpu_subtype();
-
-	switch (cpusubtype) {
-	    case CPU_SUBTYPE_386:
-		switch (execsubtype) {
-		    case CPU_SUBTYPE_386:
-			return 1;
-		    default:
-			return 0;
-		}
-
-	    case CPU_SUBTYPE_486:
-		switch (execsubtype) {
-		    case CPU_SUBTYPE_386:
-			return 1;
-
-		    case CPU_SUBTYPE_486SX:
-			return 2;
-
-		    case CPU_SUBTYPE_486:
-			return 3;
-
-		    default:
-			return 0;
-		}
-
-	    case CPU_SUBTYPE_486SX:
-		switch (execsubtype) {
-		    case CPU_SUBTYPE_386:
-			return 1;
-
-		    case CPU_SUBTYPE_486:
-			return 2;
-
-		    case CPU_SUBTYPE_486SX:
-			return 3;
-
-		    default:
-			return 0;
-		}
-
-	    case CPU_SUBTYPE_586:
-		switch (execsubtype) {
-		    case CPU_SUBTYPE_386:
-			return 1;
-
-		    case CPU_SUBTYPE_486SX:
-			return 2;
-
-		    case CPU_SUBTYPE_486:
-			return 3;
-
-		    case CPU_SUBTYPE_586:
-			return 4;
-
-		    default:
-			return 0;
-		}
-
-	    default:
-		if (	CPU_SUBTYPE_INTEL_MODEL(execsubtype) ==
-		    	CPU_SUBTYPE_INTEL_MODEL_ALL) {
-		    if (	CPU_SUBTYPE_INTEL_FAMILY(cpusubtype) >=
-				CPU_SUBTYPE_INTEL_FAMILY(execsubtype))
-			return CPU_SUBTYPE_INTEL_FAMILY_MAX - 
-			    CPU_SUBTYPE_INTEL_FAMILY(cpusubtype) -
-			    CPU_SUBTYPE_INTEL_FAMILY(execsubtype);
-		}
-		else {
-		    if (	cpusubtype == execsubtype)
-			return CPU_SUBTYPE_INTEL_FAMILY_MAX + 1;
-		}
+	switch(exectype) {
+	case CPU_TYPE_X86:		/* native */
+	case CPU_TYPE_POWERPC:		/* via translator */
+		return 1;
+	case CPU_TYPE_X86_64:		/* native 64-bit */
+		return ((ml_is64bit() && !bootarg_no64exec) ? 2 : 0);
+	default:			/* all other binary types */
 		return 0;
 	}
 }