Make byteswap work correctly on Twin??_t types.

--HG--
extra : convert_revision : a8a14078d62c24e480ffa69591edfc775d1d76cc
This commit is contained in:
Gabe Black 2007-03-07 17:46:04 +00:00
parent ea7bdf9f60
commit b7ea19760a
2 changed files with 18 additions and 26 deletions

View file

@ -41,31 +41,6 @@
// these functions and make the users do their own byte swapping since
// the memory system does not in fact have an endianness.
template<>
inline Twin64_t
Packet::get()
{
Twin64_t d;
assert(staticData || dynamicData);
assert(sizeof(Twin64_t) <= size);
d.a = TheISA::gtoh(*(uint64_t*)data);
d.b = TheISA::gtoh(*((uint64_t*)data + 1));
return d;
}
template<>
inline Twin32_t
Packet::get()
{
Twin32_t d;
assert(staticData || dynamicData);
assert(sizeof(Twin32_t) <= size);
d.a = TheISA::gtoh(*(uint32_t*)data);
d.b = TheISA::gtoh(*((uint32_t*)data + 1));
return d;
}
/** return the value of what is pointed to in the packet. */
template <typename T>
inline T

View file

@ -37,6 +37,7 @@
#ifndef __SIM_BYTE_SWAP_HH__
#define __SIM_BYTE_SWAP_HH__
#include "base/bigint.hh"
#include "base/misc.hh"
#include "sim/host.hh"
@ -109,7 +110,7 @@ swap_byte16(uint16_t x)
// This function lets the compiler figure out how to call the
// swap_byte functions above for different data types. Since the
// sizeof() values are known at compiel time, it should inline to a
// sizeof() values are known at compile time, it should inline to a
// direct call to the right swap_byteNN() function.
template <typename T>
static inline T swap_byte(T x) {
@ -125,6 +126,22 @@ static inline T swap_byte(T x) {
panic("Can't byte-swap values larger than 64 bits");
}
template<>
static inline Twin64_t swap_byte<Twin64_t>(Twin64_t x)
{
x.a = swap_byte(x.a);
x.b = swap_byte(x.b);
return x;
}
template<>
static inline Twin32_t swap_byte<Twin32_t>(Twin32_t x)
{
x.a = swap_byte(x.a);
x.b = swap_byte(x.b);
return x;
}
//The conversion functions with fixed endianness on both ends don't need to
//be in a namespace
template <typename T> static inline T betole(T value) {return swap_byte(value);}