X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..HEAD:/bsd/dev/i386/kern_machdep.c diff --git a/bsd/dev/i386/kern_machdep.c b/bsd/dev/i386/kern_machdep.c index dab7011e0..890c15f25 100644 --- a/bsd/dev/i386/kern_machdep.c +++ b/bsd/dev/i386/kern_machdep.c @@ -1,31 +1,29 @@ /* - * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved. - * - * @APPLE_LICENSE_OSREFERENCE_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. 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. + * Copyright (c) 2000-2013 Apple Inc. All rights reserved. * - * Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and + * 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. + * + * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_OSREFERENCE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * Copyright (C) 1990, NeXT, Inc. @@ -36,105 +34,55 @@ * Machine-specific kernel routines. */ -#include -#include -#include +#include +#include +#include +#include +#include -extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype); +#if __x86_64__ +extern int bootarg_no32exec; /* bsd_init.c */ +#endif /********************************************************************** - * 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. - **********************************************************************/ +* 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(__unused cpu_type_t exectype, cpu_subtype_t execsubtype) +grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype, cpu_subtype_t execfeatures __unused, bool allow_simulator_binary __unused) { - 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; + 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; } - - 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: + break; + case CPU_TYPE_X86: /* native */ +#if __x86_64__ + if (bootarg_no32exec && !allow_simulator_binary) { 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; - } - return 0; +#endif + return 1; } -} - -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; }