6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-20 10:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into OpenGLAgain

Browse Source
This commit is contained in:
Thomas Harte
2026-02-05 21:20:57 -05:00
parent 83231821cf fbb2776fa7
commit 6332c8ae8c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Machines/AmstradCPC/AmstradCPC.cpp
+7 -1
View File
@@ -1,4 +1,5 @@
//
//
// AmstradCPC.cpp
// Clock Signal
//
@@ -247,6 +248,7 @@ public:
/// Palette management: selects a pen to modify.
void select_pen(const int pen) {
assert(pen >= 0 && pen < 32);
pen_ = pen;
}
@@ -326,7 +328,7 @@ private:
if(!pixel_data_) {
pixel_pointer_ = pixel_data_ = crt_.begin_data(320, 8);
}
if(pixel_pointer_) {
if(pixel_data_) {
// the CPC shuffles output lines as:
// MA13 MA12 RA2 RA1 RA0 MA9 MA8 MA7 MA6 MA5 MA4 MA3 MA2 MA1 MA0 CCLK
// ... so form the real access address.
@@ -342,24 +344,28 @@ private:
// exactly reaching 320 output pixels.
switch(mode_) {
case 0:
assert(pixel_data_ + 320 >= pixel_data_ + 2 * sizeof(uint16_t));
reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode0_output_[ram_[address]];
reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode0_output_[ram_[address+1]];
pixel_pointer_ += 2 * sizeof(uint16_t);
break;
case 1:
assert(pixel_data_ + 320 >= pixel_data_ + 2 * sizeof(uint32_t));
reinterpret_cast<uint32_t *>(pixel_pointer_)[0] = mode1_output_[ram_[address]];
reinterpret_cast<uint32_t *>(pixel_pointer_)[1] = mode1_output_[ram_[address+1]];
pixel_pointer_ += 2 * sizeof(uint32_t);
break;
case 2:
assert(pixel_data_ + 320 >= pixel_data_ + 2 * sizeof(uint64_t));
reinterpret_cast<uint64_t *>(pixel_pointer_)[0] = mode2_output_[ram_[address]];
reinterpret_cast<uint64_t *>(pixel_pointer_)[1] = mode2_output_[ram_[address+1]];
pixel_pointer_ += 2 * sizeof(uint64_t);
break;
case 3:
assert(pixel_data_ + 320 >= pixel_data_ + 2 * sizeof(uint16_t));
reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode3_output_[ram_[address]];
reinterpret_cast<uint16_t *>(pixel_pointer_)[1] = mode3_output_[ram_[address+1]];
pixel_pointer_ += 2 * sizeof(uint16_t);