Missed this file in last check in.

--HG--
extra : convert_revision : 6c42350fc3cebb5cf4a6da8ea0c51cca15b3f99f
This commit is contained in:
Kevin Lim 2006-05-25 17:13:00 -04:00
parent 248bd2bb62
commit f5b5391cfb

View file

@ -1,3 +1,30 @@
/*
* Copyright (c) 2006 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 <string> #include <string>
@ -103,6 +130,7 @@ Param<unsigned> renameToROBDelay;
Param<unsigned> commitWidth; Param<unsigned> commitWidth;
Param<unsigned> squashWidth; Param<unsigned> squashWidth;
Param<std::string> predType;
Param<unsigned> localPredictorSize; Param<unsigned> localPredictorSize;
Param<unsigned> localCtrBits; Param<unsigned> localCtrBits;
Param<unsigned> localHistoryTableSize; Param<unsigned> localHistoryTableSize;
@ -236,6 +264,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(DerivOzoneCPU)
INIT_PARAM(commitWidth, "Commit width"), INIT_PARAM(commitWidth, "Commit width"),
INIT_PARAM(squashWidth, "Squash width"), INIT_PARAM(squashWidth, "Squash width"),
INIT_PARAM(predType, "Type of branch predictor ('local', 'tournament')"),
INIT_PARAM(localPredictorSize, "Size of local predictor"), INIT_PARAM(localPredictorSize, "Size of local predictor"),
INIT_PARAM(localCtrBits, "Bits per counter"), INIT_PARAM(localCtrBits, "Bits per counter"),
INIT_PARAM(localHistoryTableSize, "Size of local history table"), INIT_PARAM(localHistoryTableSize, "Size of local history table"),
@ -375,7 +404,7 @@ CREATE_SIM_OBJECT(DerivOzoneCPU)
params->commitWidth = commitWidth; params->commitWidth = commitWidth;
params->squashWidth = squashWidth; params->squashWidth = squashWidth;
params->predType = predType;
params->localPredictorSize = localPredictorSize; params->localPredictorSize = localPredictorSize;
params->localCtrBits = localCtrBits; params->localCtrBits = localCtrBits;
params->localHistoryTableSize = localHistoryTableSize; params->localHistoryTableSize = localHistoryTableSize;
@ -504,6 +533,7 @@ Param<unsigned> renameToROBDelay;
Param<unsigned> commitWidth; Param<unsigned> commitWidth;
Param<unsigned> squashWidth; Param<unsigned> squashWidth;
Param<std::string> predType;
Param<unsigned> localPredictorSize; Param<unsigned> localPredictorSize;
Param<unsigned> localCtrBits; Param<unsigned> localCtrBits;
Param<unsigned> localHistoryTableSize; Param<unsigned> localHistoryTableSize;
@ -636,6 +666,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
INIT_PARAM(commitWidth, "Commit width"), INIT_PARAM(commitWidth, "Commit width"),
INIT_PARAM(squashWidth, "Squash width"), INIT_PARAM(squashWidth, "Squash width"),
INIT_PARAM(predType, "Type of branch predictor ('local', 'tournament')"),
INIT_PARAM(localPredictorSize, "Size of local predictor"), INIT_PARAM(localPredictorSize, "Size of local predictor"),
INIT_PARAM(localCtrBits, "Bits per counter"), INIT_PARAM(localCtrBits, "Bits per counter"),
INIT_PARAM(localHistoryTableSize, "Size of local history table"), INIT_PARAM(localHistoryTableSize, "Size of local history table"),
@ -774,7 +805,7 @@ CREATE_SIM_OBJECT(SimpleOzoneCPU)
params->commitWidth = commitWidth; params->commitWidth = commitWidth;
params->squashWidth = squashWidth; params->squashWidth = squashWidth;
params->predType = predType;
params->localPredictorSize = localPredictorSize; params->localPredictorSize = localPredictorSize;
params->localCtrBits = localCtrBits; params->localCtrBits = localCtrBits;
params->localHistoryTableSize = localHistoryTableSize; params->localHistoryTableSize = localHistoryTableSize;