From baad1bb7af28edcf0c3a69fc0e99dacd96aefd90 Mon Sep 17 00:00:00 2001 From: Benjamin Nash Date: Fri, 10 Jun 2005 12:44:18 -0400 Subject: [PATCH] Created FreebsdSystem, for FreeBSD-specific tweaks. SConscript: Included kern/freebsd/freebsd_system.cc --HG-- extra : convert_revision : 4fa31602acb511b16bf371f78a8e5a8082536b88 --- SConscript | 1 + kern/freebsd/freebsd_system.cc | 140 +++++++++++++++++++++++++++++++++ kern/freebsd/freebsd_system.hh | 53 +++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 kern/freebsd/freebsd_system.cc create mode 100644 kern/freebsd/freebsd_system.hh diff --git a/SConscript b/SConscript index e66763ca1..5d4fc42e1 100644 --- a/SConscript +++ b/SConscript @@ -278,6 +278,7 @@ full_system_sources = Split(''' kern/kernel_binning.cc kern/kernel_stats.cc kern/system_events.cc + kern/freebsd/freebsd_system.cc kern/linux/linux_events.cc kern/linux/linux_syscalls.cc kern/linux/linux_system.cc diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc new file mode 100644 index 000000000..a22fda9dc --- /dev/null +++ b/kern/freebsd/freebsd_system.cc @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2004-2005 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * Modifications for the FreeBSD kernel. Based off of kern/linux/linux_system.cc. + * Currently only used to skip DELAY function. -Ben + * + */ + +#include "base/loader/symtab.hh" +#include "base/trace.hh" +#include "cpu/exec_context.hh" +#include "cpu/base.hh" +#include "kern/freebsd/freebsd_system.hh" +#include "kern/system_events.hh" +#include "mem/functional/memory_control.hh" +#include "mem/functional/physical.hh" +#include "sim/builder.hh" +#include "dev/platform.hh" +#include "targetarch/isa_traits.hh" +#include "targetarch/vtophys.hh" +#include "sim/debug.hh" + +using namespace std; + +FreebsdSystem::FreebsdSystem(Params *p) + : System(p) +{ + Addr addr = 0; + + /** + * Any time ide_delay_50ms, calibarte_delay or + * determine_cpu_caches is called just skip the + * function. Currently determine_cpu_caches only is used put + * information in proc, however if that changes in the future we + * will have to fill in the cache size variables appropriately. + */ + skipDelayEvent = new SkipFuncEvent(&pcEventQueue, "DELAY"); + if (kernelSymtab->findAddress("DELAY", addr)) + skipDelayEvent->schedule(addr+sizeof(MachInst)); +} + +FreebsdSystem::~FreebsdSystem() +{ + delete skipDelayEvent; +} + + +BEGIN_DECLARE_SIM_OBJECT_PARAMS(FreebsdSystem) + + Param boot_cpu_frequency; + SimObjectParam memctrl; + SimObjectParam physmem; + + Param kernel; + Param console; + Param pal; + + Param boot_osflags; + Param readfile; + Param init_param; + + Param system_type; + Param system_rev; + + Param bin; + VectorParam binned_fns; + Param bin_int; + +END_DECLARE_SIM_OBJECT_PARAMS(FreebsdSystem) + +BEGIN_INIT_SIM_OBJECT_PARAMS(FreebsdSystem) + + INIT_PARAM(boot_cpu_frequency, "Frequency of the boot CPU"), + INIT_PARAM(memctrl, "memory controller"), + INIT_PARAM(physmem, "phsyical memory"), + INIT_PARAM(kernel, "file that contains the kernel code"), + INIT_PARAM(console, "file that contains the console code"), + INIT_PARAM(pal, "file that contains palcode"), + INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot", + "a"), + INIT_PARAM_DFLT(readfile, "file to read startup script from", ""), + INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0), + INIT_PARAM_DFLT(system_type, "Type of system we are emulating", 34), + INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10), + INIT_PARAM_DFLT(bin, "is this system to be binned", false), + INIT_PARAM(binned_fns, "functions to be broken down and binned"), + INIT_PARAM_DFLT(bin_int, "is interrupt code binned seperately?", true) + +END_INIT_SIM_OBJECT_PARAMS(FreebsdSystem) + +CREATE_SIM_OBJECT(FreebsdSystem) +{ + System::Params *p = new System::Params; + p->name = getInstanceName(); + p->boot_cpu_frequency = boot_cpu_frequency; + p->memctrl = memctrl; + p->physmem = physmem; + p->kernel_path = kernel; + p->console_path = console; + p->palcode = pal; + p->boot_osflags = boot_osflags; + p->init_param = init_param; + p->readfile = readfile; + p->system_type = system_type; + p->system_rev = system_rev; + p->bin = bin; + p->binned_fns = binned_fns; + p->bin_int = bin_int; + return new FreebsdSystem(p); +} + +REGISTER_SIM_OBJECT("FreebsdSystem", FreebsdSystem) + diff --git a/kern/freebsd/freebsd_system.hh b/kern/freebsd/freebsd_system.hh new file mode 100644 index 000000000..8caa81cbc --- /dev/null +++ b/kern/freebsd/freebsd_system.hh @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2004-2005 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __KERN_FREEBSD_FREEBSD_SYSTEM_HH__ +#define __KERN_FREEBSD_FREEBSD_SYSTEM_HH__ + +#include "sim/host.hh" +#include "sim/system.hh" +#include "targetarch/isa_traits.hh" + + +/** + * This class skips a lengthy function in the FreeBSD kernel. + */ +class FreebsdSystem : public System +{ + private: + + /** PC based event to skip the DELAY call */ + SkipFuncEvent *skipDelayEvent; + + public: + FreebsdSystem(Params *p); + ~FreebsdSystem(); + +}; + +#endif // __KERN_LINUX_LINUX_SYSTEM_HH__