6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-22 12:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Allow chip RAM size selection, while I'm here.

Browse Source
This commit is contained in:
Thomas Harte 2021-12-22 15:30:19 -05:00
parent 1916a9b99c
commit a17c192a9e
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Analyser/Static/Amiga/Target.hpp
View File

@ -17,6 +17,10 @@ namespace Static {
namespace Amiga { namespace Amiga {
struct Target: public Analyser::Static::Target, public Reflection::StructImpl<Target> { struct Target: public Analyser::Static::Target, public Reflection::StructImpl<Target> {
ReflectableEnum(ChipRAM,
FiveHundredAndTwelveKilobytes,
OneMegabyte,
TwoMegabytes);
ReflectableEnum(FastRAM, ReflectableEnum(FastRAM,
None, None,
OneMegabyte, OneMegabyte,
@ -24,12 +28,15 @@ struct Target: public Analyser::Static::Target, public Reflection::StructImpl<Ta
FourMegabytes, FourMegabytes,
EightMegabytes); EightMegabytes);
FastRAM fast_ram = FastRAM::TwoMegabytes; ChipRAM chip_ram = ChipRAM::FiveHundredAndTwelveKilobytes;
FastRAM fast_ram = FastRAM::EightMegabytes;
Target() : Analyser::Static::Target(Machine::Amiga) { Target() : Analyser::Static::Target(Machine::Amiga) {
if(needs_declare()) { if(needs_declare()) {
DeclareField(fast_ram); DeclareField(fast_ram);
DeclareField(chip_ram);
AnnounceEnum(FastRAM); AnnounceEnum(FastRAM);
AnnounceEnum(ChipRAM);
} }
} }
}; };

2
Machines/Amiga/Amiga.cpp
View File

@ -53,7 +53,7 @@ class ConcreteMachine:
public: public:
ConcreteMachine(const Analyser::Static::Amiga::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : ConcreteMachine(const Analyser::Static::Amiga::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) :
mc68000_(*this), mc68000_(*this),
memory_(target.fast_ram), memory_(target.chip_ram, target.fast_ram),
chipset_(memory_, PALClockRate) chipset_(memory_, PALClockRate)
{ {
// Temporary: use a hard-coded Kickstart selection. // Temporary: use a hard-coded Kickstart selection.

23
Machines/Amiga/MemoryMap.hpp
View File

@ -11,6 +11,10 @@
#include "../../Analyser/Static/Amiga/Target.hpp" #include "../../Analyser/Static/Amiga/Target.hpp"
#include <array>
#include <cassert>
#include <vector>
namespace Amiga { namespace Amiga {
class MemoryMap { class MemoryMap {
@ -20,9 +24,8 @@ class MemoryMap {
static constexpr auto PermitReadWrite = PermitRead | PermitWrite; static constexpr auto PermitReadWrite = PermitRead | PermitWrite;
public: public:
// TODO: decide what of the below I want to be dynamic.
std::array<uint8_t, 512*1024> kickstart{0xff}; std::array<uint8_t, 512*1024> kickstart{0xff};
std::array<uint8_t, 1024*1024> chip_ram{}; std::vector<uint8_t> chip_ram{};
struct MemoryRegion { struct MemoryRegion {
uint8_t *contents = nullptr; uint8_t *contents = nullptr;
@ -30,7 +33,8 @@ class MemoryMap {
} regions[64]; // i.e. top six bits are used as an index. } regions[64]; // i.e. top six bits are used as an index.
using FastRAM = Analyser::Static::Amiga::Target::FastRAM; using FastRAM = Analyser::Static::Amiga::Target::FastRAM;
MemoryMap(FastRAM fast_ram_size) { using ChipRAM = Analyser::Static::Amiga::Target::ChipRAM;
MemoryMap(ChipRAM chip_ram_size, FastRAM fast_ram_size) {
// Address spaces that matter: // Address spaces that matter:
// //
// 00'0000 – 08'0000: chip RAM. [or overlayed KickStart] // 00'0000 – 08'0000: chip RAM. [or overlayed KickStart]
@ -49,6 +53,19 @@ class MemoryMap {
// fc'0000 – : 256kb Kickstart otherwise. // fc'0000 – : 256kb Kickstart otherwise.
set_region(0xfc'0000, 0x1'00'0000, kickstart.data(), PermitRead); set_region(0xfc'0000, 0x1'00'0000, kickstart.data(), PermitRead);
switch(chip_ram_size) {
default:
case ChipRAM::FiveHundredAndTwelveKilobytes:
chip_ram.resize(512 * 1024);
break;
case ChipRAM::OneMegabyte:
chip_ram.resize(1 * 1024 * 1024);
break;
case ChipRAM::TwoMegabytes:
chip_ram.resize(2 * 1024 * 1024);
break;
}
switch(fast_ram_size) { switch(fast_ram_size) {
default: default:
fast_autoconf_visible_ = false; fast_autoconf_visible_ = false;