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

Merge branch 'dos' into wifi

Browse source
This commit is contained in:
folkert van heusden 2022-03-19 11:41:13 +01:00
commit 6674f8b484
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cpu.cpp
View file

@ -1104,18 +1104,18 @@ void cpu::busError()
{ {
fprintf(stderr, "BUS ERROR\n"); fprintf(stderr, "BUS ERROR\n");
// PSW = 177776 trap(4);
// mov @#PSW, -(sp) }
pushStack(getPSW());
// mov pc, -(sp) void cpu::trap(const uint16_t vector)
{
pushStack(getPSW());
pushStack(getPC()); pushStack(getPC());
// mov @#VEC+2, @#PSW setPSW(b->readWord(vector + 2));
setPSW(b -> readWord(6)); setPC (b->readWord(vector + 0));
// mov @#VEC, pc fprintf(stderr, "TRAP %o: PC is now %06o\n", vector, getPC());
setPC(b -> readWord(4));
} }
std::pair<std::string, int> cpu::addressing_to_string(const uint8_t mode_register, const uint16_t pc) std::pair<std::string, int> cpu::addressing_to_string(const uint8_t mode_register, const uint16_t pc)

1
cpu.h
View file

@ -58,6 +58,7 @@ public:
uint16_t popStack(); uint16_t popStack();
void busError(); void busError();
void trap(const uint16_t vector);
void setEmulateMFPT(const bool v) { emulateMFPT = v; } void setEmulateMFPT(const bool v) { emulateMFPT = v; }

22
rk05.cpp
View file

@ -4,6 +4,7 @@
#include <string.h> #include <string.h>
#include "bus.h" #include "bus.h"
#include "cpu.h"
#include "error.h" #include "error.h"
#include "esp32.h" #include "esp32.h"
#include "gen.h" #include "gen.h"
@ -133,6 +134,9 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
const int reg = (addr - RK05_BASE) / 2; const int reg = (addr - RK05_BASE) / 2;
fprintf(stderr, "RK05 write %s/%o: %o\n", regnames[reg], addr, v); fprintf(stderr, "RK05 write %s/%o: %o\n", regnames[reg], addr, v);
D(fprintf(stderr, "set register %o to %o\n", addr, v);)
registers[reg] = v;
if (addr == RK05_CS) { if (addr == RK05_CS) {
if (v & 1) { // GO if (v & 1) { // GO
const int func = (v >> 1) & 7; // FUNCTION const int func = (v >> 1) & 7; // FUNCTION
@ -206,9 +210,9 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
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);
#if defined(ESP32)
yield(); yield();
#if defined(ESP32)
if (fh.read(xfer_buffer, cur) != size_t(cur)) if (fh.read(xfer_buffer, cur) != size_t(cur))
D(fprintf(stderr, "RK05 fread error: %s\n", strerror(errno));) D(fprintf(stderr, "RK05 fread error: %s\n", strerror(errno));)
#else #else
@ -249,16 +253,16 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
fprintf(stderr, "RK05 command %d UNHANDLED\n", func); fprintf(stderr, "RK05 command %d UNHANDLED\n", func);
} }
if (v & 64) { // bit 6, invoke interrupt when done vector address 220, see http://www.pdp-11.nl/peripherals/disk/rk05-info.html
fprintf(stderr, "RK05 HIER\n"); // FIXME
}
registers[(RK05_WC - RK05_BASE) / 2] = 0; registers[(RK05_WC - RK05_BASE) / 2] = 0;
}
}
D(fprintf(stderr, "set register %o to %o\n", addr, v);) registers[(RK05_DS - RK05_BASE) / 2] |= 64; // drive ready
registers[reg] = v; registers[(RK05_CS - RK05_BASE) / 2] |= 128; // control ready
if (v & 64) { // bit 6, invoke interrupt when done vector address 220, see http://www.pdp-11.nl/peripherals/disk/rk05-info.html
b->getCpu()->trap(0220);
}
}
}
#if defined(ESP32) #if defined(ESP32)
digitalWrite(LED_BUILTIN, HIGH); digitalWrite(LED_BUILTIN, HIGH);