changeset 5851586f399c in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=5851586f399c
description:
ISA,CPU: Generalize and split out the components of the decode cache.
This will allow it to be specialized by the ISAs. The existing caching
scheme
is provided by the BasicDecodeCache in the GenericISA namespace and is
built
from the generalized components.
diffstat:
src/arch/alpha/decoder.cc | 2 +-
src/arch/alpha/decoder.hh | 8 +-
src/arch/arm/decoder.cc | 2 +-
src/arch/arm/decoder.hh | 5 +-
src/arch/generic/SConscript | 31 ++++++++++
src/arch/generic/decode_cache.cc | 59 ++++++++++++++++++++
src/arch/generic/decode_cache.hh | 63 +++++++++++++++++++++
src/arch/mips/decoder.cc | 2 +-
src/arch/mips/decoder.hh | 6 +-
src/arch/power/decoder.cc | 2 +-
src/arch/power/decoder.hh | 8 +-
src/arch/sparc/decoder.cc | 2 +-
src/arch/sparc/decoder.hh | 6 +-
src/arch/x86/decoder.cc | 21 ++++++-
src/arch/x86/decoder.hh | 13 +--
src/cpu/SConscript | 1 -
src/cpu/decode_cache.cc | 113 ---------------------------------------
src/cpu/decode_cache.hh | 107 +++++++++++++++++++++++++-----------
18 files changed, 275 insertions(+), 176 deletions(-)
diffs (truncated from 677 to 300 lines):
diff -r e9201a7bce59 -r 5851586f399c src/arch/alpha/decoder.cc
--- a/src/arch/alpha/decoder.cc Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/alpha/decoder.cc Sat May 26 13:45:12 2012 -0700
@@ -33,6 +33,6 @@
namespace AlphaISA
{
-DecodeCache Decoder::defaultCache;
+GenericISA::BasicDecodeCache Decoder::defaultCache;
}
diff -r e9201a7bce59 -r 5851586f399c src/arch/alpha/decoder.hh
--- a/src/arch/alpha/decoder.hh Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/alpha/decoder.hh Sat May 26 13:45:12 2012 -0700
@@ -31,11 +31,13 @@
#ifndef __ARCH_ALPHA_DECODER_HH__
#define __ARCH_ALPHA_DECODER_HH__
+#include "arch/generic/decode_cache.hh"
#include "arch/types.hh"
-#include "cpu/decode_cache.hh"
-#include "cpu/static_inst_fwd.hh"
+#include "cpu/static_inst.hh"
#include "sim/full_system.hh"
+class ThreadContext;
+
namespace AlphaISA
{
@@ -99,7 +101,7 @@
protected:
/// A cache of decoded instruction objects.
- static DecodeCache defaultCache;
+ static GenericISA::BasicDecodeCache defaultCache;
public:
StaticInstPtr decodeInst(ExtMachInst mach_inst);
diff -r e9201a7bce59 -r 5851586f399c src/arch/arm/decoder.cc
--- a/src/arch/arm/decoder.cc Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/arm/decoder.cc Sat May 26 13:45:12 2012 -0700
@@ -38,7 +38,7 @@
namespace ArmISA
{
-DecodeCache Decoder::defaultCache;
+GenericISA::BasicDecodeCache Decoder::defaultCache;
void
Decoder::process()
diff -r e9201a7bce59 -r 5851586f399c src/arch/arm/decoder.hh
--- a/src/arch/arm/decoder.hh Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/arm/decoder.hh Sat May 26 13:45:12 2012 -0700
@@ -35,8 +35,9 @@
#include "arch/arm/miscregs.hh"
#include "arch/arm/types.hh"
+#include "arch/generic/decode_cache.hh"
#include "base/types.hh"
-#include "cpu/decode_cache.hh"
+#include "cpu/static_inst.hh"
class ThreadContext;
@@ -122,7 +123,7 @@
protected:
/// A cache of decoded instruction objects.
- static DecodeCache defaultCache;
+ static GenericISA::BasicDecodeCache defaultCache;
public:
StaticInstPtr decodeInst(ExtMachInst mach_inst);
diff -r e9201a7bce59 -r 5851586f399c src/arch/generic/SConscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/generic/SConscript Sat May 26 13:45:12 2012 -0700
@@ -0,0 +1,31 @@
+# Copyright (c) 2012 Google
+# 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.
+#
+# Authors: Gabe Black
+
+Import('*')
+
+Source('decode_cache.cc')
diff -r e9201a7bce59 -r 5851586f399c src/arch/generic/decode_cache.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/generic/decode_cache.cc Sat May 26 13:45:12 2012 -0700
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2011-2012 Google
+ * 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.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "arch/generic/decode_cache.hh"
+#include "arch/decoder.hh"
+#include "arch/types.hh"
+#include "config/the_isa.hh"
+#include "cpu/static_inst.hh"
+
+namespace GenericISA
+{
+
+StaticInstPtr
+BasicDecodeCache::decode(TheISA::Decoder *decoder,
+ TheISA::ExtMachInst mach_inst, Addr addr)
+{
+ StaticInstPtr &si = decodePages.lookup(addr);
+ if (si && (si->machInst == mach_inst))
+ return si;
+
+ DecodeCache::InstMap::iterator iter = instMap.find(mach_inst);
+ if (iter != instMap.end()) {
+ si = iter->second;
+ return si;
+ }
+
+ si = decoder->decodeInst(mach_inst);
+ instMap[mach_inst] = si;
+ return si;
+}
+
+} // namespace GenericISA
diff -r e9201a7bce59 -r 5851586f399c src/arch/generic/decode_cache.hh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/generic/decode_cache.hh Sat May 26 13:45:12 2012 -0700
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2011 Google
+ * 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.
+ *
+ * Authors: Gabe Black
+ */
+
+#ifndef __ARCH_GENERIC_DECODE_CACHE_HH__
+#define __ARCH_GENERIC_DECODE_CACHE_HH__
+
+#include "arch/types.hh"
+#include "config/the_isa.hh"
+#include "cpu/decode_cache.hh"
+#include "cpu/static_inst_fwd.hh"
+
+namespace TheISA
+{
+ class Decoder;
+}
+
+namespace GenericISA
+{
+
+class BasicDecodeCache
+{
+ private:
+ DecodeCache::InstMap instMap;
+ DecodeCache::AddrMap<StaticInstPtr> decodePages;
+
+ public:
+ /// Decode a machine instruction.
+ /// @param mach_inst The binary instruction to decode.
+ /// @retval A pointer to the corresponding StaticInst object.
+ StaticInstPtr decode(TheISA::Decoder * const decoder,
+ TheISA::ExtMachInst mach_inst, Addr addr);
+};
+
+} // namespace GenericISA
+
+#endif // __ARCH_GENERIC_DECODE_CACHE_HH__
diff -r e9201a7bce59 -r 5851586f399c src/arch/mips/decoder.cc
--- a/src/arch/mips/decoder.cc Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/mips/decoder.cc Sat May 26 13:45:12 2012 -0700
@@ -33,6 +33,6 @@
namespace MipsISA
{
-DecodeCache Decoder::defaultCache;
+GenericISA::BasicDecodeCache Decoder::defaultCache;
}
diff -r e9201a7bce59 -r 5851586f399c src/arch/mips/decoder.hh
--- a/src/arch/mips/decoder.hh Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/mips/decoder.hh Sat May 26 13:45:12 2012 -0700
@@ -31,11 +31,11 @@
#ifndef __ARCH_MIPS_DECODER_HH__
#define __ARCH_MIPS_DECODER_HH__
+#include "arch/generic/decode_cache.hh"
#include "arch/mips/types.hh"
#include "base/misc.hh"
#include "base/types.hh"
-#include "cpu/decode_cache.hh"
-#include "cpu/static_inst_fwd.hh"
+#include "cpu/static_inst.hh"
class ThreadContext;
@@ -99,7 +99,7 @@
protected:
/// A cache of decoded instruction objects.
- static DecodeCache defaultCache;
+ static GenericISA::BasicDecodeCache defaultCache;
public:
StaticInstPtr decodeInst(ExtMachInst mach_inst);
diff -r e9201a7bce59 -r 5851586f399c src/arch/power/decoder.cc
--- a/src/arch/power/decoder.cc Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/power/decoder.cc Sat May 26 13:45:12 2012 -0700
@@ -33,6 +33,6 @@
namespace PowerISA
{
-DecodeCache Decoder::defaultCache;
+GenericISA::BasicDecodeCache Decoder::defaultCache;
}
diff -r e9201a7bce59 -r 5851586f399c src/arch/power/decoder.hh
--- a/src/arch/power/decoder.hh Sat May 26 13:44:46 2012 -0700
+++ b/src/arch/power/decoder.hh Sat May 26 13:45:12 2012 -0700
@@ -31,9 +31,11 @@
#ifndef __ARCH_POWER_DECODER_HH__
#define __ARCH_POWER_DECODER_HH__
+#include "arch/generic/decode_cache.hh"
#include "arch/types.hh"
-#include "cpu/decode_cache.hh"
-#include "cpu/static_inst_fwd.hh"
+#include "cpu/static_inst.hh"
+
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
