Skip to content

Commit

Permalink
Optable 370 ter (z390development#537)
Browse files Browse the repository at this point in the history 
* Create new optable DFLT

* Test and fix issues for changes to correct optable(370)

* undoing change to build.bat - needs separate issue

* Fix logical inversion in handling debug option in bldjar.bat

* Add overview of optable/machine options and equivalences

* Fix layout issue with documentation for machine/optable options

* Fix layout issue with table for machine/optable options

* Fix alignmenent of remarks following the table of machine/optable options

* Fix leftovers of creating rt\rt\OPCD$ from rt\rt\OPCD$DOS

* Fixing case of filenames to be assembled and sequence of entries in optable_370
  • Loading branch information
@abekornelis
abekornelis authored Jul 24, 2024
1 parent 3b70952 commit a73a4f4
Show file tree
Hide file tree
Showing 19 changed files with 674 additions and 335 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ soa/demo/DEMOCMGR.[mM][lL][cC]
soa/demo/DEMOMAIN.[mM][lL][cC]
soa/demo/DEMOSUB1.[mM][lL][cC]
soa/demo/DEMOSUB2.[mM][lL][cC]
vse/demo/DEMOVSE3.[tT][fF]
zcobol/demo/COMPSUM.[mM][lL][cC]
zcobol/demo/COPYFILE.[mM][lL][cC]
zcobol/demo/COPYFILE_OLD.[mM][lL][cC]
Expand Down
6 changes: 3 additions & 3 deletions barcode/BLD390.BAT
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rem asml routines
call asm linklib\barcode\encodetr sysmac(+linklib\barcode) syscpy(+linklib\barcode) %1 %2 %3 %4
call asml linklib\barcode\s4bcdrva sysmac(+linklib\barcode) syscpy(+linklib\barcode) %1 %2 %3 %4
copy linklib\barcode\*.390 linklib
call bat\asm barcode\encodetr sysmac(+barcode) syscpy(+barcode) %1 %2 %3 %4
call bat\asml barcode\s4bcdrva sysmac(+barcode) syscpy(+barcode) %1 %2 %3 %4
copy barcode\*.390 linklib
8 changes: 6 additions & 2 deletions bat/BLDJAR.BAT
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
@if /I "%1" == "tron" (echo on) else (echo off)
rem create z390 jar file from sources
rem unless NoDocs is specified as an argument, generate javadoc files
rem A single parameter is allowed:
rem - NoDocs specifies to suppress generating javadoc files
rem - Debug specifies to generate jar with debug enabled
rem --> the default is to generate javadoc and suppress debug info

setlocal
if /I "%1" == "tron" (set z_TraceMode=tron
Expand Down Expand Up @@ -31,8 +34,9 @@ copy src\*.java jar
copy src\z390.man jar
cd jar
rem compile z390 java sources to class vm object code
if /I %1. EQU Debug. (set jvopt=-g) else (set jvopt=-g:none)
java -version
javac.exe -g:none *.java
javac.exe %jvopt% *.java
set z_ReturnCode=%ERRORLEVEL%
if %z_ReturnCode% NEQ 0 (echo %0 ERROR: Error compiling z390 java sources
goto return
Expand Down
30 changes: 16 additions & 14 deletions doc/contributing/contribute_code.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ The test scripts are in subdirectory z390test\src\test\groovy\org\z390\test

Action | Command
------------------------------------------|------------
get a list of gradlew command options | gradlew --help
force a test run | gradlew test -—rerun
get a list of gradlew command options | `gradlew --help`
force a test run | `gradlew test --rerun`
run a specific test/testset | `gradlew test --tests 'pattern'`
run all zCobol tests | `gradlew test --tests '*cbl*'`

## Proposing new functionality

Expand Down Expand Up @@ -245,15 +247,15 @@ git documentation:https://git-scm.com/doc

Action | Command
------------------------------------------|------------
get list of available commands | git help
get syntax details for a git command | git help <command>
create local clone of git repo | git clone <url> <subdir>
review status of current branch | git status
get list of all defined branches | git branch -v --all
prepare commit | git add .
commit a set of changes | git commit -m"desriptive comments"
push changes to your own fork | git push
graphical display of branches | git log --graph --oneline --decorate --all
-- > when viewing the bracnches displayed | <Enter> to scroll 1 line, <PgDn> to scroll a page, q to quit
go 'back in time' to a specific commit | git branch -f <new_branch> [<start-point>]
| git switch <new_branch>
get list of available commands | `git help`
get syntax details for a git command | `git help <command>`
create local clone of git repo | `git clone <url\> <subdir>`
review status of current branch | `git status`
get list of all defined branches | `git branch -v --all`
prepare commit | `git add .`
commit a set of changes | `git commit -m"descriptive comments"`
push changes to your own fork | `git push`
graphical display of branches | `git log --graph --oneline --decorate --all`
-- > when viewing the bracnches displayed | `<Enter> to scroll 1 line, <PgDn> to scroll a page, q to quit`
go 'back in time' to a specific commit | `git branch -f <new_branch> [<start-point>]`
| `git switch <new_branch>`
2 changes: 2 additions & 0 deletions doc/reference/soa_services.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ GENRUN= | name of the generated run command file |

#### Usage

```
SOAGEN MAIN=DEMOMAIN, MAIN CLIENT APPLICATION PGM X
CLIENT=DEMOCMGR, SOA CLIENT MSG MGR NAME X
SERVER=DEMOSMGR, SOA SERVER MSG MGR NAME X
Expand All @@ -194,6 +195,7 @@ GENRUN= | name of the generated run command file |
GENBLD=DEMOBLD, GENERATED BUILD BAT FILE X
GENRUN=DEMORUN GENERATED RUN BAT FILE
END
```

The above SOA application generation macro call generates server
message manager DEMOSMGR to run on the same host as client using
Expand Down
38 changes: 19 additions & 19 deletions doc/reference/zCOBOL_NIST_COBOL_1985_Test_Results.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,25 @@ ZPAR utility commands:
call zpar\ZPARSUM2 \work\nist\src\*.ERR
```

| | |XLAT |XLAT |ASM |ASM |ASM |EXEC |EXEC |
|ID |TOT |RC=0 |RC>0 |RC<=4 |RC=8 |RC>8 |RC=0 |RC>0 |
|------|-----|-----|-----|------|-----|-----|-----|-----|
|CM | 7 | 7 | 0 | 0 | 7 | 0 | 0 | 0 |
|DB | 10 | 10 | 0 | 0 | 10 | 0 | 0 | 0 |
|EX | 1 | 1 | 0 | 0 | 1 | 0 | 0 | 0 |
|IC | 35 | 35 | 0 | 26 | 9 | 0 | 7 | 7 |
|IF | 42 | 42 | 0 | 0 | 42 | 0 | 0 | 0 |
|IX | 38 | 38 | 0 | 0 | 38 | 0 | 0 | 0 |
|NC | 92 | 92 | 0 | 18 | 72 | 0 | 2 | 18 |
|OB | 9 | 9 | 0 | 3 | 6 | 0 | 0 | 2 |
|RL | 32 | 32 | 0 | 0 | 32 | 0 | 0 | 0 |
|RW | 4 | 4 | 0 | 0 | 4 | 0 | 0 | 0 |
|SG | 10 | 10 | 0 | 0 | 10 | 0 | 0 | 0 |
|SM | 7 | 7 | 0 | 1 | 6 | 0 | 0 | 1 |
|SQ | 82 | 82 | 0 | 0 | 82 | 0 | 0 | 0 |
|ST | 39 | 39 | 0 | 0 | 39 | 0 | 0 | 0 |
|------|-----|-----|-----|------|-----|-----|-----|-----|
|Total |408 | 408 | 0 | 48 | 358 | 0 | 9 | 28 |
| | |XLAT |XLAT |ASM |ASM |ASM |EXEC |EXEC |
|ID |TOT |RC=0 |RC&gt;0 |RC&lt;=4 |RC=8 |RC&gt;8 |RC=0 |RC&gt;0 |
|------|-----|-----|--------|---------|-----|--------|-----|--------|
|CM | 7 | 7 | 0 | 0 | 7 | 0 | 0 | 0 |
|DB | 10 | 10 | 0 | 0 | 10 | 0 | 0 | 0 |
|EX | 1 | 1 | 0 | 0 | 1 | 0 | 0 | 0 |
|IC | 35 | 35 | 0 | 26 | 9 | 0 | 7 | 7 |
|IF | 42 | 42 | 0 | 0 | 42 | 0 | 0 | 0 |
|IX | 38 | 38 | 0 | 0 | 38 | 0 | 0 | 0 |
|NC | 92 | 92 | 0 | 18 | 72 | 0 | 2 | 18 |
|OB | 9 | 9 | 0 | 3 | 6 | 0 | 0 | 2 |
|RL | 32 | 32 | 0 | 0 | 32 | 0 | 0 | 0 |
|RW | 4 | 4 | 0 | 0 | 4 | 0 | 0 | 0 |
|SG | 10 | 10 | 0 | 0 | 10 | 0 | 0 | 0 |
|SM | 7 | 7 | 0 | 1 | 6 | 0 | 0 | 1 |
|SQ | 82 | 82 | 0 | 0 | 82 | 0 | 0 | 0 |
|ST | 39 | 39 | 0 | 0 | 39 | 0 | 0 | 0 |
|------|-----|-----|--------|---------|-----|--------|-----|--------|
|Total |408 | 408 | 0 | 48 | 358 | 0 | 9 | 28 |

Notes:
1. *The total NIST COBOL 1985 test suite includes 459 programs.*
Expand Down
2 changes: 1 addition & 1 deletion doc/user_guide/z390/commands.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@ The ez390 emulator supports the following interactive test commands when the
* `* addr` = hex.,+-hex, *+-hex, dec, nnr% (24 bit), nnr? (31 bit)
* `* reg` = nnr where nn = 0-15
* `* sdt` = self defining term (b'01',c'ab',f'1',h'2',x'ff')
* `* ??` = break compare operator (=,!=,<,<=,>,>=)
* `* ??` = break compare operator (=,!=,&lt;,&lt;=,&gt;,&gt;=)

Loading

0 comments on commit a73a4f4

Please sign in to comment.