folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bus address update fix

Browse source
This commit is contained in:
folkert van heusden 2024-04-17 10:40:56 +02:00
parent 67835c7a07
commit 04bd8ac6eb
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rk05.cpp
View file

@ -87,14 +87,7 @@ void rk05::writeByte(const uint16_t addr, const uint8_t v)
{ {
uint16_t vtemp = registers[(addr - RK05_BASE) / 2]; uint16_t vtemp = registers[(addr - RK05_BASE) / 2];
if (addr & 1) { update_word(&vtemp, addr & 1, v);
vtemp &= ~0xff00;
vtemp |= v << 8;
}
else {
vtemp &= ~0x00ff;
vtemp |= v;
}
writeWord(addr, vtemp); writeWord(addr, vtemp);
} }
@ -135,7 +128,6 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
uint8_t *xfer_buffer = new uint8_t[reclen]; uint8_t *xfer_buffer = new uint8_t[reclen];
uint32_t p = reclen;
for(size_t i=0; i<reclen; i++) for(size_t i=0; i<reclen; i++)
xfer_buffer[i] = b->readUnibusByte(memoff + i); xfer_buffer[i] = b->readUnibusByte(memoff + i);
@ -145,7 +137,7 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
if (v & 2048) if (v & 2048)
DOLOG(debug, false, "RK05 inhibit BA increase"); DOLOG(debug, false, "RK05 inhibit BA increase");
else else
registers[(RK05_BA - RK05_BASE) / 2] += p; registers[(RK05_BA - RK05_BASE) / 2] += reclen;
if (++sector >= 12) { if (++sector >= 12) {
sector = 0; sector = 0;
@ -171,7 +163,7 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
uint32_t temp_diskoffb = diskoffb; uint32_t temp_diskoffb = diskoffb;
uint32_t temp = reclen; uint32_t temp = reclen;
uint32_t p = memoff; uint32_t p = memoff;
while(temp > 0) { while(temp > 0) {
uint32_t cur = std::min(uint32_t(sizeof xfer_buffer), temp); uint32_t cur = std::min(uint32_t(sizeof xfer_buffer), temp);
@ -183,20 +175,15 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
temp_diskoffb += cur; temp_diskoffb += cur;
for(uint32_t i=0; i<cur; i++) { for(uint32_t i=0; i<cur; i++) {
if (p >= 0160000)
break;
b->writeUnibusByte(p++, xfer_buffer[i]); b->writeUnibusByte(p++, xfer_buffer[i]);
if ((v & 2048) == 0)
registers[(RK05_BA - RK05_BASE) / 2] += 2;
} }
temp -= cur; temp -= cur;
} }
if (v & 2048)
DOLOG(debug, false, "RK05 inhibit BA increase");
else
registers[(RK05_BA - RK05_BASE) / 2] += p;
if (++sector >= 12) { if (++sector >= 12) {
sector = 0; sector = 0;
if (++surface >= 2) { if (++surface >= 2) {