From f3af0d060ff5eabd7b35dca19cc5126438fef641 Mon Sep 17 00:00:00 2001 From: Olaf Seibert Date: Sat, 6 May 2017 17:15:20 +0200 Subject: [PATCH] Adjust tests: .ENABL LC can now be removed. This changes all the 2.11 listings. --- tests/2.11BSD-m11-code.lst.ok | 9 ++++----- tests/2.11BSD-m11-debug.lst.ok | 9 ++++----- tests/2.11BSD-m11-errs.lst.ok | 9 ++++----- tests/2.11BSD-m11-exec.lst.ok | 9 ++++----- tests/2.11BSD-m11-expr.lst.ok | 9 ++++----- tests/2.11BSD-m11-fltg.lst.ok | 9 ++++----- tests/2.11BSD-m11-getl.lst.ok | 9 ++++----- tests/2.11BSD-m11-lout.lst.ok | 9 ++++----- tests/2.11BSD-m11-mac.lst.ok | 9 ++++----- tests/2.11BSD-m11-macro.lst.ok | 9 ++++----- tests/2.11BSD-m11-misc.lst.ok | 9 ++++----- tests/2.11BSD-m11-often.lst.ok | 9 ++++----- tests/2.11BSD-m11-pst.lst.ok | 9 ++++----- tests/2.11BSD-m11-srch.lst.ok | 9 ++++----- tests/2.11BSD-m11-syscalls.lst.ok | 9 ++++----- tests/2.11BSD-m11-xlat.lst.ok | 9 ++++----- tests/2.11BSD-m11-xpcor.lst.ok | 9 ++++----- tests/RunTests | 1 - 18 files changed, 68 insertions(+), 86 deletions(-) diff --git a/tests/2.11BSD-m11-code.lst.ok b/tests/2.11BSD-m11-code.lst.ok index 98f997d..78b2ace 100644 --- a/tests/2.11BSD-m11-code.lst.ok +++ b/tests/2.11BSD-m11-code.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/code.m11" + 7 .include "2.11BSD/m11/code.m11" 1 .title code 2 3 .ident /10may4/ @@ -1227,7 +1226,7 @@ 472 473 .end 473 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-debug.lst.ok b/tests/2.11BSD-m11-debug.lst.ok index b5ce3f1..ea22543 100644 --- a/tests/2.11BSD-m11-debug.lst.ok +++ b/tests/2.11BSD-m11-debug.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/debug.m11" + 7 .include "2.11BSD/m11/debug.m11" 1 .mcall (at) always 2 .globl $write 3 @@ -620,7 +619,7 @@ 52 53 .end 53 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-errs.lst.ok b/tests/2.11BSD-m11-errs.lst.ok index a415c2e..727b1a2 100644 --- a/tests/2.11BSD-m11-errs.lst.ok +++ b/tests/2.11BSD-m11-errs.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/errs.m11" + 7 .include "2.11BSD/m11/errs.m11" 1 ; 2 ; m11 error messages 3 ; jim reeds 4 july 1981 @@ -1197,7 +1196,7 @@ 003063 103 110 000 83 .END 83 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-exec.lst.ok b/tests/2.11BSD-m11-exec.lst.ok index 1d158cd..b9a9339 100644 --- a/tests/2.11BSD-m11-exec.lst.ok +++ b/tests/2.11BSD-m11-exec.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/exec.m11" + 7 .include "2.11BSD/m11/exec.m11" 1 2 ; @(#)exec.m11 1.2 3/26/82 3 ;this is the key to the bob bowering assembler that has been modified for @@ -4576,7 +4575,7 @@ 1472 1473 .end start 1473 - 8 + 7 **:0: ***ERROR ./2.11BSD/m11/exec.m11:1188: Unterminated conditional diff --git a/tests/2.11BSD-m11-expr.lst.ok b/tests/2.11BSD-m11-expr.lst.ok index 2aeef78..4918b40 100644 --- a/tests/2.11BSD-m11-expr.lst.ok +++ b/tests/2.11BSD-m11-expr.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/expr.m11" + 7 .include "2.11BSD/m11/expr.m11" 1 .title expr - expression evaluator 2 3 .ident /16jan4/ @@ -1697,7 +1696,7 @@ 566 567 .end 567 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-fltg.lst.ok b/tests/2.11BSD-m11-fltg.lst.ok index 0208d0f..8016ea1 100644 --- a/tests/2.11BSD-m11-fltg.lst.ok +++ b/tests/2.11BSD-m11-fltg.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/fltg.m11" + 7 .include "2.11BSD/m11/fltg.m11" 1 .title fltg 2 3 .ident /27dec3/ @@ -954,7 +953,7 @@ 249 250 250 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-getl.lst.ok b/tests/2.11BSD-m11-getl.lst.ok index f8fa1e1..5bf090a 100644 --- a/tests/2.11BSD-m11-getl.lst.ok +++ b/tests/2.11BSD-m11-getl.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/getl.m11" + 7 .include "2.11BSD/m11/getl.m11" 1 .title getl 2 .list me 3 @@ -1538,7 +1537,7 @@ 1 002034 000207 rts pc 453 .end 453 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-lout.lst.ok b/tests/2.11BSD-m11-lout.lst.ok index 3ae8900..b23b006 100644 --- a/tests/2.11BSD-m11-lout.lst.ok +++ b/tests/2.11BSD-m11-lout.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/lout.m11" + 7 .include "2.11BSD/m11/lout.m11" 1 .title lout 2 3 @@ -2545,7 +2544,7 @@ 957 958 .end 958 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-mac.lst.ok b/tests/2.11BSD-m11-mac.lst.ok index b04bd55..3ba2760 100644 --- a/tests/2.11BSD-m11-mac.lst.ok +++ b/tests/2.11BSD-m11-mac.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/mac.m11" + 7 .include "2.11BSD/m11/mac.m11" 1 .title mac ;macro handlers 2 3 .ident /03apr4/ @@ -2212,7 +2211,7 @@ 885 000000 macdfn: .blkw 886 .end 886 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-macro.lst.ok b/tests/2.11BSD-m11-macro.lst.ok index 2875257..ce2c4ef 100644 --- a/tests/2.11BSD-m11-macro.lst.ok +++ b/tests/2.11BSD-m11-macro.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/macro.m11" + 7 .include "2.11BSD/m11/macro.m11" 1 .title main 2 3 .ident /03apr4/ @@ -1274,7 +1273,7 @@ 220 221 .end 221 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-misc.lst.ok b/tests/2.11BSD-m11-misc.lst.ok index d6df723..e77211a 100644 --- a/tests/2.11BSD-m11-misc.lst.ok +++ b/tests/2.11BSD-m11-misc.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/misc.m11" + 7 .include "2.11BSD/m11/misc.m11" 1 .title atmisc 2 3 .ident /14dec3/ ; @@ -1185,7 +1184,7 @@ 304 305 .end 305 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-often.lst.ok b/tests/2.11BSD-m11-often.lst.ok index 136a628..d5e986d 100644 --- a/tests/2.11BSD-m11-often.lst.ok +++ b/tests/2.11BSD-m11-often.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/often.m11" + 7 .include "2.11BSD/m11/often.m11" 1 .title often 2 3 ; @@ -692,7 +691,7 @@ 1 000154 000207 rts pc 77 .end 77 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-pst.lst.ok b/tests/2.11BSD-m11-pst.lst.ok index 3dce1fb..76e4839 100644 --- a/tests/2.11BSD-m11-pst.lst.ok +++ b/tests/2.11BSD-m11-pst.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/pst.m11" + 7 .include "2.11BSD/m11/pst.m11" 1 .title pst v095a11 permanent symbol table 2 3 .ident /03apr4/ @@ -3017,7 +3016,7 @@ 285 286 .end 286 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-srch.lst.ok b/tests/2.11BSD-m11-srch.lst.ok index 95d3672..6868a4d 100644 --- a/tests/2.11BSD-m11-srch.lst.ok +++ b/tests/2.11BSD-m11-srch.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/srch.m11" + 7 .include "2.11BSD/m11/srch.m11" 1 .title srch 2 .ident /03apr4/ 3 @@ -939,7 +938,7 @@ 322 323 .end 323 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-syscalls.lst.ok b/tests/2.11BSD-m11-syscalls.lst.ok index b7c8b72..d570e26 100644 --- a/tests/2.11BSD-m11-syscalls.lst.ok +++ b/tests/2.11BSD-m11-syscalls.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/syscalls.m11" + 7 .include "2.11BSD/m11/syscalls.m11" 1 .globl $creat, $open, $close, $exit, $read, $write, $sbrk 2 .globl $seek, $gettod, $fork, $wait, $execv 3 @@ -457,7 +456,7 @@ 16 17 .end 17 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-xlat.lst.ok b/tests/2.11BSD-m11-xlat.lst.ok index dca51b3..db6d490 100644 --- a/tests/2.11BSD-m11-xlat.lst.ok +++ b/tests/2.11BSD-m11-xlat.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/xlat.m11" + 7 .include "2.11BSD/m11/xlat.m11" 1 .title xlat 2 3 .ident /09may4/ @@ -2968,7 +2967,7 @@ 1 006240 .psect .text con 1059 .end 1059 - 8 + 7 Symbol table diff --git a/tests/2.11BSD-m11-xpcor.lst.ok b/tests/2.11BSD-m11-xpcor.lst.ok index 8e95b0b..3a92faf 100644 --- a/tests/2.11BSD-m11-xpcor.lst.ok +++ b/tests/2.11BSD-m11-xpcor.lst.ok @@ -2,9 +2,8 @@ 2 .list 3 .list 4 .list - 5 .enabl lc - 6 000001 debug = 1 - 7 .include "2.11BSD/m11/at.sml" + 5 000001 debug = 1 + 6 .include "2.11BSD/m11/at.sml" 1 .title at.sml - assembler/translator system macros 2 ; @(#)at.sml 1.3 11/3/82 3 @@ -438,7 +437,7 @@ 424 425 .end 425 - 8 .include "2.11BSD/m11/xpcor.m11" + 7 .include "2.11BSD/m11/xpcor.m11" 1 .title xpcor 2 3 ;this file must be linked last to ensure that it is the last @@ -457,7 +456,7 @@ 15 16 .end 16 - 8 + 7 Symbol table diff --git a/tests/RunTests b/tests/RunTests index a5e7c60..c06e8e7 100755 --- a/tests/RunTests +++ b/tests/RunTests @@ -57,7 +57,6 @@ do .list .list .list - .enabl lc debug = 1 .include "2.11BSD/m11/at.sml" .include "${t}"