xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / machine / exec.h

diff --git a/bsd/machine/exec.h b/bsd/machine/exec.h
index 6dd16564a10c5f68b3f43aa37ffc423147bb2e26..cdbf3a2e363b8597e07308f1594af414b89867f8 100644 (file)
--- a/bsd/machine/exec.h
+++ b/bsd/machine/exec.h
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_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
  * 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.
  * 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.
  * 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,
  * 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.
  * 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@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -32,24 +32,17 @@
 #define _BSD_MACHINE_EXEC_H_
 
 #include <sys/param.h>
 #define _BSD_MACHINE_EXEC_H_
 
 #include <sys/param.h>

+#include <stdbool.h>

 
 

-struct exec_archhandler {
-       char path[MAXPATHLEN];
-       uint32_t fsid;
-       long fileid;
+struct exec_info {
+       char    path[MAXPATHLEN];
+       int     ac;
+       int     ec;
+       char    **av;
+       char    **ev;

 };
 
 };
 

-extern struct exec_archhandler exec_archhandler_ppc;
-extern int set_archhandler(struct proc *p, int arch);
-extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/exec.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/exec.h"
-#else
-#error architecture not supported
-#endif
-
+int grade_binary(cpu_type_t, cpu_subtype_t, bool allow_simulator_binary);
+boolean_t pie_required(cpu_type_t, cpu_subtype_t);

 
 #endif /* _BSD_MACHINE_EXEC_H_ */
 
 #endif /* _BSD_MACHINE_EXEC_H_ */