]> git.sur5r.net Git - cc65/commitdiff
Allow different output formats using additional linker configs. Contributed by
authoruz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Wed, 26 Jan 2011 22:14:42 +0000 (22:14 +0000)
committeruz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Wed, 26 Jan 2011 22:14:42 +0000 (22:14 +0000)
Karri Kaksonen.

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

libsrc/lynx/Makefile
libsrc/lynx/bllhdr.s [new file with mode: 0644]
libsrc/lynx/crt0.s
libsrc/lynx/exehdr.s [new file with mode: 0644]
packages/rpm/redhat/cc65.spec
src/ld65/cfg/lynx-bll.cfg [new file with mode: 0644]
src/ld65/cfg/lynx-coll.cfg [new file with mode: 0644]
src/ld65/cfg/lynx.cfg

index 07cf5c20c61eeb61362453acc8a2fce266cb1241..91056d3c20fd515ac98fdd198ae4a73d5f5aadcd 100644 (file)
@@ -45,11 +45,13 @@ CFLAGS      = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 #--------------------------------------------------------------------------
 # Object files
 
-OBJS =  cgetc.o         \
+OBJS =  bllhdr.o       \
+       cgetc.o         \
         crt0.o          \
        ctype.o         \
         eeprom.o        \
        exec.o          \
+       exehdr.o        \
         extzp.o         \
         kbhit.o         \
        load.o          \
diff --git a/libsrc/lynx/bllhdr.s b/libsrc/lynx/bllhdr.s
new file mode 100644 (file)
index 0000000..6cadb59
--- /dev/null
@@ -0,0 +1,19 @@
+;
+; Karri Kaksonen, 2011
+;
+; This header is required for BLL builds.
+;
+       .import         __BSS_LOAD__
+       .import         __RAM_START__
+       .export         __BLLHDR__: absolute = 1
+; ------------------------------------------------------------------------
+; BLL header (BLL header)
+
+       .segment "BLLHDR"
+       .word   $0880
+       .dbyt   __RAM_START__
+       .dbyt   __BSS_LOAD__ - __RAM_START__ + 10
+       .byte   $42,$53
+       .byte   $39,$33
+
index 7cf823c90cda8bca0d0693a3069ebf42bc7e638a..a7252f84792400b771de3c972f685994fe5296cf 100644 (file)
        .import         zerobss
        .import         callmain
        .import         _main
-       .import         __BSS_LOAD__
        .import         __INTERRUPTOR_COUNT__
        .import         __RAM_START__, __RAM_SIZE__, __STACKSIZE__
-       .import         __BSS_SIZE__
 
        .include        "zeropage.inc"
         .include        "extzp.inc"
 
-
-; ------------------------------------------------------------------------
-; EXE header
-__BLOCKSIZE__=1024
-       .segment "EXEHDR"
-       .byte   'L','Y','N','X'                         ; magic
-       .word   __BLOCKSIZE__                           ; bank 0 page size
-       .word   __BLOCKSIZE__                           ; bank 1 page size
-       .word   1                                       ; version number
-       .asciiz "Cart name                      "       ; 32 bytes cart name
-       .asciiz "Manufacturer   "                       ; 16 bytes manufacturer
-       .byte   0                                       ; rotation 1=left
-                                                       ; rotation 2=right
-       .byte   0,0,0,0,0                               ; spare
-
-__LOADER_SIZE__=410
-
-       ; The cart starts with an encrypted loader for 1024 bytes/block
-       ; images. The size of the loader is 410 bytes followed by two
-       ; mandatory directory entries.
-       .byte   $FD,$C1,$0D,$8E,$E9,$EE,$09,$13,$E5,$96
-       .byte   $0C,$34,$64,$DA,$D4,$BB,$99,$EC,$CE,$4F
-       .byte   $AA,$8C,$ED,$65,$F0,$32,$70,$A3,$84,$C4
-       .byte   $FC,$A2,$6D,$3A,$F8,$77,$4B,$AC,$9B,$54
-       .byte   $7D,$82,$6F,$F8,$A5,$06,$4D,$7B,$77,$55
-       .byte   $E4,$31,$C4,$2C,$2F,$2F,$B6,$4D,$15,$A9
-       .byte   $C7,$99,$5D,$6E,$B3,$97,$92,$44,$7B,$2B
-       .byte   $85,$18,$E6,$F1,$96,$F4,$C4,$DE,$A4,$CF
-       .byte   $79,$E2,$C1,$1A,$E0,$0C,$93,$C5,$26,$BD
-       .byte   $A3,$16,$8A,$C3,$59,$A0,$39,$38,$A0,$3B
-       .byte   $EF,$BB,$1D,$5C,$0D,$1D,$CC,$48,$1D,$DD
-       .byte   $98,$9A,$7A,$F7,$96,$F9,$61,$03,$50,$DA
-       .byte   $47,$69,$94,$C3,$80,$DA,$A9,$99,$A1,$21
-       .byte   $2B,$2E,$7D,$F5,$E4,$F7,$B3,$5C,$A8,$14
-       .byte   $FA,$E9,$06,$AC,$1E,$9F,$B5,$31,$BE,$42
-       .byte   $14,$08,$0E,$05,$FB,$25,$BB,$5C,$5C,$66
-       .byte   $76,$8E,$36,$E8,$EB,$39,$F2,$26,$BD,$17
-       .byte   $29,$F4,$B8,$1D,$7E,$EE,$47,$61,$BB,$9E
-       .byte   $F5,$72,$C9,$BC,$26,$37,$D5,$78,$8F,$D0
-       .byte   $CE,$95,$21,$EB,$4A,$07,$8D,$3A,$3A,$01
-       .byte   $82,$CF,$01,$C5,$1E,$1D,$A8,$41,$4F,$BD
-       .byte   $C1,$76,$22,$A3,$88,$D9,$57,$C9,$51,$3A
-       .byte   $26,$BE,$4A,$1A,$7F,$42,$61,$CF,$FC,$FC
-       .byte   $5B,$06,$94,$D2,$2C,$78,$45,$BA,$93,$C4
-       .byte   $7D,$7C,$81,$73,$07,$4F,$E2,$6C,$E9,$81
-       .byte   $1A,$DE,$77,$74,$87,$DE,$26,$9E,$7A,$A8
-       .byte   $19,$A7,$34,$32,$70,$ED,$59,$A8,$4A,$D8
-       .byte   $FE,$CB,$DD,$02,$2F,$CE,$92,$E9,$13,$A6
-       .byte   $FF,$B4,$4B,$18,$9D,$63,$48,$E0,$3B,$3B
-       .byte   $0D,$2B,$FC,$04,$A4,$E3,$5E,$4C,$3C,$94
-       .byte   $70,$C4,$F0,$64,$15,$48,$68,$17,$DE,$14
-       .byte   $72,$F0,$59,$33,$4C,$49,$47,$8D,$B6,$F4
-       .byte   $82,$4E,$B7,$4E,$01,$C9,$C2,$82,$0B,$7A
-       .byte   $AC,$67,$9B,$0F,$04,$E1,$B6,$78,$34,$C8
-       .byte   $4F,$2A,$11,$ED,$D0,$1C,$6D,$CD,$3D,$47
-       .byte   $09,$8B,$E5,$38,$19,$7A,$31,$6E,$30,$71
-       .byte   $1C,$90,$34,$E5,$44,$CC,$00,$C7,$41,$D0
-       .byte   $27,$8A,$06,$29,$5C,$2B,$E4,$26,$63,$09
-       .byte   $52,$D3,$97,$33,$D7,$59,$1C,$36,$2F,$C9
-       .byte   $A9,$A2,$B5,$BB,$A9,$1D,$E6,$36,$7E,$56
-       .byte   $05,$A4,$9C,$E0,$45,$59,$21,$E1,$E6,$21
-
-       ; The directory structure required by the 410 byte bootloader
-__DIRECTORY_START__:
-; Entry 0 - title sprite (mandatory)
-off0=__LOADER_SIZE__+(__DIRECTORY_END__-__DIRECTORY_START__)
-blocka=off0/__BLOCKSIZE__
-len0=(__TITLE_END__-__TITLE_START__)
-        .byte   <blocka
-        .word   off0 & (__BLOCKSIZE__ - 1)
-        .byte   $00
-        .word   __TITLE_START__
-        .word   len0
-
-; Entry 1 - first executable (mandatory)
-off1=off0+len0
-block1=off1/__BLOCKSIZE__
-len1=__RAM_SIZE__-__BSS_SIZE__
-        .byte   <block1
-        .word   off1 & (__BLOCKSIZE__ - 1)
-        .byte   $88
-        .word   __RAM_START__
-        .word   len1
-__DIRECTORY_END__:
-       .org $b000
-__TITLE_START__:
-       ; The palette for the title sprite. Complete black.
-       .byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-        .byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-       ; The title sprite
-cls_sprite:
-        .byte   %00000001                      ; A pixel sprite
-               .byte   %00010000
-               .byte   %00100000
-               .addr   0,pixel_bitmap
-               .word   0
-               .word   0
-               .word   $a000                           ; 160
-               .word   $6600                           ; 102
-               .byte   $00
-pixel_bitmap:
-        .byte   3,%10000100,%00000000, $0       ; A pixel bitmap
-__TITLE_END__:
-       .reloc
-
 ; ------------------------------------------------------------------------
 ; Mikey and Suzy init data, reg offsets and data
 
diff --git a/libsrc/lynx/exehdr.s b/libsrc/lynx/exehdr.s
new file mode 100644 (file)
index 0000000..c5f378b
--- /dev/null
@@ -0,0 +1,121 @@
+;
+; Karri Kaksonen, 2011
+;
+; This header is required for cart builds.
+;
+       .import         __RAM_START__
+       .import         __CODE_SIZE__,__DATA_SIZE__,__RODATA_SIZE__
+       .import         __STARTUP_SIZE__,__INIT_SIZE__
+       .import         __BLOCKSIZE__
+       .export         __EXEHDR__: absolute = 1
+
+
+; ------------------------------------------------------------------------
+; EXE header
+       .segment "EXEHDR"
+       .byte   'L','Y','N','X'                         ; magic
+       .word   __BLOCKSIZE__                           ; bank 0 page size
+       .word   __BLOCKSIZE__                           ; bank 1 page size
+       .word   1                                       ; version number
+       .asciiz "Cart name                      "       ; 32 bytes cart name
+       .asciiz "Manufacturer   "                       ; 16 bytes manufacturer
+       .byte   0                                       ; rotation 1=left
+                                                       ; rotation 2=right
+       .byte   0,0,0,0,0                               ; spare
+
+.if (.match (__BLOCKSIZE__, 2048))
+__LOADER_SIZE__=0
+.elseif (.match (__BLOCKSIZE__, 512))
+__LOADER_SIZE__=0
+.else
+__LOADER_SIZE__=410
+
+       ; The cart starts with an encrypted loader for 1024 bytes/block
+       ; images. The size of the loader is 410 bytes followed by two
+       ; mandatory directory entries.
+       .byte   $FD,$C1,$0D,$8E,$E9,$EE,$09,$13,$E5,$96
+       .byte   $0C,$34,$64,$DA,$D4,$BB,$99,$EC,$CE,$4F
+       .byte   $AA,$8C,$ED,$65,$F0,$32,$70,$A3,$84,$C4
+       .byte   $FC,$A2,$6D,$3A,$F8,$77,$4B,$AC,$9B,$54
+       .byte   $7D,$82,$6F,$F8,$A5,$06,$4D,$7B,$77,$55
+       .byte   $E4,$31,$C4,$2C,$2F,$2F,$B6,$4D,$15,$A9
+       .byte   $C7,$99,$5D,$6E,$B3,$97,$92,$44,$7B,$2B
+       .byte   $85,$18,$E6,$F1,$96,$F4,$C4,$DE,$A4,$CF
+       .byte   $79,$E2,$C1,$1A,$E0,$0C,$93,$C5,$26,$BD
+       .byte   $A3,$16,$8A,$C3,$59,$A0,$39,$38,$A0,$3B
+       .byte   $EF,$BB,$1D,$5C,$0D,$1D,$CC,$48,$1D,$DD
+       .byte   $98,$9A,$7A,$F7,$96,$F9,$61,$03,$50,$DA
+       .byte   $47,$69,$94,$C3,$80,$DA,$A9,$99,$A1,$21
+       .byte   $2B,$2E,$7D,$F5,$E4,$F7,$B3,$5C,$A8,$14
+       .byte   $FA,$E9,$06,$AC,$1E,$9F,$B5,$31,$BE,$42
+       .byte   $14,$08,$0E,$05,$FB,$25,$BB,$5C,$5C,$66
+       .byte   $76,$8E,$36,$E8,$EB,$39,$F2,$26,$BD,$17
+       .byte   $29,$F4,$B8,$1D,$7E,$EE,$47,$61,$BB,$9E
+       .byte   $F5,$72,$C9,$BC,$26,$37,$D5,$78,$8F,$D0
+       .byte   $CE,$95,$21,$EB,$4A,$07,$8D,$3A,$3A,$01
+       .byte   $82,$CF,$01,$C5,$1E,$1D,$A8,$41,$4F,$BD
+       .byte   $C1,$76,$22,$A3,$88,$D9,$57,$C9,$51,$3A
+       .byte   $26,$BE,$4A,$1A,$7F,$42,$61,$CF,$FC,$FC
+       .byte   $5B,$06,$94,$D2,$2C,$78,$45,$BA,$93,$C4
+       .byte   $7D,$7C,$81,$73,$07,$4F,$E2,$6C,$E9,$81
+       .byte   $1A,$DE,$77,$74,$87,$DE,$26,$9E,$7A,$A8
+       .byte   $19,$A7,$34,$32,$70,$ED,$59,$A8,$4A,$D8
+       .byte   $FE,$CB,$DD,$02,$2F,$CE,$92,$E9,$13,$A6
+       .byte   $FF,$B4,$4B,$18,$9D,$63,$48,$E0,$3B,$3B
+       .byte   $0D,$2B,$FC,$04,$A4,$E3,$5E,$4C,$3C,$94
+       .byte   $70,$C4,$F0,$64,$15,$48,$68,$17,$DE,$14
+       .byte   $72,$F0,$59,$33,$4C,$49,$47,$8D,$B6,$F4
+       .byte   $82,$4E,$B7,$4E,$01,$C9,$C2,$82,$0B,$7A
+       .byte   $AC,$67,$9B,$0F,$04,$E1,$B6,$78,$34,$C8
+       .byte   $4F,$2A,$11,$ED,$D0,$1C,$6D,$CD,$3D,$47
+       .byte   $09,$8B,$E5,$38,$19,$7A,$31,$6E,$30,$71
+       .byte   $1C,$90,$34,$E5,$44,$CC,$00,$C7,$41,$D0
+       .byte   $27,$8A,$06,$29,$5C,$2B,$E4,$26,$63,$09
+       .byte   $52,$D3,$97,$33,$D7,$59,$1C,$36,$2F,$C9
+       .byte   $A9,$A2,$B5,$BB,$A9,$1D,$E6,$36,$7E,$56
+       .byte   $05,$A4,$9C,$E0,$45,$59,$21,$E1,$E6,$21
+.endif
+
+       ; The directory structure required by the 410 byte bootloader
+__DIRECTORY_START__:
+; Entry 0 - title sprite (mandatory)
+off0=__LOADER_SIZE__+(__DIRECTORY_END__-__DIRECTORY_START__)
+blocka=off0/__BLOCKSIZE__
+len0=(__TITLE_END__-__TITLE_START__)
+        .byte   <blocka
+        .word   off0 & (__BLOCKSIZE__ - 1)
+        .byte   $00
+        .word   __TITLE_START__
+        .word   len0
+
+; Entry 1 - first executable (mandatory)
+off1=off0+len0
+block1=off1/__BLOCKSIZE__
+len1=__STARTUP_SIZE__+__INIT_SIZE__+__CODE_SIZE__+__DATA_SIZE__+__RODATA_SIZE__
+        .byte   <block1
+        .word   off1 & (__BLOCKSIZE__ - 1)
+        .byte   $88
+        .word   __RAM_START__
+        .word   len1
+__DIRECTORY_END__:
+       .org $2400
+__TITLE_START__:
+       ; The palette for the title sprite. Complete black.
+       .byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+        .byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+       ; The title sprite
+cls_sprite:
+        .byte   %00000001                      ; A pixel sprite
+               .byte   %00010000
+               .byte   %00100000
+               .addr   0,pixel_bitmap
+               .word   0
+               .word   0
+               .word   $a000                           ; 160
+               .word   $6600                           ; 102
+               .byte   $00
+pixel_bitmap:
+        .byte   3,%10000100,%00000000, $0       ; A pixel bitmap
+__TITLE_END__:
+       .reloc
+
index 944f7a6dada0835c5965d8a623282c19425cabd6..457763b72bfb94e2013216d6510b72ff3cf1f865 100644 (file)
@@ -353,7 +353,8 @@ programs for the Lynx Game Console using the cc65 crosscompiler.
 %attr(644,root,root)        %{_libdir}/cc65/joy/lynx-*.joy
 %attr(644,root,root)        %{_libdir}/cc65/ser/lynx-*.ser
 %attr(644,root,root)        %{_libdir}/cc65/tgi/lynx-*.tgi
-
+%attr(644,root,root)        %{_libdir}/cc65/cfg/lynx-*.cfg
+                                                             
 
 
 ###############################################################################
diff --git a/src/ld65/cfg/lynx-bll.cfg b/src/ld65/cfg/lynx-bll.cfg
new file mode 100644 (file)
index 0000000..ec4f4e4
--- /dev/null
@@ -0,0 +1,38 @@
+SYMBOLS {
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __STARTOFDIRECTORY__: type = weak, value = $019A; # start just after loader
+    __BLOCKSIZE__: type = weak, value = 1024; # cart block size
+    __BLLHDR__:    type = import;
+}
+MEMORY {
+    ZP:     file = "", define = yes, start = $0000, size = $0100;
+    HEADER: file = %O,               start = $0000, size = $000a;
+    RAM:    file = %O, define = yes, start = $0400, size = $BC38 - __STACKSIZE__;
+}
+SEGMENTS {
+    BLLHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro,  define = yes;
+    LOWCODE:  load = RAM,    type = ro,                optional = yes;
+    INIT:     load = RAM,    type = ro,  define = yes, optional = yes;
+    CODE:     load = RAM,    type = ro,  define = yes;
+    RODATA:   load = RAM,    type = ro,  define = yes;
+    DATA:     load = RAM,    type = rw,  define = yes;
+    BSS:      load = RAM,    type = bss, define = yes;
+    ZEROPAGE: load = ZP,     type = zp;
+    EXTZP:    load = ZP,     type = zp,                optional = yes;
+    APPZP:    load = ZP,     type = zp,                optional = yes;
+}
+FEATURES {
+    CONDES: segment = INIT,
+           type    = constructor,
+           label   = __CONSTRUCTOR_TABLE__,
+           count   = __CONSTRUCTOR_COUNT__;
+    CONDES: segment = RODATA,
+           type    = destructor,
+           label   = __DESTRUCTOR_TABLE__,
+           count   = __DESTRUCTOR_COUNT__;
+    CONDES: segment = RODATA,
+           type    = interruptor,
+           label   = __INTERRUPTOR_TABLE__,
+           count   = __INTERRUPTOR_COUNT__;
+}
diff --git a/src/ld65/cfg/lynx-coll.cfg b/src/ld65/cfg/lynx-coll.cfg
new file mode 100644 (file)
index 0000000..193f1a2
--- /dev/null
@@ -0,0 +1,38 @@
+SYMBOLS {
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __STARTOFDIRECTORY__: type = weak, value = $019A; # start just after loader
+    __BLOCKSIZE__: type = weak, value = 1024; # cart block size
+    __EXEHDR__:    type = import;
+}
+MEMORY {
+    ZP:     file = "", define = yes, start = $0000, size = $0100;
+    HEADER: file = %O,               start = $0000, size = $021e;
+    RAM:    file = %O, define = yes, start = $0400, size = $9C58 - __STACKSIZE__;
+}
+SEGMENTS {
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro,  define = yes;
+    LOWCODE:  load = RAM,    type = ro,                optional = yes;
+    INIT:     load = RAM,    type = ro,  define = yes, optional = yes;
+    CODE:     load = RAM,    type = ro,  define = yes;
+    RODATA:   load = RAM,    type = ro,  define = yes;
+    DATA:     load = RAM,    type = rw,  define = yes;
+    BSS:      load = RAM,    type = bss, define = yes;
+    ZEROPAGE: load = ZP,     type = zp;
+    EXTZP:    load = ZP,     type = zp,                optional = yes;
+    APPZP:    load = ZP,     type = zp,                optional = yes;
+}
+FEATURES {
+    CONDES: segment = INIT,
+           type    = constructor,
+           label   = __CONSTRUCTOR_TABLE__,
+           count   = __CONSTRUCTOR_COUNT__;
+    CONDES: segment = RODATA,
+           type    = destructor,
+           label   = __DESTRUCTOR_TABLE__,
+           count   = __DESTRUCTOR_COUNT__;
+    CONDES: segment = RODATA,
+           type    = interruptor,
+           label   = __INTERRUPTOR_TABLE__,
+           count   = __INTERRUPTOR_COUNT__;
+}
index 5d45a2614d5853c542cba6c10de1a71565d201d0..20e843f831aa829baf22f10abf6b86d02ec4950a 100644 (file)
@@ -2,6 +2,7 @@ SYMBOLS {
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
     __STARTOFDIRECTORY__: type = weak, value = $019A; # start just after loader
     __BLOCKSIZE__: type = weak, value = 1024; # cart block size
+    __EXEHDR__:    type = import;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0000, size = $0100;