empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from cc65/master

Browse source 
Update
This commit is contained in:
Stefan 2018-02-26 01:36:38 +01:00 • committed by GitHub
commit 71e3330eca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 154 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cfg/pce.cfg
View file

@ -1,34 +1,29 @@
# linker config to produce simple NEC PC-Engine cartridge (.pce) # linker config. to produce a NEC PC-Engine 8K, 16K, or 32K image (.bin)
SYMBOLS { SYMBOLS {
__CARTSIZE__: type = weak, value = $2000; # $2000, $4000, or $8000
__STACKSIZE__: type = weak, value = $0300; # 3 pages stack __STACKSIZE__: type = weak, value = $0300; # 3 pages stack
} }
MEMORY { MEMORY {
# FIXME: is this correct? the first 3? bytes cant be used? ZP: file = "", start = $0000, size = $0100, define = yes;
ZP: file = "", start = $0003, size = $00FD, type = rw, define = yes; # RAM bank
MAIN: file = "", start = $2200, size = $1E00 - __STACKSIZE__, define = yes;
# reset-bank and hardware vectors # ROM banks, before swapping, and after mapping
ROM0: file = %O, start = $E000, size = $1FF6, fill = yes, define = yes; ROM: file = %O, start = $10000 - __CARTSIZE__, size = __CARTSIZE__, fill = yes, fillval = $FF;
ROMV: file = %O, start = $FFF6, size = $000A, fill = yes;
# first RAM page (also contains stack and zeropage)
RAM: file = "", start = $2200, size = $1e00, define = yes;
} }
SEGMENTS { SEGMENTS {
ZEROPAGE: load = ZP, type = zp, define = yes; ZEROPAGE: load = ZP, type = zp;
EXTZP: load = ZP, type = zp, define = yes, optional = yes; EXTZP: load = ZP, type = zp, optional = yes;
APPZP: load = ZP, type = zp, define = yes, optional = yes; APPZP: load = ZP, type = zp, optional = yes;
STARTUP: load = ROM0, type = ro, define = yes; DATA: load = ROM, run = MAIN, type = rw, define = yes;
ONCE: load = ROM0, type = ro, optional = yes; INIT: load = MAIN, type = bss, optional = yes;
CODE: load = ROM0, type = ro, define = yes; BSS: load = MAIN, type = bss, define = yes;
RODATA: load = ROM0, type = ro, define = yes; RODATA: load = ROM, type = ro;
DATA: load = ROM0, run = RAM, type = rw, define = yes; CODE: load = ROM, type = ro;
BSS: load = RAM, type = bss, define = yes; LOWCODE: load = ROM, type = ro, optional = yes;
VECTORS: load = ROMV, type = rw, define = yes; ONCE: load = ROM, type = ro, optional = yes;
STARTUP: load = ROM, type = ro, start = $FFF6 - $0066;
VECTORS: load = ROM, type = ro, start = $FFF6;
} }
FEATURES { FEATURES {
CONDES: type = constructor, CONDES: type = constructor,
label = __CONSTRUCTOR_TABLE__, label = __CONSTRUCTOR_TABLE__,

3
doc/dio.sgml
View file

@ -25,8 +25,7 @@ released with the <tt>dio_close</tt> function.
dhandle_t __fastcall__ dio_open (unsigned char device); dhandle_t __fastcall__ dio_open (unsigned char device);
</verb></tscreen> </verb></tscreen>
The <tt>device</tt> specifies the device to access, with 0 being the first The <tt>device</tt> specifies the device to access.
device, 1 the second, and so on.
<tscreen><verb> <tscreen><verb>
unsigned char __fastcall__ dio_close (dhandle_t handle); unsigned char __fastcall__ dio_close (dhandle_t handle);

61
doc/pce.sgml
View file

@ -3,9 +3,9 @@
<article> <article>
<title>PC-Engine (TurboGrafx) System specific information for cc65 <title>PC-Engine (TurboGrafx) System specific information for cc65
<author> <author><url url="mailto:groepaz@gmx.net" name="Groepaz/Hitmen">,<newline>
<url url="mailto:groepaz@gmx.net" name="Groepaz/Hitmen"> <url url="mailto:greg.king5@verizon.net" name="Greg King">
<date>2016-09-29 <date>2018-02-12
<abstract> <abstract>
An overview over the PCE runtime system as it is implemented for the An overview over the PCE runtime system as it is implemented for the
@ -30,11 +30,36 @@ more than one platform. Please see the function reference for more
information. information.
<sect>Binary format<p> <sect>Binary format<p>
The standard binary output format generated by the linker for the PCE target The binary output file generated by the linker, for the PCE target, is an
is a cartridge image with no header. It is of course possible to change this image, with no header, that has 8K bytes in the wrong place. That file must be
behaviour by using a modified startup file and linker config. post-processed; the 8K at the end must be moved to the front of the image.
On POSIX systems, the <tt/dd/ command and the shell give a convenient way to do
it. Here is an example of their use:
<tscreen><verb>
dd if=conio.bin bs=8K skip=3 > conio.pce
dd if=conio.bin bs=8K count=3 >> conio.pce
</verb></tscreen>
The first command grabs the last 8K of a 32K file, and writes it as the first
part of a new file. The second command reads all but the last part of the old
file, and appends it to the new file.
<tscreen><verb>
+--------+--------+--------+--------+
| Bank 1 | Bank 2 | Bank 3 | Bank 0 | &lt;-- "conio.bin"
+--------+--------+--------+--------+
+--------+--------+--------+--------+
| Bank 0 | Bank 1 | Bank 2 | Bank 3 | &lt;-- "conio.pce"
+--------+--------+--------+--------+
</verb></tscreen>
<em/Note/: That <tt/.pce/ file shows the format of the ROM cartridge that is
plugged into a PC-Engine. But, that <tt/.bin/ file shows what programs
actually see when they execute the code in that cartridge.
<sect>Memory layout<p> <sect>Memory layout<p>
@ -52,19 +77,23 @@ Special locations:
<tag/Stack/ <tag/Stack/
The C runtime stack is located in system RAM at &dollar;3FFF and growing downwards. The C runtime stack is located in system RAM at &dollar;3FFF and growing downwards.
<tag/BSS and Data/ <tag/Data and BSS/
The Data (initialized variables) and BSS (uninitialized variables) sections are
The BSS (uninitialized variables) and Data (initialized variables) sections are placed one after the other into system RAM at &dollar;2200.
placed one after the other into system RAM at &dollar;2000.
<tag/Heap/ <tag/Heap/
The C heap is located after the end of the Data section and grows towards the C The C heap is located after the end of the BSS section; and, grows towards the C
runtime stack. runtime stack.
<tag/Code/ <tag/Code/
The startup code is located at &dollar;E000 in the System/Hardware bank. Further In an 8K ROM cartridge, code and read-only data are located between
code can be placed in other ROM banks, this must be done manually however. &dollar;E000 and &dollar;FFF5 in the System bank.
In a 16K cartridge, code and read-only data are located between &dollar;C000
and &dollar;FFF5.
In a 32K cartridge, code and read-only data are located between &dollar;8000
and &dollar;FFF5.
</descrip><p> </descrip><p>
@ -171,7 +200,8 @@ following functions (and a few others):
<sect>Other hints<p> <sect>Other hints<p>
<itemize> <itemize>
<item>a good emulator to use for PC-Engine is "mednafen" (<url url="http://mednafen.fobby.net/">) <item><url url="https://mednafen.github.io/" name= "Mednafen"> is a good
emulator to use for the PC-Engine.
</itemize> </itemize>
some useful resources on PCE coding: some useful resources on PCE coding:
@ -210,6 +240,3 @@ freely, subject to the following restrictions:
</enum> </enum>
</article> </article>

10
libsrc/geos-cbm/disk/dio_cts.s
View file

@ -1,6 +1,6 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2.7.2001 ; 2015-08-26, Greg King
; ;
; ;
; unsigned char __fastcall__ dio_phys_to_log (dhandle_t handle, ; unsigned char __fastcall__ dio_phys_to_log (dhandle_t handle,
@ -59,7 +59,7 @@ _dio_phys_to_log:
lda (ptr3),y lda (ptr3),y
tay tay
lda driveType,y lda driveType,y
and #%00000011 ; this is for RamDrive compatibility and #%00001111 ; remove ramDisk flags
cmp #DRV_1541 cmp #DRV_1541
beq dio_cts1541 beq dio_cts1541
cmp #DRV_1571 cmp #DRV_1571
@ -67,7 +67,7 @@ _dio_phys_to_log:
cmp #DRV_1581 cmp #DRV_1581
beq dio_cts1581 beq dio_cts1581
lda #DEV_NOT_FOUND ; unknown device lda #INCOMPATIBLE ; unsupported device
ldx #0 ldx #0
beq ret beq ret
@ -91,7 +91,7 @@ _inv_data:
lda #INV_TRACK lda #INV_TRACK
.byte $2c .byte $2c
_inv_hand: _inv_hand:
lda #INCOMPATIBLE lda #DEV_NOT_FOUND
ldx #0 ldx #0
beq ret beq ret

8
libsrc/geos-cbm/disk/dio_openclose.s
View file

@ -1,8 +1,8 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2015-08-24, Greg King
; ;
; based on Atari version by Christian Groessler ; based on Atari version by Christian Groessler
; 2.7.2001
; ;
; dhandle_t __fastcall__ dio_open (unsigned char device); ; dhandle_t __fastcall__ dio_open (unsigned char device);
; unsigned char __fastcall__ dio_close (dhandle_t handle); ; unsigned char __fastcall__ dio_close (dhandle_t handle);
@ -27,11 +27,13 @@ sectsizetab:
.code .code
_dio_open: _dio_open:
pha cmp #4
bcs _inv_drive
tax tax
lda driveType,x ; check if there's a device lda driveType,x ; check if there's a device
beq _inv_drive beq _inv_drive
txa txa
pha
clc clc
adc #8 ; normalize devnum adc #8 ; normalize devnum
sta curDevice sta curDevice

8
libsrc/geos-cbm/disk/dio_read.s
View file

@ -1,6 +1,6 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2.7.2001 ; 2015-08-27, Greg King
; ;
; this file provides the _dio_read function ; this file provides the _dio_read function
; ;
@ -15,7 +15,9 @@
_dio_read: _dio_read:
jsr dio_params jsr dio_params
tay
bne err
jsr ReadBlock jsr ReadBlock
stx __oserror stx __oserror
txa txa
rts err: rts

23
libsrc/geos-cbm/disk/dio_stc.s
View file

@ -1,6 +1,6 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2.7.2001 ; 2015-08-27, Greg King
; ;
; unsigned char __fastcall__ dio_log_to_phys (dhandle_t handle, ; unsigned char __fastcall__ dio_log_to_phys (dhandle_t handle,
; unsigned *sectnum, /* input */ ; unsigned *sectnum, /* input */
@ -55,7 +55,7 @@ _dio_log_to_phys:
lda (ptr3),y lda (ptr3),y
tay tay
lda driveType,y lda driveType,y
and #%00000011 ; this is for RamDrive compatibility and #%00001111 ; remove ramDisk flags
cmp #DRV_1541 cmp #DRV_1541
beq dio_stc1541 beq dio_stc1541
cmp #DRV_1571 cmp #DRV_1571
@ -63,7 +63,7 @@ _dio_log_to_phys:
cmp #DRV_1581 cmp #DRV_1581
beq dio_stc1581 beq dio_stc1581
lda #DEV_NOT_FOUND ; unknown device lda #INCOMPATIBLE ; unsupported device
ldx #0 ldx #0
beq _ret beq _ret
@ -86,7 +86,7 @@ _inv_data:
lda #INV_TRACK lda #INV_TRACK
.byte $2c .byte $2c
_inv_hand: _inv_hand:
lda #INCOMPATIBLE lda #DEV_NOT_FOUND
ldx #0 ldx #0
beq _ret beq _ret
@ -102,8 +102,8 @@ _loop41:
bne _nxt bne _nxt
lda tmp1 lda tmp1
cmp sectab_1541_l+1,x cmp sectab_1541_l+1,x
bcc _found _nxt: bcc _found
_nxt: inx inx
cpx #35 cpx #35
bne _loop41 bne _loop41
beq _inv_data beq _inv_data
@ -124,12 +124,11 @@ dio_stc1571:
; - fall down to 1541 ; - fall down to 1541
lda tmp2 lda tmp2
cmp #>683 cmp #>683
bne _cnt71 bne _if71
lda tmp1 lda tmp1
cmp #<683 cmp #<683
bcc dio_stc1541 _if71: bcc dio_stc1541
_cnt71:
lda tmp1 lda tmp1
sec sec
sbc #<683 sbc #<683
@ -138,6 +137,8 @@ _cnt71:
sbc #>683 sbc #>683
sta tmp2 sta tmp2
jsr dio_stc1541 ; will fall through here jsr dio_stc1541 ; will fall through here
tay
bne _ret ; result beyond track 70
ldy #diopp_track ldy #diopp_track
lda (ptr1),y lda (ptr1),y
@ -166,7 +167,7 @@ _sub81: lda tmp1
sbc #0 sbc #0
sta tmp2 sta tmp2
inx inx
cpx #81 cpx #80
bne _loop81 bne _loop81
beq _inv_data beq _inv_data

8
libsrc/geos-cbm/disk/dio_write.s
View file

@ -1,6 +1,6 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2.7.2001 ; 2015-08-27, Greg King
; ;
; this file provides the _dio_write function ; this file provides the _dio_write function
; ;
@ -15,5 +15,9 @@
_dio_write: _dio_write:
jsr dio_params jsr dio_params
tay
bne err
jsr WriteBlock jsr WriteBlock
jmp setoserror jmp setoserror
err: rts

8
libsrc/geos-cbm/disk/dio_writev.s
View file

@ -1,6 +1,6 @@
; ;
; Maciej 'YTM/Elysium' Witkowiak ; 2001-07-02, Maciej 'YTM/Elysium' Witkowiak
; 2.7.2001 ; 2015-08-27, Greg King
; ;
; this file provides the _dio_write function ; this file provides the _dio_write function
; ;
@ -15,7 +15,9 @@
_dio_write_verify: _dio_write_verify:
jsr dio_params jsr dio_params
tay
bne err
jsr VerWriteBlock jsr VerWriteBlock
stx __oserror stx __oserror
txa txa
rts err: rts

66
libsrc/pce/crt0.s
View file

@ -4,33 +4,26 @@
; by Groepaz/Hitmen <groepaz@gmx.net> ; by Groepaz/Hitmen <groepaz@gmx.net>
; based on code by Ullrich von Bassewitz <uz@cc65.org> ; based on code by Ullrich von Bassewitz <uz@cc65.org>
; ;
; This must be the *first* file on the linker command line ; 2018-02-11, Greg King
; ;
.export _exit .export _exit
.export __STARTUP__ : absolute = 1 ; Mark as startup .export __STARTUP__ : absolute = 1 ; Mark as startup
.import initlib, donelib .import initlib, donelib
.import push0, _main, zerobss .import push0, _main
.import initheap
.import IRQStub .import IRQStub
; Linker generated ; Linker-generated
.import __RAM_START__, __RAM_SIZE__ .import __CARTSIZE__
.import __ROM0_START__, __ROM0_SIZE__
.import __ROM_START__, __ROM_SIZE__
.import __STARTUP_LOAD__,__STARTUP_RUN__, __STARTUP_SIZE__
.import __CODE_LOAD__,__CODE_RUN__, __CODE_SIZE__
.import __RODATA_LOAD__,__RODATA_RUN__, __RODATA_SIZE__
.import __DATA_LOAD__, __DATA_RUN__, __DATA_SIZE__ .import __DATA_LOAD__, __DATA_RUN__, __DATA_SIZE__
.import __BSS_SIZE__ .import __BSS_RUN__, __BSS_SIZE__
.import __MAIN_START__, __MAIN_SIZE__, __STACKSIZE__
.include "pce.inc" .include "pce.inc"
.include "extzp.inc" .include "extzp.inc"
.importzp sp .importzp sp
.importzp ptr1,ptr2
.importzp tmp1,tmp2,tmp3
; ------------------------------------------------------------------------ ; ------------------------------------------------------------------------
; Place the startup code in a special segment. ; Place the startup code in a special segment.
@ -53,29 +46,27 @@ start:
ldx #$FF ; Stack top ($21FF) ldx #$FF ; Stack top ($21FF)
txs txs
; At startup all MPRs are set to 0, so init them ; At power-on, most MPRs have random values; so, initiate them.
lda #$ff lda #$FF
tam #%00000001 ; 0000-1FFF = Hardware page tam #%00000001 ; $0000-$1FFF = Hardware bank
lda #$F8 lda #$F8
tam #%00000010 ; 2000-3FFF = Work RAM tam #%00000010 ; $2000-$3FFF = Work RAM
; FIXME: setup a larger block of memory to use with C-code
;lda #$F7 ;lda #$F7
;tam #%00000100 ; 4000-5FFF = Save RAM ;tam #%00000100 ; $4000-$47FF = 2K Battery-backed RAM
;lda #1
;tam #%00001000 ; 6000-7FFF Page 2
;lda #2
;tam #%00010000 ; 8000-9FFF Page 3
;lda #3
;tam #%00100000 ; A000-BFFF Page 4
;lda #4 ;lda #4
;tam #%01000000 ; C000-DFFF Page 5 ;tam #%00001000 ; $6000-$7FFF
;lda #0
;tam #%10000000 ; e000-fFFF hucard/syscard bank 0
; Clear work RAM (2000-3FFF) lda #$01
stz <$00 ldx #>$8000
tii $2000, $2001, $1FFF cpx #>__CARTSIZE__
bcc @L1 ;(blt)
tam #%00010000 ; $8000-$9FFF = ROM bank 1 (32K block of ROM)
inc a
tam #%00100000 ; $A000-$BFFF = ROM bank 2
inc a
@L1: tam #%01000000 ; $C000-$DFFF = ROM bank 3 (32K) or 1 (16K)
;lda #$00 ; (The reset default)
;tam #%10000000 ; $E000-$FFFF hucard/syscard bank 0
; Initialize hardware ; Initialize hardware
stz TIMER_CTRL ; Timer off stz TIMER_CTRL ; Timer off
@ -91,15 +82,16 @@ start:
lda #$05 lda #$05
sta IRQ_MASK ; IRQ1=on sta IRQ_MASK ; IRQ1=on
; Clear the BSS data
jsr zerobss
; Copy the .data segment to RAM ; Copy the .data segment to RAM
tii __DATA_LOAD__, __DATA_RUN__, __DATA_SIZE__ tii __DATA_LOAD__, __DATA_RUN__, __DATA_SIZE__
; Clear the .bss segment
stz __BSS_RUN__
tii __BSS_RUN__, __BSS_RUN__ + 1, __BSS_SIZE__ - 1
; Set up the stack ; Set up the stack
lda #<(__RAM_START__+__RAM_SIZE__) lda #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
ldx #>(__RAM_START__+__RAM_SIZE__) ldx #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
sta sp sta sp
stx sp + 1 stx sp + 1

25
testcode/lib/pce/Makefile
View file

@ -1,12 +1,29 @@
.PHONY: all clean test .PHONY: all clean test
# Size of cartridge to generate.
# Possible values:
# 8K = 0x2000
# 16K = 0x4000
# 32K = 0x8000
CARTSIZE := 0x2000
ifeq (${CARTSIZE},0x8000)
COUNT := 3
else
COUNT := 1
endif
all: conio.pce all: conio.pce
conio.pce: conio.c %.pce: %.bin
../../../bin/cl65 -t pce conio.c --mapfile conio.map -o conio.pce dd if=$< bs=8K skip=${COUNT} > $@
dd if=$< bs=8K count=${COUNT} >> $@
%.bin: %.c ../../../lib/pce.lib
../../../bin/cl65 -t pce $< -Wl -D__CARTSIZE__=${CARTSIZE} -m $*.map -o $@
clean: clean:
$(RM) conio.o conio.pce conio.map $(RM) conio.o conio.???
test: conio.pce test: conio.pce
mednafen -force_module pce conio.pce mednafen -force_module pce $<

2
testcode/lib/pce/conio.c
View file

@ -45,7 +45,7 @@ void main(void)
p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15] p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]
); );
} }
memcpy(p, main, 0); /* test that a zero length doesn't copy 64K */ memcpy(p, main, i = 0); /* test that a zero length doesn't copy 64K */
gotoxy(0,ysize - 1); gotoxy(0,ysize - 1);
for (i = 0; i < xsize; ++i) { for (i = 0; i < xsize; ++i) {