6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-05 10:28:58 +00:00
Code Issues Projects Releases Wiki Activity

VHPOSR's fields are the other way around.

Browse Source
This commit is contained in:
Thomas Harte 2021-10-30 12:04:46 -07:00
parent 9ecd43238f
commit 02c88e6826
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/Amiga/Chipset.cpp
View File

@ -586,7 +586,9 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
switch(RW(register_address)) {
default:
LOG("Unimplemented chipset " << (cycle.operation & Microcycle::Read ? "read" : "write") << " " << PADHEX(6) << *cycle.address);
assert(false);
if(cycle.operation & Microcycle::Read) {
cycle.set_value16(0xffff);
}
break;
// Raster position.
@ -594,8 +596,8 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
const uint16_t position = uint16_t(y_ >> 8);
cycle.set_value16(position);
} break;
case Read(0x006): { // VHPOSR; b0–b7 = b0–b7 of y position; b8–b15 = horizontal position.
const uint16_t position = uint16_t(((line_cycle_ << 6) & 0xff00) | (y_ & 0x00ff));
case Read(0x006): { // VHPOSR; b0–b7 = horizontal; b8–b15 = low bits of vertical position.
const uint16_t position = uint16_t(((line_cycle_ >> 1) & 0x00ff) | (y_ << 8));
cycle.set_value16(position);
} break;