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

Merge branch 'master' of ssh://172.29.0.8/home/folkert/git/PDP-11

Browse source
This commit is contained in:
folkert van heusden 2024-03-31 22:29:28 +02:00
commit 07ead5578a
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main.cpp
View file

@ -38,6 +38,8 @@ std::atomic_bool *running { nullptr };
std::atomic_bool sigw_event { false }; std::atomic_bool sigw_event { false };
constexpr const uint16_t validation_psw_mask = 0174037; // ignore unused bits & priority(!)
#if !defined(_WIN32) #if !defined(_WIN32)
void sw_handler(int s) void sw_handler(int s)
{ {
@ -98,7 +100,7 @@ int run_cpu_validation(const std::string & filename)
{ {
json_t *psw_reg = json_object_get(registers_before, "psw"); json_t *psw_reg = json_object_get(registers_before, "psw");
assert(psw_reg); assert(psw_reg);
c->lowlevel_psw_set(json_integer_value(psw_reg) & 0174377); c->lowlevel_psw_set(json_integer_value(psw_reg));
} }
{ {
json_t *b_pc = json_object_get(registers_before, "pc"); json_t *b_pc = json_object_get(registers_before, "pc");
@ -190,9 +192,9 @@ int run_cpu_validation(const std::string & filename)
{ {
json_t *a_psw = json_object_get(registers_after, "psw"); json_t *a_psw = json_object_get(registers_after, "psw");
assert(a_psw); assert(a_psw);
uint16_t should_be_psw = json_integer_value(a_psw) & 0174377; uint16_t should_be_psw = json_integer_value(a_psw);
if (should_be_psw != psw) { if ((should_be_psw & validation_psw_mask) != (psw & validation_psw_mask)) {
DOLOG(warning, true, "PSW register mismatch (is: %06o (%d), should be: %06o (%d))", psw, psw, should_be_psw, should_be_psw); DOLOG(warning, true, "PSW register mismatch (is: %06o (%d), w/m %06o, should be: %06o (%d), w/m %06o)", psw, psw, psw & validation_psw_mask, should_be_psw, should_be_psw, should_be_psw & validation_psw_mask);
err = true; err = true;
} }
} }