changeset 683ab55819fd in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=683ab55819fd
description:
        arch, base, dev, kern, sym: FreeBSD support

        This adds support for FreeBSD/aarch64 FS and SE mode (basic set of 
syscalls only)

        Committed by: Nilay Vaish <[email protected]>

diffstat:

 src/arch/arm/ArmSystem.py              |    14 +-
 src/arch/arm/SConscript                |     3 +
 src/arch/arm/freebsd/freebsd.cc        |    78 +
 src/arch/arm/freebsd/freebsd.hh        |   356 ++++++++
 src/arch/arm/freebsd/process.cc        |  1280 ++++++++++++++++++++++++++++++++
 src/arch/arm/freebsd/process.hh        |    86 ++
 src/arch/arm/freebsd/system.cc         |   175 ++++
 src/arch/arm/freebsd/system.hh         |   135 +++
 src/arch/arm/linux/system.cc           |     4 +-
 src/arch/arm/linux/system.hh           |     2 +-
 src/arch/arm/process.cc                |    89 +-
 src/arch/arm/system.cc                 |    18 +
 src/arch/arm/system.hh                 |    20 +-
 src/arch/generic/freebsd/threadinfo.hh |    60 +
 src/base/loader/elf_object.cc          |    16 +-
 src/base/loader/object_file.hh         |     3 +-
 src/base/output.cc                     |     1 +
 src/base/vnc/vncserver.cc              |    12 +-
 src/dev/arm/gic_pl390.cc               |     6 +-
 src/dev/terminal.cc                    |    10 +-
 src/kern/SConscript                    |     1 +
 src/kern/freebsd/events.cc             |    71 +
 src/kern/freebsd/events.hh             |    68 +
 src/kern/freebsd/freebsd.hh            |   120 +++
 src/sim/process.cc                     |    10 +
 25 files changed, 2592 insertions(+), 46 deletions(-)

diffs (truncated from 2922 to 300 lines):

diff -r e3963342ead4 -r 683ab55819fd src/arch/arm/ArmSystem.py
--- a/src/arch/arm/ArmSystem.py Wed Apr 29 22:35:22 2015 -0500
+++ b/src/arch/arm/ArmSystem.py Wed Apr 29 22:35:23 2015 -0500
@@ -71,9 +71,9 @@
     have_large_asid_64 = Param.Bool(False,
         "True if ASID is 16 bits in AArch64 (ARMv8)")
 
-class LinuxArmSystem(ArmSystem):
-    type = 'LinuxArmSystem'
-    cxx_header = "arch/arm/linux/system.hh"
+class GenericArmSystem(ArmSystem):
+    type = 'GenericArmSystem'
+    cxx_header = "arch/arm/system.hh"
     load_addr_mask = 0x0fffffff
     machine_type = Param.ArmMachineType('VExpress_EMM',
         "Machine id from http://www.arm.linux.org.uk/developer/machines/";)
@@ -91,3 +91,11 @@
                                     "guest kernel panics")
     panic_on_oops = Param.Bool(False, "Trigger a gem5 panic if the " \
                                    "guest kernel oopses")
+
+class LinuxArmSystem(GenericArmSystem):
+    type = 'LinuxArmSystem'
+    cxx_header = "arch/arm/linux/system.hh"
+
+class FreebsdArmSystem(GenericArmSystem):
+    type = 'FreebsdArmSystem'
+    cxx_header = "arch/arm/freebsd/system.hh"
diff -r e3963342ead4 -r 683ab55819fd src/arch/arm/SConscript
--- a/src/arch/arm/SConscript   Wed Apr 29 22:35:22 2015 -0500
+++ b/src/arch/arm/SConscript   Wed Apr 29 22:35:23 2015 -0500
@@ -67,6 +67,9 @@
     Source('linux/linux.cc')
     Source('linux/process.cc')
     Source('linux/system.cc')
+    Source('freebsd/freebsd.cc')
+    Source('freebsd/process.cc')
+    Source('freebsd/system.cc')
     Source('miscregs.cc')
     Source('nativetrace.cc')
     Source('pmu.cc')
diff -r e3963342ead4 -r 683ab55819fd src/arch/arm/freebsd/freebsd.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/arm/freebsd/freebsd.cc   Wed Apr 29 22:35:23 2015 -0500
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2015 Ruslan Bukin <[email protected]>
+ * 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: 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.
+ */
+
+#include "arch/arm/freebsd/freebsd.hh"
+
+#include <fcntl.h>
+
+// open(2) flags translation table
+OpenFlagTransTable ArmFreebsd32::openFlagTable[] = {
+  { ArmFreebsd32::TGT_O_RDONLY,     O_RDONLY },
+  { ArmFreebsd32::TGT_O_WRONLY,     O_WRONLY },
+  { ArmFreebsd32::TGT_O_RDWR,       O_RDWR },
+  { ArmFreebsd32::TGT_O_CREAT,      O_CREAT },
+  { ArmFreebsd32::TGT_O_EXCL,       O_EXCL },
+  { ArmFreebsd32::TGT_O_NOCTTY,     O_NOCTTY },
+  { ArmFreebsd32::TGT_O_TRUNC,      O_TRUNC },
+  { ArmFreebsd32::TGT_O_APPEND,     O_APPEND },
+  { ArmFreebsd32::TGT_O_NONBLOCK,   O_NONBLOCK },
+  { ArmFreebsd32::TGT_O_SYNC,       O_SYNC },
+  { ArmFreebsd32::TGT_FASYNC,       FASYNC },
+  { ArmFreebsd32::TGT_O_DIRECT,     O_DIRECT },
+  { ArmFreebsd32::TGT_O_DIRECTORY,  O_DIRECTORY },
+  { ArmFreebsd32::TGT_O_NOFOLLOW,   O_NOFOLLOW },
+};
+
+const int ArmFreebsd32::NUM_OPEN_FLAGS = sizeof(ArmFreebsd32::openFlagTable) /
+                                       sizeof(ArmFreebsd32::openFlagTable[0]);
+
+// open(2) flags translation table
+OpenFlagTransTable ArmFreebsd64::openFlagTable[] = {
+  { ArmFreebsd32::TGT_O_RDONLY,     O_RDONLY },
+  { ArmFreebsd32::TGT_O_WRONLY,     O_WRONLY },
+  { ArmFreebsd32::TGT_O_RDWR,       O_RDWR },
+  { ArmFreebsd32::TGT_O_CREAT,      O_CREAT },
+  { ArmFreebsd32::TGT_O_EXCL,       O_EXCL },
+  { ArmFreebsd32::TGT_O_NOCTTY,     O_NOCTTY },
+  { ArmFreebsd32::TGT_O_TRUNC,      O_TRUNC },
+  { ArmFreebsd32::TGT_O_APPEND,     O_APPEND },
+  { ArmFreebsd32::TGT_O_NONBLOCK,   O_NONBLOCK },
+  { ArmFreebsd32::TGT_O_SYNC,       O_SYNC },
+  { ArmFreebsd32::TGT_FASYNC,       FASYNC },
+  { ArmFreebsd32::TGT_O_DIRECT,     O_DIRECT },
+  { ArmFreebsd32::TGT_O_DIRECTORY,  O_DIRECTORY },
+  { ArmFreebsd32::TGT_O_NOFOLLOW,   O_NOFOLLOW },
+};
+
+const int ArmFreebsd64::NUM_OPEN_FLAGS = sizeof(ArmFreebsd64::openFlagTable) /
+                                       sizeof(ArmFreebsd64::openFlagTable[0]);
+
diff -r e3963342ead4 -r 683ab55819fd src/arch/arm/freebsd/freebsd.hh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/arm/freebsd/freebsd.hh   Wed Apr 29 22:35:23 2015 -0500
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2015 Ruslan Bukin <[email protected]>
+ * 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: 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 __ARCH_ARM_FREEBSD_FREEBSD_HH__
+#define __ARCH_ARM_FREEBSD_FREEBSD_HH__
+
+#include "kern/freebsd/freebsd.hh"
+
+class ArmFreebsd32 : public FreeBSD
+{
+  public:
+
+    /// This table maps the target open() flags to the corresponding
+    /// host open() flags.
+    static OpenFlagTransTable openFlagTable[];
+
+    /// Number of entries in openFlagTable[].
+    static const int NUM_OPEN_FLAGS;
+
+    //@{
+    /// Basic ARM FreeBSD types
+    typedef uint32_t size_t;
+    typedef uint32_t off_t;
+    typedef int32_t time_t;
+    typedef int32_t clock_t;
+    //@}
+
+    //@{
+    /// open(2) flag values.
+    static const int TGT_O_RDONLY    = 0x00000000; //!< O_RDONLY
+    static const int TGT_O_WRONLY    = 0x00000001; //!< O_WRONLY
+    static const int TGT_O_RDWR      = 0x00000002; //!< O_RDWR
+    static const int TGT_O_CREAT     = 0x00000200; //!< O_CREAT
+    static const int TGT_O_EXCL      = 0x00000800; //!< O_EXCL
+    static const int TGT_O_NOCTTY    = 0x00008000; //!< O_NOCTTY
+    static const int TGT_O_TRUNC     = 0x00000400; //!< O_TRUNC
+    static const int TGT_O_APPEND    = 0x00000008; //!< O_APPEND
+    static const int TGT_O_NONBLOCK  = 0x00000004; //!< O_NONBLOCK
+    static const int TGT_O_SYNC      = 0x00000080; //!< O_SYNC
+    static const int TGT_FASYNC      = 0x00000040; //!< FASYNC
+    static const int TGT_O_DIRECT    = 0x00010000; //!< O_DIRECT
+    static const int TGT_O_DIRECTORY = 0x00020000; //!< O_DIRECTORY
+    static const int TGT_O_NOFOLLOW  = 0x00000100; //!< O_NOFOLLOW
+    static const int TGT_O_CLOEXEC   = 0x00100000; //!< O_CLOEXEC
+    //@}
+
+    /// For mmap().
+    static const unsigned TGT_MAP_ANONYMOUS = 0x1000;
+    static const unsigned TGT_MAP_FIXED     = 0x0010;
+
+    /// Limit struct for getrlimit/setrlimit.
+    struct rlimit {
+        uint32_t  rlim_cur;     //!< soft limit
+        uint32_t  rlim_max;     //!< hard limit
+    };
+
+    /// For gettimeofday().
+    struct timeval {
+        int32_t tv_sec;         //!< seconds
+        int32_t tv_usec;        //!< microseconds
+    };
+
+    // For writev/readv
+    struct tgt_iovec {
+        uint32_t iov_base; // void *
+        uint32_t iov_len;
+    };
+
+    /*
+     * sizeof st 120
+     * sizeof st_dev 4
+     * sizeof st_ino 4
+     * sizeof st_mode 2
+     * sizeof st_nlink 2
+     * sizeof st_uid 4
+     * sizeof st_gid 4
+     * sizeof st_rdev 4
+     * sizeof st_atim 16
+     * sizeof st_size 8
+     * sizeof st_blocks 8
+     * sizeof st_blksize 4
+     * sizeof st_flags 4
+     * sizeof st_gen 4
+     * sizeof st_lspare 4
+     */
+
+    typedef struct {
+        uint32_t   st_dev;
+        uint32_t   st_ino;
+        uint16_t   st_mode;
+        uint16_t   st_nlink;
+        uint32_t   st_uid;
+        uint32_t   st_gid;
+        uint32_t   st_rdev;
+        uint64_t   st_atimeX;
+        uint64_t   st_atime_nsec;
+        uint64_t   st_mtimeX;
+        uint64_t   st_mtime_nsec;
+        uint64_t   st_ctimeX;
+        uint64_t   st_ctime_nsec;
+        uint64_t   st_size;
+        uint64_t   st_blocks;
+        uint32_t   st_blksize;
+        uint32_t   st_flags;
+        uint32_t   st_gen;
+        uint32_t   st_lspare;
+        uint64_t   st_birthtimX;
+        uint64_t   st_birthtim;
+    } tgt_stat;
+
+    typedef struct {
+        uint32_t   st_dev;
+        uint32_t   st_ino;
+        uint16_t   st_mode;
+        uint16_t   st_nlink;
+        uint32_t   st_uid;
+        uint32_t   st_gid;
+        uint32_t   st_rdev;
+        uint64_t   st_atimeX;
+        uint64_t   st_atime_nsec;
+        uint64_t   st_mtimeX;
+        uint64_t   st_mtime_nsec;
+        uint64_t   st_ctimeX;
+        uint64_t   st_ctime_nsec;
+        uint64_t   st_size;
+        uint64_t   st_blocks;
+        uint32_t   st_blksize;
+        uint32_t   st_flags;
+        uint32_t   st_gen;
+        uint32_t   st_lspare;
+        uint64_t   st_birthtimX;
+        uint64_t   st_birthtim;
+    } tgt_stat64;
+
+    /// For getrusage().
+    struct rusage {
+        struct timeval ru_utime;        //!< user time used
+        struct timeval ru_stime;        //!< system time used
+        int32_t ru_maxrss;              //!< max rss
+        int32_t ru_ixrss;               //!< integral shared memory size
+        int32_t ru_idrss;               //!< integral unshared data "
+        int32_t ru_isrss;               //!< integral unshared stack "
+        int32_t ru_minflt;              //!< page reclaims - total vmfaults
+        int32_t ru_majflt;              //!< page faults
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to