Move op_class.hh out of encumbered/cpu/full and into cpu.

Pull opClassStrings array out of encumbered/cpu/full/fu_pool.cc and move to
new cpu/op_class.cc file.

SConscript:
    Add new cpu-model-independent file to define OpClass enum strings.
cpu/op_class.hh:
    Fix comments etc.
cpu/static_inst.hh:
    op_class.hh moved to cpu directory

--HG--
rename : encumbered/cpu/full/op_class.hh => cpu/op_class.hh
extra : convert_revision : 314ac5ab7cc5c6a34b43dc1c2f2adc3e02f6d07f
This commit is contained in:
Steve Reinhardt 2006-02-21 22:12:27 -05:00
parent 1fff9f504f
commit 9c4e4a2181
4 changed files with 71 additions and 20 deletions

View file

@ -86,6 +86,7 @@ base_sources = Split('''
cpu/base.cc cpu/base.cc
cpu/exec_context.cc cpu/exec_context.cc
cpu/exetrace.cc cpu/exetrace.cc
cpu/op_class.cc
cpu/pc_event.cc cpu/pc_event.cc
cpu/static_inst.cc cpu/static_inst.cc
cpu/sampler/sampler.cc cpu/sampler/sampler.cc

50
cpu/op_class.cc Normal file
View file

@ -0,0 +1,50 @@
/*
* Copyright (c) 2003-2005 The Regents of The University of Michigan
* 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.
*/
#include "cpu/op_class.hh"
/** OpClass enum -> description string */
const char *
opClassStrings[Num_OpClasses] =
{
"(null)",
"IntAlu",
"IntMult",
"IntDiv",
"FloatAdd",
"FloatCmp",
"FloatCvt",
"FloatMult",
"FloatDiv",
"FloatSqrt",
"MemRead",
"MemWrite",
"IprAccess",
"InstPrefetch"
};

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __ENCUMBERED_CPU_FULL_OP_CLASS_HH__ #ifndef __CPU__OP_CLASS_HH__
#define __ENCUMBERED_CPU_FULL_OP_CLASS_HH__ #define __CPU__OP_CLASS_HH__
/** /**
* @file * @file
@ -39,26 +39,26 @@
* assigning instructions to functional units. * assigning instructions to functional units.
*/ */
enum OpClass { enum OpClass {
No_OpClass = 0, /* inst does not use a functional unit */ No_OpClass = 0, ///< Instruction does not use a functional unit
IntAluOp, /* integer ALU */ IntAluOp, ///< Integer ALU operaton (add/sub/logical)
IntMultOp, /* integer multiplier */ IntMultOp, ///< Integer multiply
IntDivOp, /* integer divider */ IntDivOp, ///< Integer divide
FloatAddOp, /* floating point adder/subtractor */ FloatAddOp, ///< Floating point add/subtract
FloatCmpOp, /* floating point comparator */ FloatCmpOp, ///< Floating point comparison
FloatCvtOp, /* floating point<->integer converter */ FloatCvtOp, ///< Floating point<->integer conversion
FloatMultOp, /* floating point multiplier */ FloatMultOp, ///< Floating point multiply
FloatDivOp, /* floating point divider */ FloatDivOp, ///< Floating point divide
FloatSqrtOp, /* floating point square root */ FloatSqrtOp, ///< Floating point square root
MemReadOp, /* memory read port */ MemReadOp, ///< Memory read port
MemWriteOp, /* memory write port */ MemWriteOp, ///< Memory write port
IprAccessOp, /* Internal Processor Register read/write port */ IprAccessOp, ///< Internal Processor Register read/write port
InstPrefetchOp, /* instruction prefetch port (on I-cache) */ InstPrefetchOp, ///< Instruction prefetch port (on I-cache)
Num_OpClasses /* total functional unit classes */ Num_OpClasses ///< Total number of operation classes
}; };
/** /**
* Array mapping OpClass enum values to strings. Defined in fu_pool.cc. * Array mapping OpClass enum values to strings. Defined in op_class.cc.
*/ */
extern const char *opClassStrings[]; extern const char *opClassStrings[];
#endif // __ENCUMBERED_CPU_FULL_OP_CLASS_HH__ #endif // __CPU__OP_CLASS_HH__

View file

@ -34,7 +34,7 @@
#include "base/hashmap.hh" #include "base/hashmap.hh"
#include "base/refcnt.hh" #include "base/refcnt.hh"
#include "encumbered/cpu/full/op_class.hh" #include "cpu/op_class.hh"
#include "sim/host.hh" #include "sim/host.hh"
#include "targetarch/isa_traits.hh" #include "targetarch/isa_traits.hh"