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

explicit 'use_prev' for bus::read()

Browse source
This commit is contained in:
folkert van heusden 2022-04-11 14:32:40 +02:00
parent 517f2afb9b
commit f8b8bc45e6
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bus.cpp
View file

@ -653,7 +653,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons
uint16_t bus::readWord(const uint16_t a) uint16_t bus::readWord(const uint16_t a)
{ {
return read(a, false); return read(a, false, false);
} }
uint16_t bus::writeWord(const uint16_t a, const uint16_t value) uint16_t bus::writeWord(const uint16_t a, const uint16_t value)

4
bus.h
View file

@ -54,8 +54,8 @@ public:
void init(); // invoked by 'RESET' command void init(); // invoked by 'RESET' command
uint16_t read(const uint16_t a, const bool word_mode, const bool use_prev=false); uint16_t read(const uint16_t a, const bool word_mode, const bool use_prev);
uint16_t readByte(const uint16_t a) { return read(a, true); } uint16_t readByte(const uint16_t a) { return read(a, true, false); }
uint16_t readWord(const uint16_t a); uint16_t readWord(const uint16_t a);
uint16_t readUnibusByte(const uint16_t a); uint16_t readUnibusByte(const uint16_t a);

30
cpu.cpp
View file

@ -419,7 +419,7 @@ bool cpu::double_operand_instructions(const uint16_t instr)
case 0b100: { // BIC/BICB Bit Clear Word/Byte case 0b100: { // BIC/BICB Bit Clear Word/Byte
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t result = b->read(a, word_mode) & ~src_value; uint16_t result = b->read(a, word_mode, false) & ~src_value;
put_result(a, dst_mode, dst_reg, word_mode, result); put_result(a, dst_mode, dst_reg, word_mode, result);
@ -433,7 +433,7 @@ bool cpu::double_operand_instructions(const uint16_t instr)
case 0b101: { // BIS/BISB Bit Set Word/Byte case 0b101: { // BIS/BISB Bit Set Word/Byte
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t result = b->read(a, word_mode) | src_value; uint16_t result = b->read(a, word_mode, false) | src_value;
put_result(a, dst_mode, dst_reg, word_mode, result); put_result(a, dst_mode, dst_reg, word_mode, result);
@ -547,7 +547,7 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
case 2: { // ASH case 2: { // ASH
int16_t R = getRegister(reg), oldR = R; int16_t R = getRegister(reg), oldR = R;
uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false);
int16_t shift = b->read(a, false) & 077; // mask of lower 6 bit int16_t shift = b->read(a, false, false) & 077; // mask of lower 6 bit
if (shift == 0) if (shift == 0)
setPSW_c(false); setPSW_c(false);
@ -579,7 +579,7 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
case 3: { // ASHC case 3: { // ASHC
uint32_t R0R1 = (getRegister(reg) << 16) | getRegister(reg + 1); uint32_t R0R1 = (getRegister(reg) << 16) | getRegister(reg + 1);
uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false);
int16_t shift = b->read(a, false) & 077; // mask of lower 6 bit int16_t shift = b->read(a, false, false) & 077; // mask of lower 6 bit
if (shift == 0) { if (shift == 0) {
setPSW_c(false); setPSW_c(false);
@ -614,7 +614,7 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
case 4: { // XOR (word only) case 4: { // XOR (word only)
uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, false, false);
uint16_t vl = b->read(a, false) ^ getRegister(reg); uint16_t vl = b->read(a, false, false) ^ getRegister(reg);
if (dst_mode == 0) if (dst_mode == 0)
putGAM(dst_mode, dst_reg, false, vl, false); putGAM(dst_mode, dst_reg, false, vl, false);
@ -726,7 +726,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t v = b -> read(a, word_mode); uint16_t v = b -> read(a, word_mode, false);
if (word_mode) if (word_mode)
v ^= 0xff; v ^= 0xff;
@ -759,7 +759,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t v = b -> read(a, word_mode); uint16_t v = b -> read(a, word_mode, false);
int32_t vl = (v + 1) & (word_mode ? 0xff : 0xffff); int32_t vl = (v + 1) & (word_mode ? 0xff : 0xffff);
setPSW_n(SIGN(vl, word_mode)); setPSW_n(SIGN(vl, word_mode));
@ -788,7 +788,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t v = b -> read(a, word_mode); uint16_t v = b -> read(a, word_mode, false);
int32_t vl = (v - 1) & (word_mode ? 0xff : 0xffff); int32_t vl = (v - 1) & (word_mode ? 0xff : 0xffff);
setPSW_n(SIGN(vl, word_mode)); setPSW_n(SIGN(vl, word_mode));
@ -818,7 +818,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t v = -b -> read(a, word_mode); uint16_t v = -b -> read(a, word_mode, false);
b->write(a, word_mode, v); b->write(a, word_mode, v);
@ -850,7 +850,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
const uint16_t vo = b -> read(a, word_mode); const uint16_t vo = b -> read(a, word_mode, false);
bool org_c = getPSW_c(); bool org_c = getPSW_c();
uint16_t v = (vo + org_c) & (word_mode ? 0x00ff : 0xffff); uint16_t v = (vo + org_c) & (word_mode ? 0x00ff : 0xffff);
@ -884,7 +884,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
const uint16_t vo = b -> read(a, word_mode); const uint16_t vo = b -> read(a, word_mode, false);
bool org_c = getPSW_c(); bool org_c = getPSW_c();
uint16_t v = (vo - org_c) & (word_mode ? 0xff : 0xffff); uint16_t v = (vo - org_c) & (word_mode ? 0xff : 0xffff);
@ -935,7 +935,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t t = b -> read(a, word_mode); uint16_t t = b -> read(a, word_mode, false);
bool new_carry = t & 1; bool new_carry = t & 1;
uint16_t temp = 0; uint16_t temp = 0;
@ -978,7 +978,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t t = b -> read(a, word_mode); uint16_t t = b -> read(a, word_mode, false);
bool new_carry = false; bool new_carry = false;
uint16_t temp = 0; uint16_t temp = 0;
@ -1029,7 +1029,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t v = b -> read(a, word_mode); uint16_t v = b -> read(a, word_mode, false);
uint16_t add = word_mode ? v & 0xff00 : 0; uint16_t add = word_mode ? v & 0xff00 : 0;
bool hb = word_mode ? v & 128 : v & 32768; bool hb = word_mode ? v & 128 : v & 32768;
@ -1072,7 +1072,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
} }
else { else {
uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false); uint16_t a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
uint16_t vl = b -> read(a, word_mode); uint16_t vl = b -> read(a, word_mode, false);
uint16_t v = (vl << 1) & (word_mode ? 0xff : 0xffff); uint16_t v = (vl << 1) & (word_mode ? 0xff : 0xffff);
setPSW_n(SIGN(v, word_mode)); setPSW_n(SIGN(v, word_mode));