/*
* Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
- * 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
+ * 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
+ *
+ * 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_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
* the rights to redistribute these changes.
*/
-#include <cpus.h>
#include <platforms.h>
#include <mach_kdb.h>
#include <himem.h>
-#include <fast_idle.h>
#include <mach/i386/vm_param.h>
#include <mach/vm_prot.h>
#include <mach/machine.h>
#include <mach/time_value.h>
-#include <kern/etap_macros.h>
#include <kern/spl.h>
#include <kern/assert.h>
#include <kern/debug.h>
#include <kern/misc_protos.h>
#include <kern/startup.h>
#include <kern/clock.h>
-#include <kern/time_out.h>
#include <kern/xpr.h>
#include <kern/cpu_data.h>
#include <kern/processor.h>
#include <i386/pio.h>
#include <i386/misc_protos.h>
#include <i386/cpuid.h>
-#include <i386/rtclock_entries.h>
#include <i386/mp.h>
+#include <i386/machine_routines.h>
+#include <i386/postcode.h>
#if MACH_KDB
#include <ddb/db_aout.h>
#endif /* MACH_KDB */
#include <ddb/tr.h>
#ifdef __MACHO__
-#include <mach/boot_info.h>
#include <mach/thread_status.h>
static KernelBootArgs_t *kernelBootArgs;
#include <mach-o/loader.h>
vm_offset_t edata, etext, end;
+/* operations only against currently loaded 32 bit mach kernel */
+extern struct segment_command *getsegbyname(const char *);
+extern struct section *firstsect(struct segment_command *);
+extern struct section *nextsect(struct segment_command *, struct section *);
+
/*
* Called first for a mach-o kernel before paging is set up.
* Returns the first available physical address in memory.
*/
-unsigned long
-i386_preinit()
+void
+i386_preinit(void)
{
struct segment_command *sgp;
struct section *sp;
+ struct KernelBootArgs *pp;
+ int i;
- sgp = (struct segment_command *) getsegbyname("__DATA");
+ sgp = getsegbyname("__DATA");
if (sgp) {
- sp = (struct section *) firstsect(sgp);
+ sp = firstsect(sgp);
if (sp) {
do {
- if (sp->flags & S_ZEROFILL)
+ if ((sp->flags & S_ZEROFILL))
bzero((char *) sp->addr, sp->size);
- } while (sp = (struct section *)nextsect(sgp, sp));
+ } while ((sp = nextsect(sgp, sp)));
}
}
- kernelBootArgs = (KernelBootArgs_t *) boot_args_start;
- end = round_page( kernelBootArgs->kaddr + kernelBootArgs->ksize );
-
- return end;
+ kernelBootArgs = (KernelBootArgs_t *)
+ ml_static_ptovirt(boot_args_start);
+ pp = (struct KernelBootArgs *) kernelBootArgs;
+ pp->configEnd = (char *)
+ ml_static_ptovirt((vm_offset_t) pp->configEnd);
+ for (i = 0; i < pp->numBootDrivers; i++) {
+ pp->driverConfig[i].address = (unsigned)
+ ml_static_ptovirt(pp->driverConfig[i].address);
+ }
+ return;
}
#endif
i386_init(void)
{
unsigned int maxmem;
+ unsigned int cpus;
+ postcode(I386_INIT_ENTRY);
+
+ master_cpu = 0;
+ cpu_data_alloc(TRUE);
cpu_init();
+ postcode(CPU_INIT_D);
/*
* Setup some processor related structures to satisfy funnels.
* Must be done before using unparallelized device drivers.
*/
- processor_ptr[0] = &processor_array[0];
- master_cpu = 0;
- master_processor = cpu_to_processor(master_cpu);
+ processor_bootstrap();
PE_init_platform(FALSE, kernelBootArgs);
+ postcode(PE_INIT_PLATFORM_D);
/*
* Set up initial thread so current_thread() works early on
*/
thread_bootstrap();
+ postcode(THREAD_BOOTSTRAP_D);
printf_init(); /* Init this in case we need debugger */
panic_init(); /* Init this in case we need debugger */
/* setup debugging output if one has been chosen */
PE_init_kprintf(FALSE);
- kprintf("kprintf initialized\n");
/* setup console output */
PE_init_printf(FALSE);
kprintf("version_variant = %s\n", version_variant);
kprintf("version = %s\n", version);
-
/*
* VM initialization, after this we're using page tables...
* The maximum number of cpus must be set beforehand.
else
maxmem = maxmem * (1024 * 1024);
- if (PE_parse_boot_arg("cpus", &wncpu)) {
- if (!((wncpu > 0) && (wncpu < NCPUS)))
- wncpu = NCPUS;
- } else
- wncpu = NCPUS;
+ if (PE_parse_boot_arg("cpus", &cpus)) {
+ if ((0 < cpus) && (cpus < max_ncpus))
+ max_ncpus = cpus;
+ }
i386_vm_init(maxmem, kernelBootArgs);
/* create the console for verbose or pretty mode */
PE_create_console();
-
+
machine_startup();
}
projects / apple / xnu.git / blobdiff