diff -r d1df075f3b71 src/sim/process.cc --- a/src/sim/process.cc Wed Apr 15 16:04:37 2015 -0500 +++ b/src/sim/process.cc Mon Apr 20 13:08:23 2015 +0100 @@ -77,6 +77,7 @@ #include "arch/mips/linux/process.hh" #elif THE_ISA == ARM_ISA #include "arch/arm/linux/process.hh" +#include "arch/arm/freebsd/process.hh" #elif THE_ISA == X86_ISA #include "arch/x86/linux/process.hh" #elif THE_ISA == POWER_ISA @@ -736,6 +737,15 @@ objFile->getArch()); } break; + case ObjectFile::FreeBSD: + if (arch == ObjectFile::Arm64) { + process = new ArmFreebsdProcess64(params, objFile, + objFile->getArch()); + } else { + process = new ArmFreebsdProcess32(params, objFile, + objFile->getArch()); + } + break; case ObjectFile::LinuxArmOABI: fatal("M5 does not support ARM OABI binaries. Please recompile with an" " EABI compiler."); diff -r d1df075f3b71 src/kern/SConscript --- a/src/kern/SConscript Wed Apr 15 16:04:37 2015 -0500 +++ b/src/kern/SConscript Mon Apr 20 13:08:23 2015 +0100 @@ -37,6 +37,7 @@ Source('linux/events.cc') Source('linux/linux.cc') Source('linux/printk.cc') +Source('freebsd/events.cc') Source('operatingsystem.cc') Source('system_events.cc') diff -r d1df075f3b71 src/kern/freebsd/events.hh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kern/freebsd/events.hh Mon Apr 20 13:08:23 2015 +0100 @@ -0,0 +1,66 @@ +/*- + * Copyright (c) 2015 Ruslan Bukin + * All rights reserved. + * + * This software was developed by the University of Cambridge Computer + * Laboratory as part of the CTSRD Project, with support from the UK Higher + * Education Innovation Fund (HEIF). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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_EVENTS_HH__ +#define __KERN_FREEBSD_EVENTS_HH__ + +#include "kern/system_events.hh" + +namespace FreeBSD { + +/** A class to skip udelay() and related calls in the kernel. + * This class has two additional parameters that take the argument to udelay and + * manipulated it to come up with ns and eventually ticks to quiesce for. + * See descriptions of argDivToNs and argMultToNs below. + */ +class UDelayEvent : public SkipFuncEvent +{ + private: + /** value to divide arg by to create ns. This is present beacues the linux + * kernel code sometime precomputes the first multiply that is done in + * udelay() if the parameter is a constant. We need to undo it so here is + * how. */ + uint64_t argDivToNs; + + /** value to multiple arg by to create ns. Nominally, this is 1000 to + * convert us to ns, but since linux can do some preprocessing of constant + * values something else might be required. */ + uint64_t argMultToNs; + + public: + UDelayEvent(PCEventQueue *q, const std::string &desc, Addr addr, + uint64_t mult, uint64_t div) + : SkipFuncEvent(q, desc, addr), argDivToNs(div), argMultToNs(mult) {} + virtual void process(ThreadContext *xc); +}; + +} + +#endif diff -r d1df075f3b71 src/kern/freebsd/events.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kern/freebsd/events.cc Mon Apr 20 13:08:23 2015 +0100 @@ -0,0 +1,68 @@ +/*- + * Copyright (c) 2015 Ruslan Bukin + * All rights reserved. + * + * This software was developed by the University of Cambridge Computer + * Laboratory as part of the CTSRD Project, with support from the UK Higher + * Education Innovation Fund (HEIF). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + */ + +#include + +#include "arch/utility.hh" +#include "base/trace.hh" +#include "cpu/thread_context.hh" +#include "debug/DebugPrintf.hh" +#include "kern/freebsd/events.hh" +#include "kern/system_events.hh" +#include "sim/arguments.hh" +#include "sim/pseudo_inst.hh" +#include "sim/system.hh" + +namespace FreeBSD { + +void +UDelayEvent::process(ThreadContext *tc) +{ + int arg_num; + + arg_num = 0; + + // Get the time in native size + uint64_t time = TheISA::getArgument(tc, arg_num, (uint16_t)-1, false); + + //DPRINTFN("DELAY(%d)\n", time); + + // convert parameter to ns + if (argDivToNs) + time /= argDivToNs; + + time *= argMultToNs; + + SkipFuncEvent::process(tc); + + PseudoInst::quiesceNs(tc, time); +} + +} // namespace FreeBSD diff -r d1df075f3b71 src/kern/freebsd/freebsd.hh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/kern/freebsd/freebsd.hh Mon Apr 20 13:08:23 2015 +0100 @@ -0,0 +1,124 @@ +/*- + * Copyright (c) 2015 Ruslan Bukin + * All rights reserved. + * + * This software was developed by the University of Cambridge Computer + * Laboratory as part of the CTSRD Project, with support from the UK Higher + * Education Innovation Fund (HEIF). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 __FREEBSD_HH__ +#define __FREEBSD_HH__ + +#include "base/types.hh" + +#include + +#include "kern/operatingsystem.hh" + +class ThreadContext; +class LiveProcess; + +/// +/// This class encapsulates the types, structures, constants, +/// functions, and syscall-number mappings specific to the Alpha FreeBSD +/// syscall interface. +/// +class FreeBSD : public OperatingSystem +{ + + public: + + //@{ + /// Basic FreeBSD types. + typedef uint64_t size_t; + typedef uint64_t off_t; + typedef int64_t time_t; + typedef int64_t clock_t; + typedef uint32_t uid_t; + typedef uint32_t gid_t; + //@} + + /// Clock ticks per second, for times(). + static const int M5_SC_CLK_TCK = 100; + + //@{ + /// ioctl() command codes. + static const unsigned TGT_TCGETS = 0x5401; + static const unsigned TGT_TCGETA = 0x5405; + static const unsigned TGT_TCSETAW = 0x5407; + static const unsigned TGT_FIONREAD = 0x541B; + //@} + + /// Return true for the ioctl codes for which we return ENOTTY + /// *without* printing a warning, since we know that ENOTTY is the + /// correct thing to return (and not just a sign that we don't + /// recognize the ioctl code. + static bool + isTtyReq(unsigned req) + { + switch (req) { + case TGT_FIONREAD: + case TGT_TCSETAW: + case TGT_TCGETS: + case TGT_TCGETA: + return true; + default: + return false; + } + } + + /// Resource constants for getrlimit(). + static const unsigned TGT_RLIMIT_CPU = 0; + static const unsigned TGT_RLIMIT_FSIZE = 1; + static const unsigned TGT_RLIMIT_DATA = 2; + static const unsigned TGT_RLIMIT_STACK = 3; + static const unsigned TGT_RLIMIT_CORE = 4; + static const unsigned TGT_RLIMIT_RSS = 5; + static const unsigned TGT_RLIMIT_NPROC = 6; + static const unsigned TGT_RLIMIT_NOFILE = 7; + static const unsigned TGT_RLIMIT_MEMLOCK = 8; + static const unsigned TGT_RLIMIT_AS = 9; + static const unsigned TGT_RLIMIT_LOCKS = 10; + static const unsigned TGT_RLIMIT_SIGPENDING = 11; + static const unsigned TGT_RLIMIT_MSGQUEUE = 12; + static const unsigned TGT_RLIMIT_NICE = 13; + static const unsigned TGT_RLIMIT_RTPRIO = 14; + static const unsigned TGT_RLIMIT_RTTIME = 15; + static const unsigned TGT_RLIM_NLIMITS = 16; + + /// For getrusage(). + static const int TGT_RUSAGE_SELF = 0; + static const int TGT_RUSAGE_CHILDREN = -1; + static const int TGT_RUSAGE_THREAD = 1; + + // for *at syscalls + static const int TGT_AT_FDCWD = -100; + + // for MREMAP + static const unsigned TGT_MREMAP_MAYMOVE = 0x1; + static const unsigned TGT_MREMAP_FIXED = 0x2; +}; // class FreeBSD + +#endif // __FREEBSD_HH__ diff -r d1df075f3b71 src/arch/arm/freebsd/system.hh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/arch/arm/freebsd/system.hh Mon Apr 20 13:08:23 2015 +0100 @@ -0,0 +1,134 @@ +/*- + * Copyright (c) 2015 Ruslan Bukin + * All rights reserved. + * + * This software was developed by the University of Cambridge Computer + * Laboratory as part of the CTSRD Project, with support from the UK Higher + * Education Innovation Fund (HEIF). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 __ARCH_ARM_FREEBSD_SYSTEM_HH__ +#define __ARCH_ARM_FREEBSD_SYSTEM_HH__ + +#include +#include +#include +#include + +#include "arch/arm/system.hh" +#include "base/output.hh" +#include "kern/freebsd/events.hh" +#include "params/FreebsdArmSystem.hh" +#include "sim/core.hh" + +class DumpStatsPCEventF; + +class FreebsdArmSystem : public ArmSystem +{ + protected: + DumpStatsPCEventF *dumpStatsPCEventF; + + public: + /** Boilerplate params code */ + typedef FreebsdArmSystemParams Params; + const Params * + params() const + { + return dynamic_cast(_params); + } + + /** When enabled, dump stats/task info on context switches for + * Streamline and per-thread cache occupancy studies, etc. */ + bool enableContextSwitchStatsDump; + + /** This map stores a mapping of OS process IDs to internal Task IDs. The + * mapping is done because the stats system doesn't tend to like vectors + * that are much greater than 1000 items and the entire process space is + * 65K. */ + std::map taskMap; + + /** This is a file that is placed in the run directory that prints out + * mappings between taskIds and OS process IDs */ + std::ostream* taskFile; + + FreebsdArmSystem(Params *p); + ~FreebsdArmSystem(); + + void initState(); + + bool adderBootUncacheable(Addr a); + + void startup(); + + /** This function creates a new task Id for the given pid. + * @param tc thread context that is currentyl executing */ + void mapPid(ThreadContext* tc, uint32_t pid); + + private: + /** Event to halt the simulator if the kernel calls panic() */ + PCEvent *kernelPanicEvent; + + /** Event to halt the simulator if the kernel calls oopses */ + PCEvent *kernelOopsEvent; + + /** + * PC based event to skip udelay(