6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-02 14:31:20 +00:00
Code Issues Projects Releases Wiki Activity

Edges towards implementing an ADB device.

Browse Source
This commit is contained in:
Thomas Harte 2021-02-12 21:50:24 -05:00
parent ea40b2c982
commit 2c4dcf8843
8 changed files with 81 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InstructionSets/M50740/Executor.cpp
View File

@ -12,6 +12,8 @@
#include <cassert>
#include <cstring>
#include "../../Machines/Utility/MemoryFuzzer.hpp"
#define LOG_PREFIX "[M50740] "
#include "../../Outputs/Log.hpp"
@ -35,6 +37,8 @@ Executor::Executor(PortHandler &port_handler) : port_handler_(port_handler) {
performers_[c] = performer_lookup_.performer(instruction.operation, instruction.addressing_mode);
}
}
Memory::Fuzz(memory_);
}
void Executor::set_rom(const std::vector<uint8_t> &rom) {

2
Machines/Apple/ADB/Bus.hpp
View File

@ -23,7 +23,9 @@ struct Command {
Reset,
Flush,
Reserved,
/// The host wishes the device to store register contents.
Listen,
/// The host wishes the device to broadcast register contents.
Talk
};
const Type type = Type::Reserved;

30
Machines/Apple/ADB/Mouse.cpp Normal file
View File

@ -0,0 +1,30 @@
//
// Mouse.cpp
// Clock Signal
//
// Created by Thomas Harte on 12/02/2021.
// Copyright © 2021 Thomas Harte. All rights reserved.
//
#include "Mouse.hpp"
using namespace Apple::ADB;
Mouse::Mouse(Bus &bus) : ReactiveDevice(bus) {}
void Mouse::adb_bus_did_observe_event(Bus::Event event, uint8_t value) {
if(!next_is_command_ && event != Bus::Event::Attention) {
return;
}
if(next_is_command_ && event == Bus::Event::Byte) {
next_is_command_ = false;
const auto command = decode_command(value);
if(command.device != 3) {
return;
}
} else if(event == Bus::Event::Attention) {
next_is_command_ = true;
}
}

30
Machines/Apple/ADB/Mouse.hpp Normal file
View File

@ -0,0 +1,30 @@
//
// Mouse.hpp
// Clock Signal
//
// Created by Thomas Harte on 12/02/2021.
// Copyright © 2021 Thomas Harte. All rights reserved.
//
#ifndef Mouse_hpp
#define Mouse_hpp
#include "ReactiveDevice.hpp"
namespace Apple {
namespace ADB {
class Mouse: public ReactiveDevice {
public:
Mouse(Bus &);
void adb_bus_did_observe_event(Bus::Event event, uint8_t value) override;
private:
bool next_is_command_ = false;
};
}
}
#endif /* Mouse_hpp */

2
Machines/Apple/AppleIIgs/ADB.cpp
View File

@ -39,7 +39,7 @@ enum class MicrocontrollerFlags: uint8_t {
}
GLU::GLU() : executor_(*this), bus_(HalfCycles(1'789'772)), controller_id_(bus_.add_device()) {}
GLU::GLU() : executor_(*this), bus_(HalfCycles(1'789'772)), controller_id_(bus_.add_device()), mouse_(bus_) {}
// MARK: - External interface.

3
Machines/Apple/AppleIIgs/ADB.hpp
View File

@ -12,7 +12,9 @@
#include <cstdint>
#include <vector>
#include "../../../InstructionSets/M50740/Executor.hpp"
#include "../ADB/Bus.hpp"
#include "../ADB/Mouse.hpp"
namespace Apple {
namespace IIgs {
@ -55,6 +57,7 @@ class GLU: public InstructionSet::M50740::PortHandler {
size_t controller_id_;
// TODO: add some other devices, and attach them to the ADB bus.
Apple::ADB::Mouse mouse_;
};
}

6
Machines/Utility/MemoryFuzzer.hpp
View File

@ -21,9 +21,9 @@ void Fuzz(uint8_t *buffer, std::size_t size);
/// Stores @c size random 16-bit words from @c buffer onwards.
void Fuzz(uint16_t *buffer, std::size_t size);
/// Replaces all existing vector contents with random bytes.
template <typename T> void Fuzz(std::vector<T> &buffer) {
Fuzz(reinterpret_cast<uint8_t *>(buffer.data()), buffer.size() * sizeof(buffer[0]));
/// Replaces all existing vector or array contents with random bytes.
template <typename T> void Fuzz(T &buffer) {
Fuzz(reinterpret_cast<uint8_t *>(buffer.data()), buffer.size() * sizeof(typename T::value_type));
}
}

8
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
View File

@ -174,6 +174,8 @@
4B2E2D9D1C3A070400138695 /* Electron.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E2D9B1C3A070400138695 /* Electron.cpp */; };
4B2E86B725D7490E0024F1E9 /* ReactiveDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E86B525D7490E0024F1E9 /* ReactiveDevice.cpp */; };
4B2E86B825D7490E0024F1E9 /* ReactiveDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E86B525D7490E0024F1E9 /* ReactiveDevice.cpp */; };
4B2E86BE25D74F160024F1E9 /* Mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E86BC25D74F160024F1E9 /* Mouse.cpp */; };
4B2E86BF25D74F160024F1E9 /* Mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E86BC25D74F160024F1E9 /* Mouse.cpp */; };
4B302184208A550100773308 /* DiskII.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B302183208A550100773308 /* DiskII.cpp */; };
4B302185208A550100773308 /* DiskII.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B302183208A550100773308 /* DiskII.cpp */; };
4B30512D1D989E2200B4FED8 /* Drive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B30512B1D989E2200B4FED8 /* Drive.cpp */; };
@ -1120,6 +1122,8 @@
4B2E2D9C1C3A070400138695 /* Electron.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Electron.hpp; path = Electron/Electron.hpp; sourceTree = "<group>"; };
4B2E86B525D7490E0024F1E9 /* ReactiveDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ReactiveDevice.cpp; sourceTree = "<group>"; };
4B2E86B625D7490E0024F1E9 /* ReactiveDevice.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ReactiveDevice.hpp; sourceTree = "<group>"; };
4B2E86BC25D74F160024F1E9 /* Mouse.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Mouse.cpp; sourceTree = "<group>"; };
4B2E86BD25D74F160024F1E9 /* Mouse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Mouse.hpp; sourceTree = "<group>"; };
4B302182208A550100773308 /* DiskII.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = DiskII.hpp; sourceTree = "<group>"; };
4B302183208A550100773308 /* DiskII.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DiskII.cpp; sourceTree = "<group>"; };
4B30512B1D989E2200B4FED8 /* Drive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Drive.cpp; sourceTree = "<group>"; };
@ -4195,6 +4199,8 @@
4BCE1DF025D4C3FA00AE7A2B /* Bus.hpp */,
4B2E86B525D7490E0024F1E9 /* ReactiveDevice.cpp */,
4B2E86B625D7490E0024F1E9 /* ReactiveDevice.hpp */,
4B2E86BC25D74F160024F1E9 /* Mouse.cpp */,
4B2E86BD25D74F160024F1E9 /* Mouse.hpp */,
);
path = ADB;
sourceTree = "<group>";
@ -5028,6 +5034,7 @@
4B055AC11FAE98DC0060FFFF /* MachineForTarget.cpp in Sources */,
4B65086122F4CFE0009C1100 /* Keyboard.cpp in Sources */,
4BBB70A9202014E2002FE009 /* MultiProducer.cpp in Sources */,
4B2E86BF25D74F160024F1E9 /* Mouse.cpp in Sources */,
4B6ED2F1208E2F8A0047B343 /* WOZ.cpp in Sources */,
4B055AD81FAE9B180060FFFF /* Video.cpp in Sources */,
4B89452F201967B4007DE474 /* StaticAnalyser.cpp in Sources */,
@ -5252,6 +5259,7 @@
4B89453C201967B4007DE474 /* StaticAnalyser.cpp in Sources */,
4B595FAD2086DFBA0083CAA8 /* AudioToggle.cpp in Sources */,
4B1497921EE4B5A800CE2596 /* ZX8081.cpp in Sources */,
4B2E86BE25D74F160024F1E9 /* Mouse.cpp in Sources */,
4B643F3F1D77B88000D431D6 /* DocumentController.swift in Sources */,
4BDA00E422E663B900AC3CD0 /* NSData+CRC32.m in Sources */,
4BB8616E24E22DC500A00E03 /* BufferingScanTarget.cpp in Sources */,