Shring the bootloader by 20 bytes and remove restrictions on file size

git-svn-id: svn://svn.cc65.org/cc65/trunk@5824 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/lynx/bootldr.s b/libsrc/lynx/bootldr.s
index 4c437bc9792217266acf0bd6546eae74da0e8d78..c5d051610f477902aaa5484cdf13e282a32c9205 100644 (file)
--- a/libsrc/lynx/bootldr.s
+++ b/libsrc/lynx/bootldr.s
@@ -23,7 +23,7 @@
 ;      .org $0200
 ;
 ;      ; 1. force Mikey to be in memory
-;      stz     MAPCTL
+;      stz MAPCTL
 ;
 ;      ; 3. set ComLynx to open collector
 ;      lda #4          ; a = 00000100
@@ -35,7 +35,7 @@
 ;
 ;      ; 5. read in secondary exe + 8 bytes from the cart and store it in $f000
 ;      ldx #0          ; x = 0
-;      ldy #$AB        ; y = secondary loader size (171 bytes)
+;      ldy #$97        ; y = secondary loader size (151 bytes)
 ;rloop1: lda RCART0     ; read a byte from the cart
 ;      sta EXE,X       ; EXE[X] = a
 ;      inx             ; x++
@@ -49,13 +49,13 @@
 ;**********************************
 ; After compilation, encryption and obfuscation it turns into this.
 ;**********************************
-       .byte $ff, $dc, $e3, $bd, $bc, $7f, $f8, $94 
-       .byte $b7, $dd, $68, $bb, $da, $5b, $50, $5c 
-       .byte $ea, $9f, $2b, $df, $96, $80, $3f, $7e 
-       .byte $ef, $15, $81, $ae, $ad, $e4, $6e, $b3 
-       .byte $46, $d7, $72, $58, $f7, $76, $8a, $4a 
-       .byte $c7, $99, $bd, $ff, $02, $3e, $5b, $3f 
-       .byte $0c, $49, $1b, $22
+       .byte $ff, $30, $73, $35, $4a, $a8, $54, $ef 
+       .byte $54, $20, $f5, $38, $f4, $35, $7e, $31 
+       .byte $7a, $c3, $f6, $eb, $ee, $30, $e3, $e5 
+       .byte $81, $91, $85, $bf, $4b, $d9, $cf, $80 
+       .byte $5f, $54, $36, $b5, $8a, $b0, $50, $d6 
+       .byte $38, $22, $3e, $c1, $01, $a6, $dd, $f5 
+       .byte $4b, $5e, $6b, $21
 
 ;**********************************
 ; Now we have the secondary loader
@@ -76,20 +76,12 @@ rloop:      lda RCART0      ; read a byte from the cart
        jsr     seclynxblock
 
        ; 3. Skip over the block offset
-       lda     _FileBlockOffset
-       ldx     _FileBlockOffset+1
-       phx                             ; The BLL kit uses negative offsets
-       plx                             ; while the basic Lynx uses positive
-       bmi     @1                      ; Make all offsets negative
+       lda     _FileBlockOffset+1
         eor    #$FF
-       pha
-       txa
+       tay
+       lda     _FileBlockOffset
         eor    #$FF
-       bra     @2
-@1:    pha
-       txa
-@2:    tay
-       plx
+       tax
        jsr     seclynxskip0
 
        ; 4. Read in the main exe to RAM
@@ -97,20 +89,12 @@ rloop:      lda RCART0      ; read a byte from the cart
        ldx     _FileDestAddr+1
        sta     _FileDestPtr
        stx     _FileDestPtr+1
-       lda     _FileFileLen
-       ldx     _FileFileLen+1
-       phx                     ; The BLL kit uses negative counts
-       plx                     ; while the basic Lynx uses positive
-       bmi     @3              ; make all counts negative
+       lda     _FileFileLen+1
        eor     #$FF
-       pha
-       txa
+       tay
+       lda     _FileFileLen
        eor     #$FF
-       bra     @4
-@3:    pha
-       txa
-@4:    tay
-       plx
+       tax
        jsr     seclynxread0
 
        ; 5. Jump to start of the main exe code
@@ -190,5 +174,6 @@ seclynxblock:
        pla
 
 exit:  rts
+
        .reloc
 

diff --git a/libsrc/lynx/open.s b/libsrc/lynx/open.s
index 88c8b8c8f9f5901d2569b2a183876d374290bbe1..04ef2b68ecd77bbd5492b4468fefac9c4bd0a305 100644 (file)
--- a/libsrc/lynx/open.s
+++ b/libsrc/lynx/open.s
@@ -122,20 +122,12 @@ flagsok:
        lda     _FileStartBlock
        sta     _FileCurrBlock
        jsr     lynxblock
-       lda     _FileBlockOffset
-       ldx     _FileBlockOffset+1
-       phx                             ; The BLL kit uses negative offsets
-       plx                             ; while tha basic Lynx uses positive
-       bmi     @1                      ; Make all offsets negative
+       lda     _FileBlockOffset+1
         eor    #$FF
-       pha
-       txa
+       tay
+       lda     _FileBlockOffset
         eor    #$FF
-       bra     @2
-@1:    pha
-       txa
-@2:    tay
-       plx
+       tax
        jsr     lynxskip0
        jsr     stax0sp
        jmp     incsp8

diff --git a/libsrc/lynx/read.s b/libsrc/lynx/read.s
index c461e378fba6479891310b427abb313ca1927edc..43bb27cbaa8e96b373142a61311fe71365408798 100644 (file)
--- a/libsrc/lynx/read.s
+++ b/libsrc/lynx/read.s
@@ -8,8 +8,7 @@
 ; reads bytes from a raw cart and does not understand the concept of files.
 ; So if you read over the end of file you get data from the next file.
 ;
-; The count-parameter can be positive (Atari style) or negative (BLL style).
-; In any case the read routine will work correctly.
+; The count-parameter is positive (Atari style).
 ;
 ; int __fastcall__ read(int fd,void *buf,int count)
 ;
@@ -30,18 +29,13 @@
        sta     _FileDestPtr
        stx     _FileDestPtr+1
        jsr     ldax0sp
-       phx                     ; The BLL kit uses negative counts
-       plx                     ; while the basic Lynx uses positive
-       bmi     @1              ; make all counts negative
-       eor     #$FF
        pha
-       txa
+        txa
+       eor     #$FF
+       tay
+       pla
        eor     #$FF
-       bra     @2
-@1:    pha
-       txa
-@2:    tay
-       plx
+       tax
        jsr     lynxread0
        jsr     ldax0sp
        jmp     incsp6

diff --git a/src/ld65/cfg/lynx-bll.cfg b/src/ld65/cfg/lynx-bll.cfg
index 0cb677c9ca20158044f51cdf478b8d9f551b791c..468ed5e213ed41eb597a7ef71d8862b88d83122f 100644 (file)
--- a/src/ld65/cfg/lynx-bll.cfg
+++ b/src/ld65/cfg/lynx-bll.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
-    __STARTOFDIRECTORY__: type = weak, value = $00DF; # start just after loader
+    __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
     __BLOCKSIZE__: type = weak, value = 1024; # cart block size
     __BLLHDR__:    type = import;
 }

diff --git a/src/ld65/cfg/lynx-coll.cfg b/src/ld65/cfg/lynx-coll.cfg
index f1f35dfe110f18484ac359108bde999a973e75aa..b189936f1a695355293a3b0c3894bc279c6fb579 100644 (file)
--- a/src/ld65/cfg/lynx-coll.cfg
+++ b/src/ld65/cfg/lynx-coll.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
-    __STARTOFDIRECTORY__: type = weak, value = $00DF; # start just after loader
+    __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
     __BLOCKSIZE__: type = weak, value = 1024; # cart block size
     __EXEHDR__:    type = import;
     __BOOTLDR__:   type = import;

diff --git a/src/ld65/cfg/lynx-uploader.cfg b/src/ld65/cfg/lynx-uploader.cfg
index 96f43db4ea7585136b65727d08d4315aaa5c8992..6a47964437bfb076470ec3b7ed081d3a296c9158 100644 (file)
--- a/src/ld65/cfg/lynx-uploader.cfg
+++ b/src/ld65/cfg/lynx-uploader.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
-    __STARTOFDIRECTORY__: type = weak, value = $00DF; # start just after loader
+    __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
     __BLOCKSIZE__: type = weak, value = 1024; # cart block size
     __EXEHDR__:    type = import;
     __BOOTLDR__:   type = import;

diff --git a/src/ld65/cfg/lynx.cfg b/src/ld65/cfg/lynx.cfg
index 0fea7eb85ab4a314e4094b4095d8169d5d7dd28b..520a291d59224b3e0d7d2d88703dc1816bcb4452 100644 (file)
--- a/src/ld65/cfg/lynx.cfg
+++ b/src/ld65/cfg/lynx.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
-    __STARTOFDIRECTORY__: type = weak, value = $00DF; # start just after loader
+    __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
     __BLOCKSIZE__: type = weak, value = 1024; # cart block size
     __EXEHDR__:    type = import;
     __BOOTLDR__:   type = import;