sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gcc: fix unused variable warnings from GCC 4.6.1

Browse source 
--HG--
extra : rebase_source : f9e22de341493a25ac6106c16ac35c61c128a080
This commit is contained in:
Nathan Binkert 2011-12-13 11:49:27 -08:00
parent 9b52717a92
commit 6ef9691035
13 changed files with 55 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/arch/arm/nativetrace.cc
View file

@ -156,18 +156,23 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
// Regular int regs
for (int i = 0; i < STATE_NUMVALS; i++) {
if (nState.changed[i] || mState.changed[i]) {
const char *vergence = " ";
bool oldMatch = (mState.oldState[i] == nState.oldState[i]);
bool newMatch = (mState.newState[i] == nState.newState[i]);
if (oldMatch && newMatch) {
// The more things change, the more they stay the same.
continue;
} else if (oldMatch && !newMatch) {
}
errorFound = true;
#ifndef NDEBUG
const char *vergence = " ";
if (oldMatch && !newMatch) {
vergence = "<>";
} else if (!oldMatch && newMatch) {
vergence = "><";
}
errorFound = true;
if (!nState.changed[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x "\
@ -190,6 +195,7 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
nState.oldState[i], nState.newState[i],
mState.oldState[i], mState.newState[i]);
}
#endif
}
}
if (errorFound) {

3
src/base/remote_gdb.cc
View file

@ -648,8 +648,7 @@ BaseRemoteGDB::trap(int type)
bufferSize = gdbregs.bytes() * 2 + 256;
buffer = (char*)malloc(bufferSize);
TheISA::PCState pc = context->pcState();
DPRINTF(GDBMisc, "trap: PC=%s\n", pc);
DPRINTF(GDBMisc, "trap: PC=%s\n", context->pcState());
clearSingleStep();

4
src/cpu/o3/fetch_impl.hh
View file

@ -1053,8 +1053,8 @@ DefaultFetch<Impl>::checkSignalsAndUpdate(ThreadID tid)
if (fetchStatus[tid] != Squashing) {
TheISA::PCState nextPC = fromDecode->decodeInfo[tid].nextPC;
DPRINTF(Fetch, "Squashing from decode with PC = %s\n", nextPC);
DPRINTF(Fetch, "Squashing from decode with PC = %s\n",
fromDecode->decodeInfo[tid].nextPC);
// Squash unless we're already squashing
squashFromDecode(fromDecode->decodeInfo[tid].nextPC,
fromDecode->decodeInfo[tid].squashInst,

7
src/dev/i8254xGBe.cc
View file

@ -2118,11 +2118,12 @@ IGbE::txStateMachine()
// iteration we'll get the rest of the data
if (txPacket && txDescCache.packetAvailable()
&& !txDescCache.packetMultiDesc() && txPacket->length) {
bool success;
anQ("TXS", "TX FIFO Q");
DPRINTF(EthernetSM, "TXS: packet placed in TX FIFO\n");
success = txFifo.push(txPacket);
#ifndef NDEBUG
bool success =
#endif
txFifo.push(txPacket);
txFifoTick = true && !drainEvent;
assert(success);
txPacket = NULL;

2
src/dev/ide_ctrl.cc
View file

@ -490,6 +490,7 @@ IdeController::dispatchAccess(PacketPtr pkt, bool read)
panic("IDE controller access to invalid address: %#x\n", addr);
}
#ifndef NDEBUG
uint32_t data;
if (pkt->getSize() == 1)
data = pkt->get<uint8_t>();
@ -499,6 +500,7 @@ IdeController::dispatchAccess(PacketPtr pkt, bool read)
data = pkt->get<uint32_t>();
DPRINTF(IdeCtrl, "%s from offset: %#x size: %#x data: %#x\n",
read ? "Read" : "Write", pkt->getAddr(), pkt->getSize(), data);
#endif
pkt->makeAtomicResponse();
}

5
src/dev/sinic.cc
View file

@ -33,6 +33,7 @@
#include <string>
#include "arch/vtophys.hh"
#include "base/compiler.hh"
#include "base/debug.hh"
#include "base/inet.hh"
#include "base/types.hh"
@ -404,7 +405,7 @@ Device::read(PacketPtr pkt)
prepareRead(cpu, index);
uint64_t value = 0;
uint64_t value M5_VAR_USED = 0;
if (pkt->getSize() == 4) {
uint32_t reg = regData32(raddr);
pkt->set(reg);
@ -916,6 +917,7 @@ Device::rxKick()
VirtualReg *vn = &virtualRegs[i];
bool busy = Regs::get_RxDone_Busy(vn->RxDone);
if (vn->rxIndex != end) {
#ifndef NDEBUG
bool dirty = vn->rxPacketOffset > 0;
const char *status;
@ -933,6 +935,7 @@ Device::rxKick()
i, status, vn->rxUnique,
rxFifo.countPacketsBefore(vn->rxIndex),
vn->rxIndex->slack);
#endif
} else if (busy) {
DPRINTF(EthernetSM, "vnic %d unmapped (rxunique %d)\n",
i, vn->rxUnique);

32
src/dev/sparc/mm_disk.cc
View file

@ -56,7 +56,6 @@ MmDisk::read(PacketPtr pkt)
{
Addr accessAddr;
off_t sector;
off_t bytes_read;
uint16_t d16;
uint32_t d32;
uint64_t d64;
@ -68,10 +67,16 @@ MmDisk::read(PacketPtr pkt)
if (sector != curSector) {
if (dirty) {
bytes_read = image->write(diskData, curSector);
assert(bytes_read == SectorSize);
#ifndef NDEBUG
off_t bytes_written =
#endif
image->write(diskData, curSector);
assert(bytes_written == SectorSize);
}
bytes_read = image->read(diskData, sector);
#ifndef NDEBUG
off_t bytes_read =
#endif
image->read(diskData, sector);
assert(bytes_read == SectorSize);
curSector = sector;
}
@ -109,7 +114,6 @@ MmDisk::write(PacketPtr pkt)
{
Addr accessAddr;
off_t sector;
off_t bytes_read;
uint16_t d16;
uint32_t d32;
uint64_t d64;
@ -121,10 +125,16 @@ MmDisk::write(PacketPtr pkt)
if (sector != curSector) {
if (dirty) {
bytes_read = image->write(diskData, curSector);
assert(bytes_read == SectorSize);
#ifndef NDEBUG
off_t bytes_written =
#endif
image->write(diskData, curSector);
assert(bytes_written == SectorSize);
}
bytes_read = image->read(diskData, sector);
#ifndef NDEBUG
off_t bytes_read =
#endif
image->read(diskData, sector);
assert(bytes_read == SectorSize);
curSector = sector;
}
@ -164,9 +174,11 @@ MmDisk::serialize(std::ostream &os)
{
// just write any dirty changes to the cow layer it will take care of
// serialization
int bytes_read;
if (dirty) {
bytes_read = image->write(diskData, curSector);
#ifndef NDEBUG
int bytes_read =
#endif
image->write(diskData, curSector);
assert(bytes_read == SectorSize);
}
}

8
src/dev/terminal.cc
View file

@ -259,17 +259,13 @@ Terminal::write(const uint8_t *buf, size_t len)
uint8_t
Terminal::in()
{
bool empty;
uint8_t c;
empty = rxbuf.empty();
assert(!empty);
assert(!rxbuf.empty());
rxbuf.read((char *)&c, 1);
empty = rxbuf.empty();
DPRINTF(TerminalVerbose, "in: \'%c\' %#02x more: %d\n",
isprint(c) ? c : ' ', c, !empty);
isprint(c) ? c : ' ', c, !rxbuf.empty());
return c;
}

8
src/mem/page_table.cc
View file

@ -93,9 +93,7 @@ PageTable::remap(Addr vaddr, int64_t size, Addr new_vaddr)
new_vaddr, size);
for (; size > 0; size -= pageSize, vaddr += pageSize, new_vaddr += pageSize) {
PTableItr iter = pTable.find(vaddr);
assert(iter != pTable.end());
assert(pTable.find(vaddr) != pTable.end());
pTable[new_vaddr] = pTable[vaddr];
pTable.erase(vaddr);
@ -112,9 +110,7 @@ PageTable::unmap(Addr vaddr, int64_t size)
DPRINTF(MMU, "Unmapping page: %#x-%#x\n", vaddr, vaddr+ size);
for (; size > 0; size -= pageSize, vaddr += pageSize) {
PTableItr iter = pTable.find(vaddr);
assert(iter != pTable.end());
assert(pTable.find(vaddr) != pTable.end());
pTable.erase(vaddr);
}

2
src/mem/ruby/system/SConscript
View file

@ -49,6 +49,6 @@ Source('WireBuffer.cc')
Source('MemoryNode.cc')
Source('PersistentTable.cc')
Source('RubyPort.cc')
Source('Sequencer.cc', Werror=False)
Source('Sequencer.cc')
Source('System.cc')
Source('TimerTable.cc')

10
src/mem/ruby/system/Sequencer.cc
View file

@ -221,10 +221,8 @@ Sequencer::printConfig(ostream& out) const
RequestStatus
Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type)
{
int total_outstanding =
m_writeRequestTable.size() + m_readRequestTable.size();
assert(m_outstanding_count == total_outstanding);
assert(m_outstanding_count ==
(m_writeRequestTable.size() + m_readRequestTable.size()));
// See if we should schedule a deadlock check
if (deadlockCheckEvent.scheduled() == false) {
@ -285,8 +283,8 @@ Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type)
}
g_system_ptr->getProfiler()->sequencerRequests(m_outstanding_count);
total_outstanding = m_writeRequestTable.size() + m_readRequestTable.size();
assert(m_outstanding_count == total_outstanding);
assert(m_outstanding_count ==
(m_writeRequestTable.size() + m_readRequestTable.size()));
return RequestStatus_Ready;
}

2
src/mem/slicc/ast/PeekStatementAST.py
View file

@ -60,7 +60,7 @@ class PeekStatementAST(StatementAST):
code('''
{
// Declare message
const $mtid* in_msg_ptr;
const $mtid* in_msg_ptr M5_VAR_USED;
in_msg_ptr = dynamic_cast<const $mtid *>(($qcode).${{self.method}}());
assert(in_msg_ptr != NULL); // Check the cast result
''')

1
src/mem/slicc/symbols/StateMachine.py
View file

@ -411,6 +411,7 @@ void unset_tbe(${{self.TBEType.c_ident}}*& m_tbe_ptr);
#include <sstream>
#include <string>
#include "base/compiler.hh"
#include "base/cprintf.hh"
#include "debug/RubyGenerated.hh"
#include "debug/RubySlicc.hh"