Fixed to assemble in Merlin-16 again.

2021-09-10 16:11:57 -04:00 · 2021-09-10 16:11:57 -04:00 · d3f32a8743
parent 21aeb99a70
commit d3f32a8743
19 changed files with 36 additions and 6 deletions
--- a/applecorn.po
+++ b/applecorn.po
--- a/applecorn.s
+++ b/applecorn.s
@ -192,3 +192,5 @@ MAINZP      MAC



+
+
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@ -534,3 +534,5 @@ OSBM2        ASC   ').'



+
+
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@ -449,3 +449,5 @@ BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT



+
+
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@ -907,3 +907,5 @@ ERROR2E     DW    $C800



+
+
--- a/auxmem.init.s
+++ b/auxmem.init.s
@ -150,3 +150,5 @@ BYTE00A     BRK
 HELLO       ASC   'Applecorn MOS 2021-09-10 snapshot'
            DB    $00                        ; Unify MOS messages

+
+
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@ -478,3 +478,5 @@ AUXBLK      ASC   '**ENDOFCODE**'



+
+
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@ -66,3 +66,5 @@ OSFILECB     EQU   $2EE        ; OSFILE control block



+
+
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@ -580,3 +580,5 @@ ECHO3        PHP



+
+
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@ -631,3 +631,5 @@ BYTEA0       LDY   #79              ; Read VDU variable $09,$0A



+
+
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@ -56,3 +56,5 @@ GEOFCMD     EQU   $D1



+
+
--- a/mainmem.init.s
+++ b/mainmem.init.s
@ -102,3 +102,5 @@ RESET       TSX



+
+
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@ -130,4 +130,6 @@ CANTOPEN    ASC   "Unable to open ROM file"



+
+

--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@ -106,3 +106,5 @@ QUITPL      HEX   04          ; Number of parameters



+
+
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@ -136,4 +136,6 @@ ROM8        STR   "USERROM2.ROM"



+
+

--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@ -155,3 +155,5 @@ FILEREFS    DB    $00,$00,$00,$00



+
+
--- a/mainmem.path.s
+++ b/mainmem.path.s
@ -282,3 +282,5 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix



+
+
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@ -94,9 +94,9 @@ OFILE        >>>   ENTMAIN
             PLA
             PHA
             CMP   #$80               ; Is it "w"?
-             BEQ   :S1                ; If so, no wildcards
+             BEQ   :NOWILD            ; If so, no wildcards
             JSR   WILDONE            ; Handle any wildcards
-:S1          JSR   EXISTS             ; See if file exists ...
+:NOWILD      JSR   EXISTS             ; See if file exists ...
             CMP   #$02               ; ... and is a directory
             BNE   :NOTDIR
             JMP   :NOTFND            ; Bail out if directory
@ -812,7 +812,3 @@ MAINRDMEM    STA   A1L
             LDA   (A1L)
 MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS

-
-
-
-
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@ -332,3 +332,5 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)



+
+
				`@ -449,3 +449,5 @@ BYTE76 LDX #$00 ; Update LEDs and return X=SHIFT`
				`@ -631,3 +631,5 @@ BYTEA0 LDY #79 ; Read VDU variable $09,$0A`
				`@ -282,3 +282,5 @@ PREFIX DS 65 ; Buffer for ProDOS prefix`
				`@ -332,3 +332,5 @@ MATCHBUF DS 65 ; For storing match results (Pascal str)`