null: Stop specifying an endianness in isa_traits.hh.
The NULL ISA doesn't really have an endianness. Now that the packet accessors which consumed that endianness are gone, we can get rid of that setting as well. Change-Id: I8dd4c7b8236b07df4458fea377865f30141121d4 Reviewed-on: https://gem5-review.googlesource.com/c/13466 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
@@ -42,15 +42,10 @@
|
||||
|
||||
#include "base/types.hh"
|
||||
|
||||
namespace LittleEndianGuest {}
|
||||
|
||||
namespace NullISA
|
||||
{
|
||||
using namespace LittleEndianGuest;
|
||||
|
||||
const Addr PageShift = 12;
|
||||
const Addr PageBytes = ULL(1) << PageShift;
|
||||
|
||||
}
|
||||
|
||||
#endif //__ARCH_NULL_ISA_TRAITS_HH__
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
#include "base/logging.hh"
|
||||
#include "base/printable.hh"
|
||||
#include "base/types.hh"
|
||||
#include "config/the_isa.hh"
|
||||
#include "mem/request.hh"
|
||||
#include "sim/core.hh"
|
||||
|
||||
@@ -1055,12 +1056,14 @@ class Packet : public Printable
|
||||
template <typename T>
|
||||
T get(ByteOrder endian) const;
|
||||
|
||||
#if THE_ISA != NULL_ISA
|
||||
/**
|
||||
* Get the data in the packet byte swapped from guest to host
|
||||
* endian.
|
||||
*/
|
||||
template <typename T>
|
||||
T get() const;
|
||||
#endif
|
||||
|
||||
/** Set the value in the data pointer to v as big endian. */
|
||||
template <typename T>
|
||||
@@ -1077,9 +1080,11 @@ class Packet : public Printable
|
||||
template <typename T>
|
||||
void set(T v, ByteOrder endian);
|
||||
|
||||
#if THE_ISA != NULL_ISA
|
||||
/** Set the value in the data pointer to v as guest endian. */
|
||||
template <typename T>
|
||||
void set(T v);
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
*/
|
||||
|
||||
#include "arch/isa_traits.hh"
|
||||
#include "config/the_isa.hh"
|
||||
#include "mem/packet.hh"
|
||||
#include "sim/byteswap.hh"
|
||||
|
||||
@@ -99,12 +98,14 @@ Packet::get(ByteOrder endian) const
|
||||
};
|
||||
}
|
||||
|
||||
#if THE_ISA != NULL_ISA
|
||||
template <typename T>
|
||||
inline T
|
||||
Packet::get() const
|
||||
{
|
||||
return TheISA::gtoh(getRaw<T>());
|
||||
}
|
||||
#endif
|
||||
|
||||
template <typename T>
|
||||
inline void
|
||||
@@ -136,11 +137,13 @@ Packet::set(T v, ByteOrder endian)
|
||||
};
|
||||
}
|
||||
|
||||
#if THE_ISA != NULL_ISA
|
||||
template <typename T>
|
||||
inline void
|
||||
Packet::set(T v)
|
||||
{
|
||||
setRaw(TheISA::htog(v));
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif //__MEM_PACKET_ACCESS_HH__
|
||||
|
||||
Reference in New Issue
Block a user