Closed jgharston closed 1 year ago
I'm unable to merge this pull request due to too many conflicts with the UNZIP156.Z80 source-code.
You will need to save any files with your recent changes, delete your current forked repository jgharston/UNZIP-CPM-Z80 and make a new forked copy from agn453/UNZIP-CPM-Z80 to resync things. Then you can restore your changed files and GitHub merges should work again.
For your earlier merge request I manually added your changes - and corrected a syntax error that prevented assembly with both the Microsoft M80 and Hector Peraza's ZSM4. (The test for if FASTQUIT=0
needs to be written as if FASTQUIT eq 0
). I'm assuming the assembler you use (ZMAC) also accepts this form of conditional syntax.
Also, the ZIP100.Z80 source generates many errors with M80 and ZSM4 - mainly missing :
on labels and a syntax difference in specifying hexadecimal numbers (ZMAC uses &nnnn
whereas M80 and ZSM4 require a nnnnH
format).
I've once again manually updated the other files and attributed the changes to you. I've also included copies of the assembler listing files from M80 and ZSM4 so you can correct the ZIP100.Z80 source.
Translated source for ZIP from BBC BASIC source to ZMAC source.