make our code a little more standards compliant
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
This commit is contained in:
@@ -56,12 +56,14 @@ Tick
|
||||
BadDevice::read(PacketPtr pkt)
|
||||
{
|
||||
panic("Device %s not imlpmented\n", devname);
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
Tick
|
||||
BadDevice::write(PacketPtr pkt)
|
||||
{
|
||||
panic("Device %s not imlpmented\n", devname);
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
BEGIN_DECLARE_SIM_OBJECT_PARAMS(BadDevice)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
#if defined(linux)
|
||||
#include <endian.h>
|
||||
#elif defined(__sun__)
|
||||
#elif defined(__sun)
|
||||
#include <sys/isa_defs.h>
|
||||
#else
|
||||
#include <machine/endian.h>
|
||||
|
||||
@@ -109,7 +109,7 @@ class DmaPort : public Port
|
||||
|
||||
virtual bool recvTiming(PacketPtr pkt);
|
||||
virtual Tick recvAtomic(PacketPtr pkt)
|
||||
{ panic("dma port shouldn't be used for pio access."); }
|
||||
{ panic("dma port shouldn't be used for pio access."); M5_DUMMY_RETURN }
|
||||
virtual void recvFunctional(PacketPtr pkt)
|
||||
{ panic("dma port shouldn't be used for pio access."); }
|
||||
|
||||
|
||||
@@ -83,8 +83,10 @@ PciConfigAll::write(PacketPtr pkt)
|
||||
{
|
||||
assert(pkt->result == Packet::Unknown);
|
||||
panic("Attempting to write to config space on non-existant device\n");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PciConfigAll::addressRanges(AddrRangeList &range_list)
|
||||
{
|
||||
|
||||
@@ -37,6 +37,8 @@
|
||||
#ifndef __DEV_PCIDEV_HH__
|
||||
#define __DEV_PCIDEV_HH__
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "dev/io_device.hh"
|
||||
#include "dev/pcireg.h"
|
||||
#include "dev/platform.hh"
|
||||
@@ -62,8 +64,8 @@ class PciConfigData : public SimObject
|
||||
PciConfigData(const std::string &name)
|
||||
: SimObject(name)
|
||||
{
|
||||
memset(config.data, 0, sizeof(config.data));
|
||||
memset(BARSize, 0, sizeof(BARSize));
|
||||
std::memset(config.data, 0, sizeof(config.data));
|
||||
std::memset(BARSize, 0, sizeof(BARSize));
|
||||
}
|
||||
|
||||
/** The first 64 bytes */
|
||||
|
||||
@@ -62,6 +62,7 @@ Addr
|
||||
Platform::pciToDma(Addr pciAddr) const
|
||||
{
|
||||
panic("No PCI dma support in platform.");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
* in legion. Any access is translated to an offset in the disk image.
|
||||
*/
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "base/trace.hh"
|
||||
#include "dev/sparc/mm_disk.hh"
|
||||
#include "dev/platform.hh"
|
||||
@@ -45,7 +47,7 @@
|
||||
MmDisk::MmDisk(Params *p)
|
||||
: BasicPioDevice(p), image(p->image), curSector((uint64_t)-1), dirty(false)
|
||||
{
|
||||
memset(&bytes, 0, SectorSize);
|
||||
std::memset(&bytes, 0, SectorSize);
|
||||
pioSize = image->size() * SectorSize;
|
||||
}
|
||||
|
||||
@@ -99,6 +101,7 @@ Tick
|
||||
MmDisk::write(PacketPtr pkt)
|
||||
{
|
||||
panic("need to implement\n");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ Tick
|
||||
T1000::intrFrequency()
|
||||
{
|
||||
panic("Need implementation\n");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
void
|
||||
@@ -89,6 +90,7 @@ Addr
|
||||
T1000::pciToDma(Addr pciAddr) const
|
||||
{
|
||||
panic("Need implementation\n");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
|
||||
@@ -96,6 +98,7 @@ Addr
|
||||
T1000::calcConfigAddr(int bus, int dev, int func)
|
||||
{
|
||||
panic("Need implementation\n");
|
||||
M5_DUMMY_RETURN
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user