derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tick: rename Clock namespace to SimClock

Browse Source
This commit is contained in:
Nathan Binkert
2010-04-15 16:24:12 -07:00
parent f7e6f19ada
commit e99828b06a
20 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dev/alpha/tsunami_io.cc
View File

@@ -80,7 +80,7 @@ TsunamiIO::TsunamiIO(const Params *p)
Tick
TsunamiIO::frequency() const
{
return Clock::Frequency / params()->frequency;
return SimClock::Frequency / params()->frequency;
}
Tick

4
src/dev/etherdump.cc
View File

@@ -94,8 +94,8 @@ void
EtherDump::dumpPacket(EthPacketPtr &packet)
{
pcap_pkthdr pkthdr;
pkthdr.seconds = curTick / Clock::Int::s;
pkthdr.microseconds = (curTick / Clock::Int::us) % ULL(1000000);
pkthdr.seconds = curTick / SimClock::Int::s;
pkthdr.microseconds = (curTick / SimClock::Int::us) % ULL(1000000);
pkthdr.caplen = std::min(packet->length, maxlen);
pkthdr.len = packet->length;
stream->write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));

4
src/dev/i8254xGBe.cc
View File

@@ -693,7 +693,7 @@ IGbE::postInterrupt(IntTypes t, bool now)
regs.icr = regs.icr() | t;
Tick itr_interval = Clock::Int::ns * 256 * regs.itr.interval();
Tick itr_interval = SimClock::Int::ns * 256 * regs.itr.interval();
DPRINTF(EthernetIntr,
"EINT: postInterrupt() curTick: %d itr: %d interval: %d\n",
curTick, regs.itr.interval(), itr_interval);
@@ -801,7 +801,7 @@ IGbE::chkInterrupt()
DPRINTF(Ethernet,
"Possibly scheduling interrupt because of imr write\n");
if (!interEvent.scheduled()) {
Tick t = curTick + Clock::Int::ns * 256 * regs.itr.interval();
Tick t = curTick + SimClock::Int::ns * 256 * regs.itr.interval();
DPRINTF(Ethernet, "Scheduling for %d\n", t);
schedule(interEvent, t);
}

2
src/dev/i8254xGBe.hh
View File

@@ -171,7 +171,7 @@ class IGbE : public EtherDevice
*/
void cpuClearInt();
Tick intClock() { return Clock::Int::ns * 1024; }
Tick intClock() { return SimClock::Int::ns * 1024; }
/** This function is used to restart the clock so it can handle things like
* draining and resume in one place. */

2
src/dev/intel_8254_timer.cc
View File

@@ -255,7 +255,7 @@ Intel8254Timer::Counter::unserialize(const string &base, Checkpoint *cp,
Intel8254Timer::Counter::CounterEvent::CounterEvent(Counter* c_ptr)
{
interval = (Tick)(Clock::Float::s / 1193180.0);
interval = (Tick)(SimClock::Float::s / 1193180.0);
counter = c_ptr;
}

2
src/dev/mc146818.cc
View File

@@ -271,7 +271,7 @@ void
MC146818::RTCTickEvent::process()
{
DPRINTF(MC146818, "RTC clock tick\n");
parent->schedule(this, curTick + Clock::Int::s);
parent->schedule(this, curTick + SimClock::Int::s);
parent->tickClock();
}

2
src/dev/mc146818.hh
View File

@@ -71,7 +71,7 @@ class MC146818 : public EventManager
RTCTickEvent(MC146818 * _parent) : parent(_parent)
{
parent->schedule(this, curTick + Clock::Int::s);
parent->schedule(this, curTick + SimClock::Int::s);
}
/** Event process to occur at interrupt*/

2
src/dev/mips/malta_io.cc
View File

@@ -80,7 +80,7 @@ MaltaIO::MaltaIO(const Params *p)
Tick
MaltaIO::frequency() const
{
return Clock::Frequency / params()->frequency;
return SimClock::Frequency / params()->frequency;
}
Tick

4
src/dev/uart8250.cc
View File

@@ -90,7 +90,7 @@ Uart8250::IntrEvent::process()
void
Uart8250::IntrEvent::scheduleIntr()
{
static const Tick interval = 225 * Clock::Int::ns;
static const Tick interval = 225 * SimClock::Int::ns;
DPRINTF(Uart, "Scheduling IER interrupt for %#x, at cycle %lld\n", intrBit,
curTick + interval);
if (!scheduled())
@@ -217,7 +217,7 @@ Uart8250::write(PacketPtr pkt)
if (UART_IER_THRI & IER)
{
DPRINTF(Uart, "IER: IER_THRI set, scheduling TX intrrupt\n");
if (curTick - lastTxInt > 225 * Clock::Int::ns) {
if (curTick - lastTxInt > 225 * SimClock::Int::ns) {
DPRINTF(Uart, "-- Interrupting Immediately... %d,%d\n",
curTick, lastTxInt);
txIntrEvent.process();