From: <m97...@us...> - 2008-11-13 18:38:51
|
Revision: 8353 http://openmsx.svn.sourceforge.net/openmsx/?rev=8353&view=rev Author: m9710797 Date: 2008-11-13 18:38:44 +0000 (Thu, 13 Nov 2008) Log Message: ----------- previous commit caused coredump in debug mode Modified Paths: -------------- openmsx/trunk/src/EmuTime.hh openmsx/trunk/src/MSXBunsetsu.cc openmsx/trunk/src/MSXF4Device.cc openmsx/trunk/src/MSXKanji.cc openmsx/trunk/src/MSXKanji12.cc openmsx/trunk/src/MSXMatsushita.cc openmsx/trunk/src/MSXS1990.cc openmsx/trunk/src/MSXTurboRPause.cc openmsx/trunk/src/PasswordCart.cc openmsx/trunk/src/ide/GoudaSCSI.cc openmsx/trunk/src/input/Joystick.cc openmsx/trunk/src/memory/MSXMegaRam.cc openmsx/trunk/src/memory/MSXPac.cc openmsx/trunk/src/memory/RomAscii16_2.cc openmsx/trunk/src/memory/RomAscii16kB.cc openmsx/trunk/src/memory/RomAscii8_8.cc openmsx/trunk/src/memory/RomAscii8kB.cc openmsx/trunk/src/memory/RomCrossBlaim.cc openmsx/trunk/src/memory/RomFSA1FM.cc openmsx/trunk/src/memory/RomGameMaster2.cc openmsx/trunk/src/memory/RomGeneric16kB.cc openmsx/trunk/src/memory/RomGeneric8kB.cc openmsx/trunk/src/memory/RomHalnote.cc openmsx/trunk/src/memory/RomHarryFox.cc openmsx/trunk/src/memory/RomHolyQuran.cc openmsx/trunk/src/memory/RomKonamiKeyboardMaster.cc openmsx/trunk/src/memory/RomMSXDOS2.cc openmsx/trunk/src/memory/RomMatraInk.cc openmsx/trunk/src/memory/RomNational.cc openmsx/trunk/src/memory/RomNettouYakyuu.cc openmsx/trunk/src/memory/RomPadial16kB.cc openmsx/trunk/src/memory/RomPadial8kB.cc openmsx/trunk/src/memory/RomPanasonic.cc openmsx/trunk/src/memory/RomPlayBall.cc openmsx/trunk/src/memory/RomRType.cc openmsx/trunk/src/memory/RomSuperLodeRunner.cc openmsx/trunk/src/memory/RomZemina126in1.cc openmsx/trunk/src/memory/RomZemina80in1.cc openmsx/trunk/src/memory/RomZemina90in1.cc openmsx/trunk/src/video/ADVram.cc Modified: openmsx/trunk/src/EmuTime.hh =================================================================== --- openmsx/trunk/src/EmuTime.hh 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/EmuTime.hh 2008-11-13 18:38:44 UTC (rev 8353) @@ -17,8 +17,10 @@ // is cheaper. #ifdef __x86_64 typedef const EmuTime param; + static param dummy() { return EmuTime(); } #else typedef const EmuTime& param; + static param dummy() { EmuTime* d; return *d; } #endif // Note: default copy constructor and assigment operator are ok. @@ -61,6 +63,7 @@ void serialize(Archive& ar, unsigned version); private: + EmuTime() {} // uninitialized explicit EmuTime(uint64 n) : time(n) {} uint64 time; Modified: openmsx/trunk/src/MSXBunsetsu.cc =================================================================== --- openmsx/trunk/src/MSXBunsetsu.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXBunsetsu.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -14,7 +14,7 @@ , jisyoRom (new Rom(motherBoard, getName() + "_2", "rom", config, "jisyo")) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXBunsetsu::~MSXBunsetsu() Modified: openmsx/trunk/src/MSXF4Device.cc =================================================================== --- openmsx/trunk/src/MSXF4Device.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXF4Device.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -10,7 +10,7 @@ : MSXDevice(motherBoard, config) , inverted(config.getChildDataAsBool("inverted", false)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void MSXF4Device::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/MSXKanji.cc =================================================================== --- openmsx/trunk/src/MSXKanji.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXKanji.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -16,7 +16,7 @@ throw MSXException("MSXKanji: wrong kanji rom"); } - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXKanji::~MSXKanji() Modified: openmsx/trunk/src/MSXKanji12.cc =================================================================== --- openmsx/trunk/src/MSXKanji12.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXKanji12.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -19,7 +19,7 @@ throw MSXException("MSXKanji12: wrong kanji rom"); } - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXKanji12::~MSXKanji12() Modified: openmsx/trunk/src/MSXMatsushita.cc =================================================================== --- openmsx/trunk/src/MSXMatsushita.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXMatsushita.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -21,7 +21,7 @@ { // TODO find out what ports 0x41 0x45 0x46 are used for - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXMatsushita::~MSXMatsushita() Modified: openmsx/trunk/src/MSXS1990.cc =================================================================== --- openmsx/trunk/src/MSXS1990.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXS1990.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -27,7 +27,7 @@ new FirmwareSwitch(motherBoard.getCommandController(), config)) , debuggable(new S1990Debuggable(motherBoard, *this)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXS1990::~MSXS1990() Modified: openmsx/trunk/src/MSXTurboRPause.cc =================================================================== --- openmsx/trunk/src/MSXTurboRPause.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/MSXTurboRPause.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -19,7 +19,7 @@ , hwPause(false) { pauseSetting->attach(*this); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXTurboRPause::~MSXTurboRPause() @@ -89,7 +89,7 @@ ar.template serializeBase<MSXDevice>(*this); ar.serialize("status", status); if (ar.isLoader()) { - writeIO(0, status, *static_cast<EmuTime*>(0)); + writeIO(0, status, EmuTime::dummy()); } } INSTANTIATE_SERIALIZE_METHODS(MSXTurboRPause); Modified: openmsx/trunk/src/PasswordCart.cc =================================================================== --- openmsx/trunk/src/PasswordCart.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/PasswordCart.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -20,7 +20,7 @@ : MSXDevice(motherBoard, config) , password(config.getChildDataAsInt("password", 0)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void PasswordCart::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/ide/GoudaSCSI.cc =================================================================== --- openmsx/trunk/src/ide/GoudaSCSI.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/ide/GoudaSCSI.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -13,7 +13,7 @@ , rom(new Rom(motherBoard, getName() + " ROM", "rom", config)) , wd33c93(new WD33C93(motherBoard, config)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } GoudaSCSI::~GoudaSCSI() Modified: openmsx/trunk/src/input/Joystick.cc =================================================================== --- openmsx/trunk/src/input/Joystick.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/input/Joystick.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -209,8 +209,7 @@ if (ar.isLoader()) { Connector* conn = getConnector(); if (joystick && conn) { - EmuTime* dummy = 0; - plugHelper(*conn, *dummy); + plugHelper(*conn, EmuTime::dummy()); } } } Modified: openmsx/trunk/src/memory/MSXMegaRam.cc =================================================================== --- openmsx/trunk/src/memory/MSXMegaRam.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/MSXMegaRam.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -47,7 +47,7 @@ setBank(i, 0); } writeMode = false; - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXMegaRam::~MSXMegaRam() Modified: openmsx/trunk/src/memory/MSXPac.cc =================================================================== --- openmsx/trunk/src/memory/MSXPac.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/MSXPac.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -14,7 +14,7 @@ , sram(new SRAM(motherBoard, getName() + " SRAM", 0x1FFE, config, PAC_Header)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } MSXPac::~MSXPac() Modified: openmsx/trunk/src/memory/RomAscii16_2.cc =================================================================== --- openmsx/trunk/src/memory/RomAscii16_2.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomAscii16_2.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -27,7 +27,7 @@ : RomAscii16kB(motherBoard, config, rom) { sram.reset(new SRAM(motherBoard, getName() + " SRAM", 0x0800, config)); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomAscii16_2::~RomAscii16_2() Modified: openmsx/trunk/src/memory/RomAscii16kB.cc =================================================================== --- openmsx/trunk/src/memory/RomAscii16kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomAscii16kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -21,7 +21,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomAscii16kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomAscii8_8.cc =================================================================== --- openmsx/trunk/src/memory/RomAscii8_8.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomAscii8_8.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -34,7 +34,7 @@ sram.reset(new SRAM(motherBoard, getName() + " SRAM", (subType == KOEI_32) ? 0x8000 : 0x2000, config)); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomAscii8_8::~RomAscii8_8() Modified: openmsx/trunk/src/memory/RomAscii8kB.cc =================================================================== --- openmsx/trunk/src/memory/RomAscii8kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomAscii8kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -21,7 +21,7 @@ std::auto_ptr<Rom> rom) : Rom8kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomAscii8kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomCrossBlaim.cc =================================================================== --- openmsx/trunk/src/memory/RomCrossBlaim.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomCrossBlaim.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -28,7 +28,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomCrossBlaim::reset(EmuTime::param dummy) Modified: openmsx/trunk/src/memory/RomFSA1FM.cc =================================================================== --- openmsx/trunk/src/memory/RomFSA1FM.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomFSA1FM.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -187,7 +187,7 @@ : Rom8kBBlocks(motherBoard, config, rom) , sram(allocSRAM(motherBoard, config)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomFSA1FM2::~RomFSA1FM2() Modified: openmsx/trunk/src/memory/RomGameMaster2.cc =================================================================== --- openmsx/trunk/src/memory/RomGameMaster2.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomGameMaster2.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -51,7 +51,7 @@ : Rom4kBBlocks(motherBoard, config, rom) { sram.reset(new SRAM(motherBoard, getName() + " SRAM", 0x2000, config)); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomGameMaster2::~RomGameMaster2() Modified: openmsx/trunk/src/memory/RomGeneric16kB.cc =================================================================== --- openmsx/trunk/src/memory/RomGeneric16kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomGeneric16kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -11,7 +11,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomGeneric16kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomGeneric8kB.cc =================================================================== --- openmsx/trunk/src/memory/RomGeneric8kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomGeneric8kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -11,7 +11,7 @@ std::auto_ptr<Rom> rom) : Rom8kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomGeneric8kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomHalnote.cc =================================================================== --- openmsx/trunk/src/memory/RomHalnote.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomHalnote.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -38,7 +38,7 @@ : Rom8kBBlocks(motherBoard, config, rom) { sram.reset(new SRAM(motherBoard, getName() + " SRAM", 0x4000, config)); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomHalnote::~RomHalnote() Modified: openmsx/trunk/src/memory/RomHarryFox.cc =================================================================== --- openmsx/trunk/src/memory/RomHarryFox.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomHarryFox.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -19,7 +19,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomHarryFox::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomHolyQuran.cc =================================================================== --- openmsx/trunk/src/memory/RomHolyQuran.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomHolyQuran.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -16,7 +16,7 @@ std::auto_ptr<Rom> rom) : Rom8kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomHolyQuran::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomKonamiKeyboardMaster.cc =================================================================== --- openmsx/trunk/src/memory/RomKonamiKeyboardMaster.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomKonamiKeyboardMaster.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -22,7 +22,7 @@ setBank(2, unmappedRead); setBank(3, unmappedRead); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); getMotherBoard().getCPUInterface().register_IO_Out(0x00, this); getMotherBoard().getCPUInterface().register_IO_Out(0x20, this); Modified: openmsx/trunk/src/memory/RomMSXDOS2.cc =================================================================== --- openmsx/trunk/src/memory/RomMSXDOS2.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomMSXDOS2.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -18,7 +18,7 @@ if ((range != 0x00) && (range != 0x60) && (range != 0x7f)) { throw MSXException("Invalid rom for MSXDOS2 mapper"); } - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomMSXDOS2::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomMatraInk.cc =================================================================== --- openmsx/trunk/src/memory/RomMatraInk.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomMatraInk.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -13,7 +13,7 @@ : MSXRom(motherBoard, config, rom_) , flash(new AmdFlash(*rom, 16, 2, 0)) // don't load/save { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomMatraInk::~RomMatraInk() Modified: openmsx/trunk/src/memory/RomNational.cc =================================================================== --- openmsx/trunk/src/memory/RomNational.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomNational.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -13,7 +13,7 @@ : Rom16kBBlocks(motherBoard, config, rom) { sram.reset(new SRAM(motherBoard, getName() + " SRAM", 0x1000, config)); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomNational::~RomNational() Modified: openmsx/trunk/src/memory/RomNettouYakyuu.cc =================================================================== --- openmsx/trunk/src/memory/RomNettouYakyuu.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomNettouYakyuu.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -55,7 +55,7 @@ "Jaleco Moero!! Nettou Yakuu '88 DAC", config, "nettou_yakyuu/nettou_yakyuu_", 16)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomNettouYakyuu::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomPadial16kB.cc =================================================================== --- openmsx/trunk/src/memory/RomPadial16kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomPadial16kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -17,7 +17,7 @@ std::auto_ptr<Rom> rom) : RomAscii16kB(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomPadial16kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomPadial8kB.cc =================================================================== --- openmsx/trunk/src/memory/RomPadial8kB.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomPadial8kB.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -18,7 +18,7 @@ std::auto_ptr<Rom> rom) : RomAscii8kB(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomPadial8kB::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomPanasonic.cc =================================================================== --- openmsx/trunk/src/memory/RomPanasonic.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomPanasonic.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -39,7 +39,7 @@ // Actual registration is done in changeBank(), right before we // actually select ram pages. - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomPanasonic::~RomPanasonic() Modified: openmsx/trunk/src/memory/RomPlayBall.cc =================================================================== --- openmsx/trunk/src/memory/RomPlayBall.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomPlayBall.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -20,7 +20,7 @@ setRom (2, 1); setBank(3, unmappedRead); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomPlayBall::~RomPlayBall() Modified: openmsx/trunk/src/memory/RomRType.cc =================================================================== --- openmsx/trunk/src/memory/RomRType.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomRType.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -19,7 +19,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomRType::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomSuperLodeRunner.cc =================================================================== --- openmsx/trunk/src/memory/RomSuperLodeRunner.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomSuperLodeRunner.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -15,7 +15,7 @@ : Rom16kBBlocks(motherBoard, config, rom) { getMotherBoard().getCPUInterface().registerGlobalWrite(*this, 0x0000); - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } RomSuperLodeRunner::~RomSuperLodeRunner() Modified: openmsx/trunk/src/memory/RomZemina126in1.cc =================================================================== --- openmsx/trunk/src/memory/RomZemina126in1.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomZemina126in1.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -19,7 +19,7 @@ std::auto_ptr<Rom> rom) : Rom16kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomZemina126in1::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomZemina80in1.cc =================================================================== --- openmsx/trunk/src/memory/RomZemina80in1.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomZemina80in1.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -20,7 +20,7 @@ std::auto_ptr<Rom> rom) : Rom8kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void RomZemina80in1::reset(EmuTime::param /*time*/) Modified: openmsx/trunk/src/memory/RomZemina90in1.cc =================================================================== --- openmsx/trunk/src/memory/RomZemina90in1.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/memory/RomZemina90in1.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -25,7 +25,7 @@ std::auto_ptr<Rom> rom) : Rom8kBBlocks(motherBoard, config, rom) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); getMotherBoard().getCPUInterface().register_IO_Out(0x77, this); } Modified: openmsx/trunk/src/video/ADVram.cc =================================================================== --- openmsx/trunk/src/video/ADVram.cc 2008-11-12 18:39:08 UTC (rev 8352) +++ openmsx/trunk/src/video/ADVram.cc 2008-11-13 18:38:44 UTC (rev 8353) @@ -16,7 +16,7 @@ , vram(NULL) , hasEnable(config.getChildDataAsBool("hasEnable", true)) { - reset(*static_cast<EmuTime*>(0)); + reset(EmuTime::dummy()); } void ADVram::init(const HardwareConfig& hwConf) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |