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

wip

Browse source
This commit is contained in:
folkert van heusden 2023-03-21 14:52:51 +01:00
parent 2afa705209
commit d876a23eee
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cpu.cpp
View file

@ -324,6 +324,8 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
g.set = getBitPSW(11); g.set = getBitPSW(11);
g.space = reg == 7 ? i_space : (b->get_use_data_space(psw >> 14) ? d_space : i_space); g.space = reg == 7 ? i_space : (b->get_use_data_space(psw >> 14) ? d_space : i_space);
addToMMR1(mode, reg, word_mode);
uint16_t next_word = 0; uint16_t next_word = 0;
switch(mode) { switch(mode) {
@ -430,8 +432,6 @@ bool cpu::double_operand_instructions(const uint16_t instr)
switch(operation) { switch(operation) {
case 0b001: { // MOV/MOVB Move Word/Byte case 0b001: { // MOV/MOVB Move Word/Byte
addToMMR1(src_mode, src_reg, word_mode);
if (word_mode && dst_mode == 0) if (word_mode && dst_mode == 0)
setRegister(dst_reg, false, int8_t(g_src.value.value())); // int8_t: sign extension setRegister(dst_reg, false, int8_t(g_src.value.value())); // int8_t: sign extension
else { else {
@ -440,8 +440,6 @@ bool cpu::double_operand_instructions(const uint16_t instr)
set_flags = putGAM(g_dst, g_src.value.value()); set_flags = putGAM(g_dst, g_src.value.value());
} }
addToMMR1(dst_mode, dst_reg, word_mode);
if (set_flags) if (set_flags)
setPSW_flags_nzv(g_src.value.value(), word_mode); setPSW_flags_nzv(g_src.value.value(), word_mode);
@ -449,14 +447,10 @@ bool cpu::double_operand_instructions(const uint16_t instr)
} }
case 0b010: { // CMP/CMPB Compare Word/Byte case 0b010: { // CMP/CMPB Compare Word/Byte
addToMMR1(src_mode, src_reg, word_mode);
auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false); auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false);
uint16_t temp = (g_src.value.value() - g_dst.value.value()) & (word_mode ? 0xff : 0xffff); uint16_t temp = (g_src.value.value() - g_dst.value.value()) & (word_mode ? 0xff : 0xffff);
addToMMR1(dst_mode, dst_reg, word_mode);
setPSW_n(SIGN(temp, word_mode)); setPSW_n(SIGN(temp, word_mode));
setPSW_z(IS_0(temp, word_mode)); setPSW_z(IS_0(temp, word_mode));
setPSW_v(SIGN((g_src.value.value() ^ g_dst.value.value()) & (~g_dst.value.value() ^ temp), word_mode)); setPSW_v(SIGN((g_src.value.value() ^ g_dst.value.value()) & (~g_dst.value.value() ^ temp), word_mode));
@ -1209,7 +1203,6 @@ bool cpu::single_operand_instructions(const uint16_t instr)
case 0b00110101: { // MFPD/MFPI case 0b00110101: { // MFPD/MFPI
// always words: word_mode-bit is to select between MFPI and MFPD // always words: word_mode-bit is to select between MFPI and MFPD
if ((b->getMMR0() & 0160000) == 0)
b->addToMMR1(-2, 6); b->addToMMR1(-2, 6);
bool set_flags = true; bool set_flags = true;
@ -1251,7 +1244,6 @@ bool cpu::single_operand_instructions(const uint16_t instr)
case 0b00110110: { // MTPI/MTPD case 0b00110110: { // MTPI/MTPD
// always words: word_mode-bit is to select between MTPI and MTPD // always words: word_mode-bit is to select between MTPI and MTPD
if ((b->getMMR0() & 0160000) == 0)
b->addToMMR1(2, 6); b->addToMMR1(2, 6);
// retrieve word from '15/14'-stack // retrieve word from '15/14'-stack
@ -1627,10 +1619,10 @@ void cpu::trap(uint16_t vector, const int new_ipl, const bool is_interrupt)
before_psw = getPSW(); before_psw = getPSW();
before_pc = getPC(); before_pc = getPC();
if ((b->getMMR0() & 0160000) == 0 && vector != 4) { if ((b->getMMR0() & 0160000) == 0) {
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
b->setMMR2(vector); b->setMMR2(vector);
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
} }
if (is_interrupt) if (is_interrupt)