projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with head, hopefully the last time for this batch.
[gem5.git]
/
src
/
mem
/
packet_access.hh
diff --git
a/src/mem/packet_access.hh
b/src/mem/packet_access.hh
index 1e233ee576654a507e7802d86f96757dd2c4c2a4..fca9606fc84a73273a4a3e54f96c9d8e0dedd98d 100644
(file)
--- a/
src/mem/packet_access.hh
+++ b/
src/mem/packet_access.hh
@@
-31,6
+31,7
@@
#include "arch/isa_traits.hh"
#include "base/bigint.hh"
#include "arch/isa_traits.hh"
#include "base/bigint.hh"
+#include "config/the_isa.hh"
#include "mem/packet.hh"
#include "sim/byteswap.hh"
#include "mem/packet.hh"
#include "sim/byteswap.hh"
@@
-46,7
+47,7
@@
template <typename T>
inline T
Packet::get()
{
inline T
Packet::get()
{
- assert(flags.
any
(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.
isSet
(STATIC_DATA|DYNAMIC_DATA));
assert(sizeof(T) <= size);
return TheISA::gtoh(*(T*)data);
}
assert(sizeof(T) <= size);
return TheISA::gtoh(*(T*)data);
}
@@
-56,7
+57,7
@@
template <typename T>
inline void
Packet::set(T v)
{
inline void
Packet::set(T v)
{
- assert(flags.
any
(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.
isSet
(STATIC_DATA|DYNAMIC_DATA));
assert(sizeof(T) <= size);
*(T*)data = TheISA::htog(v);
}
assert(sizeof(T) <= size);
*(T*)data = TheISA::htog(v);
}