diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-12 11:38:26 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-12 11:38:26 -0500 |
| commit | 94590a4dba6712ae61bfed260d7933b58b78c449 (patch) | |
| tree | cbde4c0a95ab6e064649ec9ffd474a43fdd9b24e /cpu | |
| parent | b0700182662df6050c5baf46ea6bae2835b55a78 (diff) | |
| parent | 79613686f0f6a8725e88e935a7c9ff4ede4cfc2b (diff) | |
| download | gem5-94590a4dba6712ae61bfed260d7933b58b78c449.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
--HG--
extra : convert_revision : 427b5c957f91e66271444acebc01e1a861790363
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/inst_seq.hh | 2 | ||||
| -rw-r--r-- | cpu/o3/inst_queue_impl.hh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpu/inst_seq.hh b/cpu/inst_seq.hh index 3239d4d24..8de047af7 100644 --- a/cpu/inst_seq.hh +++ b/cpu/inst_seq.hh @@ -32,7 +32,7 @@ // inst sequence type, used to order instructions in the ready list, // if this rolls over the ready list order temporarily will get messed // up, but execution will continue and complete correctly -typedef unsigned long long InstSeqNum; +typedef uint64_t InstSeqNum; // inst tag type, used to tag an operation instance in the IQ typedef unsigned int InstTag; diff --git a/cpu/o3/inst_queue_impl.hh b/cpu/o3/inst_queue_impl.hh index 2221ba456..048dc7c00 100644 --- a/cpu/o3/inst_queue_impl.hh +++ b/cpu/o3/inst_queue_impl.hh @@ -34,6 +34,7 @@ // but probably is more flexible to actually add in a delay parameter than // just running it backwards. +#include <limits> #include <vector> #include "sim/root.hh" @@ -42,7 +43,7 @@ // Either compile error or max int due to sign extension. // Hack to avoid compile warnings. -const InstSeqNum MaxInstSeqNum = 0 - 1; +const InstSeqNum MaxInstSeqNum = std::numeric_limits<InstSeqNum>::max(); template <class Impl> InstructionQueue<Impl>::InstructionQueue(Params ¶ms) |