1
0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-26 03:29:40 +00:00

Correct Copper start address.

This commit is contained in:
Thomas Harte
2021-09-16 21:01:37 -04:00
parent 692d87f446
commit 0eeaaa150a
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ bool Blitter::advance() {
printf("!!! %08x\n", pointer_[3]); printf("!!! %08x\n", pointer_[3]);
ram_[pointer_[3] & ram_mask_] = 0xffff; ram_[pointer_[3] & ram_mask_] = 0xffff;
--height_; height_ = 0;
return true; return true;
} }
+3 -3
View File
@@ -255,13 +255,13 @@ template <int cycle> void Chipset::output() {
((current_bitplanes_[3]&4) << 1) | ((current_bitplanes_[3]&4) << 1) |
((current_bitplanes_[4]&4) << 2) ((current_bitplanes_[4]&4) << 2)
]; ];
pixels_[3] = 0;/*palette_[ pixels_[3] = palette_[
((current_bitplanes_[0]&8) >> 3) | ((current_bitplanes_[0]&8) >> 3) |
((current_bitplanes_[1]&8) >> 2) | ((current_bitplanes_[1]&8) >> 2) |
((current_bitplanes_[2]&8) >> 1) | ((current_bitplanes_[2]&8) >> 1) |
((current_bitplanes_[3]&8) << 0) | ((current_bitplanes_[3]&8) << 0) |
((current_bitplanes_[4]&8) << 1) ((current_bitplanes_[4]&8) << 1)
];*/ ];
current_bitplanes_ >>= 4; current_bitplanes_ >>= 4;
pixels_ += 4; pixels_ += 4;
@@ -378,7 +378,7 @@ template <bool stop_on_cpu> int Chipset::advance_slots(int first_slot, int last_
C10(200); C10(210); C10(200); C10(210);
C(220); C(221); C(222); C(223); C(224); C(220); C(221); C(222); C(223); C(224);
C(225); C(226); C(227); C(228); C(225); C(226); C(227); C(228);
break; // break;
default: assert(false); default: assert(false);
} }
+1 -1
View File
@@ -202,7 +202,7 @@ class Chipset {
/// Forces a reload of address @c id (i.e. 0 or 1) and restarts the Copper. /// Forces a reload of address @c id (i.e. 0 or 1) and restarts the Copper.
template <int id> void reload() { template <int id> void reload() {
address_ = pointer_[id] >> 1; address_ = pointer_[id];
state_ = State::FetchFirstWord; state_ = State::FetchFirstWord;
} }