Merge pull request #341 from alexthissen/master

Update exehdr.s for Lynx target

diff --git a/cfg/lynx-bll.cfg b/cfg/lynx-bll.cfg
index a1687b423f90f30789c175a114169ab9abefc2f5..adf1e7ab697d9b632385f10ef0d32c185d40c301 100644 (file)
--- a/cfg/lynx-bll.cfg
+++ b/cfg/lynx-bll.cfg
@@ -1,7 +1,8 @@
 SYMBOLS {
     __STACKSIZE__:        type = weak, value = $0800; # 2k stack
     __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
-    __BLOCKSIZE__:        type = weak, value = $0400; # cart block size
+    __BANK0BLOCKSIZE__:   type = weak, value = $0400; # bank 0 cart block size
+    __BANK1BLOCKSIZE__:   type = weak, value = $0000; # bank 1 block size
     __BLLHDR__:           type = import;
 }
 MEMORY {

diff --git a/cfg/lynx-coll.cfg b/cfg/lynx-coll.cfg
index 9467c3c921f64a7ddd5588700b969e1a5ed4dded..7c71993f80b35e72d08e5b0c408540e65082ce3f 100644 (file)
--- a/cfg/lynx-coll.cfg
+++ b/cfg/lynx-coll.cfg
@@ -1,7 +1,8 @@
 SYMBOLS {
     __STACKSIZE__:        type = weak, value = $0800; # 2k stack
     __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
-    __BLOCKSIZE__:        type = weak, value = $0400; # cart block size
+    __BANK0BLOCKSIZE__:   type = weak, value = $0400; # bank 0 cart block size
+    __BANK1BLOCKSIZE__:   type = weak, value = $0000; # bank 1 block size
     __EXEHDR__:           type = import;
     __BOOTLDR__:          type = import;
     __DEFDIR__:           type = import;

diff --git a/cfg/lynx-uploader.cfg b/cfg/lynx-uploader.cfg
index c32e3583f400b836183d8dccd138a449d6b866f3..476b3c5deacd3e2ba40d8694c906c0061bd2df6b 100644 (file)
--- a/cfg/lynx-uploader.cfg
+++ b/cfg/lynx-uploader.cfg
@@ -1,7 +1,8 @@
 SYMBOLS {
     __STACKSIZE__:        type = weak, value = $0800; # 2k stack
     __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
-    __BLOCKSIZE__:        type = weak, value = $0400; # cart block size
+    __BANK0BLOCKSIZE__:   type = weak, value = $0400; # bank 0 cart block size
+    __BANK1BLOCKSIZE__:   type = weak, value = $0000; # bank 1 block size
     __EXEHDR__:           type = import;
     __BOOTLDR__:          type = import;
     __DEFDIR__:           type = import;

diff --git a/cfg/lynx.cfg b/cfg/lynx.cfg
index 5140b342fe90a43360607f99a8cabf3d912dd486..5c42654d773d224b302d5e85fd9e004cd915b225 100644 (file)
--- a/cfg/lynx.cfg
+++ b/cfg/lynx.cfg
@@ -1,7 +1,8 @@
 SYMBOLS {
     __STACKSIZE__:        type = weak, value = $0800; # 2k stack
     __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader
-    __BLOCKSIZE__:        type = weak, value = 1024; # cart block size
+    __BANK0BLOCKSIZE__:   type = weak, value = $0400; # bank 0 cart block size
+    __BANK1BLOCKSIZE__:   type = weak, value = $0000; # bank 1 block size
     __EXEHDR__:           type = import;
     __BOOTLDR__:          type = import;
     __DEFDIR__:           type = import;

diff --git a/libsrc/lynx/bootldr.s b/libsrc/lynx/bootldr.s
index a62d6155cd706709ee6b7c246a0fcaab9cfacf34..64569e6eec9e6fbbfd6ddbd2303bbd747550dad8 100644 (file)
--- a/libsrc/lynx/bootldr.s
+++ b/libsrc/lynx/bootldr.s
@@ -5,7 +5,7 @@
 ;
         .include "lynx.inc"
         .include "extzp.inc"
-        .import         __BLOCKSIZE__
+        .import         __BANK0BLOCKSIZE__
         .export         __BOOTLDR__: absolute = 1
 
 
@@ -167,7 +167,7 @@ seclynxblock:
         lda __iodat
         sta IODAT
         stz _FileBlockByte
-        lda #<($100-(>__BLOCKSIZE__))
+        lda #<($100-(>__BANK0BLOCKSIZE__))
         sta _FileBlockByte+1
         ply
         plx

diff --git a/libsrc/lynx/defdir.s b/libsrc/lynx/defdir.s
index 2930edf4beab17260cfce842d397694d73574a94..c0fe19f4de270fe130c12427f99412f2bba25d28 100644 (file)
--- a/libsrc/lynx/defdir.s
+++ b/libsrc/lynx/defdir.s
@@ -8,7 +8,7 @@
         .import         __MAIN_START__
         .import         __CODE_SIZE__, __DATA_SIZE__, __RODATA_SIZE__
         .import         __STARTUP_SIZE__, __ONCE_SIZE__, __LOWCODE_SIZE__
-        .import         __BLOCKSIZE__
+        .import         __BANK0BLOCKSIZE__
         .export         __DEFDIR__: absolute = 1
 
 
@@ -18,12 +18,12 @@
 
 __DIRECTORY_START__:
 off0 = __STARTOFDIRECTORY__ + (__DIRECTORY_END__ - __DIRECTORY_START__)
-blocka = off0 / __BLOCKSIZE__
+blocka = off0 / __BANK0BLOCKSIZE__
 ; Entry 0 - first executable
-block0 = off0 / __BLOCKSIZE__
+block0 = off0 / __BANK0BLOCKSIZE__
 len0 = __STARTUP_SIZE__ + __ONCE_SIZE__ + __CODE_SIZE__ + __DATA_SIZE__ + __RODATA_SIZE__ + __LOWCODE_SIZE__
         .byte   <block0
-        .word   off0 & (__BLOCKSIZE__ - 1)
+        .word   off0 & (__BANK0BLOCKSIZE__ - 1)
         .byte   $88
         .word   __MAIN_START__
         .word   len0

diff --git a/libsrc/lynx/exehdr.s b/libsrc/lynx/exehdr.s
index 4f077fb82403e849d06caeaa74745b7585518b5a..d63c0524d708042e0ed1bf0ef99d2edc37b989c4 100644 (file)
--- a/libsrc/lynx/exehdr.s
+++ b/libsrc/lynx/exehdr.s
@@ -3,7 +3,8 @@
 ;
 ; This header contains data for emulators like Handy and Mednafen
 ;
-        .import         __BLOCKSIZE__
+        .import         __BANK0BLOCKSIZE__
+        .import         __BANK1BLOCKSIZE__
         .export         __EXEHDR__: absolute = 1
 
 
@@ -11,8 +12,8 @@
 ; EXE header
         .segment "EXEHDR"
         .byte   'L','Y','N','X'                         ; magic
-        .word   __BLOCKSIZE__                           ; bank 0 page size
-        .word   __BLOCKSIZE__                           ; bank 1 page size
+        .word   __BANK0BLOCKSIZE__                      ; bank 0 page size
+        .word   __BANK1BLOCKSIZE__                      ; bank 1 page size
         .word   1                                       ; version number
         .asciiz "Cart name                      "       ; 32 bytes cart name
         .asciiz "Manufacturer   "                       ; 16 bytes manufacturer