summaryrefslogtreecommitdiff
path: root/src/arch/sparc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-05-25 00:55:24 -0700
committerGabe Black <gblack@eecs.umich.edu>2012-05-25 00:55:24 -0700
commiteae1e97fb002b44a9d8c46df2da1ddc1d0156ce4 (patch)
tree56805ea5d0817aff8febe4bea280f4cb5e5f8acf /src/arch/sparc
parent276f3e9535e72c8e9764b5f7369e1fa9eb055055 (diff)
downloadgem5-eae1e97fb002b44a9d8c46df2da1ddc1d0156ce4.tar.xz
ISA: Make the decode function part of the ISA's decoder.
Diffstat (limited to 'src/arch/sparc')
-rw-r--r--src/arch/sparc/SConscript1
-rw-r--r--src/arch/sparc/decoder.cc38
-rw-r--r--src/arch/sparc/decoder.hh24
-rw-r--r--src/arch/sparc/isa/includes.isa1
4 files changed, 61 insertions, 3 deletions
diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript
index 75a3590e7..5e2146750 100644
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -33,6 +33,7 @@ Import('*')
if env['TARGET_ISA'] == 'sparc':
Source('asi.cc')
+ Source('decoder.cc')
Source('faults.cc')
Source('interrupts.cc')
Source('isa.cc')
diff --git a/src/arch/sparc/decoder.cc b/src/arch/sparc/decoder.cc
new file mode 100644
index 000000000..e8769a573
--- /dev/null
+++ b/src/arch/sparc/decoder.cc
@@ -0,0 +1,38 @@
+/*
+ * 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
+ */
+
+#include "arch/sparc/decoder.hh"
+
+namespace SparcISA
+{
+
+DecodeCache Decoder::defaultCache;
+
+}
diff --git a/src/arch/sparc/decoder.hh b/src/arch/sparc/decoder.hh
index 0386bd095..9c8e740b8 100644
--- a/src/arch/sparc/decoder.hh
+++ b/src/arch/sparc/decoder.hh
@@ -31,13 +31,31 @@
#ifndef __ARCH_SPARC_DECODER_HH__
#define __ARCH_SPARC_DECODER_HH__
-#include "arch/generic/decoder.hh"
+#include "arch/types.hh"
+#include "cpu/decode_cache.hh"
+#include "cpu/static_inst_fwd.hh"
namespace SparcISA
{
-class Decoder : public GenericISA::Decoder
-{};
+class Decoder
+{
+ protected:
+ /// A cache of decoded instruction objects.
+ static DecodeCache defaultCache;
+
+ public:
+ StaticInstPtr decodeInst(ExtMachInst mach_inst);
+
+ /// Decode a machine instruction.
+ /// @param mach_inst The binary instruction to decode.
+ /// @retval A pointer to the corresponding StaticInst object.
+ StaticInstPtr
+ decode(ExtMachInst mach_inst, Addr addr)
+ {
+ return defaultCache.decode(this, mach_inst, addr);
+ }
+};
} // namespace SparcISA
diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index 541254d51..79c90a50e 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -51,6 +51,7 @@ output header {{
output decoder {{
#include <algorithm>
+#include "arch/sparc/decoder.hh"
#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
#include "base/fenv.hh"