From b6ff600bcae2d1e816d0e409c1638a15e207695b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 4 Feb 2004 21:42:00 -0800 Subject: [PATCH 01/10] Add support for "serializing" instructions that flush execution pipeline (Alpha trapb & excb). Add support for write memory barriers (mostly impacts store buffer). Add StaticInst flag to indicate memory barriers, though this is not modeled in the pipeline yet. arch/alpha/isa_desc: Implement trapb, excb, mb, and wmb as insts with no execution effect (empty execute() function) but with flags that indicate their side effects. Also make sure every instruction that needs to go to the execute stage has a real opClass value, since we are now using No_OpClass to signal insts that can get dropped at dispatch. StaticInst::branchTarget() is now a const method. cpu/static_inst.hh: Add flags to indicate serializing insts (trapb, excb) and memory and write barriers. Also declare some StaticInst methods as const methods. dev/etherlink.hh: sim/eventq.hh: sim/serialize.cc: sim/serialize.hh: sim/sim_object.hh: Make name() return value const. --HG-- extra : convert_revision : 39520e71469fa20e0a7446b2e06b494eec17a02c --- arch/alpha/isa_desc | 35 ++++++++++++++++++++++++++--------- cpu/static_inst.hh | 24 +++++++++++++++++++----- dev/etherlink.hh | 2 +- sim/eventq.hh | 4 ++-- sim/serialize.cc | 4 ++-- sim/serialize.hh | 2 +- sim/sim_object.hh | 2 +- 7 files changed, 52 insertions(+), 21 deletions(-) diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc index 51bce65c2..d4636f609 100644 --- a/arch/alpha/isa_desc +++ b/arch/alpha/isa_desc @@ -1225,7 +1225,7 @@ declare {{ { } - Addr branchTarget(Addr branchPC) + Addr branchTarget(Addr branchPC) const { return branchPC + 4 + disp; } @@ -1287,7 +1287,7 @@ declare {{ { } - Addr branchTarget(ExecContext *xc) + Addr branchTarget(ExecContext *xc) const { Addr NPC = xc->readPC() + 4; uint64_t Rb = xc->readIntReg(_srcRegIdx[0]); @@ -2330,10 +2330,6 @@ decode OPCODE default Unknown::unknown() { // miscellaneous mem-format ops 0x18: decode MEMFUNC { format WarnUnimpl { - 0x0000: trapb(); - 0x0400: excb(); - 0x4000: mb(); - 0x4400: wmb(); 0x8000: fetch(); 0xa000: fetch_m(); 0xe800: ecb(); @@ -2347,6 +2343,27 @@ decode OPCODE default Unknown::unknown() { format BasicOperate { 0xc000: rpcc({{ Ra = curTick; }}); + + // All of the barrier instructions below do nothing in + // their execute() methods (hence the empty code blocks). + // All of their functionality is hard-coded in the + // pipeline based on the flags IsSerializing, + // IsMemBarrier, and IsWriteBarrier. In the current + // detailed CPU model, the execute() function only gets + // called at fetch, so there's no way to generate pipeline + // behavior at any other stage. Once we go to an + // exec-in-exec CPU model we should be able to get rid of + // these flags and implement this behavior via the + // execute() methods. + + // trapb is just a barrier on integer traps, where excb is + // a barrier on integer and FP traps. "EXCB is thus a + // superset of TRAPB." (Alpha ARM, Sec 4.11.4) We treat + // them the same though. + 0x0000: trapb({{ }}, IsSerializing, No_OpClass); + 0x0400: excb({{ }}, IsSerializing, No_OpClass); + 0x4000: mb({{ }}, IsMemBarrier); + 0x4400: wmb({{ }}, IsWriteBarrier); } #ifdef FULL_SYSTEM @@ -2356,13 +2373,13 @@ decode OPCODE default Unknown::unknown() { if (!xc->misspeculating()) { xc->regs.intrflag = 0; } - }}, No_OpClass); + }}); 0xf000: rs({{ Ra = xc->regs.intrflag; if (!xc->misspeculating()) { xc->regs.intrflag = 1; } - }}, No_OpClass); + }}); } #else format FailUnimpl { @@ -2476,7 +2493,7 @@ decode OPCODE default Unknown::unknown() { if (!xc->misspeculating()) AlphaPseudo::m5exit(xc); }}, No_OpClass); - 0x30: initparam({{ Ra = xc->cpu->system->init_param; }}); + 0x30: initparam({{ Ra = cpu->system->init_param; }}); 0x40: resetstats({{ if (!xc->misspeculating()) AlphaPseudo::resetstats(xc); diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index f3fd6fa24..5f4bcae3d 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -78,6 +78,12 @@ class StaticInstBase : public RefCounted /// - If IsControl is set, then exactly one of IsDirectControl or /// IsIndirect Control will be set, and exactly one of /// IsCondControl or IsUncondControl will be set. + /// - IsSerializing, IsMemBarrier, and IsWriteBarrier are + /// implemented as flags since in the current model there's no + /// other way for instructions to inject behavior into the + /// pipeline outside of fetch. Once we go to an exec-in-exec CPU + /// model we should be able to get rid of these flags and + /// implement this behavior via the execute() methods. /// enum Flags { IsNop, ///< Is a no-op (no effect at all). @@ -99,7 +105,12 @@ class StaticInstBase : public RefCounted IsCall, ///< Subroutine call. IsReturn, ///< Subroutine return. - IsThreadSync, ///< Thread synchronization operation. + IsThreadSync, ///< Thread synchronization operation. + + IsSerializing, ///< Serializes pipeline: won't until all + /// older instructions have committed. + IsMemBarrier, ///< Is a memory barrier + IsWriteBarrier, ///< Is a write barrier NumFlags }; @@ -178,6 +189,9 @@ class StaticInstBase : public RefCounted bool isUncondCtrl() const { return flags[IsUncondControl]; } bool isThreadSync() const { return flags[IsThreadSync]; } + bool isSerializing() const { return flags[IsSerializing]; } + bool isMemBarrier() const { return flags[IsMemBarrier]; } + bool isWriteBarrier() const { return flags[IsWriteBarrier]; } //@} /// Operation class. Used to select appropriate function unit in issue. @@ -216,11 +230,11 @@ class StaticInst : public StaticInstBase /// Return logical index (architectural reg num) of i'th destination reg. /// Only the entries from 0 through numDestRegs()-1 are valid. - RegIndex destRegIdx(int i) { return _destRegIdx[i]; } + RegIndex destRegIdx(int i) const { return _destRegIdx[i]; } /// Return logical index (architectural reg num) of i'th source reg. /// Only the entries from 0 through numSrcRegs()-1 are valid. - RegIndex srcRegIdx(int i) { return _srcRegIdx[i]; } + RegIndex srcRegIdx(int i) const { return _srcRegIdx[i]; } /// Pointer to a statically allocated "null" instruction object. /// Used to give eaCompInst() and memAccInst() something to return @@ -305,7 +319,7 @@ class StaticInst : public StaticInstBase * Invalid if not a PC-relative branch (i.e. isDirectCtrl() * should be true). */ - virtual Addr branchTarget(Addr branchPC) + virtual Addr branchTarget(Addr branchPC) const { panic("StaticInst::branchTarget() called on instruction " "that is not a PC-relative branch."); @@ -318,7 +332,7 @@ class StaticInst : public StaticInstBase * execute the branch in question. Invalid if not an indirect * branch (i.e. isIndirectCtrl() should be true). */ - virtual Addr branchTarget(ExecContext *xc) + virtual Addr branchTarget(ExecContext *xc) const { panic("StaticInst::branchTarget() called on instruction " "that is not an indirect branch."); diff --git a/dev/etherlink.hh b/dev/etherlink.hh index 895bac2e1..e1a7957ee 100644 --- a/dev/etherlink.hh +++ b/dev/etherlink.hh @@ -89,7 +89,7 @@ class EtherLink : public SimObject Link(const std::string &name, double rate, EtherDump *dump); ~Link() {} - virtual std::string name() const { return objName; } + virtual const std::string name() const { return objName; } bool busy() const { return (bool)packet; } bool transmit(PacketPtr &packet); diff --git a/sim/eventq.hh b/sim/eventq.hh index 36cb402a8..31bf9d652 100644 --- a/sim/eventq.hh +++ b/sim/eventq.hh @@ -153,7 +153,7 @@ class Event : public Serializable, public FastAlloc ~Event() {} - virtual std::string name() const { + virtual const std::string name() const { return csprintf("Event_%x", (uintptr_t)this); } @@ -257,7 +257,7 @@ class EventQueue : public Serializable : objName(n), head(NULL) {} - virtual std::string name() const { return objName; } + virtual const std::string name() const { return objName; } // schedule the given event on this queue void schedule(Event *ev); diff --git a/sim/serialize.cc b/sim/serialize.cc index 180cc38a0..d836e7c20 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -186,7 +186,7 @@ INSTANTIATE_PARAM_TEMPLATES(string) class Globals : public Serializable { public: - string name() const; + const string name() const; void serialize(ostream& os); void unserialize(Checkpoint *cp); }; @@ -194,7 +194,7 @@ class Globals : public Serializable /// The one and only instance of the Globals class. Globals globals; -string +const string Globals::name() const { return "Globals"; diff --git a/sim/serialize.hh b/sim/serialize.hh index 9ab2fa833..43dbd2c85 100644 --- a/sim/serialize.hh +++ b/sim/serialize.hh @@ -111,7 +111,7 @@ class Serializable virtual ~Serializable() {} // manditory virtual function, so objects must provide names - virtual std::string name() const = 0; + virtual const std::string name() const = 0; virtual void serialize(std::ostream& os) {} virtual void unserialize(Checkpoint *cp, const std::string §ion) {} diff --git a/sim/sim_object.hh b/sim/sim_object.hh index 165931b2b..aaaafc04b 100644 --- a/sim/sim_object.hh +++ b/sim/sim_object.hh @@ -63,7 +63,7 @@ class SimObject : public Serializable virtual ~SimObject() {} - virtual std::string name() const { return objName; } + virtual const std::string name() const { return objName; } // initialization pass of all objects. Gets invoked by SimInit() virtual void init(); From de285ff2a0c49fdf61dba7c4fcc6b3804e045e56 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 7 Feb 2004 01:16:50 -0500 Subject: [PATCH 03/10] Totally rework the Range class. Now the range is from [start, end) to be consistent with the way that the stl works. It also makes lots of other stuff easier. (Maybe those guys were smart?) Overload the various comparison operators so that you can test for overlapping of ranges, etc. base/range.hh: Totally rework the Range class. Now the range is from [start, end) to be consistent with the way that the stl works. It also makes lots of other stuff easier. (Maybe those guys were smart?) Overload the various comparison operators so that you can test for overlapping of ranges, etc. make parse function private and offer operator= instead isValid -> valid and for you erik, I add comments test/Makefile: add range.o test/rangetest.cc: better tests --HG-- extra : convert_revision : dd58720aa3d02f20b03e933f2eaa3320c82bb27a --- base/range.cc | 83 +++++++++ base/range.hh | 448 ++++++++++++++++++++++++++++------------------ test/Makefile | 2 +- test/rangetest.cc | 78 +++----- 4 files changed, 386 insertions(+), 225 deletions(-) create mode 100644 base/range.cc diff --git a/base/range.cc b/base/range.cc new file mode 100644 index 000000000..0a4876e89 --- /dev/null +++ b/base/range.cc @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2003 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 "base/intmath.hh" +#include "base/range.hh" +#include "base/str.hh" + +using namespace std; + +template +bool +__x_parse_range(const std::string &str, T &start, T &end) +{ + std::vector values; + tokenize(values, str, ':'); + + T thestart, theend; + + if (values.size() != 2) + return false; + + std::string s = values[0]; + std::string e = values[1]; + + if (!to_number(s, thestart)) + return false; + + bool increment = (e[0] == '+'); + if (increment) + e = e.substr(1); + + if (!to_number(e, theend)) + return false; + + if (increment) + theend += thestart; + + start = thestart; + end = theend; + + return true; +} + +#define RANGE_PARSE(type) \ +template<> bool \ +__parse_range(const std::string &s, type &start, type &end) \ +{ return __x_parse_range(s, start, end); } + +RANGE_PARSE(unsigned long long); +RANGE_PARSE(signed long long); +RANGE_PARSE(unsigned long); +RANGE_PARSE(signed long); +RANGE_PARSE(unsigned int); +RANGE_PARSE(signed int); +RANGE_PARSE(unsigned short); +RANGE_PARSE(signed short); +RANGE_PARSE(unsigned char); +RANGE_PARSE(signed char); diff --git a/base/range.hh b/base/range.hh index 3443bf246..34bd34136 100644 --- a/base/range.hh +++ b/base/range.hh @@ -29,232 +29,340 @@ #ifndef __RANGE_HH__ #define __RANGE_HH__ -#include +#include +#include -#include "base/intmath.hh" -#include "base/str.hh" +template +bool __parse_range(const std::string &s, T &start, T &end); -template -class Range +template +struct Range { private: - bool valid; + /** + * @param s range string + * Ranges are in the following format: + * := {}:{} + * := | + + */ + void + parse(const std::string &s) + { + if (!__parse_range(s, start, end)) + invalidate(); + } public: T start; T end; public: - Range() {} - - Range(const Range &r) { operator=(r); } - - Range(const T &s, const T &e) - : start(s), end(e) + Range() { - valid = (start <= end); + invalidate(); } - Range(const std::string &s) { valid = parse(s); } + template + Range(const Range &r) + : start(r.start), end(r.end) + {} - ~Range() {} + template + Range(const std::pair &r) + : start(r.first), end(r.second) + {} - int compare(const T &p); - bool parse(const std::string &s); - const Range &operator=(const Range &r); + Range(const std::string &s) + { + parse(s); + } - bool isValid() const { return valid; } -}; - - -template -inline int -Range::compare(const T &p) -{ - assert(isValid()); - - if (p < start) - return -1; - else if (p > end) - return 1; - else - return 0; -} - -// Parse a range string -// -// Ranges are in the following format: -// := {}:{} -// := | + -template -inline bool -Range::parse(const std::string &str) -{ - std::vector values; - tokenize(values, str, ':'); - - T thestart, theend; - - if (values.size() != 2) - return false; - - std::string s = values[0]; - std::string e = values[1]; - - if (!to_number(s, thestart)) - return false; - - bool increment = (e[0] == '+'); - if (increment) - e = e.substr(1); - - if (!to_number(e, theend)) - return false; - - if (increment) - theend += thestart; - - start = thestart; - end = theend; - - if (start > end) - return false; - - return true; -} - - -template -inline const Range & -Range::operator=(const Range &r) -{ - if (this != &r) { + template + const Range &operator=(const Range &r) + { start = r.start; end = r.end; - - valid = r.valid; - } - else { - valid = false; + return *this; } - return *this; -} + template + const Range &operator=(const std::pair &r) + { + start = r.first; + end = r.second; + return *this; + } + + const Range &operator=(const std::string &s) + { + parse(s); + return *this; + } + + void invalidate() { start = 0; end = 0; } + bool size() const { return end - start; } + bool valid() const { return start < end; } +}; template inline std::ostream & operator<<(std::ostream &o, const Range &r) { // don't currently support output of invalid ranges - assert(r.isValid()); + assert(r.valid()); o << r.start << ":" << r.end; return o; } -////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////// // -// Compare two ranges +// Range to Range Comparisons // -template + +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 and range2 are identical. + */ +template inline bool -operator==(const Range &l, const Range &r) +operator==(const Range &range1, const Range &range2) { - // ranges must both be valid to be equal - return (l.isValid() && r.isValid() && - (l.start == r.start) && (l.end == r.end)); + assert(range1.valid() && range2.valid()); + return range1.start == range2.start && range1.end == range2.end; } -template +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 and range2 are not identical. + */ +template inline bool -operator!=(const Range &l, const Range &r) +operator!=(const Range &range1, const Range &range2) { - // for symmetry with ==, an invalid range is not equal to any other - return (!l.isValid() || !r.isValid() || - (l.start != r.start) || (l.end != r.end)); + assert(range1.valid() && range2.valid()); + return range1.start != range2.start || range1.end != range2.end; } -////////////////////////////////////////// -// -// Compare position to a range -// -// - 'pos == range' indicates that position pos is within the given range. -// This test always returns false if the range is invalid. -// -// - 'pos < range' and 'pos > range' indicate that the position is -// before the start of or after the end of the range, respectively. -// The range must be valid for these comparisons to be made. -// -// All other comparisons do the obvious thing based on these definitions. +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is less than range2 and does not overlap range1. + */ +template +inline bool +operator<(const Range &range1, const Range &range2) +{ + assert(range1.valid() && range2.valid()); + return range1.end <= range2.start; +} + +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is less than range2. range1 may overlap range2, + * but not extend beyond the end of range2. + */ +template +inline bool +operator<=(const Range &range1, const Range &range2) +{ + assert(range1.valid() && range2.valid()); + return range1.start <= range2.start && range1.end <= range2.end; +} + +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is greater than range2 and does not overlap range2. + */ +template +inline bool +operator>(const Range &range1, const Range &range2) +{ + assert(range1.valid() && range2.valid()); + return range1.start >= range2.end; +} + +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is greater than range2. range1 may overlap range2, + * but not extend beyond the beginning of range2. + */ +template +inline bool +operator>=(const Range &range1, const Range &range2) +{ + assert(range1.valid() && range2.valid()); + return range1.start >= range2.start && range1.end >= range2.end; +} + +//////////////////////////////////////////////////////////////////////// // +// Position to Range Comparisons // +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is within the range. + */ +template +inline bool +operator==(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.start && pos < range.end; +} + +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is not within the range. + */ +template +inline bool +operator!=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.start || pos >= range.end; +} + +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is below the range. + */ +template +inline bool +operator<(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.start; +} + +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is below or in the range. + */ +template +inline bool +operator<=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.end; +} + +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is above the range. + */ +template +inline bool +operator>(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.end; +} + +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is above or in the range. + */ +template +inline bool +operator>=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.start; +} + +//////////////////////////////////////////////////////////////////////// // -// Basic comparisons +// Range to Position Comparisons (for symmetry) // -template -inline bool -operator==(const T &pos, const Range &range) -{ return range.isValid() && pos >= range.start && pos <= range.end; } -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is within the range. + */ +template inline bool -operator<(const T &pos, const Range &range) -{ assert(range.isValid()); return pos < range.start; } +operator==(const Range &range, const U &pos) +{ + assert(range.valid()); + return pos >= range.start && pos < range.end; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is not within the range. + */ +template inline bool -operator>(const T &pos, const Range &range) -{ assert(range.isValid()); return pos > range.end; } +operator!=(const Range &range, const U &pos) +{ + assert(range.valid()); + return pos < range.start || pos >= range.end; +} -// -// Derived comparisons -// -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is above the range. + */ +template inline bool -operator<=(const T &pos, const Range &range) -{ assert(range.isValid()); return pos <= range.end; } +operator<(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.end <= pos; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is above or in the range. + */ +template inline bool -operator>=(const T &pos, const Range &range) -{ assert(range.isValid()); return pos >= range.start; } +operator<=(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.start <= pos; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * 'range > pos' indicates that position pos is below the range. + */ +template inline bool -operator!=(const T &pos, const Range &range) -{ return !(pos == range); } +operator>(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.start > pos; +} -// -// Define symmetric comparisons based on above -// -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * 'range >= pos' indicates that position pos is below or in the range. + */ +template inline bool -operator>(const Range &range, const T &pos) -{ return pos < range; } - -template -inline bool -operator<(const Range &range, const T &pos) -{ return pos > range; } - -template -inline bool -operator<=(const Range &range, const T &pos) -{ return pos >= range; } - -template -inline bool -operator>=(const Range &range, const T &pos) -{ return pos <= range; } - -template -inline bool -operator==(const Range &range, const T &pos) -{ return (pos == range); } - -template -inline bool -operator!=(const Range &range, const T &pos) -{ return (pos != range); } +operator>=(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.end > pos; +} #endif // __RANGE_HH__ diff --git a/test/Makefile b/test/Makefile index 2c3780c93..d62dba64a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -49,7 +49,7 @@ nmtest: nmtest.o object_file.o symtab.o misc.o str.o offtest: offtest.o $(CXX) $(LFLAGS) -o $@ $^ -rangetest: rangetest.o str.o +rangetest: rangetest.o range.o str.o $(CXX) $(LFLAGS) -o $@ $^ stattest: cprintf.o hostinfo.o misc.o python.o statistics.o stattest.o \ diff --git a/test/rangetest.cc b/test/rangetest.cc index f44d835b7..c38c13fd1 100644 --- a/test/rangetest.cc +++ b/test/rangetest.cc @@ -31,11 +31,12 @@ #include "base/range.hh" +using namespace std; int main() { - Range r1(9, 28); + Range r1(make_pair(9, 28)); Range r2("0x1000:+0x100"); cout << r1 << "\n" @@ -44,61 +45,30 @@ main() #define RANGETEST(X, C, Y) \ cout << X << " "#C" " << Y << " => " << ((X C Y) ? "true" : "false") << "\n" - int i1 = 10; - int i2 = 0x1001; - RANGETEST(i1, < , r1); - RANGETEST(i1, <=, r1); - RANGETEST(i1, > , r1); - RANGETEST(i1, >=, r1); - RANGETEST(i1, ==, r1); - RANGETEST(i1, !=, r1); - RANGETEST(r1, < , i1); - RANGETEST(r1, <=, i1); - RANGETEST(r1, > , i1); - RANGETEST(r1, >=, i1); - RANGETEST(r1, ==, i1); - RANGETEST(r1, !=, i1); +#define TESTEM(X, Y) do { \ + RANGETEST(X, < , Y); \ + RANGETEST(X, <=, Y); \ + RANGETEST(X, > , Y); \ + RANGETEST(X, >=, Y); \ + RANGETEST(X, ==, Y); \ + RANGETEST(X, !=, Y); \ + RANGETEST(Y, < , X); \ + RANGETEST(Y, <=, X); \ + RANGETEST(Y, > , X); \ + RANGETEST(Y, >=, X); \ + RANGETEST(Y, ==, X); \ + RANGETEST(Y, !=, X); \ +} while (0) - RANGETEST(i2, < , r1); - RANGETEST(i2, <=, r1); - RANGETEST(i2, > , r1); - RANGETEST(i2, >=, r1); - RANGETEST(i2, ==, r1); - RANGETEST(i2, !=, r1); - RANGETEST(r1, < , i2); - RANGETEST(r1, <=, i2); - RANGETEST(r1, > , i2); - RANGETEST(r1, >=, i2); - RANGETEST(r1, ==, i2); - RANGETEST(r1, !=, i2); + TESTEM(8, r1); + TESTEM(9, r1); + TESTEM(27, r1); + TESTEM(28, r1); - unsigned u1 = 10; - unsigned u2 = 0x1001; - RANGETEST(u1, < , r2); - RANGETEST(u1, <=, r2); - RANGETEST(u1, > , r2); - RANGETEST(u1, >=, r2); - RANGETEST(u1, ==, r2); - RANGETEST(u1, !=, r2); - RANGETEST(r2, < , u1); - RANGETEST(r2, <=, u1); - RANGETEST(r2, > , u1); - RANGETEST(r2, >=, u1); - RANGETEST(r2, ==, u1); - RANGETEST(r2, !=, u1); - - RANGETEST(u2, < , r2); - RANGETEST(u2, <=, r2); - RANGETEST(u2, > , r2); - RANGETEST(u2, >=, r2); - RANGETEST(u2, ==, r2); - RANGETEST(u2, !=, r2); - RANGETEST(r2, < , u2); - RANGETEST(r2, <=, u2); - RANGETEST(r2, > , u2); - RANGETEST(r2, >=, u2); - RANGETEST(r2, ==, u2); - RANGETEST(r2, !=, u2); + TESTEM(0x0fff, r2); + TESTEM(0x1000, r2); + TESTEM(0x10ff, r2); + TESTEM(0x1100, r2); return 0; } From 9c7bec74b1deb9fd78d17818e0bc14620d2b4314 Mon Sep 17 00:00:00 2001 From: Erik Hallnor Date: Sun, 8 Feb 2004 17:26:27 -0500 Subject: [PATCH 04/10] Separate template definitions and instantiations into *_impl.hh and *.cc. Eventually the *.cc fils should be generate by our super-duper python script. base/compression/null_compression.hh: Need some includes. --HG-- extra : convert_revision : caf52320f6f6ff255e8a93817419ad13ad44224f --- base/compression/null_compression.hh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/compression/null_compression.hh b/base/compression/null_compression.hh index d2bc76eef..6a630b113 100644 --- a/base/compression/null_compression.hh +++ b/base/compression/null_compression.hh @@ -34,6 +34,10 @@ * This file defines a doNothing compression algorithm. */ +#include // for uint8_t +#include "base/misc.hh" // for fatal() + + /** * A dummy compression class to use when no data compression is desired. */ From d7b7363444614a4e07676151604ce9600bad1169 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Mon, 9 Feb 2004 00:22:43 -0800 Subject: [PATCH 05/10] Add support for memory barriers. arch/alpha/isa_desc: Add cache port bindings for mb & wmb. --HG-- extra : convert_revision : 72f76150fe471d0dc97bd41598cad4d86a035e39 --- arch/alpha/isa_desc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc index d4636f609..75b2f4138 100644 --- a/arch/alpha/isa_desc +++ b/arch/alpha/isa_desc @@ -2362,8 +2362,8 @@ decode OPCODE default Unknown::unknown() { // them the same though. 0x0000: trapb({{ }}, IsSerializing, No_OpClass); 0x0400: excb({{ }}, IsSerializing, No_OpClass); - 0x4000: mb({{ }}, IsMemBarrier); - 0x4400: wmb({{ }}, IsWriteBarrier); + 0x4000: mb({{ }}, IsMemBarrier, RdPort); + 0x4400: wmb({{ }}, IsWriteBarrier, WrPort); } #ifdef FULL_SYSTEM From 6ece3a7e5985e4bf5ff1f8eb9d0680647d00c4c6 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 9 Feb 2004 09:04:52 -0500 Subject: [PATCH 08/10] random fixes base/range.hh: Add a constructor that takes the beginning and end as arguments size returns T not a bool quick make_range() function that is a shortcut for making a range kinda like make_pair() quick formatting fix --HG-- extra : convert_revision : 94b1d462710e6fb55e72e1da2ad8c46993af1ef7 --- base/range.hh | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/base/range.hh b/base/range.hh index 34bd34136..d72aa9755 100644 --- a/base/range.hh +++ b/base/range.hh @@ -62,6 +62,10 @@ struct Range invalidate(); } + Range(T first, T second) + : start(first), end(second) + {} + template Range(const Range &r) : start(r.start), end(r.end) @@ -100,11 +104,18 @@ struct Range } void invalidate() { start = 0; end = 0; } - bool size() const { return end - start; } + T size() const { return end - start; } bool valid() const { return start < end; } }; -template +template +inline Range +make_range(T start, T end) +{ + return Range(start, end); +} + +template inline std::ostream & operator<<(std::ostream &o, const Range &r) { @@ -124,7 +135,7 @@ operator<<(std::ostream &o, const Range &r) * @param range2 is a range. * @return if range1 and range2 are identical. */ -template +template inline bool operator==(const Range &range1, const Range &range2) { @@ -137,7 +148,7 @@ operator==(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 and range2 are not identical. */ -template +template inline bool operator!=(const Range &range1, const Range &range2) { @@ -150,7 +161,7 @@ operator!=(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 is less than range2 and does not overlap range1. */ -template +template inline bool operator<(const Range &range1, const Range &range2) { @@ -164,7 +175,7 @@ operator<(const Range &range1, const Range &range2) * @return if range1 is less than range2. range1 may overlap range2, * but not extend beyond the end of range2. */ -template +template inline bool operator<=(const Range &range1, const Range &range2) { @@ -177,7 +188,7 @@ operator<=(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 is greater than range2 and does not overlap range2. */ -template +template inline bool operator>(const Range &range1, const Range &range2) { @@ -191,7 +202,7 @@ operator>(const Range &range1, const Range &range2) * @return if range1 is greater than range2. range1 may overlap range2, * but not extend beyond the beginning of range2. */ -template +template inline bool operator>=(const Range &range1, const Range &range2) { @@ -209,7 +220,7 @@ operator>=(const Range &range1, const Range &range2) * @param range range compared against. * @return indicates that position pos is within the range. */ -template +template inline bool operator==(const T &pos, const Range &range) { @@ -222,7 +233,7 @@ operator==(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is not within the range. */ -template +template inline bool operator!=(const T &pos, const Range &range) { @@ -235,7 +246,7 @@ operator!=(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is below the range. */ -template +template inline bool operator<(const T &pos, const Range &range) { @@ -248,7 +259,7 @@ operator<(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is below or in the range. */ -template +template inline bool operator<=(const T &pos, const Range &range) { @@ -261,7 +272,7 @@ operator<=(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is above the range. */ -template +template inline bool operator>(const T &pos, const Range &range) { @@ -274,7 +285,7 @@ operator>(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is above or in the range. */ -template +template inline bool operator>=(const T &pos, const Range &range) { @@ -292,7 +303,7 @@ operator>=(const T &pos, const Range &range) * @param pos position compared to the range. * @return indicates that position pos is within the range. */ -template +template inline bool operator==(const Range &range, const U &pos) { @@ -305,7 +316,7 @@ operator==(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is not within the range. */ -template +template inline bool operator!=(const Range &range, const U &pos) { @@ -318,7 +329,7 @@ operator!=(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is above the range. */ -template +template inline bool operator<(const Range &range, const U &pos) { @@ -331,7 +342,7 @@ operator<(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is above or in the range. */ -template +template inline bool operator<=(const Range &range, const U &pos) { @@ -344,7 +355,7 @@ operator<=(const Range &range, const U &pos) * @param pos position compared to the range. * 'range > pos' indicates that position pos is below the range. */ -template +template inline bool operator>(const Range &range, const U &pos) { @@ -357,7 +368,7 @@ operator>(const Range &range, const U &pos) * @param pos position compared to the range. * 'range >= pos' indicates that position pos is below or in the range. */ -template +template inline bool operator>=(const Range &range, const U &pos) { From 411d5497fa2bd28c9cf4ac1fccf806ee8a1ff33d Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 9 Feb 2004 09:06:20 -0500 Subject: [PATCH 09/10] Add that one IPR memory space address that we keep seeing --HG-- extra : convert_revision : 81b365ac9ca8b33cae99107e5b1900f7c46f0866 --- arch/alpha/alpha_memory.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc index 0f9ad2cfc..00e97250f 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/alpha_memory.cc @@ -90,8 +90,17 @@ AlphaTlb::checkCacheability(MemReqPtr &req) if (req->paddr & PA_UNCACHED_BIT) { if (PA_IPR_SPACE(req->paddr)) { // IPR memory space not implemented - if (!req->xc->misspeculating()) - panic("IPR memory space not implemented! PA=%x\n", req->paddr); + if (!req->xc->misspeculating()) { + switch (req->paddr) { + case 0xFFFFF00188: + req->data = 0; + break; + + default: + panic("IPR memory space not implemented! PA=%x\n", + req->paddr); + } + } } else { // mark request as uncacheable req->flags |= UNCACHEABLE; From da8a7022126eef87d4007b7135aa89c559eb6747 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 9 Feb 2004 10:49:48 -0500 Subject: [PATCH 10/10] - Whack unused code - Make the MemoryController use address ranges (via Range) instead of an address and a mask base/remote_gdb.cc: reflect name change dev/alpha_access.h: better include dev/alpha_console.cc: - FunctionalMemory no longer takes care of mapping my address into the proper address space. It must be done locally. - the memory controller no longer uses a mask, but a size, and the size is determined by the device, not the .ini file - fix up address calculations to reflect the removal of a mask - PhysicalMemory::getSize() -> PhysicalMemory::size() dev/alpha_console.hh: - FunctionalMemory no longer takes care of mapping my address into the proper address space. It must be done locally. - the memory controller no longer uses a mask, but a size, and the size is determined by the device, not the .ini file - fix up address calculations to reflect the removal of a mask - get rid of MmapDevice and inherit from FunctionalMemory --HG-- extra : convert_revision : e3a65c9debf6f899632d62c70781cbdc2826616b --- base/remote_gdb.cc | 2 +- dev/alpha_access.h | 2 +- dev/alpha_console.cc | 28 ++++++++++++---------------- dev/alpha_console.hh | 21 +++++++++++---------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc index e701b5a01..e20800d12 100644 --- a/base/remote_gdb.cc +++ b/base/remote_gdb.cc @@ -338,7 +338,7 @@ RemoteGDB::acc(Addr va, size_t len) } if (va < ALPHA_K1SEG_BASE) { - if (va < (ALPHA_K0SEG_BASE + pmem->getSize())) { + if (va < (ALPHA_K0SEG_BASE + pmem->size())) { DPRINTF(GDBAcc, "acc: Mapping is valid K0SEG <= " "%#x < K0SEG + size\n", va); return true; diff --git a/dev/alpha_access.h b/dev/alpha_access.h index 7502635e9..40567e96f 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -36,7 +36,7 @@ #define ALPHA_ACCESS_VERSION (1301) /* CH++*/ #ifndef CONSOLE -#include +#include #include class Checkpoint; #endif diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index e708be514..2dc939b97 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -49,12 +49,13 @@ using namespace std; -AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, - SimpleDisk *d, int size, System *system, - BaseCPU *cpu, TlaserClock *clock, int num_cpus, - Addr addr, Addr mask, MemoryController *mmu) - : MmapDevice(name, addr, mask, mmu), disk(d), console(cons) +AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d, + System *system, BaseCPU *cpu, TlaserClock *clock, + int num_cpus, MemoryController *mmu, Addr a) + : FunctionalMemory(name), disk(d), console(cons), addr(a) { + mmu->add_child(this, Range(addr, addr + size)); + consoleData = new uint8_t[size]; memset(consoleData, 0, size); @@ -65,7 +66,7 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, alphaAccess->version = ALPHA_ACCESS_VERSION; alphaAccess->numCPUs = num_cpus; - alphaAccess->mem_size = system->physmem->getSize(); + alphaAccess->mem_size = system->physmem->size(); alphaAccess->cpuClock = cpu->getFreq() / 1000000; alphaAccess->intrClockFrequency = clock->frequency(); @@ -78,7 +79,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data) memset(data, 0, req->size); uint64_t val; - Addr daddr = req->paddr & addr_mask; + Addr daddr = req->paddr - addr; + switch (daddr) { case offsetof(AlphaAccess, inputChar): val = console->console_in(); @@ -125,7 +127,7 @@ AlphaConsole::write(MemReqPtr &req, const uint8_t *data) return Machine_Check_Fault; } - Addr daddr = req->paddr & addr_mask; + Addr daddr = req->paddr - addr; ExecContext *other_xc; switch (daddr) { @@ -243,11 +245,9 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole) SimObjectParam sim_console; SimObjectParam disk; - Param size; Param num_cpus; SimObjectParam mmu; Param addr; - Param mask; SimObjectParam system; SimObjectParam cpu; SimObjectParam clock; @@ -258,11 +258,9 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AlphaConsole) INIT_PARAM(sim_console, "The Simulator Console"), INIT_PARAM(disk, "Simple Disk"), - INIT_PARAM_DFLT(size, "AlphaConsole size", sizeof(AlphaAccess)), INIT_PARAM_DFLT(num_cpus, "Number of CPU's", 1), INIT_PARAM(mmu, "Memory Controller"), INIT_PARAM(addr, "Device Address"), - INIT_PARAM(mask, "Address Mask"), INIT_PARAM(system, "system object"), INIT_PARAM(cpu, "Processor"), INIT_PARAM(clock, "Turbolaser Clock") @@ -271,10 +269,8 @@ END_INIT_SIM_OBJECT_PARAMS(AlphaConsole) CREATE_SIM_OBJECT(AlphaConsole) { - return new AlphaConsole(getInstanceName(), sim_console, - disk, size, system, - cpu, clock, num_cpus, - addr, mask, mmu); + return new AlphaConsole(getInstanceName(), sim_console, disk, + system, cpu, clock, num_cpus, mmu, addr); } REGISTER_SIM_OBJECT("AlphaConsole", AlphaConsole) diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh index c39b8e8d4..54a2af6d5 100644 --- a/dev/alpha_console.hh +++ b/dev/alpha_console.hh @@ -33,9 +33,10 @@ #ifndef __ALPHA_CONSOLE_HH__ #define __ALPHA_CONSOLE_HH__ -#include "sim/host.hh" +#include "base/range.hh" #include "dev/alpha_access.h" -#include "mem/functional_mem/mmap_device.hh" +#include "mem/functional_mem/functional_memory.hh" +#include "sim/host.hh" class BaseCPU; class SimConsole; @@ -68,7 +69,7 @@ class SimpleDisk; * primarily used doing boot before the kernel has loaded its device * drivers. */ -class AlphaConsole : public MmapDevice +class AlphaConsole : public FunctionalMemory { protected: union { @@ -82,15 +83,15 @@ class AlphaConsole : public MmapDevice /** the system console (the terminal) is accessable from the console */ SimConsole *console; - public: - /** Standard Constructor */ - AlphaConsole(const std::string &name, SimConsole *cons, - SimpleDisk *d, int size, - System *system, BaseCPU *cpu, - TlaserClock *clock, int num_cpus, - Addr addr, Addr mask, MemoryController *mmu); + Addr addr; + static const Addr size = 0x80; // equal to sizeof(alpha_access); public: + /** Standard Constructor */ + AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d, + System *system, BaseCPU *cpu, TlaserClock *clock, + int num_cpus, MemoryController *mmu, Addr addr); + /** * memory mapped reads and writes */