diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-05-25 00:55:24 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-05-25 00:55:24 -0700 |
commit | eae1e97fb002b44a9d8c46df2da1ddc1d0156ce4 (patch) | |
tree | 56805ea5d0817aff8febe4bea280f4cb5e5f8acf /src/arch/alpha | |
parent | 276f3e9535e72c8e9764b5f7369e1fa9eb055055 (diff) | |
download | gem5-eae1e97fb002b44a9d8c46df2da1ddc1d0156ce4.tar.xz |
ISA: Make the decode function part of the ISA's decoder.
Diffstat (limited to 'src/arch/alpha')
-rw-r--r-- | src/arch/alpha/SConscript | 1 | ||||
-rw-r--r-- | src/arch/alpha/decoder.cc | 38 | ||||
-rw-r--r-- | src/arch/alpha/decoder.hh | 24 | ||||
-rw-r--r-- | src/arch/alpha/isa/main.isa | 1 |
4 files changed, 61 insertions, 3 deletions
diff --git a/src/arch/alpha/SConscript b/src/arch/alpha/SConscript index 7e683364a..421040bb5 100644 --- a/src/arch/alpha/SConscript +++ b/src/arch/alpha/SConscript @@ -32,6 +32,7 @@ Import('*') if env['TARGET_ISA'] == 'alpha': + Source('decoder.cc') Source('ev5.cc') Source('faults.cc') Source('freebsd/system.cc') diff --git a/src/arch/alpha/decoder.cc b/src/arch/alpha/decoder.cc new file mode 100644 index 000000000..8cabe515d --- /dev/null +++ b/src/arch/alpha/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/alpha/decoder.hh" + +namespace AlphaISA +{ + +DecodeCache Decoder::defaultCache; + +} diff --git a/src/arch/alpha/decoder.hh b/src/arch/alpha/decoder.hh index 77a165ad7..a41ed06bb 100644 --- a/src/arch/alpha/decoder.hh +++ b/src/arch/alpha/decoder.hh @@ -31,13 +31,31 @@ #ifndef __ARCH_ALPHA_DECODER_HH__ #define __ARCH_ALPHA_DECODER_HH__ -#include "arch/generic/decoder.hh" +#include "arch/types.hh" +#include "cpu/decode_cache.hh" +#include "cpu/static_inst_fwd.hh" namespace AlphaISA { -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 AlphaISA diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index 5285d0572..1bc00e753 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -56,6 +56,7 @@ output header {{ output decoder {{ #include <cmath> +#include "arch/alpha/decoder.hh" #include "arch/alpha/registers.hh" #include "arch/alpha/regredir.hh" #include "base/loader/symtab.hh" |