misc: Delete the now unnecessary create methods.

Most create() methods are no longer necessary. This change deletes them,
and occasionally moves some code from them into the constructors they
call.

Change-Id: Icbab29ba280144b892f9b12fac9e29a0839477e5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36536
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2020-10-23 19:34:07 -07:00
parent 6c454ee53b
commit d05a0a4ea1
337 changed files with 56 additions and 2960 deletions

View File

@@ -103,9 +103,3 @@ A9SCU::write(PacketPtr pkt)
pkt->makeAtomicResponse();
return pioDelay;
}
A9SCU *
A9SCUParams::create() const
{
return new A9SCU(*this);
}

View File

@@ -81,10 +81,3 @@ AmbaFake::write(PacketPtr pkt)
pkt->makeAtomicResponse();
return pioDelay;
}
AmbaFake *
AmbaFakeParams::create() const
{
return new AmbaFake(*this);
}

View File

@@ -194,15 +194,3 @@ ArmPPI::clear()
_active = false;
platform->gic->clearPPInt(intNum, targetContext());
}
ArmSPIGen *
ArmSPIParams::create() const
{
return new ArmSPIGen(*this);
}
ArmPPIGen *
ArmPPIParams::create() const
{
return new ArmPPIGen(*this);
}

View File

@@ -42,9 +42,3 @@
Display::Display(const DisplayParams &p)
: SimObject(p)
{}
Display *
DisplayParams::create() const
{
return new Display(*this);
}

View File

@@ -241,12 +241,6 @@ EnergyCtrl::unserialize(CheckpointIn &cp)
}
}
EnergyCtrl *
EnergyCtrlParams::create() const
{
return new EnergyCtrl(*this);
}
void
EnergyCtrl::startup()
{

View File

@@ -55,17 +55,6 @@
#include "base/trace.hh"
#include "debug/Drain.hh"
/**
* Create this device
*/
FlashDevice*
FlashDeviceParams::create() const
{
return new FlashDevice(*this);
}
/**
* Flash Device constructor and destructor
*/

View File

@@ -310,9 +310,3 @@ FVPBasePwrCtrl::startCoreUp(ThreadContext *const tc)
ArmISA::Reset().invoke(tc);
tc->activate();
}
FVPBasePwrCtrl *
FVPBasePwrCtrlParams::create() const
{
return new FVPBasePwrCtrl(*this);
}

View File

@@ -1584,27 +1584,3 @@ GenericTimerMem::timerCtrlWrite(Addr addr, size_t size, uint64_t data,
"(0x%x:%i), assuming WI\n", addr, size);
}
}
SystemCounter *
SystemCounterParams::create() const
{
return new SystemCounter(*this);
}
GenericTimer *
GenericTimerParams::create() const
{
return new GenericTimer(*this);
}
GenericTimerFrame *
GenericTimerFrameParams::create() const
{
return new GenericTimerFrame(*this);
}
GenericTimerMem *
GenericTimerMemParams::create() const
{
return new GenericTimerMem(*this);
}

View File

@@ -1090,9 +1090,3 @@ GicV2::BankedRegs::unserialize(CheckpointIn &cp)
UNSERIALIZE_ARRAY(intConfig, 2);
UNSERIALIZE_ARRAY(intPriority, SGI_MAX + PPI_MAX);
}
GicV2 *
GicV2Params::create() const
{
return new GicV2(*this);
}

View File

@@ -64,18 +64,6 @@
#include "mem/packet.hh"
#include "mem/packet_access.hh"
Gicv2m *
Gicv2mParams::create() const
{
return new Gicv2m(*this);
}
Gicv2mFrame *
Gicv2mFrameParams::create() const
{
return new Gicv2mFrame(*this);
}
Gicv2m::Gicv2m(const Params &p)
: PioDevice(p), pioDelay(p.pio_delay), frames(p.frames), gic(p.gic)
{

View File

@@ -294,9 +294,3 @@ Gicv3::unserialize(CheckpointIn & cp)
cpuInterfaces[cpu_interface_id]->unserializeSection(cp,
csprintf("cpuInterface.%i", cpu_interface_id));
}
Gicv3 *
Gicv3Params::create() const
{
return new Gicv3(*this);
}

View File

@@ -1286,9 +1286,3 @@ Gicv3Its::moveAllPendingState(
rd2->updateDistributor();
}
Gicv3Its *
Gicv3ItsParams::create() const
{
return new Gicv3Its(*this);
}

View File

@@ -374,17 +374,3 @@ CustomNoMaliGpu::onReset()
for (const auto &reg : idRegs)
writeRegRaw(reg.first, reg.second);
}
NoMaliGpu *
NoMaliGpuParams::create() const
{
return new NoMaliGpu(*this);
}
CustomNoMaliGpu *
CustomNoMaliGpuParams::create() const
{
return new CustomNoMaliGpu(*this);
}

View File

@@ -689,10 +689,3 @@ HDLcd::PixelPump::dumpSettings()
inform("PixelPump vertical fron porch: %u", t.vFrontPorch);
inform("PixelPump vertical fron porch: %u", t.vSync);
}
HDLcd *
HDLcdParams::create() const
{
return new HDLcd(*this);
}

View File

@@ -219,9 +219,3 @@ Pl050::unserialize(CheckpointIn &cp)
UNSERIALIZE_SCALAR(clkdiv);
paramIn(cp, "raw_ints", rawInterrupts);
}
Pl050 *
Pl050Params::create() const
{
return new Pl050(*this);
}

View File

@@ -68,10 +68,3 @@ GenericArmPciHost::mapPciInterrupt(const PciBusAddr &addr, PciIntPin pin) const
fatal("Unsupported PCI interrupt routing policy.");
}
}
GenericArmPciHost *
GenericArmPciHostParams::create() const
{
return new GenericArmPciHost(*this);
}

View File

@@ -325,9 +325,3 @@ Pl011::unserialize(CheckpointIn &cp)
paramIn(cp, "imsc_serial", imsc);
paramIn(cp, "rawInt_serial", rawInt);
}
Pl011 *
Pl011Params::create() const
{
return new Pl011(*this);
}

View File

@@ -742,11 +742,3 @@ Pl111::getAddrRanges() const
ranges.push_back(RangeSize(pioAddr, pioSize));
return ranges;
}
Pl111 *
Pl111Params::create() const
{
return new Pl111(*this);
}

View File

@@ -82,9 +82,3 @@ RealView::clearPciInt(int line)
{
gic->clearInt(line);
}
RealView *
RealViewParams::create() const
{
return new RealView(*this);
}

View File

@@ -237,11 +237,3 @@ PL031::unserialize(CheckpointIn &cp)
schedule(matchEvent, event_time);
}
}
PL031 *
PL031Params::create() const
{
return new PL031(*this);
}

View File

@@ -313,21 +313,3 @@ RealViewTemperatureSensor::read() const
// Report a dummy 25 degrees temperature
return 25000000;
}
RealViewCtrl *
RealViewCtrlParams::create() const
{
return new RealViewCtrl(*this);
}
RealViewOsc *
RealViewOscParams::create() const
{
return new RealViewOsc(*this);
}
RealViewTemperatureSensor *
RealViewTemperatureSensorParams::create() const
{
return new RealViewTemperatureSensor(*this);
}

View File

@@ -826,9 +826,3 @@ SMMUv3::getPort(const std::string &name, PortID id)
return ClockedObject::getPort(name, id);
}
}
SMMUv3*
SMMUv3Params::create() const
{
return new SMMUv3(*this);
}

View File

@@ -259,9 +259,3 @@ SMMUv3DeviceInterface::drain()
}
return DrainState::Drained;
}
SMMUv3DeviceInterface*
SMMUv3DeviceInterfaceParams::create() const
{
return new SMMUv3DeviceInterface(*this);
}

View File

@@ -308,9 +308,3 @@ A9GlobalTimer::unserialize(CheckpointIn &cp)
{
global_timer.unserialize(cp);
}
A9GlobalTimer *
A9GlobalTimerParams::create() const
{
return new A9GlobalTimer(*this);
}

View File

@@ -439,9 +439,3 @@ CpuLocalTimer::unserialize(CheckpointIn &cp)
for (int i = 0; i < sys->threads.size(); i++)
localTimer[i]->unserializeSection(cp, csprintf("timer%d", i));
}
CpuLocalTimer *
CpuLocalTimerParams::create() const
{
return new CpuLocalTimer(*this);
}

View File

@@ -280,9 +280,3 @@ Sp804::unserialize(CheckpointIn &cp)
timer0.unserializeSection(cp, "timer0");
timer1.unserializeSection(cp, "timer1");
}
Sp804 *
Sp804Params::create() const
{
return new Sp804(*this);
}

View File

@@ -752,17 +752,6 @@ UFSHostDevice::UFSHostDevice(const UFSHostDeviceParams &p) :
setValues();
}
/**
* Create the parameters of this device
*/
UFSHostDevice*
UFSHostDeviceParams::create() const
{
return new UFSHostDevice(*this);
}
void
UFSHostDevice::regStats()
{

View File

@@ -552,9 +552,3 @@ VGic::vcpuIntData::unserialize(CheckpointIn &cp)
paramIn(cp, "lr", LR[i]);
}
}
VGic *
VGicParams::create() const
{
return new VGic(*this);
}

View File

@@ -273,10 +273,3 @@ MmioVirtIO::setInterrupts(uint32_t value)
interrupt->clear();
}
}
MmioVirtIO *
MmioVirtIOParams::create() const
{
return new MmioVirtIO(*this);
}

View File

@@ -259,9 +259,3 @@ Sp805::unserialize(CheckpointIn &cp)
reschedule(timeoutEvent, when, true);
}
}
Sp805 *
Sp805Params::create() const
{
return new Sp805(*this);
}

View File

@@ -56,9 +56,3 @@ BadDevice::write(PacketPtr pkt)
{
panic("Device %s not imlpmented\n", devname);
}
BadDevice *
BadDeviceParams::create() const
{
return new BadDevice(*this);
}

View File

@@ -657,12 +657,6 @@ AQLRingBuffer::allocEntry(uint32_t nBufReq)
return nBufReq;
}
HSAPacketProcessor *
HSAPacketProcessorParams::create() const
{
return new HSAPacketProcessor(*this);
}
void
HSAPacketProcessor::finishPkt(void *pvPkt, uint32_t rl_idx)
{

View File

@@ -234,9 +234,3 @@ I2CBus::unserialize(CheckpointIn &cp)
UNSERIALIZE_SCALAR(i2cAddr);
UNSERIALIZE_SCALAR(message);
}
I2CBus*
I2CBusParams::create() const
{
return new I2CBus(*this);
}

View File

@@ -142,9 +142,3 @@ IsaFake::write(PacketPtr pkt)
}
return pioDelay;
}
IsaFake *
IsaFakeParams::create() const
{
return new IsaFake(*this);
}

View File

@@ -95,9 +95,3 @@ Malta::unserialize(CheckpointIn &cp)
{
UNSERIALIZE_ARRAY(intr_sum_type, Malta::Max_CPUs);
}
Malta *
MaltaParams::create() const
{
return new Malta(*this);
}

View File

@@ -139,10 +139,3 @@ void
MaltaCChip::unserialize(CheckpointIn &cp)
{
}
MaltaCChip *
MaltaCChipParams::create() const
{
return new MaltaCChip(*this);
}

View File

@@ -143,9 +143,3 @@ MaltaIO::startup()
rtc.startup();
pitimer.startup();
}
MaltaIO *
MaltaIOParams::create() const
{
return new MaltaIO(*this);
}

View File

@@ -253,10 +253,4 @@ DistEtherLink::LocalIface::LocalIface(const std::string &name,
rx->setDistInt(m);
}
DistEtherLink *
DistEtherLinkParams::create() const
{
return new DistEtherLink(*this);
}

View File

@@ -105,9 +105,3 @@ EtherBus::send(EtherInt *sndr, EthPacketPtr &pkt)
return true;
}
EtherBus *
EtherBusParams::create() const
{
return new EtherBus(*this);
}

View File

@@ -100,9 +100,3 @@ EtherDump::dumpPacket(EthPacketPtr &packet)
stream->write(reinterpret_cast<char *>(packet->data), pkthdr.caplen);
stream->flush();
}
EtherDump *
EtherDumpParams::create() const
{
return new EtherDump(*this);
}

View File

@@ -264,9 +264,3 @@ EtherLink::Link::unserialize(const string &base, CheckpointIn &cp)
"in-flight packets may have been dropped.\n");
}
}
EtherLink *
EtherLinkParams::create() const
{
return new EtherLink(*this);
}

View File

@@ -345,9 +345,3 @@ EtherSwitch::Interface::PortFifo::unserialize(CheckpointIn &cp)
}
}
EtherSwitch *
EtherSwitchParams::create() const
{
return new EtherSwitch(*this);
}

View File

@@ -469,16 +469,4 @@ EtherTap::sendReal(const void *data, size_t len)
return true;
}
EtherTap *
EtherTapParams::create() const
{
return new EtherTap(*this);
}
#endif
EtherTapStub *
EtherTapStubParams::create() const
{
return new EtherTapStub(*this);
}

View File

@@ -2463,9 +2463,3 @@ IGbE::unserialize(CheckpointIn &cp)
txDescCache.unserializeSection(cp, "TxDescCache");
rxDescCache.unserializeSection(cp, "RxDescCache");
}
IGbE *
IGbEParams::create() const
{
return new IGbE(*this);
}

View File

@@ -2365,9 +2365,3 @@ NSGigE::unserialize(CheckpointIn &cp)
schedule(intrEvent, intrEventTick);
}
}
NSGigE *
NSGigEParams::create() const
{
return new NSGigE(*this);
}

View File

@@ -1501,9 +1501,3 @@ Device::unserialize(CheckpointIn &cp)
}
} // namespace Sinic
Sinic::Device *
SinicParams::create() const
{
return new Sinic::Device(*this);
}

View File

@@ -730,9 +730,3 @@ CopyEngine::CopyEngineChannel::drainResume()
DPRINTF(DMACopyEngine, "Restarting state machine at state %d\n", nextState);
restartStateMachine();
}
CopyEngine *
CopyEngineParams::create() const
{
return new CopyEngine(*this);
}

View File

@@ -550,33 +550,3 @@ PciDevice::unserialize(CheckpointIn &cp)
pxcap.pxdc2 = tmp32;
pioPort.sendRangeChange();
}
PciBarNone *
PciBarNoneParams::create() const
{
return new PciBarNone(*this);
}
PciIoBar *
PciIoBarParams::create() const
{
return new PciIoBar(*this);
}
PciLegacyIoBar *
PciLegacyIoBarParams::create() const
{
return new PciLegacyIoBar(*this);
}
PciMemBar *
PciMemBarParams::create() const
{
return new PciMemBar(*this);
}
PciMemUpperBar *
PciMemUpperBarParams::create() const
{
return new PciMemUpperBar(*this);
}

View File

@@ -217,9 +217,3 @@ GenericPciHost::mapPciInterrupt(const PciBusAddr &addr, PciIntPin pin) const
return dev->interruptLine();
}
GenericPciHost *
GenericPciHostParams::create() const
{
return new GenericPciHost(*this);
}

View File

@@ -171,10 +171,3 @@ PS2Keyboard::keyPress(uint32_t key, bool down)
for (uint8_t c : keys)
send(c);
}
PS2Keyboard *
PS2KeyboardParams::create() const
{
return new PS2Keyboard(*this);
}

View File

@@ -166,9 +166,3 @@ PS2Mouse::unserialize(CheckpointIn &cp)
UNSERIALIZE_SCALAR(resolution);
UNSERIALIZE_SCALAR(sampleRate);
}
PS2Mouse *
PS2MouseParams::create() const
{
return new PS2Mouse(*this);
}

View File

@@ -204,9 +204,3 @@ PS2TouchKit::mouseAt(uint16_t x, uint16_t y, uint8_t buttons)
send(resp, sizeof(resp));
}
PS2TouchKit *
PS2TouchKitParams::create() const
{
return new PS2TouchKit(*this);
}

View File

@@ -82,11 +82,3 @@ SerialNullDevice::readData()
{
panic("SerialNullDevice does not have pending data.\n");
}
SerialNullDevice *
SerialNullDeviceParams::create() const
{
return new SerialNullDevice(*this);
}

View File

@@ -78,9 +78,3 @@ SimpleUart::write(PacketPtr pkt)
pkt->makeAtomicResponse();
return pioDelay;
}
SimpleUart *
SimpleUartParams::create() const
{
return new SimpleUart(*this);
}

View File

@@ -359,9 +359,3 @@ Terminal::writeData(uint8_t c)
isprint(c) ? c : ' ', (int)c);
}
Terminal *
TerminalParams::create() const
{
return new Terminal(*this);
}

View File

@@ -319,9 +319,3 @@ Uart8250::unserialize(CheckpointIn &cp)
if (txintrwhen != 0)
schedule(txIntrEvent, txintrwhen);
}
Uart8250 *
Uart8250Params::create() const
{
return new Uart8250(*this);
}

View File

@@ -86,9 +86,3 @@ DumbTOD::unserialize(CheckpointIn &cp)
{
UNSERIALIZE_SCALAR(todTime);
}
DumbTOD *
DumbTODParams::create() const
{
return new DumbTOD(*this);
}

View File

@@ -375,9 +375,3 @@ Iob::unserialize(CheckpointIn &cp)
paramIn(cp, "source", jIntBusy[x].source);
};
}
Iob *
IobParams::create() const
{
return new Iob(*this);
}

View File

@@ -182,9 +182,3 @@ MmDisk::serialize(CheckpointOut &cp) const
}
ClockedObject::serialize(cp);
}
MmDisk *
MmDiskParams::create() const
{
return new MmDisk(*this);
}

View File

@@ -95,9 +95,3 @@ T1000::calcPciMemAddr(Addr addr)
{
panic("Need implementation\n");
}
T1000 *
T1000Params::create() const
{
return new T1000(*this);
}

View File

@@ -159,12 +159,6 @@ RawDiskImage::write(const uint8_t *data, std::streampos offset)
return stream.tellp() - pos;
}
RawDiskImage *
RawDiskImageParams::create() const
{
return new RawDiskImage(*this);
}
////////////////////////////////////////////////////////////////////////
//
// Copy on Write Disk image
@@ -441,9 +435,3 @@ CowDiskImage::unserialize(CheckpointIn &cp)
cowFilename = cp.getCptDir() + "/" + cowFilename;
open(cowFilename);
}
CowDiskImage *
CowDiskImageParams::create() const
{
return new CowDiskImage(*this);
}

View File

@@ -566,9 +566,3 @@ IdeController::Channel::unserialize(const std::string &base, CheckpointIn &cp)
paramIn(cp, base + ".selectBit", selectBit);
select(selectBit);
}
IdeController *
IdeControllerParams::create() const
{
return new IdeController(*this);
}

View File

@@ -1197,9 +1197,3 @@ IdeDisk::unserialize(CheckpointIn &cp)
UNSERIALIZE_ENUM(dmaState);
UNSERIALIZE_ARRAY(dataBuffer, MAX_DMA_SIZE);
}
IdeDisk *
IdeDiskParams::create() const
{
return new IdeDisk(*this);
}

View File

@@ -82,9 +82,3 @@ SimpleDisk::write(Addr addr, baddr_t block, int count)
{
panic("unimplemented!\n");
}
SimpleDisk *
SimpleDiskParams::create() const
{
return new SimpleDisk(*this);
}

View File

@@ -484,9 +484,3 @@ VirtIODummyDevice::VirtIODummyDevice(const VirtIODummyDeviceParams &params)
: VirtIODeviceBase(params, ID_INVALID, 0, 0)
{
}
VirtIODummyDevice *
VirtIODummyDeviceParams::create() const
{
return new VirtIODummyDevice(*this);
}

View File

@@ -164,9 +164,3 @@ VirtIOBlock::RequestQueue::onNotifyDescriptor(VirtDescriptor *desc)
produceDescriptor(desc, sizeof(BlkRequest) + data_size + sizeof(Status));
parent.kick();
}
VirtIOBlock *
VirtIOBlockParams::create() const
{
return new VirtIOBlock(*this);
}

View File

@@ -112,9 +112,3 @@ VirtIOConsole::TermTransQueue::onNotifyDescriptor(VirtDescriptor *desc)
produceDescriptor(desc, 0);
parent.kick();
}
VirtIOConsole *
VirtIOConsoleParams::create() const
{
return new VirtIOConsole(*this);
}

View File

@@ -472,15 +472,7 @@ VirtIO9PDiod::terminateDiod()
// Managed to kill diod
return;
}
}
VirtIO9PDiod *
VirtIO9PDiodParams::create() const
{
return new VirtIO9PDiod(*this);
}
VirtIO9PSocket::VirtIO9PSocket(const Params &params)
@@ -569,10 +561,3 @@ VirtIO9PSocket::SocketDataEvent::process(int revent)
{
parent.serverDataReady();
}
VirtIO9PSocket *
VirtIO9PSocketParams::create() const
{
return new VirtIO9PSocket(*this);
}

View File

@@ -222,9 +222,3 @@ PciVirtIO::kick()
interruptDeliveryPending = true;
intrPost();
}
PciVirtIO *
PciVirtIOParams::create() const
{
return new PciVirtIO(*this);
}

View File

@@ -138,9 +138,3 @@ X86ISA::Cmos::unserialize(CheckpointIn &cp)
// Serialize the timer
rtc.unserialize("rtc", cp);
}
X86ISA::Cmos *
CmosParams::create() const
{
return new X86ISA::Cmos(*this);
}

View File

@@ -305,9 +305,3 @@ X86ISA::I8042::unserialize(CheckpointIn &cp)
UNSERIALIZE_SCALAR(dataReg);
UNSERIALIZE_SCALAR(lastCommand);
}
X86ISA::I8042 *
I8042Params::create() const
{
return new X86ISA::I8042(*this);
}

View File

@@ -291,9 +291,3 @@ X86ISA::I82094AA::unserialize(CheckpointIn &cp)
redirTable[i] = (RedirTableEntry)redirTableArray[i];
}
}
X86ISA::I82094AA *
I82094AAParams::create() const
{
return new X86ISA::I82094AA(*this);
}

View File

@@ -135,9 +135,3 @@ X86ISA::I8237::unserialize(CheckpointIn &cp)
{
UNSERIALIZE_SCALAR(maskReg);
}
X86ISA::I8237 *
I8237Params::create() const
{
return new X86ISA::I8237(*this);
}

View File

@@ -95,9 +95,3 @@ X86ISA::I8254::startup()
{
pit.startup();
}
X86ISA::I8254 *
I8254Params::create() const
{
return new X86ISA::I8254(*this);
}

View File

@@ -364,9 +364,3 @@ X86ISA::I8259::unserialize(CheckpointIn &cp)
UNSERIALIZE_SCALAR(initControlWord);
UNSERIALIZE_SCALAR(autoEOI);
}
X86ISA::I8259 *
I8259Params::create() const
{
return new X86ISA::I8259(*this);
}

View File

@@ -134,9 +134,3 @@ Pc::clearPciInt(int line)
{
warn_once("Tried to clear PCI interrupt %d\n", line);
}
Pc *
PcParams::create() const
{
return new Pc(*this);
}

View File

@@ -43,9 +43,3 @@ SouthBridge::SouthBridge(const Params &p) : SimObject(p),
assert(pc);
pc->southBridge = this;
}
SouthBridge *
SouthBridgeParams::create() const
{
return new SouthBridge(*this);
}

View File

@@ -83,9 +83,3 @@ X86ISA::Speaker::unserialize(CheckpointIn &cp)
{
UNSERIALIZE_SCALAR(controlVal);
}
X86ISA::Speaker *
PcSpeakerParams::create() const
{
return new X86ISA::Speaker(*this);
}