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

Merge branch 'master' into AtariST

Browse Source
This commit is contained in:
Thomas Harte 2019-10-27 21:40:51 -04:00
commit 92847037b3
3 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -41,7 +41,7 @@ namespace AmstradCPC {
std::vector<std::unique_ptr<Configurable::Option>> get_options() { std::vector<std::unique_ptr<Configurable::Option>> get_options() {
return Configurable::standard_options( return Configurable::standard_options(
static_cast<Configurable::StandardOptions>(Configurable::DisplayRGB | Configurable::DisplayCompositeColour) Configurable::StandardOptions(Configurable::DisplayRGB | Configurable::DisplayCompositeColour)
); );
} }
@ -171,7 +171,7 @@ class AYDeferrer {
*/ */
class CRTCBusHandler { class CRTCBusHandler {
public: public:
CRTCBusHandler(uint8_t *ram, InterruptTimer &interrupt_timer) : CRTCBusHandler(const uint8_t *ram, InterruptTimer &interrupt_timer) :
crt_(1024, 1, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Red2Green2Blue2), crt_(1024, 1, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Red2Green2Blue2),
ram_(ram), ram_(ram),
interrupt_timer_(interrupt_timer) { interrupt_timer_(interrupt_timer) {
@ -250,7 +250,7 @@ class CRTCBusHandler {
// MA13 MA12 RA2 RA1 RA0 MA9 MA8 MA7 MA6 MA5 MA4 MA3 MA2 MA1 MA0 CCLK // MA13 MA12 RA2 RA1 RA0 MA9 MA8 MA7 MA6 MA5 MA4 MA3 MA2 MA1 MA0 CCLK
// ... so form the real access address. // ... so form the real access address.
const uint16_t address = const uint16_t address =
static_cast<uint16_t>( uint16_t(
((state.refresh_address & 0x3ff) << 1) | ((state.refresh_address & 0x3ff) << 1) |
((state.row_address & 0x7) << 11) | ((state.row_address & 0x7) << 11) |
((state.refresh_address & 0x3000) << 2) ((state.refresh_address & 0x3000) << 2)
@ -263,25 +263,25 @@ class CRTCBusHandler {
case 0: case 0:
reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode0_output_[ram_[address]]; reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode0_output_[ram_[address]];
reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode0_output_[ram_[address+1]]; reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode0_output_[ram_[address+1]];
pixel_pointer_ += 4; pixel_pointer_ += 2 * sizeof(uint16_t);
break; break;
case 1: case 1:
reinterpret_cast<uint32_t *>(pixel_pointer_)[0] = mode1_output_[ram_[address]]; reinterpret_cast<uint32_t *>(pixel_pointer_)[0] = mode1_output_[ram_[address]];
reinterpret_cast<uint32_t *>(pixel_pointer_)[1] = mode1_output_[ram_[address+1]]; reinterpret_cast<uint32_t *>(pixel_pointer_)[1] = mode1_output_[ram_[address+1]];
pixel_pointer_ += 8; pixel_pointer_ += 2 * sizeof(uint32_t);
break; break;
case 2: case 2:
reinterpret_cast<uint64_t *>(pixel_pointer_)[0] = mode2_output_[ram_[address]]; reinterpret_cast<uint64_t *>(pixel_pointer_)[0] = mode2_output_[ram_[address]];
reinterpret_cast<uint64_t *>(pixel_pointer_)[1] = mode2_output_[ram_[address+1]]; reinterpret_cast<uint64_t *>(pixel_pointer_)[1] = mode2_output_[ram_[address+1]];
pixel_pointer_ += 16; pixel_pointer_ += 2 * sizeof(uint64_t);
break; break;
case 3: case 3:
reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode3_output_[ram_[address]]; reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode3_output_[ram_[address]];
reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode3_output_[ram_[address+1]]; reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode3_output_[ram_[address+1]];
pixel_pointer_ += 4; pixel_pointer_ += 2 * sizeof(uint16_t);
break; break;
} }
@ -397,16 +397,16 @@ class CRTCBusHandler {
void establish_palette_hits() { void establish_palette_hits() {
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
mode0_palette_hits_[Mode0Colour0(c)].push_back(static_cast<uint8_t>(c)); mode0_palette_hits_[Mode0Colour0(c)].push_back(uint8_t(c));
mode0_palette_hits_[Mode0Colour1(c)].push_back(static_cast<uint8_t>(c)); mode0_palette_hits_[Mode0Colour1(c)].push_back(uint8_t(c));
mode1_palette_hits_[Mode1Colour0(c)].push_back(static_cast<uint8_t>(c)); mode1_palette_hits_[Mode1Colour0(c)].push_back(uint8_t(c));
mode1_palette_hits_[Mode1Colour1(c)].push_back(static_cast<uint8_t>(c)); mode1_palette_hits_[Mode1Colour1(c)].push_back(uint8_t(c));
mode1_palette_hits_[Mode1Colour2(c)].push_back(static_cast<uint8_t>(c)); mode1_palette_hits_[Mode1Colour2(c)].push_back(uint8_t(c));
mode1_palette_hits_[Mode1Colour3(c)].push_back(static_cast<uint8_t>(c)); mode1_palette_hits_[Mode1Colour3(c)].push_back(uint8_t(c));
mode3_palette_hits_[Mode3Colour0(c)].push_back(static_cast<uint8_t>(c)); mode3_palette_hits_[Mode3Colour0(c)].push_back(uint8_t(c));
mode3_palette_hits_[Mode3Colour1(c)].push_back(static_cast<uint8_t>(c)); mode3_palette_hits_[Mode3Colour1(c)].push_back(uint8_t(c));
} }
} }
@ -416,7 +416,7 @@ class CRTCBusHandler {
// Mode 0: abcdefgh -> [gcea] [hdfb] // Mode 0: abcdefgh -> [gcea] [hdfb]
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
// prepare mode 0 // prepare mode 0
uint8_t *mode0_pixels = reinterpret_cast<uint8_t *>(&mode0_output_[c]); uint8_t *const mode0_pixels = reinterpret_cast<uint8_t *>(&mode0_output_[c]);
mode0_pixels[0] = palette_[Mode0Colour0(c)]; mode0_pixels[0] = palette_[Mode0Colour0(c)];
mode0_pixels[1] = palette_[Mode0Colour1(c)]; mode0_pixels[1] = palette_[Mode0Colour1(c)];
} }
@ -425,7 +425,7 @@ class CRTCBusHandler {
case 1: case 1:
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
// prepare mode 1 // prepare mode 1
uint8_t *mode1_pixels = reinterpret_cast<uint8_t *>(&mode1_output_[c]); uint8_t *const mode1_pixels = reinterpret_cast<uint8_t *>(&mode1_output_[c]);
mode1_pixels[0] = palette_[Mode1Colour0(c)]; mode1_pixels[0] = palette_[Mode1Colour0(c)];
mode1_pixels[1] = palette_[Mode1Colour1(c)]; mode1_pixels[1] = palette_[Mode1Colour1(c)];
mode1_pixels[2] = palette_[Mode1Colour2(c)]; mode1_pixels[2] = palette_[Mode1Colour2(c)];
@ -436,7 +436,7 @@ class CRTCBusHandler {
case 2: case 2:
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
// prepare mode 2 // prepare mode 2
uint8_t *mode2_pixels = reinterpret_cast<uint8_t *>(&mode2_output_[c]); uint8_t *const mode2_pixels = reinterpret_cast<uint8_t *>(&mode2_output_[c]);
mode2_pixels[0] = palette_[((c & 0x80) >> 7)]; mode2_pixels[0] = palette_[((c & 0x80) >> 7)];
mode2_pixels[1] = palette_[((c & 0x40) >> 6)]; mode2_pixels[1] = palette_[((c & 0x40) >> 6)];
mode2_pixels[2] = palette_[((c & 0x20) >> 5)]; mode2_pixels[2] = palette_[((c & 0x20) >> 5)];
@ -451,7 +451,7 @@ class CRTCBusHandler {
case 3: case 3:
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
// prepare mode 3 // prepare mode 3
uint8_t *mode3_pixels = reinterpret_cast<uint8_t *>(&mode3_output_[c]); uint8_t *const mode3_pixels = reinterpret_cast<uint8_t *>(&mode3_output_[c]);
mode3_pixels[0] = palette_[Mode3Colour0(c)]; mode3_pixels[0] = palette_[Mode3Colour0(c)];
mode3_pixels[1] = palette_[Mode3Colour1(c)]; mode3_pixels[1] = palette_[Mode3Colour1(c)];
} }
@ -463,7 +463,7 @@ class CRTCBusHandler {
switch(mode_) { switch(mode_) {
case 0: { case 0: {
for(uint8_t c : mode0_palette_hits_[pen]) { for(uint8_t c : mode0_palette_hits_[pen]) {
uint8_t *mode0_pixels = reinterpret_cast<uint8_t *>(&mode0_output_[c]); uint8_t *const mode0_pixels = reinterpret_cast<uint8_t *>(&mode0_output_[c]);
mode0_pixels[0] = palette_[Mode0Colour0(c)]; mode0_pixels[0] = palette_[Mode0Colour0(c)];
mode0_pixels[1] = palette_[Mode0Colour1(c)]; mode0_pixels[1] = palette_[Mode0Colour1(c)];
} }
@ -471,7 +471,7 @@ class CRTCBusHandler {
case 1: case 1:
if(pen > 3) return; if(pen > 3) return;
for(uint8_t c : mode1_palette_hits_[pen]) { for(uint8_t c : mode1_palette_hits_[pen]) {
uint8_t *mode1_pixels = reinterpret_cast<uint8_t *>(&mode1_output_[c]); uint8_t *const mode1_pixels = reinterpret_cast<uint8_t *>(&mode1_output_[c]);
mode1_pixels[0] = palette_[Mode1Colour0(c)]; mode1_pixels[0] = palette_[Mode1Colour0(c)];
mode1_pixels[1] = palette_[Mode1Colour1(c)]; mode1_pixels[1] = palette_[Mode1Colour1(c)];
mode1_pixels[2] = palette_[Mode1Colour2(c)]; mode1_pixels[2] = palette_[Mode1Colour2(c)];
@ -488,7 +488,7 @@ class CRTCBusHandler {
if(pen > 3) return; if(pen > 3) return;
// Same argument applies here as to case 1, as the unused bits aren't masked out. // Same argument applies here as to case 1, as the unused bits aren't masked out.
for(uint8_t c : mode3_palette_hits_[pen]) { for(uint8_t c : mode3_palette_hits_[pen]) {
uint8_t *mode3_pixels = reinterpret_cast<uint8_t *>(&mode3_output_[c]); uint8_t *const mode3_pixels = reinterpret_cast<uint8_t *>(&mode3_output_[c]);
mode3_pixels[0] = palette_[Mode3Colour0(c)]; mode3_pixels[0] = palette_[Mode3Colour0(c)];
mode3_pixels[1] = palette_[Mode3Colour1(c)]; mode3_pixels[1] = palette_[Mode3Colour1(c)];
} }
@ -538,7 +538,7 @@ class CRTCBusHandler {
Outputs::CRT::CRT crt_; Outputs::CRT::CRT crt_;
uint8_t *pixel_data_ = nullptr, *pixel_pointer_ = nullptr; uint8_t *pixel_data_ = nullptr, *pixel_pointer_ = nullptr;
uint8_t *ram_ = nullptr; const uint8_t *const ram_ = nullptr;
int next_mode_ = 2, mode_ = 2; int next_mode_ = 2, mode_ = 2;
@ -574,7 +574,7 @@ class KeyboardState: public GI::AY38910::PortHandler {
Sets the row currently being reported to the AY. Sets the row currently being reported to the AY.
*/ */
void set_row(int row) { void set_row(int row) {
row_ = static_cast<size_t>(row); row_ = size_t(row);
} }
/*! /*!
@ -593,7 +593,7 @@ class KeyboardState: public GI::AY38910::PortHandler {
*/ */
void set_is_pressed(bool is_pressed, int line, int key) { void set_is_pressed(bool is_pressed, int line, int key) {
int mask = 1 << key; int mask = 1 << key;
assert(static_cast<size_t>(line) < sizeof(rows_)); assert(size_t(line) < sizeof(rows_));
if(is_pressed) rows_[line] &= ~mask; else rows_[line] |= mask; if(is_pressed) rows_[line] &= ~mask; else rows_[line] |= mask;
} }
@ -826,8 +826,8 @@ template <bool has_fdc> class ConcreteMachine:
for(std::size_t index = 0; index < roms.size(); ++index) { for(std::size_t index = 0; index < roms.size(); ++index) {
auto &data = roms[index]; auto &data = roms[index];
if(!data) throw ROMMachine::Error::MissingROMs; if(!data) throw ROMMachine::Error::MissingROMs;
roms_[static_cast<int>(index)] = std::move(*data); roms_[int(index)] = std::move(*data);
roms_[static_cast<int>(index)].resize(16384); roms_[int(index)].resize(16384);
} }
// Establish default memory map // Establish default memory map

3
OSBindings/Mac/Clock SignalTests/MacintoshVideoTests.mm
View File

@ -23,7 +23,8 @@
- (void)setUp { - (void)setUp {
// Put setup code here. This method is called before the invocation of each test method in the class. // Put setup code here. This method is called before the invocation of each test method in the class.
_video.reset(new Apple::Macintosh::Video(_ram, _dummy_audio, _dummy_drive_speed_accumulator)); _video.reset(new Apple::Macintosh::Video(_dummy_audio, _dummy_drive_speed_accumulator));
_video->set_ram(_ram, sizeof(_ram) - 1);
} }
- (void)testPrediction { - (void)testPrediction {

4
Outputs/OpenGL/ScanTarget.cpp
View File

@ -174,8 +174,10 @@ void ScanTarget::end_scan() {
} }
uint8_t *ScanTarget::begin_data(size_t required_length, size_t required_alignment) { uint8_t *ScanTarget::begin_data(size_t required_length, size_t required_alignment) {
assert(required_alignment);
if(allocation_has_failed_) return nullptr; if(allocation_has_failed_) return nullptr;
if(!write_area_texture_.size()) { if(write_area_texture_.empty()) {
allocation_has_failed_ = true; allocation_has_failed_ = true;
return nullptr; return nullptr;
} }