6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-06-07 23:29:39 +00:00
Code Issues Projects Releases Wiki Activity

Renamed JUMPTABLE and cleaned up module.cfg.

Browse Source 
This change was suppsed to fix the issue that the former JUMPTABLE is merked as 'ro' while it is actually written to in several scenarios. When drivers are converted using co65 and then compiled into ROMs the JUMPTABLE isn't copied to RAM and therefore the write operations in question fail.

However unfortunately I didn't succeed in changing that :-( Just setting the former JUMPTABLE to 'rw' broke the drivers. So I placed the DATA segment directly after the former JUMPTABLE segment. This made the drivers converted with co65 work again - obviously after changing libsrc/Makefile:235 from '--code-label' to '--data-label'. But the actual dynamic drivers still didn't work as the former JUMPTABLE wasn't placed as the beginning of the loaded file anymore. That effect could be changed by exchanging src/ld65/o65.c:1391 with src/ld65/o65.c:1394 but doing so broke the drivers again :-((
This commit is contained in:
Oliver Schmidt 2014-05-01 21:43:34 +02:00
parent 2a3fbc6e36
commit d6c3bd29ac
75 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cfg/module.cfg
View File

@ -1,16 +1,15 @@
MEMORY {
ZP: file = %O, start = $0000, size = $0100, type = rw, define = yes;
ZP: start = $0000, size = $0100;
COMBINED: file = %O, start = $0000, size = $FFFF;
}
SEGMENTS {
JUMPTABLE: load = COMBINED, type = ro;
INIT: load = COMBINED, type = ro, optional = yes;
CODE: load = COMBINED, type = ro;
RODATA: load = COMBINED, type = ro;
DATA: load = COMBINED, type = rw, define = yes;
BSS: load = COMBINED, type = bss, define = yes;
ZEROPAGE: load = ZP, type = zp;
EXTZP: load = ZP, type = zp, optional = yes;
ZEROPAGE: load = ZP, type = zp;
EXTZP: load = ZP, type = zp, optional = yes;
HEADER: load = COMBINED, type = ro;
CODE: load = COMBINED, type = ro;
RODATA: load = COMBINED, type = ro;
DATA: load = COMBINED, type = rw;
BSS: load = COMBINED, type = bss;
}
FILES {
%O: format = o65;

2
libsrc/apple2/emd/a2.auxmem.s
View File

@ -13,7 +13,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/apple2/joy/a2.stdjoy.s
View File

@ -29,7 +29,7 @@ PREAD := $FB1E ; Read paddle in X, return AD conv. value in Y
; Header. Includes jump table.
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/apple2/mou/a2.stdmou.s
View File

@ -28,7 +28,7 @@ status := $0778
; ------------------------------------------------------------------------
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature
.byte $6D, $6F, $75 ; "mou"

2
libsrc/apple2/ser/a2.ssc.s
View File

@ -28,7 +28,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature
.byte $73, $65, $72 ; "ser"

2
libsrc/apple2/tgi/a2.hi.s
View File

@ -68,7 +68,7 @@ Y2 := ptr4
; ------------------------------------------------------------------------
.segment "JUMPTABLE"
.segment "HEADER"
; Header. Includes jump table and constants.

2
libsrc/apple2/tgi/a2.lo.s
View File

@ -38,7 +38,7 @@ Y2 := ptr4
; ------------------------------------------------------------------------
.segment "JUMPTABLE"
.segment "HEADER"
; Header. Includes jump table and constants.

2
libsrc/atari/emd/atr130.s
View File

@ -36,7 +36,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/atari/joy/atrmj8.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/atari/joy/atrstd.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/atari/mou/atrjoy.s
View File

@ -14,7 +14,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/atari/mou/atrst.s
View File

@ -31,7 +31,7 @@ DISABLE_TIMEOUT = 30 ; # of vertical blank interrupts after w
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/atari/mou/atrtt.s
View File

@ -13,7 +13,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/atari/ser/atrrdev.s
View File

@ -14,7 +14,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/atari/tgi/atari_tgi_common.inc
View File

@ -18,7 +18,7 @@
;
; ----------------------------------------------------------------------
.segment "JUMPTABLE"
.segment "HEADER"
; Header

2
libsrc/atmos/joy/atmos-pase.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/atmos/ser/atmos-acia.s
View File

@ -31,7 +31,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature
.byte $73, $65, $72 ; "ser"

2
libsrc/atmos/tgi/atmos-228-200-3.s
View File

@ -19,7 +19,7 @@ YSIZE = 8 ; System font height
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; The first part of the header is a structure that has a signature,
; and defines the capabilities of the driver.

2
libsrc/atmos/tgi/atmos-240-200-2.s
View File

@ -19,7 +19,7 @@ YSIZE = 8 ; System font height
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/c128/emd/c128-georam.s
View File

@ -20,7 +20,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/emd/c128-ram.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/emd/c128-ram2.s
View File

@ -21,7 +21,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/emd/c128-ramcart.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/emd/c128-reu.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/emd/c128-vdc.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/joy/c128-ptvjoy.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/joy/c128-stdjoy.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/mou/c128-1351.s
View File

@ -17,7 +17,7 @@ IRQInd = $2FD
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c128/mou/c128-inkwell.s
View File

@ -13,7 +13,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table.
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c128/mou/c128-joy.s
View File

@ -16,7 +16,7 @@ IRQInd = $2FD
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c128/mou/c128-pot.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c128/ser/c128-swlink.s
View File

@ -30,7 +30,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c128/tgi/c128-vdc.s
View File

@ -48,7 +48,7 @@ VDC_DATA = 31
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/c128/tgi/c128-vdc2.s
View File

@ -49,7 +49,7 @@ VDC_DATA = 31
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/c16/emd/c16-ram.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-c256k.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-dqbb.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-georam.s
View File

@ -20,7 +20,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-isepic.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-ram.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-ramcart.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-reu.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/c64-vdc.s
View File

@ -20,7 +20,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/emd/dtv-himem.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/joy/c64-hitjoy.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/joy/c64-numpad.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/joy/c64-ptvjoy.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/joy/c64-stdjoy.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/mou/c64-1351.s
View File

@ -33,7 +33,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c64/mou/c64-inkwell.s
View File

@ -13,7 +13,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table.
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c64/mou/c64-joy.s
View File

@ -32,7 +32,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c64/mou/c64-pot.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/c64/ser/c64-swlink.s
View File

@ -30,7 +30,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/c64/tgi/c64-hi.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/cbm510/emd/cbm510-ram.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/cbm510/joy/cbm510-std.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/cbm510/mou/cbm510-inkwl.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table.
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/cbm510/mou/cbm510-joy.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
HEADER:

2
libsrc/cbm510/ser/cbm510-std.s
View File

@ -31,7 +31,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/cbm610/emd/cbm610-ram.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/cbm610/ser/cbm610-std.s
View File

@ -31,7 +31,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/geos-cbm/emd/geos-vdc.s
View File

@ -14,7 +14,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/geos-cbm/joy/geos-stdjoy.s
View File

@ -15,7 +15,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/geos-cbm/tgi/geos-tgi.s
View File

@ -33,7 +33,7 @@ VDC_DATA = 31
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic signature,
; and defines the capabilities of the driver.

2
libsrc/lynx/joy/lynx-stdjoy.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/lynx/ser/lynx-comlynx.s
View File

@ -12,7 +12,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature
.byte $73, $65, $72 ; "ser"

2
libsrc/lynx/tgi/lynx-160-102-16.s
View File

@ -20,7 +20,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/nes/joy/nes-stdjoy.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/nes/tgi/nes-64-56-2.s
View File

@ -19,7 +19,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table and constants.
.segment "JUMPTABLE"
.segment "HEADER"
; First part of the header is a structure that has a magic and defines the
; capabilities of the driver

2
libsrc/pet/joy/pet-ptvjoy.s
View File

@ -17,7 +17,7 @@ VIA_DDRA := $E843 ; Data direction register A
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/pet/joy/pet-stdjoy.s
View File

@ -14,7 +14,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/plus4/joy/plus4-stdjoy.s
View File

@ -17,7 +17,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/plus4/ser/plus4-stdser.s
View File

@ -30,7 +30,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/vic20/joy/vic20-ptvjoy.s
View File

@ -16,7 +16,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature

2
libsrc/vic20/joy/vic20-stdjoy.s
View File

@ -18,7 +18,7 @@
; ------------------------------------------------------------------------
; Header. Includes jump table
.segment "JUMPTABLE"
.segment "HEADER"
; Driver signature