diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-10 14:21:32 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-10 14:21:32 -0500 |
commit | fb7899aa681001d2af7837eae7bf0e19fd3e1b02 (patch) | |
tree | 579d966c733bf87390e3c51b45f9ea8fb6fa96af /cpu | |
parent | 2c528d5865b47de45e0bb85fad86b0cf768ed278 (diff) | |
download | gem5-fb7899aa681001d2af7837eae7bf0e19fd3e1b02.tar.xz |
fix problems on darwin/*BSD for syscall emulation mode
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
fixup for bsd hosts. Some headers are included by default which means that
more variables need TGT_ prefixes and there isn't a stat call (everything
is a stat64 call) so we have to work around that a bit
base/intmath.hh:
base/socket.cc:
this is no longer needed with mac os 10.4
cpu/inst_seq.hh:
just use a uint64_t instead of long long
cpu/o3/inst_queue_impl.hh:
I much cleaner way to get max int
sim/syscall_emul.hh:
fix stat64 problems on *BSD
--HG--
extra : convert_revision : 9eef5f896e083ae1774e818a9765dd83e0305942
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) |