Merge pull request #280 from jgharston/main

Updated and sorted sample programs

.gitignore

@@ -1 +0,0 @@
-auxmem.vers.s

auxmem.shr.s

@@ -119,70 +119,25 @@ SHRPRCHAR     LDX   VDUPIXELS              ; Pixels per byte
 *           VS read cursor / VC write cursor
 * The read and write cursors have separate save-unders in :SAVEBYTES
 SHRCURSOR     PHP                          ; Preserve flags
-              PHA                          ; Preserve character
+              PHA                          ; Preserve A
               LDA   VDUSTATUS              ; If VDU5 mode, bail
               AND   #$20
-              BNE   :BAIL
-              LDA   VDUPIXELS              ; Pixels per byte
-              CMP   #$02                   ; 2 is 320-mode (MODE 1)
-              BNE   :MODE0
-              LDA   #$04                   ; 4 bytes in 320 mode
-              LDX   #$71                   ; White/red
-              BRA   :S1
-:MODE0        LDA   #$02                   ; 2 bytes in 640 mode
-              LDX   #%11011101             ; White/red/white/red
-:S1           STA   :BYTES                 ; Bytes per char
-              STX   :CURSBYTE
-              LDA   #$E1
-              STA   VDUBANK2
+              BNE   SHRCURSBAIL
               JSR   SHRCHARADDR            ; Screen addr in VDUADDR
-              LDA   VDUADDR+0              ; LSB
-              CLC
-              ADC   #<$460                 ; $460 is seven rows
-              STA   VDUADDR+0
-              LDA   VDUADDR+1              ; MSB
-              ADC   #>$460                 ; $460 is seven rows
-              STA   VDUADDR+1
-              LDY   #$00
-              LDX   #$00
-              PLA                          ; Recover character
-              PLP                          ; Recover flags
-              BVC   :S2                    ; VC: Write cursor
-              INX                          ; Advance to 2nd half of :SAVEBYTES
-              INX
-              INX
-              INX
-:S2           BCC   :CURSOROFF             ; CC: Remove cursor
-:CURSORON
-              LDA   [VDUADDR],Y            ; See if cursor shown
-              CMP   :CURSBYTE
-              BEQ   :DONE                  ; Cursor shown already, skip
-:L1           LDAL  [VDUADDR],Y
-              STA   :SAVEBYTES,X           ; Preserve bytes under cursor
-              LDA   :CURSBYTE              ; Byte of cursor data
-              STAL  [VDUADDR],Y
-              INX
-              INY
-              CPY   :BYTES
-              BNE   :L1
+              >>>   WRTMAIN
+              LDA   VDUADDR+0              ; Copy addr to SHRVDUQ
+              STA   SHRVDUQ+0
+              LDA   VDUADDR+1
+              STA   SHRVDUQ+1
+              >>>   WRTAUX
+              PLA                          ; Recover A
+              PLY                          ; Flags -> Y
+              >>>   XF2MAIN,SHRCURSM
+SHRCURSRET    >>>   ENTAUX
               RTS
-:CURSOROFF
-              LDA   [VDUADDR],Y            ; See if cursor shown
-              CMP   :CURSBYTE
-              BNE   :DONE                  ; Cursor not shown, skip
-:L2           LDA   :SAVEBYTES,X           ; Restore bytes under cursor
-              STAL  [VDUADDR],Y
-              INX
-              INY
-              CPY   :BYTES
-              BNE   :L2
-:DONE         RTS
-:BAIL         PLA                          ; Fix stack
-              PLA
+SHRCURSBAIL   PLA
+              PLP
               RTS
-:BYTES        DB    $00                    ; 2 for 640-mode, 4 for 320-mode
-:CURSBYTE     DB    $00                    ; Cursor byte for mode
-:SAVEBYTES    DS    8                      ; Bytes under cursors
 
 
 * Write character to SHR screen in 320 pixel mode
@@ -689,6 +644,7 @@ SHRSETGCOL    PHA
               >>>   WRTAUX
               RTS
 
+
 * Wrapper to call SHRDEFPALM (which sets up default palette)
 SHRDEFPAL     >>>   XF2MAIN,SHRDEFPALM
 SHRDEFPALRET  >>>   ENTAUX

auxmem.vdu.s

@@ -112,16 +112,18 @@ VDUWORKSZ     EQU   VDUVAREND-VDUWORKSP+1
 *
 
 * Screen definitions
-*                     0   1   2   3           6   7  ; MODEs sort-of completed
+*                     0   1       3   4       6   7  ; MODEs sort-of completed
 SCNTXTMAXX    DB     79, 39, 39, 79, 39, 39, 39, 39  ; Max text column
 SCNTXTMAXY    DB     23, 23, 23, 23, 23, 23, 23, 23  ; Max text row
-SCNBYTES      DB     08, 08, 08, 01, 01, 01, 01, 01  ; Bytes per character
-SCNCOLOURS    DB     03, 15, 07, 01, 01, 01, 01, 01  ; Colours-1
-SCNPIXELS     DB     04, 02, 07, 00, 00, 00, 00, 00  ; Pixels per byte
-SCNTYPE       DB     65, 64,128, 01, 00, 00, 00, 32  ; Screen type
+SCNBYTES      DB     08, 08, 08, 01, 08, 01, 01, 01  ; Bytes per character
+SCNCOLOURS    DB     03, 15, 15, 01, 07, 01, 01, 01  ; Colours-1
+SCNPIXELS     DB     04, 02, 02, 00, 07, 00, 00, 00  ; Pixels per byte
+SCNFALLBACK   DB     03, 04, 05, 03, 04, 05, 06, 07  ; Fall back if unsupported
+SCNTYPE       DB     65, 64, 66, 01,128, 02, 00, 32  ; Screen type
 * b7=FastDraw -> HGR mode
 * b6=SHR mode on Apple IIgs
 * b5=Teletext
+* b1=40COL/20COL
 * b0=40COL/80COL
 
 * Colour table
@@ -704,15 +706,16 @@ VDUINIT       STA   VDUQ+8
 * MODEs available:
 *  MODE 0 - 640x200 SHR graphics, 80x24 bitmap text (GS only)
 *  MODE 1 - 320x200 SHR graphics, 40x24 bitmap text (GS only)
-*  MODE 2 - 280x192 HGR graphics, 40x24 bitmap text
+*  MODE 2 --> MODE 1
 *  MODE 3 - 80x24 text
-*  MODE 4 --> MODE 6
+*  MODE 4 - 280x192 HGR graphics, 40x24 bitmap text
 *  MODE 5 --> MODE 6
 *  MODE 6 - 40x24 text
 *  MODE 7 - 40x24 with $80-$9F converted to spaces
 *
 * On //e, MODE 0 -> MODE 3
-*         MODE 1 -> MODE 6
+*         MODE 1 -> MODE 4
+*         MODE 2 -> MODE 5
 *
 VDU22         JSR   NEGCALL                ; Find machine type
               AND   #$0F
@@ -721,16 +724,22 @@ VDU22         JSR   NEGCALL                ; Find machine type
 :NOTGS        STA   VDUBANK
               LDA   VDUQ+8
               AND   #$07
-
+; jgh
               BIT   VDUBANK
-              BMI   :INIT                  ; Skip if GS
-              CMP   #$00                   ; Mode 0?
-              BNE   :S1
-              LDA   #$03                   ; --> Mode 3 instead
-              BRA   :INIT
-:S1           CMP   #$01                   ; Mode 1?
-              BNE   :INIT
-              LDA   #$06                   ; --> Mode 6 instead
+              BMI   :INIT                  ; All MODEs supported
+              CMP   #$03
+              BCS   :INIT
+              ADC   #$03                   ; Fall back to replacement MODE
+
+;              BIT   VDUBANK
+;              BMI   :INIT                  ; Skip if GS
+;              CMP   #$00                   ; Mode 0?
+;              BNE   :S1
+;              LDA   #$03                   ; --> Mode 3 instead
+;              BRA   :INIT
+;:S1           CMP   #$01                   ; Mode 1?
+;              BNE   :INIT
+;              LDA   #$06                   ; --> Mode 6 instead
  
 :INIT         TAX                          ; Set up MODE
               STX   VDUMODE                ; Screen MODE

auxmem.vers.s

@@ -0,0 +1,3 @@
+* Auto-generated by .git/hooks/pre-commit
+HELLO  ASC  'Applecorn v0.54-beta-0-g3325769'
+       DB   $00

mainmem.shr.s

@@ -92,7 +92,6 @@ SHRXPLDFONT   >>>   ENTMAIN
               BNE   :L1
               JSR   SHRCLR24               ; Clear row 24
               >>>   XF2AUX,SHRV22RET
-              RTS
 
 
 * Explode one character to location pointed to by A3L
@@ -200,8 +199,20 @@ SHRXPLDROW    LDX   SHRPIXELS              ; Pixels per byte
 
 
 * Clear text row 24 (0-based index)
-SHRCLR24      
-* $9800
+SHRCLR24      CLC                          ; 65816 native mode
+              XCE
+              REP   #$30                   ; 16 bit M & X
+              MX    %00                    ; Tell Merlin
+              LDX   #$00
+              LDA   #$00
+:L1           STAL  $E19800,X
+              INX
+              INX
+              CPX   #$0500
+              BNE   :L1
+              SEC                          ; 65816 emulation mode
+              XCE
+              MX    %11                    ; Tell Merlin
               RTS
 
 
@@ -263,6 +274,74 @@ SHRCHAR640    PHY                          ; Preserve Y
               RTS
 
 
+* Handle plotting & unplotting cursors
+* On entry: character in A, flags in Y
+*           pointer to screen address in SHRVDUQ+0..1
+SHRCURSM      >>>   ENTMAIN
+              PHY                          ; Preserve flags
+              PHA                          ; Preserve character
+              LDA   SHRVDUQ+0              ; Copy pointer to A3L/H
+              STA   A3L
+              LDA   SHRVDUQ+1
+              STA   A3H
+              LDA   #$E1                   ; Bank $E1
+              STA   A4L
+              LDA   SHRPIXELS              ; Pixels per byte
+              CMP   #$02                   ; 2 is 320-mode (MODE 1)
+              BNE   :MODE0
+              LDA   #$04                   ; 4 bytes in 320 mode
+              LDX   #$71                   ; White/red
+              BRA   :S1
+:MODE0        LDA   #$02                   ; 2 bytes in 640 mode
+              LDX   #%11011101             ; White/red/white/red
+:S1           STA   :BYTES                 ; Bytes per char
+              STX   :CURSBYTE
+              LDA   A3L                    ; LSB
+              CLC
+              ADC   #<$460                 ; $460 is seven rows
+              STA   A3L
+              LDA   A3H                    ; MSB
+              ADC   #>$460                 ; $460 is seven rows
+              STA   A3H
+              LDY   #$00
+              LDX   #$00
+              PLA                          ; Recover character
+              PLP                          ; Recover flags
+              BVC   :S2                    ; VC: Write cursor
+              INX                          ; Advance to 2nd half of :SAVEBYTES
+              INX
+              INX
+              INX
+:S2           BCC   :CURSOROFF             ; CC: Remove cursor
+:CURSORON
+              LDAL  [A3L],Y                ; See if cursor shown
+              CMP   :CURSBYTE
+              BEQ   :DONE                  ; Cursor shown already, skip
+:L1           LDAL  [A3L],Y
+              STA   :SAVEBYTES,X           ; Preserve bytes under cursor
+              LDA   :CURSBYTE              ; Byte of cursor data
+              STAL  [A3L],Y
+              INX
+              INY
+              CPY   :BYTES
+              BNE   :L1
+              >>>   XF2AUX,SHRCURSRET
+:CURSOROFF
+              LDAL  [A3L],Y                ; See if cursor shown
+              CMP   :CURSBYTE
+              BNE   :DONE                  ; Cursor not shown, skip
+:L2           LDA   :SAVEBYTES,X           ; Restore bytes under cursor
+              STAL  [A3L],Y
+              INX
+              INY
+              CPY   :BYTES
+              BNE   :L2
+:DONE         >>>   XF2AUX,SHRCURSRET
+:BYTES        DB    $00                    ; 2 for 640-mode, 4 for 320-mode
+:CURSBYTE     DB    $00                    ; Cursor byte for mode
+:SAVEBYTES    DS    8                      ; Bytes under cursors
+
+
 * VDU5 plot char at graphics cursor position
 SHRVDU5CH     >>>   ENTMAIN
               CLC                          ; 65816 native mode
@@ -1013,7 +1092,7 @@ SHRLINELO     MX    %00                    ; Tell merlin 16 bit M & X
               STA   :D                     ; D = D + 2 * dy
 :S3           INX
               CPX   :LIM                   ; Compare with x1
-              BNE   :L1
+              BCC   :L1
 
               SEC                          ; 65816 emulation mode
               XCE
@@ -1089,7 +1168,7 @@ SHRLINEHI     MX    %00                    ; Tell Merlin 16 bit M & X
               STA   :D                     ; D = D + 2 * dx
 :S3           INX
               CPX   :LIM                   ; Compare with y1
-              BNE   :L1
+              BCC   :L1
 
               SEC                          ; 65816 emulation mode
               XCE
@@ -1488,7 +1567,7 @@ SHRPALCHANGE  >>>   ENTMAIN
               STAL  $E19E00+9,X
               STAL  $E19E00+17,X
               STAL  $E19E00+25,X
-              RTS
+              BRA   :DONE
 :MODE320      TXA
               AND   #%00011110             ; Has already been shifted
               TAX
@@ -1496,7 +1575,7 @@ SHRPALCHANGE  >>>   ENTMAIN
               STAL  $E19E00,X              ; Store in logical slot
               LDA   PALETTE320+1,Y         ; Byte 2 of physical colour
               STAL  $E19E00+1,X            ; Store in logical slot
-              >>>   XF2AUX,VDUXXRET 
+:DONE         >>>   XF2AUX,VDUXXRET 
 
 
 * Assign a custom RGB colour to a 'logical' colour
@@ -1520,7 +1599,7 @@ SHRPALCUSTOM  >>>   ENTMAIN
               STAL  $E19E00+9,X
               STAL  $E19E00+17,X
               STAL  $E19E00+25,X
-              RTS
+              BRA   :DONE
 :MODE320      TXA
               AND   #%00011110             ; Has already been shifted
               TAX
@@ -1528,7 +1607,7 @@ SHRPALCUSTOM  >>>   ENTMAIN
               STAL  $E19E00,X              ; Store in logical slot
               TYA                          ; R component
               STAL  $E19E00+1,X            ; Store in logical slot
-              >>>   XF2AUX,VDUXXRET 
+:DONE         >>>   XF2AUX,VDUXXRET 
               
 
 * Table of addresses of SHR rows (in reverse order)

mame_applecorn

@@ -1,2 +1,2 @@
 #mame -w apple2ee -debug -sl5 mouse -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po
-mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/JGHMusic2.po
+mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/acrn*po # tests/Creat*po