xnu-3248.20.55.tar.gz

[apple/xnu.git] / bsd / dev / i386 / kern_machdep.c

diff --git a/bsd/dev/i386/kern_machdep.c b/bsd/dev/i386/kern_machdep.c
index 7bdd46a3eba99badc5d9963f3477fb46055a93b2..4d7891ba4cc1a7f16ae64bec7c2c6cade28bfefe 100644 (file)
--- a/bsd/dev/i386/kern_machdep.c
+++ b/bsd/dev/i386/kern_machdep.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -37,102 +37,49 @@
 #include       <sys/types.h>
 #include       <mach/machine.h>
 #include       <kern/cpu_number.h>
 #include       <sys/types.h>
 #include       <mach/machine.h>
 #include       <kern/cpu_number.h>

-
-extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
+#include       <machine/exec.h>
+#include       <machine/machine_routines.h>

 
 /**********************************************************************
  * Routine:    grade_binary()
  *
 
 /**********************************************************************
  * 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:   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
  **********************************************************************/
 int

-grade_binary(__unused cpu_type_t exectype, cpu_subtype_t execsubtype)
+grade_binary(cpu_type_t exectype, 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;
+       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:
-                       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;
+               break;
+       case CPU_TYPE_X86:              /* native */
+               return 1;

        }
        }

-}

 
 

-extern void md_prepare_for_shutdown(int, int, char *);
+       return 0;
+}

 
 

-void
-md_prepare_for_shutdown(
-       __unused int paniced,
-       __unused int howto,
-       __unused char * command)
+boolean_t
+pie_required(cpu_type_t exectype __unused, cpu_subtype_t execsubtype __unused)

 {
 {

+       return FALSE;

 }
 }