checkpoint

This commit is contained in:
aljazbrodar. 2025-12-07 09:56:50 +01:00
parent 4c6c4b8a22
commit 3c876211c2
35 changed files with 365 additions and 207 deletions

View file

@ -181,7 +181,7 @@ bool Machine::execSICF3F4(int opcode, int ni, int operand) {
if (ni == 0) { // stari SIC (neposredno in enostavno naslavljanje)
UA = (((operand & 0x7F) << 8) | operand2) + x_val; //izracun uporabnega naslova: operand brez bita x + drugi del naslova + x_val
if (UA + 2 > MAX_ADDRESS) {
if (UA < 0 || UA + 2 > MAX_ADDRESS) {
invalidAddressing();
return false;
}
@ -205,7 +205,7 @@ bool Machine::execSICF3F4(int opcode, int ni, int operand) {
invalidAddressing();
}
if (UA + 2 > MAX_ADDRESS) {
if (UA < 0 || UA + 2 > MAX_ADDRESS) {
invalidAddressing();
return false;
}
@ -237,7 +237,7 @@ bool Machine::execSICF3F4(int opcode, int ni, int operand) {
invalidAddressing();
}
if (UA + 2 > MAX_ADDRESS) {
if (UA < 0 || UA + 2 > MAX_ADDRESS) {
invalidAddressing();
return false;
}
@ -252,149 +252,167 @@ bool Machine::execSICF3F4(int opcode, int ni, int operand) {
}
}
switch (opcode) {
case Opcode::ADD:
setA(getA() + UV);
return true;
case Opcode::AND:
setA(getA() & UV);
return true;
case Opcode::COMP:
temp = getA();
if (temp < UV) {
setSW(0x40);
} else if (temp == UV) {
setSW(0x0);
} else {
setSW(0x80);
}
return true;
break;
case Opcode::DIV:
if (UV == 0) {
cerr << "Error: Divison by zero." << endl;
return false;
}
setA(getA() / UV);
return true;
case Opcode::J:
setPC(UV);
return true;
case Opcode::JEQ:
if (getSW() == 0x00) {
case Opcode::ADD:
setA(getA() + UV);
return true;
case Opcode::AND:
setA(getA() & UV);
return true;
case Opcode::COMP:
temp = getA();
if (temp < UV) {
setSW(0x40);
} else if (temp == UV) {
setSW(0x0);
} else {
setSW(0x80);
}
return true;
break;
case Opcode::DIV:
if (UV == 0) {
cerr << "Error: Divison by zero." << endl;
return false;
}
setA(getA() / UV);
return true;
case Opcode::J:
setPC(UV);
}
return true;
case Opcode::JGT:
if (getSW() == 0x80) {
return true;
case Opcode::JEQ:
if (getSW() == 0x00) {
setPC(UV);
}
return true;
case Opcode::JGT:
if (getSW() == 0x80) {
setPC(UV);
}
return true;
case Opcode::JLT:
if (getSW() == 0x40) {
setPC(UV);
}
return true;
case Opcode::JSUB:
setL(getPC());
setPC(UV);
}
return true;
case Opcode::JLT:
if (getSW() == 0x40) {
setPC(UV);
}
return true;
case Opcode::JSUB:
setL(getPC());
setPC(UV);
return true;
case Opcode::LDA:
setA(UV);
return true;
case Opcode::LDB:
setB(UV);
return true;
case Opcode::LDCH:
setA((getA() & 0xFFFF00) | (UV & 0xFF));
return true;
case Opcode::LDL:
setL(UV);
return true;
case Opcode::LDS:
setS(UV);
return true;
case Opcode::LDT:
setT(UV);
return true;
case Opcode::LDX:
setX(UV);
return true;
case Opcode::MUL:
setA(getA() * UV);
return true;
case Opcode::OR:
setA(getA() | UV);
return true;
case Opcode::RD:
temp = UV & 0xFF;
if (devices[temp] != nullptr) {
setA(devices[temp]->read());
}
return true;
case Opcode::RSUB:
setPC(getL());
return true;
case Opcode::STA:
temp = getA();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STCH:
temp = getA();
memory[UV] = temp & 0xFF;
return true;
case Opcode::STL:
temp = getL();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STSW:
temp = getSW();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STX:
temp = getX();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::SUB:
setA(getA() - UV);
return true;
case Opcode::TD:
temp = UV & 0xFF;
return true;
case Opcode::LDA:
setA(UV);
return true;
case Opcode::LDB:
setB(UV);
return true;
case Opcode::LDCH:
setA((getA() & 0xFFFF00) | (UV & 0xFF));
return true;
case Opcode::LDL:
setL(UV);
return true;
case Opcode::LDS:
setS(UV);
return true;
case Opcode::LDT:
setT(UV);
return true;
case Opcode::LDX:
setX(UV);
return true;
case Opcode::MUL:
setA(getA() * UV);
return true;
case Opcode::OR:
setA(getA() | UV);
return true;
case Opcode::RD:
temp = UV & 0xFF;
if (devices[temp] != nullptr) {
setA(devices[temp]->read());
}
return true;
case Opcode::RSUB:
setPC(getL());
return true;
case Opcode::STA:
temp = getA();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STB:
temp = getB();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STS:
temp = getS();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STT:
temp = getA();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STCH:
temp = getA();
memory[UV] = temp & 0xFF;
return true;
case Opcode::STL:
temp = getL();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STSW:
temp = getSW();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::STX:
temp = getX();
memory[UV] = (temp >> 16) & 0xFF;
memory[UV + 1] = (temp >> 8) & 0xFF;
memory[UV + 2] = temp & 0xFF;
return true;
case Opcode::SUB:
setA(getA() - UV);
return true;
case Opcode::TD:
temp = UV & 0xFF;
ready = false;
if (devices[temp] != nullptr) {
ready = devices[temp]->test();
}
if (ready) {
setSW(0X40);
} else {
setSW(0x00);
}
ready = false;
if (devices[temp] != nullptr) {
ready = devices[temp]->test();
}
if (ready) {
setSW(0X40);
} else {
setSW(0x00);
}
return true;
case Opcode::TIX:
temp = getX();
setX(temp + 1);
if (temp < UV) setSW(0x40);
else if (temp == UV) setSW(0x00);
else setSW(0x80);
return true;
case Opcode::WD:
temp = UV & 0xFF;
if (devices[temp] != nullptr) {
devices[temp]->write(getA() & 0xFF);
}
return true;
default:
notImplemented(opcode);
break;
return true;
case Opcode::TIX:
temp = getX();
setX(temp + 1);
if (temp < UV) setSW(0x40);
else if (temp == UV) setSW(0x00);
else setSW(0x80);
return true;
case Opcode::WD:
temp = UV & 0xFF;
if (devices[temp] != nullptr) {
devices[temp]->write(getA() & 0xFF);
}
return true;
default:
notImplemented(opcode);
break;
}
return false;
}