6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-17 10:06:21 +00:00
Code Issues Projects Releases Wiki Activity
17cad73177
CLK/Machines/Oric/Oric.cpp

821 lines
25 KiB
C++
Raw Normal View History

Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
//
// Oric.cpp
// Clock Signal
//
// Created by Thomas Harte on 11/10/2016.
Removes all instances of the copyright symbol.
2018-05-13 19:19:52 +00:00
// Copyright 2016 Thomas Harte. All rights reserved.
Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
//
#include "Oric.hpp"
Within the `Typer` framework: hatched out `CharacterMapper` as a distinct thing from the target for keypresses, better to formalise responsibility but also to make it easy cleanly to sever that stuff into its own little part.
2017-08-03 15:42:31 +00:00
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
#include "BD500.hpp"
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
#include "Jasmin.hpp"
Completes clean-up of post-formalisation per-machine keyboard code. At least for now. Standardising on how column + row is encoded might be helpful.
2017-10-21 14:52:35 +00:00
#include "Keyboard.hpp"
Transfers possession of keyboard mappings from the Mac side over to individual machines. Specifically by establishing an intermediate representation of a useful mix between the American and British IBM and Mac keyboard layouts, and routing through that.
2017-10-13 02:25:02 +00:00
#include "Microdisc.hpp"
#include "Video.hpp"
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Makes the Oric an event source.
2018-05-12 03:05:36 +00:00
#include "../../Activity/Source.hpp"
Splits 'CRTMachine' into three parts: ScanProducer, AudioProducer, TimedMachine. Simultaneously cleans up some of the naming conventions and tries to make things a bit more template-compatible.
2020-04-02 03:19:34 +00:00
#include "../MachineTypes.hpp"
Eliminates diamond inheritance of KeyboardMachine::Machine by typers. Specifically by pulling the key action stuff into a purely abstract class [/interface]. Takes the opportunity to unpublish a bunch of machine details.
2018-03-09 20:19:02 +00:00
Relocates things that were in Machines/ for machine usage. Leaving only those things intended to be visible interface.
2017-10-21 14:30:02 +00:00
#include "../Utility/MemoryFuzzer.hpp"
Factors string serialisation with \n\r conversion out of the Apple II and reuses it with the Oric.
2018-05-13 17:57:19 +00:00
#include "../Utility/StringSerialiser.hpp"
Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
#include "../../Processors/6502Esque/6502Selector.hpp"
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
#include "../../Components/6522/6522.hpp"
#include "../../Components/AY38910/AY38910.hpp"
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
#include "../../Components/DiskII/DiskII.hpp"
Within the `Typer` framework: hatched out `CharacterMapper` as a distinct thing from the target for keypresses, better to formalise responsibility but also to make it easy cleanly to sever that stuff into its own little part.
2017-08-03 15:42:31 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
#include "../../Storage/Tape/Tape.hpp"
#include "../../Storage/Tape/Parsers/Oric.hpp"
Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
Added the option not to include ready line support in the 6502 core, and took advantage of it in the Electron, Oric and Vic-20 implementations. Also tagged those as forceinline and/or override final where applicable.
2017-08-22 01:56:42 +00:00
#include "../../ClockReceiver/ForceInline.hpp"
Formally standardises machine options and introduces a --help option for the SDL target.
2017-11-21 02:55:32 +00:00
#include "../../Configurable/StandardOptions.hpp"
Separates LowpassFilter and SampleSource.
2017-12-19 02:39:23 +00:00
#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
Added the option not to include ready line support in the 6502 core, and took advantage of it in the Electron, Oric and Vic-20 implementations. Also tagged those as forceinline and/or override final where applicable.
2017-08-22 01:56:42 +00:00
Encapsulates machine configuration properties for all remaining platforms.
2018-03-09 21:07:29 +00:00
#include "../../Analyser/Static/Oric/Target.hpp"
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
#include "../../ClockReceiver/JustInTime.hpp"
Eliminates the Oric's non-reflective inputs for selections, and the Oric-specific ROM setter.
2017-11-24 21:59:00 +00:00
#include <cstdint>
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
#include <memory>
Eliminates the Oric's non-reflective inputs for selections, and the Oric-specific ROM setter.
2017-11-24 21:59:00 +00:00
#include <vector>
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
namespace {
/*!
Provides an Altai-style joystick.
*/
class Joystick: public Inputs::ConcreteJoystick {
public:
Joystick() :
ConcreteJoystick({
Input(Input::Up),
Input(Input::Down),
Input(Input::Left),
Input(Input::Right),
Input(Input::Fire)
}) {}
void did_set_input(const Input &digital_input, bool is_active) final {
#define APPLY(b) if(is_active) state_ &= ~b; else state_ |= b;
switch(digital_input.type) {
default: return;
case Input::Right: APPLY(0x02); break;
case Input::Left: APPLY(0x01); break;
case Input::Down: APPLY(0x08); break;
case Input::Up: APPLY(0x10); break;
case Input::Fire: APPLY(0x20); break;
}
#undef APPLY
}
uint8_t get_state() {
return state_;
}
private:
uint8_t state_ = 0xff;
};
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
namespace Oric {
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
using DiskInterface = Analyser::Static::Oric::Target::DiskInterface;
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
using Processor = Analyser::Static::Oric::Target::Processor;
Fixed: individual audio generators now either are or are not stereo. The speaker acts accordingly.
2020-02-16 23:28:03 +00:00
using AY = GI::AY38910::AY38910<false>;
Splits the lowpass filter into push and pull variants.
2021-11-21 20:37:29 +00:00
using Speaker = Outputs::Speaker::PullLowpass<AY>;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
Eliminates the Oric's non-reflective inputs for selections, and the Oric-specific ROM setter.
2017-11-24 21:59:00 +00:00
enum ROM {
BASIC10 = 0, BASIC11, Microdisc, Colour
};
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
/*!
Models the Oric's keyboard: eight key rows, containing a bitfield of keys set.
Active line is selected through a port on the Oric's VIA, and a column mask is
selected via a port on the AY, returning a single Boolean representation of the
logical OR of every key selected by the column mask on the active row.
*/
class Keyboard {
public:
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
struct SpecialKeyHandler {
virtual void perform_special_key(Oric::Key key) = 0;
};
Keyboard(SpecialKeyHandler *handler) : special_key_handler_(handler) {
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
clear_all_keys();
}
/// Sets whether @c key is or is not pressed, per @c is_pressed.
void set_key_state(uint16_t key, bool is_pressed) {
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
switch(key) {
default: {
const uint8_t mask = key & 0xff;
const int line = key >> 8;
if(is_pressed) rows_[line] |= mask;
else rows_[line] &= ~mask;
} break;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
case KeyNMI:
case KeyJasminReset:
if(is_pressed) {
special_key_handler_->perform_special_key(Oric::Key(key));
}
break;
}
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
/// Sets all keys as unpressed.
void clear_all_keys() {
memset(rows_, 0, sizeof(rows_));
}
/// Selects the active row.
void set_active_row(uint8_t row) {
row_ = row & 7;
}
/// Queries the keys on the active row specified by @c mask.
bool query_column(uint8_t column_mask) {
return !!(rows_[row_] & column_mask);
}
private:
uint8_t row_ = 0;
uint8_t rows_[8];
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
SpecialKeyHandler *const special_key_handler_;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
};
/*!
Provide's the Oric's tape player: a standard binary-sampled tape which also holds
an instance of the Oric tape parser, to provide fast-tape loading.
*/
class TapePlayer: public Storage::Tape::BinaryTapePlayer {
public:
TapePlayer() : Storage::Tape::BinaryTapePlayer(1000000) {}
/*!
Parses the incoming tape event stream to obtain the next stored byte.
@param use_fast_encoding If set to @c true , inspects the tape as though it
is encoded in the Oric's fast-loading scheme. Otherwise looks for a slow-encoded byte.
@returns The next byte from the tape.
*/
uint8_t get_next_byte(bool use_fast_encoding) {
Further doubles down on construction syntax for type conversions.
2020-05-10 03:00:39 +00:00
return uint8_t(parser_.get_next_byte(get_tape(), use_fast_encoding));
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
private:
Storage::Tape::Oric::Parser parser_;
};
/*!
Implements the Oric's VIA's port handler. On the Oric the VIA's ports connect
to the AY, the tape's motor control signal and the keyboard.
*/
class VIAPortHandler: public MOS::MOS6522::IRQDelegatePortHandler {
public:
Switch name back to emphasise _async_.
2022-07-16 18:41:04 +00:00
VIAPortHandler(Concurrency::AsyncTaskQueue<false> &audio_queue, AY &ay8910, Speaker &speaker, TapePlayer &tape_player, Keyboard &keyboard) :
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
audio_queue_(audio_queue), ay8910_(ay8910), speaker_(speaker), tape_player_(tape_player), keyboard_(keyboard)
{
// Attach a couple of joysticks.
joysticks_.emplace_back(new Joystick);
joysticks_.emplace_back(new Joystick);
}
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
/*!
Reponds to the 6522's control line output change signal; on an Oric A2 is connected to
the AY's BDIR, and B2 is connected to the AY's A2.
*/
void set_control_line_output(MOS::MOS6522::Port port, MOS::MOS6522::Line line, bool value) {
if(line) {
if(port) ay_bdir_ = value; else ay_bc1_ = value;
update_ay();
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
ay8910_.set_control_lines( (GI::AY38910::ControlLines)((ay_bdir_ ? GI::AY38910::BDIR : 0) | (ay_bc1_ ? GI::AY38910::BC1 : 0) | GI::AY38910::BC2));
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
}
/*!
Reponds to changes in the 6522's port output. On an Oric port B sets the tape motor control
and the keyboard's active row. Port A is connected to the AY's data bus.
*/
Eliminate various other errant spaces.
2023-05-16 20:40:09 +00:00
void set_port_output(MOS::MOS6522::Port port, uint8_t value, uint8_t) {
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
if(port) {
keyboard_.set_active_row(value);
tape_player_.set_motor_control(value & 0x40);
} else {
update_ay();
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
ay8910_.set_data_input(value);
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
porta_output_ = value;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
}
/*!
Provides input data for the 6522. Port B reads the keyboard, and port A reads from the AY.
*/
uint8_t get_port_input(MOS::MOS6522::Port port) {
if(port) {
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
uint8_t column = ay8910_.get_port_output(false) ^ 0xff;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
return keyboard_.query_column(column) ? 0x08 : 0x00;
} else {
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
uint8_t result = ay8910_.get_data_output();
if(porta_output_ & 0x40) result &= static_cast<Joystick *>(joysticks_[0].get())->get_state();
if(porta_output_ & 0x80) result &= static_cast<Joystick *>(joysticks_[1].get())->get_state();
return result;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
}
/*!
Advances time. This class manages the AY's concept of time to permit updating-on-demand.
*/
With some time additions to the 6522, starts wiring in Macintosh audio. The audio buffer is also the disk motor buffer, so this is preparatory to further disk work.
2019-06-01 18:39:40 +00:00
inline void run_for(const HalfCycles cycles) {
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
cycles_since_ay_update_ += cycles;
}
/// Flushes any queued behaviour (which, specifically, means on the AY).
void flush() {
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
update_ay();
audio_queue_.perform();
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
const std::vector<std::unique_ptr<Inputs::Joystick>> &get_joysticks() {
return joysticks_;
}
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
private:
void update_ay() {
Starts trying to formalise just-in-time execution. Which, at least, simplifies Cycle/HalfCycle to Cycle run_for usage via template.
2019-07-29 01:49:54 +00:00
speaker_.run_for(audio_queue_, cycles_since_ay_update_.flush<Cycles>());
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
}
bool ay_bdir_ = false;
bool ay_bc1_ = false;
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
uint8_t porta_output_ = 0xff;
With some time additions to the 6522, starts wiring in Macintosh audio. The audio buffer is also the disk motor buffer, so this is preparatory to further disk work.
2019-06-01 18:39:40 +00:00
HalfCycles cycles_since_ay_update_;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
Switch name back to emphasise _async_.
2022-07-16 18:41:04 +00:00
Concurrency::AsyncTaskQueue<false> &audio_queue_;
Fixed: individual audio generators now either are or are not stereo. The speaker acts accordingly.
2020-02-16 23:28:03 +00:00
AY &ay8910_;
Nudges the LowpassSpeaker towards supporting stereo generation.
2020-02-15 23:03:12 +00:00
Speaker &speaker_;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
TapePlayer &tape_player_;
Keyboard &keyboard_;
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
std::vector<std::unique_ptr<Inputs::Joystick>> joysticks_;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
};
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
template <Analyser::Static::Oric::Target::DiskInterface disk_interface, CPU::MOS6502Esque::Type processor_type> class ConcreteMachine:
Splits 'CRTMachine' into three parts: ScanProducer, AudioProducer, TimedMachine. Simultaneously cleans up some of the naming conventions and tries to make things a bit more template-compatible.
2020-04-02 03:19:34 +00:00
public MachineTypes::TimedMachine,
public MachineTypes::ScanProducer,
public MachineTypes::AudioProducer,
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
public MachineTypes::JoystickMachine,
Splits 'CRTMachine' into three parts: ScanProducer, AudioProducer, TimedMachine. Simultaneously cleans up some of the naming conventions and tries to make things a bit more template-compatible.
2020-04-02 03:19:34 +00:00
public MachineTypes::MediaTarget,
public MachineTypes::MappedKeyboardMachine,
Eliminates diamond inheritance of KeyboardMachine::Machine by typers. Specifically by pulling the key action stuff into a purely abstract class [/interface]. Takes the opportunity to unpublish a bunch of machine details.
2018-03-09 20:19:02 +00:00
public Configurable::Device,
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
public CPU::MOS6502::BusHandler,
Deconstitutes the 6522 into component parts, templated and non-templated. Adjusts the Oric, Vic-20 and C-1540 accordingly, albeit with the quickest possible solutions.
2017-09-04 18:26:04 +00:00
public MOS::MOS6522::IRQDelegatePortHandler::Delegate,
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
public Storage::Tape::BinaryTapePlayer::Delegate,
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
public DiskController::Delegate,
Makes the Oric an event source.
2018-05-12 03:05:36 +00:00
public Activity::Source,
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
public Machine,
public Keyboard::SpecialKeyHandler {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
public:
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
ConcreteMachine(const Analyser::Static::Oric::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) :
Starts to expand the range of supported 6502s. This fully implements the NES 6502 because, well, it's virtually no extra work, and ensures that RDY takes effect on write cycles on 65C02s.
2018-08-14 02:17:22 +00:00
m6502_(*this),
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
video_(ram_),
Adds an explicit declaration of chip type to all AY users.
2019-12-19 00:28:41 +00:00
ay8910_(GI::AY38910::Personality::AY38910, audio_queue_),
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
speaker_(ay8910_),
via_port_handler_(audio_queue_, ay8910_, speaker_, tape_player_, keyboard_),
Introduces more granular clocking announcements to the Disk II. As well as making it accept the clock rate it'll actually receive, to supply to the drives, so that they spin at the proper speed.
2018-05-28 21:19:29 +00:00
via_(via_port_handler_),
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
keyboard_(this),
Introduces more granular clocking announcements to the Disk II. As well as making it accept the clock rate it'll actually receive, to supply to the drives, so that they spin at the proper speed.
2018-05-28 21:19:29 +00:00
diskii_(2000000) {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
set_clock_rate(1000000);
Restores Oric audio.
2019-02-06 02:42:39 +00:00
speaker_.set_input_rate(1000000.0f);
Deconstitutes the 6522 into component parts, templated and non-templated. Adjusts the Oric, Vic-20 and C-1540 accordingly, albeit with the quickest possible solutions.
2017-09-04 18:26:04 +00:00
via_port_handler_.set_interrupt_delegate(this);
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
tape_player_.set_delegate(this);
Ensures no possible initial NTSC, removes printfs.
2020-01-16 04:47:45 +00:00
// Slight hack here: I'm unclear what RAM should look like at startup.
// Actually, I think completely random might be right since the Microdisc
// sort of assumes it, but also the BD-500 never explicitly sets PAL mode
// so I can't have any switch-to-NTSC bytes in the display area. Hence:
// disallow all atributes.
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Memory::Fuzz(ram_, sizeof(ram_));
Ensures no possible initial NTSC, removes printfs.
2020-01-16 04:47:45 +00:00
for(size_t c = 0; c < sizeof(ram_); ++c) {
Fixes quick-NTSC-avoidance fix. I suspect this is very temporary, but here it is.
2020-01-16 05:01:16 +00:00
ram_[c] |= 0x40;
Ensures no possible initial NTSC, removes printfs.
2020-01-16 04:47:45 +00:00
}
Enhances the Disk II's ability to sleep. Also enables Disk II sleep observation in the Oric.
2018-05-20 03:15:28 +00:00
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
::ROM::Request request = ::ROM::Request(::ROM::Name::OricColourROM, true);
::ROM::Name basic;
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
switch(target.rom) {
Resolves various ROM selection warnings.
2021-06-04 02:46:47 +00:00
case Analyser::Static::Oric::Target::ROM::BASIC10: basic = ::ROM::Name::OricBASIC10; break;
default:
case Analyser::Static::Oric::Target::ROM::BASIC11: basic = ::ROM::Name::OricBASIC11; break;
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
case Analyser::Static::Oric::Target::ROM::Pravetz: basic = ::ROM::Name::OricPravetzBASIC; break;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
}
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
request = request && ::ROM::Request(basic);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
switch(disk_interface) {
default: break;
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
case DiskInterface::BD500:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
request = request && ::ROM::Request(::ROM::Name::OricByteDrive500);
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Jasmin:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
request = request && ::ROM::Request(::ROM::Name::OricJasmin);
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Microdisc:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
request = request && ::ROM::Request(::ROM::Name::OricMicrodisc);
Provides extended ROM details for the VIC-20 and Oric.
2019-07-23 02:15:44 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Pravetz:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
request = request && ::ROM::Request(::ROM::Name::Oric8DOSBoot) && ::ROM::Request(::ROM::Name::DiskIIStateMachine16Sector);
Provides extended ROM details for the VIC-20 and Oric.
2019-07-23 02:15:44 +00:00
break;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
}
Implements ROM::Request::validate. It now also validates ROM sizes, so can no longer take a const Map.
2021-06-04 22:54:50 +00:00
auto roms = rom_fetcher(request);
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
if(!request.validate(roms)) {
throw ROMMachine::Error::MissingROMs;
Implements install_roms on the Electron, Oric and ZX80/81.
2017-11-07 03:14:15 +00:00
}
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
// The colour ROM is optional; an alternative composite encoding can be used if
// it is absent.
const auto colour_rom = roms.find(::ROM::Name::OricColourROM);
if(colour_rom != roms.end()) {
video_->set_colour_rom(colour_rom->second);
}
rom_ = std::move(roms.find(basic)->second);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
switch(disk_interface) {
default: break;
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
case DiskInterface::BD500:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
disk_rom_ = std::move(roms.find(::ROM::Name::OricByteDrive500)->second);
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Jasmin:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
disk_rom_ = std::move(roms.find(::ROM::Name::OricJasmin)->second);
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Microdisc:
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
disk_rom_ = std::move(roms.find(::ROM::Name::OricMicrodisc)->second);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Pravetz: {
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
pravetz_rom_ = std::move(roms.find(::ROM::Name::Oric8DOSBoot)->second);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
pravetz_rom_.resize(512);
Starts to introduce a new grammar for ROM requests. They can be optional, and chained together in AND or OR combinations. A central catalogue knows the definitions of all ROMs.
2021-06-04 01:55:59 +00:00
diskii_->set_state_machine(roms.find(::ROM::Name::DiskIIStateMachine16Sector)->second);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
} break;
}
paged_rom_ = rom_.data();
Ensures all vectors loaded from disk are the expected size.
2017-11-25 03:22:32 +00:00
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
switch(target.disk_interface) {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
default: break;
Makes the Microdisc also a DiskController, and simplifies delegate interface.
2020-01-15 03:53:27 +00:00
case DiskInterface::BD500:
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
bd500_.set_delegate(this);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Jasmin:
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
jasmin_.set_delegate(this);
break;
Makes the Microdisc also a DiskController, and simplifies delegate interface.
2020-01-15 03:53:27 +00:00
case DiskInterface::Microdisc:
microdisc_.set_delegate(this);
break;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Implemented typer for the Oric, and I'm starting to think the code is a bit too repetitious. Refactoring will be forthcoming. Added CLOAD"" as the loading command for all Oric software.
2016-11-04 02:14:40 +00:00
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
if(!target.loading_command.empty()) {
type_string(target.loading_command);
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
if(target.should_start_jasmin) {
// If Jasmin autostart is requested then plan to do so in 3 seconds; empirically long enough
// for the Oric to boot normally, before the Jasmin intercedes.
jasmin_reset_counter_ = 3000000;
}
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
switch(target.rom) {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
case Analyser::Static::Oric::Target::ROM::BASIC10:
tape_get_byte_address_ = 0xe630;
tape_speed_address_ = 0x67;
break;
case Analyser::Static::Oric::Target::ROM::BASIC11:
case Analyser::Static::Oric::Target::ROM::Pravetz:
tape_get_byte_address_ = 0xe6c9;
tape_speed_address_ = 0x024d;
break;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Split the static analyser functionality so that it's possible just to ask for the set of media implied by a particular file. Extended ConfigurationTarget so that media alone can be pushed to a machine.
2017-08-17 14:48:29 +00:00
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
insert_media(target.media);
}
~ConcreteMachine() {
audio_queue_.flush();
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void set_key_state(uint16_t key, bool is_pressed) final {
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
if(key == KeyNMI) {
m6502_.set_nmi_line(is_pressed);
} else {
keyboard_.set_key_state(key, is_pressed);
}
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void clear_all_keys() final {
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
keyboard_.clear_all_keys();
}
void set_use_fast_tape_hack(bool activate) {
use_fast_tape_hack_ = activate;
Split the static analyser functionality so that it's possible just to ask for the set of media implied by a particular file. Extended ConfigurationTarget so that media alone can be pushed to a machine.
2017-08-17 14:48:29 +00:00
}
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
template <typename DiskInterface> bool insert_disks(const Analyser::Static::Media &media, DiskInterface &interface, int num_drives) {
int drive_index = 0;
for(auto &disk : media.disks) {
interface.set_disk(disk, drive_index);
++drive_index;
if(drive_index == num_drives) break;
}
return true;
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
bool insert_media(const Analyser::Static::Media &media) final {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
bool inserted = false;
Simplifies initialisation procedure for all machines. With the side effect of allowing every machine to try to load only the ROMs that it needs.
2018-07-11 00:00:46 +00:00
if(!media.tapes.empty()) {
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
tape_player_.set_tape(media.tapes.front());
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
inserted = true;
Split the static analyser functionality so that it's possible just to ask for the set of media implied by a particular file. Extended ConfigurationTarget so that media alone can be pushed to a machine.
2017-08-17 14:48:29 +00:00
}
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
if(!media.disks.empty()) {
switch(disk_interface) {
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
case DiskInterface::BD500: inserted |= insert_disks(media, bd500_, 4); break;
case DiskInterface::Jasmin: inserted |= insert_disks(media, jasmin_, 4); break;
case DiskInterface::Microdisc: inserted |= insert_disks(media, microdisc_, 4); break;
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
case DiskInterface::Pravetz: inserted |= insert_disks(media, *diskii_.last_valid(), 2); break;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
default: break;
}
Split the static analyser functionality so that it's possible just to ask for the set of media implied by a particular file. Extended ConfigurationTarget so that media alone can be pushed to a machine.
2017-08-17 14:48:29 +00:00
}
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
return inserted;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Added enough wiring to get Oric TAPs through to a completely unimplemented Oric emulation.
2016-10-12 02:20:13 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// to satisfy CPU::MOS6502::BusHandler
Added the option not to include ready line support in the 6502 core, and took advantage of it in the Electron, Oric and Vic-20 implementations. Also tagged those as forceinline and/or override final where applicable.
2017-08-22 01:56:42 +00:00
forceinline Cycles perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value) {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
if(address > ram_top_) {
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = paged_rom_[address - ram_top_ - 1];
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// 024D = 0 => fast; otherwise slow
// E6C9 = read byte: return byte in A
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
if( address == tape_get_byte_address_ &&
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
paged_rom_ == rom_.data() &&
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
use_fast_tape_hack_ &&
operation == CPU::MOS6502::BusOperation::ReadOpcode &&
tape_player_.has_tape() &&
!tape_player_.get_tape()->is_at_end()) {
uint8_t next_byte = tape_player_.get_next_byte(!ram_[tape_speed_address_]);
Eliminate type-in-function-name from 6502-world.
2023-05-10 23:53:38 +00:00
m6502_.set_value_of(CPU::MOS6502Esque::A, next_byte);
m6502_.set_value_of(CPU::MOS6502Esque::Flags, next_byte ? 0 : CPU::MOS6502::Flag::Zero);
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
*value = 0x60; // i.e. RTS
}
} else {
if((address & 0xff00) == 0x0300) {
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
if(address < 0x0310 || (disk_interface == DiskInterface::None)) {
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = via_.read(address);
Standardises on `read` and `write` for bus accesses. Logic being: name these things for the bus action they model, not the effect they have.
2020-01-05 18:40:02 +00:00
else via_.write(address, *value);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
} else {
switch(disk_interface) {
default: break;
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
case DiskInterface::BD500:
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = bd500_.read(address);
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
else bd500_.write(address, *value);
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Jasmin:
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
if(address >= 0x3f4) {
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = jasmin_.read(address);
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
else jasmin_.write(address, *value);
}
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Microdisc:
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
switch(address) {
case 0x0310: case 0x0311: case 0x0312: case 0x0313:
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = microdisc_.read(address);
Standardises on `read` and `write` for bus accesses. Logic being: name these things for the bus action they model, not the effect they have.
2020-01-05 18:40:02 +00:00
else microdisc_.write(address, *value);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
break;
case 0x314: case 0x315: case 0x316: case 0x317:
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = microdisc_.get_interrupt_request_register();
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
else microdisc_.set_control_register(*value);
break;
case 0x318: case 0x319: case 0x31a: case 0x31b:
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = microdisc_.get_data_request_register();
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
break;
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Pravetz:
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
if(address >= 0x0320) {
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation)) *value = pravetz_rom_[pravetz_rom_base_pointer_ + (address & 0xff)];
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
else {
switch(address) {
case 0x380: case 0x381: case 0x382: case 0x383:
Pulls out a couple of repeating constants.
2018-05-10 00:28:25 +00:00
ram_top_ = (address&1) ? basic_invisible_ram_top_ : basic_visible_ram_top_;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
pravetz_rom_base_pointer_ = (address&2) ? 0x100 : 0x000;
break;
}
}
} else {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
const int disk_value = diskii_->read_address(address);
if(!isWriteOperation(operation) && disk_value != Apple::DiskII::DidNotLoad) *value = uint8_t(disk_value);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
break;
}
}
} else {
Flips conditionals to ensure 65802 safety.
2021-02-03 01:52:34 +00:00
if(!isWriteOperation(operation))
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
*value = ram_[address];
else {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
if(address >= 0x9800 && address <= 0xc000) video_.flush();
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
ram_[address] = *value;
}
}
}
Added a VIA. Now it's time to find out how poor my 6522 emulation is.
2016-10-14 00:50:55 +00:00
Eliminates all emdashes in cross-platform code.
2018-05-13 19:34:31 +00:00
// $02df is where the Oric ROMs; all of them, including BASIC 1.0, 1.1 and the Pravetz; have the
Switches the Oric to string insertion at the time of consumption. To avoid issues around keyboard scanning being decoupled from consumption via IRQ, but not buffered. Keys pressed while BASIC is otherwise busy are just lost.
2018-05-13 18:02:46 +00:00
// IRQ routine store an incoming keystroke in order for reading to occur later. By capturing the
// read rather than the decode and write: (i) nothing is lost while BASIC is parsing; and
// (ii) keyboard input is much more rapid.
if(string_serialiser_ && address == 0x02df && operation == CPU::MOS6502::BusOperation::Read) {
*value = string_serialiser_->head() | 0x80;
Factors string serialisation with \n\r conversion out of the Apple II and reuses it with the Oric.
2018-05-13 17:57:19 +00:00
if(!string_serialiser_->advance()) string_serialiser_.reset();
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Started iterating towards having an AY and a fully-working keyboard.
2016-10-15 01:18:03 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
via_.run_for(Cycles(1));
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
tape_player_.run_for(Cycles(1));
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
switch(disk_interface) {
default: break;
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
case DiskInterface::BD500:
Factors out paging, implements a bit more of the BD500. That is, enough seemingly fully to work, if I force the drive to report ready.
2020-01-16 04:15:39 +00:00
bd500_.run_for(Cycles(9)); // i.e. effective clock rate of 9Mhz.
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Jasmin:
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
jasmin_.run_for(Cycles(8)); // i.e. effective clock rate of 8Mhz.
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
// Jasmin autostart hack: wait for a period, then trigger a reset, having forced
Fixed: the issue was failing to propagate motor control. Also it seems to be incorrect to have the Jasmin paged at initial boot.
2020-01-06 02:35:20 +00:00
// the Jasmin to page its ROM in first. I assume the latter being what the Jasmin's
// hardware boot button did.
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
if(jasmin_reset_counter_) {
--jasmin_reset_counter_;
if(!jasmin_reset_counter_) {
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
perform_special_key(KeyJasminReset);
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
}
}
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Microdisc:
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
microdisc_.run_for(Cycles(8)); // i.e. effective clock rate of 8Mhz.
Eliminates the fiction of setting and getting registers. The Disk II seems lower level than that; it will read the data bus whenever it likes, it is the programmer's responsibility to keep up with that. It also reserves the right not to load the bus regardless of whether it receives a read or write access.
2018-05-18 01:39:11 +00:00
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Pravetz:
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
if(diskii_.clocking_preference() == ClockingHint::Preference::RealTime) {
diskii_->set_data_input(*value);
Enhances the Disk II's ability to sleep. Also enables Disk II sleep observation in the Oric.
2018-05-20 03:15:28 +00:00
}
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
diskii_ += Cycles(2); // i.e. effective clock rate of 2Mhz.
Eliminates the fiction of setting and getting registers. The Disk II seems lower level than that; it will read the data bus whenever it likes, it is the programmer's responsibility to keep up with that. It also reserves the right not to load the bus regardless of whether it receives a read or write access.
2018-05-18 01:39:11 +00:00
break;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
}
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
video_ += Cycles(1);
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
return Cycles(1);
}
Started iterating towards having an AY and a fully-working keyboard.
2016-10-15 01:18:03 +00:00
Switch to `int`; attempt to do a better job of initial audio filling.
2022-07-09 17:33:46 +00:00
void flush_output(int outputs) final {
if(outputs & Output::Video) {
Adopt granular flushing widely.
2022-07-08 20:04:32 +00:00
video_.flush();
}
Switch to `int`; attempt to do a better job of initial audio filling.
2022-07-09 17:33:46 +00:00
if(outputs & Output::Audio) {
Adopt granular flushing widely.
2022-07-08 20:04:32 +00:00
via_.flush();
}
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
diskii_.flush();
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Factored out the now-sampling binary-level tape player from the Vic and connected it up to the Oric.
2016-10-16 01:21:18 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// to satisfy CRTMachine::Machine
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void set_scan_target(Outputs::Display::ScanTarget *scan_target) final {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
video_.last_valid()->set_scan_target(scan_target);
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Made fast loading optional.
2016-11-03 11:59:30 +00:00
Ensures proper manipulation of scan_statuses, leading to the correct result out of a CRTMachine. Possibly with the exception of the TMS, as I appear to have uncovered an unrelated issue there.
2020-01-22 03:28:25 +00:00
Outputs::Display::ScanStatus get_scaled_scan_status() const final {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
return video_.last_valid()->get_scaled_scan_status();
Adds the necessary routine for all machines to be able to respond to get_scan_status. They all just as the CRT, as all are currently based on the CRT. Which doesn't currently know the total clock rate it would need to in order properly to scale the answer to the question. Further thought coming.
2020-01-21 02:45:10 +00:00
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void set_display_type(Outputs::Display::DisplayType display_type) final {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
video_.last_valid()->set_display_type(display_type);
Wires through `set_display_type`.
2018-11-30 04:44:21 +00:00
}
Increases const correctness, marks some additional constructors as constexpr, switches std::atomic construction style.
2020-05-21 03:34:26 +00:00
Outputs::Display::DisplayType get_display_type() const final {
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
return video_.last_valid()->get_display_type();
Reintroduces Oric runtime options.
2020-03-18 22:31:31 +00:00
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
Outputs::Speaker::Speaker *get_speaker() final {
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
return &speaker_;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Reintroduced clocking of the AY and boxed in the range of the master divider a little further.
2016-10-31 02:51:08 +00:00
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void run_for(const Cycles cycles) final {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
m6502_.run_for(cycles);
}
Reintroduced clocking of the AY and boxed in the range of the master divider a little further.
2016-10-31 02:51:08 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// to satisfy MOS::MOS6522IRQDelegate::Delegate
Starts to add Qt target; resolves many build warnings.
2020-05-30 04:37:06 +00:00
void mos6522_did_change_interrupt_status(void *) final {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
set_interrupt_line();
}
Reintroduced clocking of the AY and boxed in the range of the master divider a little further.
2016-10-31 02:51:08 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// to satisfy Storage::Tape::BinaryTapePlayer::Delegate
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void tape_did_change_input(Storage::Tape::BinaryTapePlayer *tape_player) final {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// set CB1
Deconstitutes the 6522 into component parts, templated and non-templated. Adjusts the Oric, Vic-20 and C-1540 accordingly, albeit with the quickest possible solutions.
2017-09-04 18:26:04 +00:00
via_.set_control_line_input(MOS::MOS6522::Port::B, MOS::MOS6522::Line::One, !tape_player->get_input());
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Shifted code out of the header.
2016-10-21 00:53:17 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// for Utility::TypeRecipient::Delegate
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
void type_string(const std::string &string) final {
Embraces std::make_[unique/shared] in place of .reset(new .
2019-12-24 02:31:46 +00:00
string_serialiser_ = std::make_unique<Utility::StringSerialiser>(string, true);
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
}
Completed curly bracket movement.
2017-03-26 18:34:47 +00:00
Increases const correctness, marks some additional constructors as constexpr, switches std::atomic construction style.
2020-05-21 03:34:26 +00:00
bool can_type(char c) const final {
Extends logic for when to fall back on standard keypress logic even in logical mode.
2020-03-02 01:25:12 +00:00
// Make an effort to type the entire printable ASCII range.
return c >= 32 && c < 127;
}
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
// DiskController::Delegate
Makes the Microdisc also a DiskController, and simplifies delegate interface.
2020-01-15 03:53:27 +00:00
void disk_controller_did_change_paged_item(DiskController *controller) final {
switch(controller->get_paged_item()) {
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
default:
ram_top_ = basic_visible_ram_top_;
paged_rom_ = rom_.data();
break;
Makes the Microdisc also a DiskController, and simplifies delegate interface.
2020-01-15 03:53:27 +00:00
case DiskController::PagedItem::RAM:
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
ram_top_ = basic_invisible_ram_top_;
break;
Makes the Microdisc also a DiskController, and simplifies delegate interface.
2020-01-15 03:53:27 +00:00
case DiskController::PagedItem::DiskROM:
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
ram_top_ = uint16_t(0xffff - disk_rom_.size());
paged_rom_ = disk_rom_.data();
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
break;
}
}
// WD::WD1770::Delegate
Starts to add Qt target; resolves many build warnings.
2020-05-30 04:37:06 +00:00
void wd1770_did_change_output(WD::WD1770 *) final {
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
set_interrupt_line();
}
Shifted code out of the header.
2016-10-21 00:53:17 +00:00
All these 'override's can be 'final's. At least for the purpose of being communicative. I doubt there's much to gain in terms of compiler output — the DiskImageHolder can avoid some virtual lookups but nothing else leaps out.
2020-01-24 03:57:51 +00:00
KeyboardMapper *get_keyboard_mapper() final {
Adds multiple target versions of all the DynamicMachine-vended types.
2018-02-09 21:31:05 +00:00
return &keyboard_mapper_;
Transfers possession of keyboard mappings from the Mac side over to individual machines. Specifically by establishing an intermediate representation of a useful mix between the American and British IBM and Mac keyboard layouts, and routing through that.
2017-10-13 02:25:02 +00:00
}
Adds configuration options to the Vic-20, Oric and ZX80/81.
2017-11-19 00:48:10 +00:00
// MARK: - Configuration options.
Starts a switch to reflectable-style runtime options. The Amstrad CPC and ZX80/81 have made the jump so far, subject to caveats. The macOS build is unlikely currently to work properly.
2020-03-17 03:25:05 +00:00
std::unique_ptr<Reflection::Struct> get_options() final {
Reintroduces Oric runtime options.
2020-03-18 22:31:31 +00:00
auto options = std::make_unique<Options>(Configurable::OptionsType::UserFriendly);
options->output = get_video_signal_configurable();
options->quickload = use_fast_tape_hack_;
return options;
Adds configuration options to the Vic-20, Oric and ZX80/81.
2017-11-19 00:48:10 +00:00
}
Reintroduces Oric runtime options.
2020-03-18 22:31:31 +00:00
void set_options(const std::unique_ptr<Reflection::Struct> &str) final {
const auto options = dynamic_cast<Options *>(str.get());
set_video_signal_configurable(options->output);
set_use_fast_tape_hack(options->quickload);
Adds configuration options to the Vic-20, Oric and ZX80/81.
2017-11-19 00:48:10 +00:00
}
All these 'override's can be 'final's. At least for the purpose of being communicative. I doubt there's much to gain in terms of compiler output — the DiskImageHolder can avoid some virtual lookups but nothing else leaps out.
2020-01-24 03:57:51 +00:00
void set_activity_observer(Activity::Observer *observer) final {
Makes the Oric an event source.
2018-05-12 03:05:36 +00:00
switch(disk_interface) {
default: break;
Adds activity indicators for the BD-500 and Jasmin. Also slightly cleans up DiskController a little further.
2020-01-16 04:39:15 +00:00
case DiskInterface::BD500:
bd500_.set_activity_observer(observer);
break;
case DiskInterface::Jasmin:
jasmin_.set_activity_observer(observer);
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Microdisc:
Makes the Oric an event source.
2018-05-12 03:05:36 +00:00
microdisc_.set_activity_observer(observer);
break;
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
case DiskInterface::Pravetz:
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
diskii_->set_activity_observer(observer);
Makes the Oric an event source.
2018-05-12 03:05:36 +00:00
break;
}
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
private:
Pulls out a couple of repeating constants.
2018-05-10 00:28:25 +00:00
const uint16_t basic_invisible_ram_top_ = 0xffff;
const uint16_t basic_visible_ram_top_ = 0xbfff;
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
CPU::MOS6502Esque::Processor<processor_type, ConcreteMachine, false> m6502_;
Shifted code out of the header.
2016-10-21 00:53:17 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// RAM and ROM
Factors out from the Jasmin the stuff that I'm going to need to repeat for the BD-500.
2020-01-15 03:23:00 +00:00
std::vector<uint8_t> rom_, disk_rom_;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
uint8_t ram_[65536];
Shifted code out of the header.
2016-10-21 00:53:17 +00:00
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// ROM bookkeeping
Switches the Oric to string insertion at the time of consumption. To avoid issues around keyboard scanning being decoupled from consumption via IRQ, but not buffered. Keys pressed while BASIC is otherwise busy are just lost.
2018-05-13 18:02:46 +00:00
uint16_t tape_get_byte_address_ = 0, tape_speed_address_ = 0;
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
int keyboard_read_count_ = 0;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// Outputs
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
JustInTimeActor<VideoOutput, Cycles> video_;
Separates the component parts of running an audio stream: task deferral, filtering and generation. Walking towards improving opportunities for composition.
2017-12-18 02:26:06 +00:00
Switch name back to emphasise _async_.
2022-07-16 18:41:04 +00:00
Concurrency::AsyncTaskQueue<false> audio_queue_;
Fixed: individual audio generators now either are or are not stereo. The speaker acts accordingly.
2020-02-16 23:28:03 +00:00
GI::AY38910::AY38910<false> ay8910_;
Nudges the LowpassSpeaker towards supporting stereo generation.
2020-02-15 23:03:12 +00:00
Speaker speaker_;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Transfers possession of keyboard mappings from the Mac side over to individual machines. Specifically by establishing an intermediate representation of a useful mix between the American and British IBM and Mac keyboard layouts, and routing through that.
2017-10-13 02:25:02 +00:00
// Inputs
Oric::KeyboardMapper keyboard_mapper_;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
// The tape
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
TapePlayer tape_player_;
bool use_fast_tape_hack_ = false;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Reformulates the Oric more cleanly into the modern world. Specifically: now that the implementation is contained within the CPP file, there's no need to embed the keyboard, tape player and VIA port handler as private classes. Also the pain of additional syntax is reduced, so the keyboard has been bumped up to a fully data-hiding class. I've also transferred overall ownership of the tape player, AY and keyboard up to the Oric itself, with the VIA merely being wired to them, and added a whole bunch of extra documentation.
2017-09-04 22:22:14 +00:00
VIAPortHandler via_port_handler_;
MOS::MOS6522::MOS6522<VIAPortHandler> via_;
Keyboard keyboard_;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
// the Microdisc, if in use.
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
class Microdisc microdisc_;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
// the Jasmin, if in use.
Jasmin jasmin_;
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
int jasmin_reset_counter_ = 0;
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
Adds enough of a BD500 for the boot sector seemingly to load.
2020-01-15 04:15:27 +00:00
// the BD-500, if in use.
BD500 bd500_;
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
// the Pravetz/Disk II, if in use.
Translates Oric video and Disk II into JustInTimeActors.
2021-04-05 00:43:16 +00:00
JustInTimeActor<Apple::DiskII, Cycles> diskii_;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
std::vector<uint8_t> pravetz_rom_;
std::size_t pravetz_rom_base_pointer_ = 0;
// Overlay RAM
Pulls out a couple of repeating constants.
2018-05-10 00:28:25 +00:00
uint16_t ram_top_ = basic_visible_ram_top_;
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
uint8_t *paged_rom_ = nullptr;
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
// Helper to discern current IRQ state
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
inline void set_interrupt_line() {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
bool irq_line = via_.get_interrupt_line();
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
// The Microdisc directly provides an interrupt line.
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
if constexpr (disk_interface == DiskInterface::Microdisc) {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
irq_line |= microdisc_.get_interrupt_request_line();
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
}
// The Jasmin reroutes its data request line to the processor's interrupt line.
It seems like Jasmin paged in at boot, and button = page back in and reset works? At least, that gets me a 'boot failed' error. Which is something.
2020-01-06 01:34:15 +00:00
if constexpr (disk_interface == DiskInterface::Jasmin) {
Attempts to implement most of a Jasmin disk interface. With one obvious omission: there's no way to start it? The real interface had a dedicated button, but I don't yet know what that button did. Research needed.
2020-01-06 01:05:55 +00:00
irq_line |= jasmin_.get_data_request_line();
}
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
m6502_.set_irq_line(irq_line);
This is the broad strokes effort at enabling Microdisc emulation.
2016-11-25 12:15:48 +00:00
}
Factors string serialisation with \n\r conversion out of the Apple II and reuses it with the Oric.
2018-05-13 17:57:19 +00:00
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
// Keys that aren't read by polling.
All these 'override's can be 'final's. At least for the purpose of being communicative. I doubt there's much to gain in terms of compiler output — the DiskImageHolder can avoid some virtual lookups but nothing else leaps out.
2020-01-24 03:57:51 +00:00
void perform_special_key(Oric::Key key) final {
Makes Jasmin autoboot optional, adds a Jasmin reset key, adds the Jasmin to File -> New... . Also finally implements KeyNMI.
2020-01-06 02:57:33 +00:00
switch(key) {
default: break;
case KeyJasminReset:
jasmin_.write(0x3fa, 0);
jasmin_.write(0x3fb, 1);
m6502_.set_power_on(true);
break;
case KeyNMI:
// As luck would have it, the 6502's NMI line is edge triggered.
// So just forcing through an edge will work here.
m6502_.set_nmi_line(true);
m6502_.set_nmi_line(false);
break;
}
}
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
// MARK: - typing
Factors string serialisation with \n\r conversion out of the Apple II and reuses it with the Oric.
2018-05-13 17:57:19 +00:00
std::unique_ptr<Utility::StringSerialiser> string_serialiser_;
Adds Altai-style joystick support.
2021-04-29 22:29:29 +00:00
// MARK: - Joysticks
const std::vector<std::unique_ptr<Inputs::Joystick>> &get_joysticks() override {
return via_port_handler_.get_joysticks();
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
};
This is the broad strokes effort at enabling Microdisc emulation.
2016-11-25 12:15:48 +00:00
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
using namespace Oric;
Avoid use of raw pointers in machine creation.
2024-01-13 03:03:19 +00:00
std::unique_ptr<Machine> Machine::Oric(const Analyser::Static::Target *target_hint, const ROMMachine::ROMFetcher &rom_fetcher) {
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
auto *const oric_target = dynamic_cast<const Analyser::Static::Oric::Target *>(target_hint);
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
#define DiskInterfaceSwitch(processor) \
switch(oric_target->disk_interface) { \
Avoid use of raw pointers in machine creation.
2024-01-13 03:03:19 +00:00
default: return std::make_unique<ConcreteMachine<DiskInterface::None, processor>>(*oric_target, rom_fetcher); \
case DiskInterface::Microdisc: return std::make_unique<ConcreteMachine<DiskInterface::Microdisc, processor>>(*oric_target, rom_fetcher); \
case DiskInterface::Pravetz: return std::make_unique<ConcreteMachine<DiskInterface::Pravetz, processor>>(*oric_target, rom_fetcher); \
case DiskInterface::Jasmin: return std::make_unique<ConcreteMachine<DiskInterface::Jasmin, processor>>(*oric_target, rom_fetcher); \
case DiskInterface::BD500: return std::make_unique<ConcreteMachine<DiskInterface::BD500, processor>>(*oric_target, rom_fetcher); \
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
}
switch(oric_target->processor) {
case Processor::WDC65816: DiskInterfaceSwitch(CPU::MOS6502Esque::Type::TWDC65816);
case Processor::MOS6502: DiskInterfaceSwitch(CPU::MOS6502Esque::Type::T6502);
Makes attempt to implement support for the Pravetz 8D + 8DOS. i.e. the Disk II wired up to the Oric, with some ROM swaps.
2018-05-09 02:05:43 +00:00
}
Adds the 65816 as an in-code option for Oric emulation. This also means it'll be exposed via the SDL build, but that's okay.
2020-10-19 01:43:08 +00:00
#undef DiskInterfaceSwitch
Tackles outstanding GCC warnings.
2020-11-23 02:43:56 +00:00
return nullptr;
This is the broad strokes effort at enabling Microdisc emulation.
2016-11-25 12:15:48 +00:00
}
Hid most of the Oric innards, and corrected a potential multi-thread access error emanating from the Mac side of the world.
2017-08-16 18:35:53 +00:00
Machine::~Machine() {}
Reference in New Issue Copy Permalink