-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RomAscii16X: ASCII16-X mapper support.
- Loading branch information
Showing
11 changed files
with
221 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" ?> | ||
| <!DOCTYPE msxconfig SYSTEM 'msxconfig2.dtd'> | ||
| <msxconfig> | ||
| <info> | ||
| <name>ASCII16-X Mapper XL</name> | ||
| <manufacturer>Grauw</manufacturer> | ||
| <code>ASCII16-X</code> | ||
| <release_year>2024</release_year> | ||
| <description>ASCII16-X Mapper Extra Large (XL) 8 MB</description> | ||
| <type>Flash cartridge</type> | ||
| </info> | ||
| <devices> | ||
| <primary slot="any"> | ||
| <secondary slot="any"> | ||
| <ASCII16-X id="ASCII16-X Mapper XL"> | ||
| <mem base="0x0000" size="0x10000"/> | ||
| <rom> | ||
| <size>8192</size> | ||
| </rom> | ||
| <sramname>ASCII16-X_Mapper_XL.sram</sramname> | ||
| </YamahaSFG> | ||
| </secondary> | ||
| </primary> | ||
| </devices> | ||
| </msxconfig> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // ASCII-X 16kB cartridges | ||
| // | ||
| // Banks: | ||
| // first 16kB: 0x4000 - 0x7FFF and 0xC000 - 0xFFFF | ||
| // second 16kB: 0x8000 - 0xBFFF and 0x0000 - 0x3FFF | ||
| // | ||
| // Address to change banks: | ||
| // first 16kB: 0x6000 - 0x6FFF, 0xA000 - 0xAFFF, 0xE000 - 0xEFFF, 0x2000 - 0x2FFF | ||
| // second 16kB: 0x7000 - 0x7FFF, 0xB000 - 0xBFFF, 0xF000 - 0xFFFF, 0x3000 - 0x3FFF | ||
| // | ||
| // 12-bit bank number is composed by address bits 8-11 and the data bits. | ||
| // | ||
| // Backed by FlashROM. | ||
|
|
||
| #include "RomAscii16X.hh" | ||
| #include "narrow.hh" | ||
| #include "outer.hh" | ||
| #include "serialize.hh" | ||
|
|
||
| namespace openmsx { | ||
|
|
||
| RomAscii16X::RomAscii16X(const DeviceConfig& config) | ||
| : RomAscii16X(config, Rom(std::string(config.getAttributeValue("id")), "ASCII16-X", config)) | ||
| { | ||
| } | ||
|
|
||
| RomAscii16X::RomAscii16X(const DeviceConfig& config, Rom&& rom_) | ||
| : MSXRom(config, std::move(rom_)) | ||
| , debuggable(getMotherBoard(), getName()) | ||
| , flash(rom, AmdFlashChip::S29GL064S70TFI040, {}, config) | ||
| { | ||
| } | ||
|
|
||
| void RomAscii16X::reset(EmuTime::param /* time */) | ||
| { | ||
| ranges::iota(bankRegs, word(0)); | ||
|
|
||
| flash.reset(); | ||
|
|
||
| invalidateDeviceRCache(); // flush all to be sure | ||
| } | ||
|
|
||
| unsigned RomAscii16X::getFlashAddr(word addr) const | ||
| { | ||
| word bank = bankRegs[((addr >> 14) & 1) ^ 1]; | ||
| return (bank << 14) | (addr & 0x3FFF); | ||
| } | ||
|
|
||
| byte RomAscii16X::readMem(word addr, EmuTime::param /* time */) | ||
| { | ||
| return flash.read(getFlashAddr(addr)); | ||
| } | ||
|
|
||
| byte RomAscii16X::peekMem(word addr, EmuTime::param /* time */) const | ||
| { | ||
| return flash.peek(getFlashAddr(addr)); | ||
| } | ||
|
|
||
| const byte* RomAscii16X::getReadCacheLine(word addr) const | ||
| { | ||
| return flash.getReadCacheLine(getFlashAddr(addr)); | ||
| } | ||
|
|
||
| void RomAscii16X::writeMem(word addr, byte value, EmuTime::param /* time */) | ||
| { | ||
| flash.write(getFlashAddr(addr), value); | ||
|
|
||
| if ((addr & 0x3FFF) >= 0x2000) { | ||
| const word index = (addr >> 12) & 1; | ||
| bankRegs[index] = (addr & 0x0F00) | value; | ||
| invalidateDeviceRCache(0x4000 ^ (index << 14), 0x4000); | ||
| invalidateDeviceRCache(0xC000 ^ (index << 14), 0x4000); | ||
| } | ||
| } | ||
|
|
||
| byte* RomAscii16X::getWriteCacheLine(word /* addr */) | ||
| { | ||
| return nullptr; // not cacheable | ||
| } | ||
|
|
||
| RomAscii16X::Debuggable::Debuggable(MSXMotherBoard& motherBoard_, | ||
| const std::string& name_) | ||
| : SimpleDebuggable(motherBoard_, name_ + " regs", "ASCII16-X bank registers", 4) | ||
| { | ||
| } | ||
|
|
||
| byte RomAscii16X::Debuggable::read(unsigned address) | ||
| { | ||
| auto& outer = OUTER(RomAscii16X, debuggable); | ||
| word bank = outer.bankRegs[(address >> 1) & 1]; | ||
| return narrow<byte>(address & 1 ? bank >> 8 : bank & 0xFF); | ||
| } | ||
|
|
||
| void RomAscii16X::Debuggable::write(unsigned address, byte value, | ||
| EmuTime::param /* time */) | ||
| { | ||
| auto& outer = OUTER(RomAscii16X, debuggable); | ||
| word& bank = outer.bankRegs[(address >> 1) & 1]; | ||
| if (address & 1) { | ||
| bank = (bank & 0x00FF) | narrow<word>((value << 8) & 0x0F00); | ||
| } else { | ||
| bank = (bank & 0x0F00) | value; | ||
| } | ||
|
|
||
| outer.invalidateDeviceRCache(); | ||
| } | ||
|
|
||
| template<typename Archive> | ||
| void RomAscii16X::serialize(Archive& ar, unsigned /*version*/) | ||
| { | ||
| // skip MSXRom base class | ||
| ar.template serializeBase<MSXDevice>(*this); | ||
|
|
||
| ar.serialize("flash", flash, | ||
| "bankRegs", bankRegs); | ||
| } | ||
| INSTANTIATE_SERIALIZE_METHODS(RomAscii16X); | ||
| REGISTER_MSXDEVICE(RomAscii16X, "RomAscii16X"); | ||
|
|
||
| } // namespace openmsx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #ifndef ROMASCII16X_HH | ||
| #define ROMASCII16X_HH | ||
|
|
||
| #include "MSXRom.hh" | ||
| #include "AmdFlash.hh" | ||
| #include "SimpleDebuggable.hh" | ||
| #include <array> | ||
|
|
||
| namespace openmsx { | ||
|
|
||
| class RomAscii16X final : public MSXRom | ||
| { | ||
| public: | ||
| explicit RomAscii16X(const DeviceConfig& config); | ||
| RomAscii16X(const DeviceConfig& config, Rom&& rom); | ||
|
|
||
| void reset(EmuTime::param time) override; | ||
| [[nodiscard]] byte peekMem(word address, EmuTime::param time) const override; | ||
| [[nodiscard]] byte readMem(word address, EmuTime::param time) override; | ||
| [[nodiscard]] const byte* getReadCacheLine(word address) const override; | ||
| void writeMem(word address, byte value, EmuTime::param time) override; | ||
| [[nodiscard]] byte* getWriteCacheLine(word address) override; | ||
|
|
||
| template<typename Archive> | ||
| void serialize(Archive& ar, unsigned version); | ||
|
|
||
| private: | ||
| [[nodiscard]] unsigned getFlashAddr(word addr) const; | ||
|
|
||
| struct Debuggable final : SimpleDebuggable { | ||
| Debuggable(MSXMotherBoard& motherBoard, const std::string& name); | ||
| [[nodiscard]] byte read(unsigned address) override; | ||
| void write(unsigned address, byte value, EmuTime::param time) override; | ||
| } debuggable; | ||
|
|
||
| AmdFlash flash; | ||
|
|
||
| std::array<word, 2> bankRegs = {0, 0}; | ||
| }; | ||
|
|
||
| } // namespace openmsx | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ enum class RomType { | |
| ASCII16, | ||
| ASCII16_2, | ||
| ASCII16_8, | ||
| ASCII16X, | ||
| COLECOMEGACART, | ||
| CROSS_BLAIM, | ||
| DOOLY, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters