1
0
mirror of https://github.com/wfjm/w11.git synced 2026-01-30 13:47:13 +00:00

add systyp checking; add w11 specific tcode tests

- tcode_std_start.mac: system type (w11,simh,e11) detection via sysid
- cpu_mmu.mac: add a test done for w11 only
- tcode.ecmd,tcode_exec.scmd: set up sysid
This commit is contained in:
wfjm
2022-08-25 09:00:53 +02:00
parent faf596e531
commit 7f9506b201
5 changed files with 64 additions and 30 deletions

View File

@@ -9,8 +9,9 @@ tmp_e11.ini
tmp_e11_tt0.log
# simulation stuff
rlink_cext_conf
rlink_cext_fifo_rx
rlink_cext_fifo_tx
rlink_cext_*
sysmon_stim
tmu_ofile
# Simh stuff
simh_*.dat

View File

@@ -1,4 +1,4 @@
; $Id: cpu_mmu.mac 1280 2022-08-15 09:12:03Z mueller $
; $Id: cpu_mmu.mac 1283 2022-08-22 10:07:58Z mueller $
; SPDX-License-Identifier: GPL-3.0-or-later
; Copyright 2022- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
;
@@ -611,12 +611,15 @@ tc0101: mov #1000$,r1 ; ptr to abort bit table
hcmpeq (r3),#^b0000000011110001;
;
; check @(pc)+ behavior
; Simh only adds 'general purpose register updates, thus not pc
; w11 updates mmr1 in this case, as is also expected in ekbee1
; case commented out to ensure that cpu_mmu.mac runs on both
;; reset
;; mov -(r1),@#mmr0 ; r1,-2,pc,2 00010 111 11110 001 via ale
;; hcmpeq (r3),#^b0001011111110001;
; Simh only adds 'general purpose register updates', thus not pc
; e11 doesn't like this test either
tstb systyp ; skip test if on SimH or e11
blt 100$ ; systyp<0 --> not on w11
reset
mov -(r1),@#mmr0 ; r1,-2,pc,2 00010 111 11110 001 via ale
hcmpeq (r3),#^b0001011111110001;
100$:
;
reset
jmp 9999$

View File

@@ -1,4 +1,4 @@
! $Id: tcode.ecmd 1264 2022-07-30 07:42:17Z mueller $
! $Id: tcode.ecmd 1283 2022-08-22 10:07:58Z mueller $
! SPDX-License-Identifier: GPL-3.0-or-later
! Copyright 2022- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
!
@@ -7,6 +7,8 @@
set cpu 70
set cpu nofpp
set idle delay=1
! set sysid, leading '1' indicates simulator, next '2' e11
set cpu SYSID=0120345
!
! create log file, the only way to capture e11 output
! no rediction to stdout possible

View File

@@ -1,4 +1,4 @@
; $Id: tcode_exec.scmd 1275 2022-08-10 08:10:40Z mueller $
; $Id: tcode_exec.scmd 1283 2022-08-22 10:07:58Z mueller $
; SPDX-License-Identifier: GPL-3.0-or-later
; Copyright 2022- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
;
@@ -11,6 +11,8 @@ set cpu nofpp
set cpu 4m
set cpu oct
set cpu idle
; set sysid, leading '1' indicates simulator, next '1' SimH
dep sysid 110234
;
; disable simulator stop conditions, especially "read stack trap"
;