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

more test fixes

Browse source
This commit is contained in:
folkert van heusden 2024-03-28 17:10:57 +01:00
parent d3bc4b5ff0
commit 90909f73b3
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
json/produce-json.py
View file

@ -63,7 +63,7 @@ class test_generator:
target[tag][set_][reg_] = p.registerfiles[set_][reg_] target[tag][set_][reg_] = p.registerfiles[set_][reg_]
target[tag]['sp'] = p.stackpointers target[tag]['sp'] = p.stackpointers
target[tag]['pc'] = p.PC target[tag]['pc'] = p.r[p.PC]
def create_test(self): def create_test(self):
out = { } out = { }
@ -74,10 +74,10 @@ class test_generator:
# TODO what is the maximum size of an instruction? # TODO what is the maximum size of an instruction?
mem_kv = [] mem_kv = []
mem_kv.append((addr + 0, random.randint(0, 65536))) mem_kv.append((addr + 0, random.randint(0, 65536 - 8)))
mem_kv.append((addr + 2, random.randint(0, 65536))) mem_kv.append((addr + 2, random.randint(0, 65536 - 8)))
mem_kv.append((addr + 4, random.randint(0, 65536))) mem_kv.append((addr + 4, random.randint(0, 65536 - 8)))
mem_kv.append((addr + 6, random.randint(0, 65536))) mem_kv.append((addr + 6, random.randint(0, 65536 - 8)))
out['memory-before'] = dict() out['memory-before'] = dict()
for a, v in mem_kv: for a, v in mem_kv:
p.put(a, v) p.put(a, v)
@ -104,6 +104,7 @@ class test_generator:
p.registerfiles[1 - set_][r] = (~v) & 65535 # make sure it triggers errors p.registerfiles[1 - set_][r] = (~v) & 65535 # make sure it triggers errors
assert p.registerfiles[set_][r] == p.r[r] assert p.registerfiles[set_][r] == p.r[r]
p.r[6] = p.registerfiles[set_][6] p.r[6] = p.registerfiles[set_][6]
p.r[p.PC] = addr
p._syncregs() p._syncregs()
self.put_registers(p, out, 'registers-before') self.put_registers(p, out, 'registers-before')
@ -133,7 +134,7 @@ class test_generator:
except Exception as e: except Exception as e:
# handle PDP11 traps; store them # handle PDP11 traps; store them
print('test failed', e) print(f'test failed {e}, line number: {e.__traceback__.tb_lineno}')
return None return None
fh = open(sys.argv[1], 'w') fh = open(sys.argv[1], 'w')

1
main.cpp
View file

@ -132,7 +132,6 @@ int run_cpu_validation(const std::string & filename)
uint16_t psw = c->getPSW(); uint16_t psw = c->getPSW();
json_t *const registers_after = json_object_get(test, "registers-after"); json_t *const registers_after = json_object_get(test, "registers-after");
{ {
int set_nr = (psw >> 11) & 1; int set_nr = (psw >> 11) & 1;
char set[] = { char('0' + set_nr), 0x00 }; char set[] = { char('0' + set_nr), 0x00 };