6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 16:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Attempts to get in-SNA software to start.

Browse Source
This commit is contained in:
Thomas Harte 2021-04-25 13:18:26 -04:00
parent 0ebd900e40
commit a5098a60ec
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Machines/Sinclair/ZXSpectrum/State.hpp
View File

@ -18,10 +18,12 @@ namespace ZXSpectrum {
struct State: public Reflection::StructImpl<State> { struct State: public Reflection::StructImpl<State> {
CPU::Z80::State z80; CPU::Z80::State z80;
std::vector<uint8_t> ram;
State() { State() {
if(needs_declare()) { if(needs_declare()) {
DeclareField(z80); DeclareField(z80);
DeclareField(ram);
} }
} }
}; };

1
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -127,6 +127,7 @@ template<Model model> class ConcreteMachine:
if(target.state) { if(target.state) {
const auto state = static_cast<State *>(target.state.get()); const auto state = static_cast<State *>(target.state.get());
state->z80.apply(z80_); state->z80.apply(z80_);
memcpy(ram_.data(), state->ram.data(), std::min(ram_.size(), state->ram.size()));
LOG("TODO: apply rest of state"); LOG("TODO: apply rest of state");
} }

12
Storage/State/SNA.cpp
View File

@ -63,9 +63,19 @@ std::unique_ptr<Analyser::Static::Target> SNA::load(const std::string &file_name
state->z80.registers.stack_pointer = file.get16le(); state->z80.registers.stack_pointer = file.get16le();
state->z80.registers.interrupt_mode = file.get8(); state->z80.registers.interrupt_mode = file.get8();
// TODO: border colour, RAM contents, then pop the program counter.
// 1A border colour // 1A border colour
const uint8_t border_colour = file.get8();
(void)border_colour; // TODO.
// 1B– 48kb RAM contents // 1B– 48kb RAM contents
state->ram = file.read(48*1024);
// Establish program counter.
state->z80.registers.program_counter = state->ram[state->z80.registers.stack_pointer];
state->ram[state->z80.registers.stack_pointer] = 0;
state->z80.registers.program_counter |= state->ram[state->z80.registers.stack_pointer+1] << 8;
state->ram[state->z80.registers.stack_pointer+1] = 0;
state->z80.registers.stack_pointer += 2;
return result; return result;
} }