From 7520a46ce8db738dd62b8aa3e0f04d93fb7670f7 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Sun, 20 Oct 2019 16:53:13 +0200 Subject: [PATCH 1/5] Separate out scans/cas.x from scans/cas.s and update README.md --- scans/README.md | 3 +- scans/cas.s | 569 ------------------------------------------------ scans/cas.x | 564 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 566 insertions(+), 570 deletions(-) create mode 100644 scans/cas.x diff --git a/scans/README.md b/scans/README.md index 2b2156a..359beea 100644 --- a/scans/README.md +++ b/scans/README.md @@ -29,7 +29,8 @@ Details of the files: * maksys.s: page 64 of 01-s1.pdf * trysys.s: page 65 of 01-s1.pdf * scope.v: pages 3-18 of 03-scope.pdf -* cas.s: pages 1-17 of 04-cas.pdf +* cas.s: pages 1-8 of 04-cas.pdf +* cas.x: pages 9-17 of 04-cas.pdf * adm.s: pages 2-11 of 05-1-4.pdf * ald.s: pages 13-17 of 05-1-4.pdf * apr.s: pages 19-30 of 05-1-4.pdf diff --git a/scans/cas.s b/scans/cas.s index e8a8261..7e979d2 100644 --- a/scans/cas.s +++ b/scans/cas.s @@ -488,572 +488,3 @@ nins: .=.+1 o100: 0100 o12012: 012012 o12060: 012060 - - - - - -"** 04-cas.pdf page 9 -:ca -v -af -nl "??? -x -hd -v -hi -x -mn -r - -:cb -x -ga -v -gi -ik -kk -mi "??? -ma -aa -ai -ck -ek -gi -x -mn -r - -:cc -x -kk -v -mi "??? -mc -ka -ca -ac -ai -dl -x -mn -r - -:cd -v -aa -ai -ck -kk -mi -ma -x -mn -r - -:ce -x -mk -v -ma -"** 04-cas.pdf page 10 -aa -ak -x -gh -v -ga -x -mn -r - -:cf -v -aa -ak -x -gh -v -ga -x -mn -r - -:cg -x -gf -v -gk -nk -x -kk -v -mi -mc -ka -ca -ac -ai -dl -x -mn -r - -:ch -x -aa -v -na -x -gb "??? -v -gk -x -ak -v -nk -x -mn -r - -:ci -x -"** 04-cas.pdf page 11 -md -v -mi -x -lf -v -af -x -ad -v -ai -x -mn -r - -:cj -x -ka -v -mc -mg -ki -ai "??? -x -ag -v -al "??? -x -mn -r - -:ck -x -aa -v -na -x -ak -v -ia -x -mk -v -fe -x -mn -r - -:cl -x -aa -v -ma -mk -x -mn -r - -:cm -v -aa -"** 04-cas.pdf page 12 -hf -ak -nk -x -mn -r - -:cn -x -ak -v -mk -aa -na -x -mn -r - -:co -x "??? -ai -v -ch -ei -ck -ai -ac -ca -ka -mc "??? -mi -kk -ck -x -mn -r - -:cp -v -aa -ai -ck -ek -gi -ga -x -mn -r - -:cq -x -mc -v -ka -ca -ac -ai -ck -kk -mi -mc -"** 04-cas.pdf page 13 -x -jh -v -nl -x -mn -r - -:cr -v -aa -ai -ck -ek -gi -ga -x -mk -v -gf -x -mn -r - -:cs -x -ka -v -mc -mi -kk -ik -gi -gc -ea -ca -ac -ai -dl -x -mn -r - -:ct -x -aa -v -al -x -mf -v -af -x -mn -r - -:cu -x -aa -v -ka -"** 04-cas.pdf page 14 -mc -ml "??? -kk -x -ak -v -lk -x -mn -r - -:cv -x -aa -v -mf -x -ak -v -mf -x -mn -r - -:cw -x -aa -v -mc -af -x -ak -v -mi -af -x -mn -r - -:cx -v -gf -x -ak -v -gf -x -aa -v -nl -x -mn -r - -:cy -x -aa -v -if -x -ak -"** 04-cas.pdf page 15 -v -if -nf -x -mn -r - -:cz -x -aa -v -ak -ma -ml -x -mn -r - -:c0 -x -ck -v -ai -ac -ca -ka -mc -mi -kk -ck -x -mn -r - -:c1 -x -ce -v -af -mf -x -md -v -mi -x -mn -r - -:c2 -x -ca -v -ac -ai -ck -ek -gi -gc -ia -ma -ml "??? -"** 04-cas.pdf page 16 -mc -mi -kk -hk -fi -fc -ha -x -mn -r - -:c7 -x -aa -v -ak -nb -x -mn -r - -:c8 -x -gc -v -ea -ca -ac -ai -ck -ek -gi -gc -ia -ka -mc -mi -kk -ik -gi -x -mn -r - -:c9 -x -ka -v -mc -mi -kk -ck -ai -ac -ca -fa -hc -hi -fk -x -mn -"** 04-cas.pdf page 17 -x -mn -r - -:c3 -x -aa -v -ak -fe -fi -hk -kk -mi -mc -x -ka -v -nd -x -mn -r - -:c4 -x -mh -v -ah -ia -il -x -mn -r - -:c5 -x -ak -v -aa -fa -fi -hk -kk -mi -mc -x -ka -v -nd -x -mn -r - -:c6 -x -ck -v -ai -ac -ca -ka - -" The end of file seems abrupt, every other :cX section ends with: -" x -" mn -" r diff --git a/scans/cas.x b/scans/cas.x new file mode 100644 index 0000000..21c42e0 --- /dev/null +++ b/scans/cas.x @@ -0,0 +1,564 @@ +"** 04-cas.pdf page 9 +:ca +v +af +nl "??? +x +hd +v +hi +x +mn +r + +:cb +x +ga +v +gi +ik +kk +mi "??? +ma +aa +ai +ck +ek +gi +x +mn +r + +:cc +x +kk +v +mi "??? +mc +ka +ca +ac +ai +dl +x +mn +r + +:cd +v +aa +ai +ck +kk +mi +ma +x +mn +r + +:ce +x +mk +v +ma +"** 04-cas.pdf page 10 +aa +ak +x +gh +v +ga +x +mn +r + +:cf +v +aa +ak +x +gh +v +ga +x +mn +r + +:cg +x +gf +v +gk +nk +x +kk +v +mi +mc +ka +ca +ac +ai +dl +x +mn +r + +:ch +x +aa +v +na +x +gb "??? +v +gk +x +ak +v +nk +x +mn +r + +:ci +x +"** 04-cas.pdf page 11 +md +v +mi +x +lf +v +af +x +ad +v +ai +x +mn +r + +:cj +x +ka +v +mc +mg +ki +ai "??? +x +ag +v +al "??? +x +mn +r + +:ck +x +aa +v +na +x +ak +v +ia +x +mk +v +fe +x +mn +r + +:cl +x +aa +v +ma +mk +x +mn +r + +:cm +v +aa +"** 04-cas.pdf page 12 +hf +ak +nk +x +mn +r + +:cn +x +ak +v +mk +aa +na +x +mn +r + +:co +x "??? +ai +v +ch +ei +ck +ai +ac +ca +ka +mc "??? +mi +kk +ck +x +mn +r + +:cp +v +aa +ai +ck +ek +gi +ga +x +mn +r + +:cq +x +mc +v +ka +ca +ac +ai +ck +kk +mi +mc +"** 04-cas.pdf page 13 +x +jh +v +nl +x +mn +r + +:cr +v +aa +ai +ck +ek +gi +ga +x +mk +v +gf +x +mn +r + +:cs +x +ka +v +mc +mi +kk +ik +gi +gc +ea +ca +ac +ai +dl +x +mn +r + +:ct +x +aa +v +al +x +mf +v +af +x +mn +r + +:cu +x +aa +v +ka +"** 04-cas.pdf page 14 +mc +ml "??? +kk +x +ak +v +lk +x +mn +r + +:cv +x +aa +v +mf +x +ak +v +mf +x +mn +r + +:cw +x +aa +v +mc +af +x +ak +v +mi +af +x +mn +r + +:cx +v +gf +x +ak +v +gf +x +aa +v +nl +x +mn +r + +:cy +x +aa +v +if +x +ak +"** 04-cas.pdf page 15 +v +if +nf +x +mn +r + +:cz +x +aa +v +ak +ma +ml +x +mn +r + +:c0 +x +ck +v +ai +ac +ca +ka +mc +mi +kk +ck +x +mn +r + +:c1 +x +ce +v +af +mf +x +md +v +mi +x +mn +r + +:c2 +x +ca +v +ac +ai +ck +ek +gi +gc +ia +ma +ml "??? +"** 04-cas.pdf page 16 +mc +mi +kk +hk +fi +fc +ha +x +mn +r + +:c7 +x +aa +v +ak +nb +x +mn +r + +:c8 +x +gc +v +ea +ca +ac +ai +ck +ek +gi +gc +ia +ka +mc +mi +kk +ik +gi +x +mn +r + +:c9 +x +ka +v +mc +mi +kk +ck +ai +ac +ca +fa +hc +hi +fk +x +mn +"** 04-cas.pdf page 17 +x +mn +r + +:c3 +x +aa +v +ak +fe +fi +hk +kk +mi +mc +x +ka +v +nd +x +mn +r + +:c4 +x +mh +v +ah +ia +il +x +mn +r + +:c5 +x +ak +v +aa +fa +fi +hk +kk +mi +mc +x +ka +v +nd +x +mn +r + +:c6 +x +ck +v +ai +ac +ca +ka + +" The end of file seems abrupt, every other :cX section ends with: +" x +" mn +" r From 26ea74d62264332281341567a4dca3750c9a6334 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 21 Oct 2019 03:34:59 +0200 Subject: [PATCH 2/5] Fix typo in cas.x after manual review --- scans/cas.x | 2 +- src/cmd/cas.x | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scans/cas.x b/scans/cas.x index 21c42e0..3779a83 100644 --- a/scans/cas.x +++ b/scans/cas.x @@ -311,7 +311,7 @@ v ka "** 04-cas.pdf page 14 mc -ml "??? +mi "??? kk x ak diff --git a/src/cmd/cas.x b/src/cmd/cas.x index 08fefbc..268993a 100644 --- a/src/cmd/cas.x +++ b/src/cmd/cas.x @@ -313,7 +313,7 @@ v ka "** 04-cas.pdf page 14 mc -ml "??? +mi "??? kk x ak @@ -527,7 +527,7 @@ mh v ah ia -ll +il x mn r From 483b7a28ceb4de81aaf3c2c672495f7e120e7fef Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 21 Oct 2019 03:14:09 +0200 Subject: [PATCH 3/5] Reorder contents of pages 16 and 17 in src/cmd/cas.x Pages 16 and 17 in scans/cas.x must have been accidentally reordered when scanned. This commits reorders the contents in src/cmd/cas.x, but leaves scans/cas.x contents identical to the source scans. --- src/cmd/cas.x | 123 +++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/src/cmd/cas.x b/src/cmd/cas.x index 268993a..828382c 100644 --- a/src/cmd/cas.x +++ b/src/cmd/cas.x @@ -435,68 +435,6 @@ gc ia ma ml "??? -"** 04-cas.pdf page 16 -mc -mi -kk -hk -fi -fc -ha -x -mn -r - -:c7 -x -aa -v -ak -nb -x -mn -r - -:c8 -x -gc -v -ea -ca -ac -ai -ck -ek -gi -gc -ia -ka -mc -mi -kk -ik -gi -x -mn -r - -:c9 -x -ka -v -mc -mi -kk -ck -ai -ac -ca -fa -hc -hi -fk -x -mn "** 04-cas.pdf page 17 x mn @@ -559,7 +497,68 @@ ai ac ca ka +"** 04-cas.pdf page 16 +mc +mi +kk +hk +fi +fc +ha +x +mn +r +:c7 +x +aa +v +ak +nb +x +mn +r + +:c8 +x +gc +v +ea +ca +ac +ai +ck +ek +gi +gc +ia +ka +mc +mi +kk +ik +gi +x +mn +r + +:c9 +x +ka +v +mc +mi +kk +ck +ai +ac +ca +fa +hc +hi +fk +x +mn " The end of file seems abrupt, every other :cX section ends with: " x " mn From 351d00a01882df891fcb05668d1d40882fd0aa9e Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 21 Oct 2019 03:19:28 +0200 Subject: [PATCH 4/5] Remove comments interfering with cas from src/cmd/cas.x --- src/cmd/cas.x | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/src/cmd/cas.x b/src/cmd/cas.x index 828382c..ff4fc82 100644 --- a/src/cmd/cas.x +++ b/src/cmd/cas.x @@ -1,10 +1,7 @@ -"** 04-cas.pdf page 8 -" captital character definitions??? -" lower case definitions at 03-scope.pdf, page 2 ??? :ca v af -nl "??? +nl x hd v @@ -20,7 +17,7 @@ v gi ik kk -mi "??? +mi ma aa ai @@ -35,7 +32,7 @@ r x kk v -mi "??? +mi mc ka ca @@ -63,7 +60,6 @@ x mk v ma -"** 04-cas.pdf page 10 aa ak x @@ -112,7 +108,7 @@ aa v na x -gb "??? +gb v gk x @@ -125,7 +121,6 @@ r :ci x -"** 04-cas.pdf page 11 md v mi @@ -148,11 +143,11 @@ v mc mg ki -ai "??? +ai x ag v -al "??? +al x mn r @@ -187,7 +182,6 @@ r :cm v aa -"** 04-cas.pdf page 12 hf ak nk @@ -207,7 +201,7 @@ mn r :co -x "??? +x ai v ch @@ -217,7 +211,7 @@ ai ac ca ka -mc "??? +mc mi kk ck @@ -249,7 +243,6 @@ ck kk mi mc -"** 04-cas.pdf page 13 x jh v @@ -311,9 +304,8 @@ x aa v ka -"** 04-cas.pdf page 14 mc -mi "??? +mi kk x ak @@ -373,7 +365,6 @@ v if x ak -"** 04-cas.pdf page 15 v if nf @@ -434,8 +425,7 @@ gi gc ia ma -ml "??? -"** 04-cas.pdf page 17 +ml x mn r @@ -497,7 +487,6 @@ ai ac ca ka -"** 04-cas.pdf page 16 mc mi kk @@ -559,7 +548,3 @@ hi fk x mn -" The end of file seems abrupt, every other :cX section ends with: -" x -" mn -" r From 2bb7f50322eef53116b38b74b151fa9379e5469f Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 21 Oct 2019 03:16:08 +0200 Subject: [PATCH 5/5] Adhere to common pattern even in last section of src/cmd/cas.x All previous sections end with the sequence x/mn/r, but the section :c9 ends with only x/mn. This is likely not correct. Running cd src/cmd ../../tools/as7 -o cas cas.s ../../tools/a7out cas cas2out cas.x with and without this commit reveals a difference in cas2out. Besides having the last number not be truncated, the trailing statement for the :c9 entry: c9=x-b+0264000 will only be emitted if the section ends with x/mn/r. This makes cas emit well-formed output. --- src/cmd/cas.x | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cmd/cas.x b/src/cmd/cas.x index ff4fc82..1a0e6c5 100644 --- a/src/cmd/cas.x +++ b/src/cmd/cas.x @@ -548,3 +548,4 @@ hi fk x mn +r