63fdabf191
pretty close to compiling w/ suns compiler
briefly:
add dummy return after panic()/fatal()
split out flags by compiler vendor
include cstring and cmath where appropriate
use std namespace for string ops
SConstruct:
Add code to detect compiler and choose cflags based on detected compiler
Fix zlib check to work with suncc
src/SConscript:
split out flags by compiler vendor
src/arch/sparc/isa/decoder.isa:
use correct namespace for sqrt
src/arch/sparc/isa/formats/basic.isa:
add dummy return around panic
src/arch/sparc/isa/formats/integerop.isa:
use correct namespace for stringops
src/arch/sparc/isa/includes.isa:
include cstring and cmath where appropriate
src/arch/sparc/isa_traits.hh:
remove dangling comma
src/arch/sparc/system.cc:
dummy return to make sun cc front end happy
src/arch/sparc/tlb.cc:
src/base/compression/lzss_compression.cc:
use std namespace for string ops
src/arch/sparc/utility.hh:
no reason to say something is unsigned unsigned int
src/base/compression/null_compression.hh:
dummy returns to for suncc front end
src/base/cprintf.hh:
use standard variadic argument syntax instead of gnuc specefic renaming
src/base/hashmap.hh:
don't need to define hash for suncc
src/base/hostinfo.cc:
need stdio.h for sprintf
src/base/loader/object_file.cc:
munmap is in std namespace not null
src/base/misc.hh:
use M5 generic noreturn macros
use standard variadic macro __VA_ARGS__
src/base/pollevent.cc:
we need file.h for file flags
src/base/random.cc:
mess with include files to make suncc happy
src/base/remote_gdb.cc:
malloc memory for function instead of having a non-constant in an array size
src/base/statistics.hh:
use std namespace for floor
src/base/stats/text.cc:
include math.h for rint (cmath won't work)
src/base/time.cc:
use suncc version of ctime_r
src/base/time.hh:
change macro to work with both gcc and suncc
src/base/timebuf.hh:
include cstring from memset and use std::
src/base/trace.hh:
change variadic macros to be normal format
src/cpu/SConscript:
add dummy returns where appropriate
src/cpu/activity.cc:
include cstring for memset
src/cpu/exetrace.hh:
include cstring fro memcpy
src/cpu/simple/base.hh:
add dummy return for panic
src/dev/baddev.cc:
src/dev/pciconfigall.cc:
src/dev/platform.cc:
src/dev/sparc/t1000.cc:
add dummy return where appropriate
src/dev/ide_atareg.h:
make define work for both gnuc and suncc
src/dev/io_device.hh:
add dummy returns where approirate
src/dev/pcidev.hh:
src/mem/cache/cache_impl.hh:
src/mem/cache/miss/blocking_buffer.cc:
src/mem/cache/tags/lru.hh:
src/mem/cache/tags/split.hh:
src/mem/cache/tags/split_lifo.hh:
src/mem/cache/tags/split_lru.hh:
src/mem/dram.cc:
src/mem/packet.cc:
src/mem/port.cc:
include cstring for string ops
src/dev/sparc/mm_disk.cc:
add dummy return where appropriate
include cstring for string ops
src/mem/cache/miss/blocking_buffer.hh:
src/mem/port.hh:
Add dummy return where appropriate
src/mem/cache/tags/iic.cc:
cast hastSets to double for log() call
src/mem/physical.cc:
cast pmemAddr to char* for munmap
src/sim/byteswap.hh:
make define work for suncc and gnuc
--HG--
extra : convert_revision : ef8a1f1064e43b6c39838a85c01aee4f795497bd
179 lines
6.5 KiB
C++
179 lines
6.5 KiB
C++
/*
|
|
* Copyright (c) 2004 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Gabe Black
|
|
* Ali Saidi
|
|
* Nathan Binkert
|
|
*/
|
|
|
|
//The purpose of this file is to provide endainness conversion utility
|
|
//functions. Depending on the endianness of the guest system, either
|
|
//the LittleEndianGuest or BigEndianGuest namespace is used.
|
|
|
|
#ifndef __SIM_BYTE_SWAP_HH__
|
|
#define __SIM_BYTE_SWAP_HH__
|
|
|
|
#include "base/misc.hh"
|
|
#include "sim/host.hh"
|
|
|
|
// This lets us figure out what the byte order of the host system is
|
|
#if defined(linux)
|
|
#include <endian.h>
|
|
// If this is a linux system, lets used the optimized definitions if they exist.
|
|
// If one doesn't exist, we pretty much get what is listed below, so it all
|
|
// works out
|
|
#include <byteswap.h>
|
|
#elif defined (__sun)
|
|
#include <sys/isa_defs.h>
|
|
#else
|
|
#include <machine/endian.h>
|
|
#endif
|
|
|
|
#if defined(__APPLE__)
|
|
#include <libkern/OSByteOrder.h>
|
|
#endif
|
|
|
|
//These functions actually perform the swapping for parameters
|
|
//of various bit lengths
|
|
static inline uint64_t
|
|
swap_byte64(uint64_t x)
|
|
{
|
|
#if defined(linux)
|
|
return bswap_64(x);
|
|
#elif defined(__APPLE__)
|
|
return OSSwapInt64(x);
|
|
#else
|
|
return (uint64_t)((((uint64_t)(x) & 0xff) << 56) |
|
|
((uint64_t)(x) & 0xff00ULL) << 40 |
|
|
((uint64_t)(x) & 0xff0000ULL) << 24 |
|
|
((uint64_t)(x) & 0xff000000ULL) << 8 |
|
|
((uint64_t)(x) & 0xff00000000ULL) >> 8 |
|
|
((uint64_t)(x) & 0xff0000000000ULL) >> 24 |
|
|
((uint64_t)(x) & 0xff000000000000ULL) >> 40 |
|
|
((uint64_t)(x) & 0xff00000000000000ULL) >> 56) ;
|
|
#endif
|
|
}
|
|
|
|
static inline uint32_t
|
|
swap_byte32(uint32_t x)
|
|
{
|
|
#if defined(linux)
|
|
return bswap_32(x);
|
|
#elif defined(__APPLE__)
|
|
return OSSwapInt32(x);
|
|
#else
|
|
return (uint32_t)(((uint32_t)(x) & 0xff) << 24 |
|
|
((uint32_t)(x) & 0xff00) << 8 | ((uint32_t)(x) & 0xff0000) >> 8 |
|
|
((uint32_t)(x) & 0xff000000) >> 24);
|
|
#endif
|
|
}
|
|
|
|
static inline uint16_t
|
|
swap_byte16(uint16_t x)
|
|
{
|
|
#if defined(linux)
|
|
return bswap_16(x);
|
|
#elif defined(__APPLE__)
|
|
return OSSwapInt16(x);
|
|
#else
|
|
return (uint16_t)(((uint16_t)(x) & 0xff) << 8 |
|
|
((uint16_t)(x) & 0xff00) >> 8);
|
|
#endif
|
|
}
|
|
|
|
// 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
|
|
// direct call to the right swap_byteNN() function.
|
|
template <typename T>
|
|
static inline T swap_byte(T x) {
|
|
if (sizeof(T) == 8)
|
|
return swap_byte64((uint64_t)x);
|
|
else if (sizeof(T) == 4)
|
|
return swap_byte32((uint32_t)x);
|
|
else if (sizeof(T) == 2)
|
|
return swap_byte16((uint16_t)x);
|
|
else if (sizeof(T) == 1)
|
|
return x;
|
|
else
|
|
panic("Can't byte-swap values larger than 64 bits");
|
|
}
|
|
|
|
//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);}
|
|
template <typename T> static inline T letobe(T value) {return swap_byte(value);}
|
|
|
|
//For conversions not involving the guest system, we can define the functions
|
|
//conditionally based on the BYTE_ORDER macro and outside of the namespaces
|
|
#if defined(_BIG_ENDIAN) || BYTE_ORDER == BIG_ENDIAN
|
|
template <typename T> static inline T htole(T value) {return swap_byte(value);}
|
|
template <typename T> static inline T letoh(T value) {return swap_byte(value);}
|
|
template <typename T> static inline T htobe(T value) {return value;}
|
|
template <typename T> static inline T betoh(T value) {return value;}
|
|
#elif defined(_LITTLE_ENDIAN) || BYTE_ORDER == LITTLE_ENDIAN
|
|
template <typename T> static inline T htole(T value) {return value;}
|
|
template <typename T> static inline T letoh(T value) {return value;}
|
|
template <typename T> static inline T htobe(T value) {return swap_byte(value);}
|
|
template <typename T> static inline T betoh(T value) {return swap_byte(value);}
|
|
#else
|
|
#error Invalid Endianess
|
|
#endif
|
|
|
|
namespace BigEndianGuest
|
|
{
|
|
template <typename T>
|
|
static inline T gtole(T value) {return betole(value);}
|
|
template <typename T>
|
|
static inline T letog(T value) {return letobe(value);}
|
|
template <typename T>
|
|
static inline T gtobe(T value) {return value;}
|
|
template <typename T>
|
|
static inline T betog(T value) {return value;}
|
|
template <typename T>
|
|
static inline T htog(T value) {return htobe(value);}
|
|
template <typename T>
|
|
static inline T gtoh(T value) {return betoh(value);}
|
|
}
|
|
|
|
namespace LittleEndianGuest
|
|
{
|
|
template <typename T>
|
|
static inline T gtole(T value) {return value;}
|
|
template <typename T>
|
|
static inline T letog(T value) {return value;}
|
|
template <typename T>
|
|
static inline T gtobe(T value) {return letobe(value);}
|
|
template <typename T>
|
|
static inline T betog(T value) {return betole(value);}
|
|
template <typename T>
|
|
static inline T htog(T value) {return htole(value);}
|
|
template <typename T>
|
|
static inline T gtoh(T value) {return letoh(value);}
|
|
}
|
|
#endif // __SIM_BYTE_SWAP_HH__
|