*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * 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.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
#include <kern/mach_loader.h>
#include <architecture/byte_order.h>
-#define CPU_TYPE_NATIVE (machine_slot[cpu_number()].cpu_type)
+/* XXX should be in common header */
+extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
+
+#define CPU_TYPE_NATIVE (cpu_type())
#define CPU_TYPE_CLASSIC CPU_TYPE_POWERPC
/**********************************************************************
*
* Args: vp: The vnode for the fat file.
* header: A pointer to the fat file header.
- * cpu_type: The required cpu type.
+ * req_cpu_type: The required cpu type.
+ * mask_bits: Bits to mask from the sub-image type when
+ * grading it vs. the req_cpu_type
* archret (out): Pointer to fat_arch structure to hold
* the results.
*
**********************************************************************/
static load_return_t
fatfile_getarch2(
+#if 0
struct vnode *vp,
+#else
+ __unused struct vnode *vp,
+#endif
vm_offset_t data_ptr,
- cpu_type_t cpu_type,
+ cpu_type_t req_cpu_type,
+ cpu_type_t mask_bits,
struct fat_arch *archret)
{
/* vm_pager_t pager; */
vm_offset_t addr;
vm_size_t size;
- kern_return_t kret;
load_return_t lret;
struct fat_arch *arch;
struct fat_arch *best_arch;
int nfat_arch;
int end_of_archs;
struct fat_header *header;
+#if 0
off_t filesize;
+#endif
/*
* Get the pager for the file.
* Round size of fat_arch structures up to page boundry.
*/
size = round_page_32(end_of_archs);
- if (size <= 0)
+ if (size == 0)
return(LOAD_BADMACHO);
/*
/*
* Check to see if right cpu type.
*/
- if(NXSwapBigIntToHost(arch->cputype) != cpu_type)
+ if(((cpu_type_t)NXSwapBigIntToHost(arch->cputype) & ~mask_bits) != req_cpu_type)
continue;
/*
* Get the grade of the cpu subtype.
*/
- grade = grade_cpu_subtype(
+ grade = grade_binary(
+ NXSwapBigIntToHost(arch->cputype),
NXSwapBigIntToHost(arch->cpusubtype));
/*
primary_type = CPU_TYPE_NATIVE;
fallback_type = CPU_TYPE_CLASSIC;
}
- lret = fatfile_getarch2(vp, data_ptr, primary_type, archret);
+ /*
+ * Ignore the architectural bits when determining if an image
+ * in a fat file should be skipped or graded.
+ */
+ lret = fatfile_getarch2(vp, data_ptr, primary_type, CPU_ARCH_MASK, archret);
if ((lret != 0) && handler) {
lret = fatfile_getarch2(vp, data_ptr, fallback_type,
- archret);
+ 0, archret);
}
return lret;
}
vm_offset_t data_ptr,
struct fat_arch *archret)
{
- return fatfile_getarch2(vp, data_ptr, CPU_TYPE_NATIVE, archret);
+ return fatfile_getarch2(vp, data_ptr, CPU_TYPE_NATIVE, 0, archret);
+}
+
+/**********************************************************************
+ * Routine: fatfile_getarch_with_bits()
+ *
+ * Function: Locate the architecture-dependant contents of a fat
+ * file that match this CPU.
+ *
+ * Args: vp: The vnode for the fat file.
+ * archbits: Architecture specific feature bits
+ * header: A pointer to the fat file header.
+ * archret (out): Pointer to fat_arch structure to hold
+ * the results.
+ *
+ * Returns: KERN_SUCCESS: Valid architecture found.
+ * KERN_FAILURE: No valid architecture found.
+ **********************************************************************/
+load_return_t
+fatfile_getarch_with_bits(
+ struct vnode *vp,
+ integer_t archbits,
+ vm_offset_t data_ptr,
+ struct fat_arch *archret)
+{
+ return fatfile_getarch2(vp, data_ptr, archbits | CPU_TYPE_NATIVE, 0, archret);
}
projects / apple / xnu.git / blobdiff