bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #152 from smuehlst/c1p_bootload

Browse Source 
Fix for use of uninitialized memory in osic1p bootstrap.s
This commit is contained in:
Oliver Schmidt
2015-03-15 11:40:33 +01:00
parent a7ecab38bd 8b10534429
commit 166a299535
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/osic1p-asm.cfg
View File

@@ -11,7 +11,7 @@ SYMBOLS {
MEMORY { MEMORY {
# for size of ZP, see runtime/zeropage.s and c1p/extzp.s # for size of ZP, see runtime/zeropage.s and c1p/extzp.s
ZP: file = "", define = yes, start = $0002, size = $001A + $0006; ZP: file = "", define = yes, start = $0002, size = $001A + $0006;
HEAD: file = %O, start = $0000, size = $00AA; HEAD: file = %O, start = $0000, size = $00B6;
RAM: file = %O, define = yes, start = %S, size = __HIMEM__ - __STACKSIZE__ - %S; RAM: file = %O, define = yes, start = %S, size = __HIMEM__ - __STACKSIZE__ - %S;
} }
SEGMENTS { SEGMENTS {

2
cfg/osic1p.cfg
View File

@@ -11,7 +11,7 @@ SYMBOLS {
MEMORY { MEMORY {
# for size of ZP, see runtime/zeropage.s and c1p/extzp.s # for size of ZP, see runtime/zeropage.s and c1p/extzp.s
ZP: file = "", define = yes, start = $0002, size = $001A + $0006; ZP: file = "", define = yes, start = $0002, size = $001A + $0006;
HEAD: file = %O, start = $0000, size = $00AA; HEAD: file = %O, start = $0000, size = $00B6;
RAM: file = %O, define = yes, start = %S, size = __HIMEM__ - __STACKSIZE__ - %S; RAM: file = %O, define = yes, start = %S, size = __HIMEM__ - __STACKSIZE__ - %S;
} }
SEGMENTS { SEGMENTS {

6
libsrc/osic1p/bootstrap.s
View File

@@ -45,9 +45,10 @@ GETCHAR := $FFBF ; gets one character from ACIA
FIRSTVISC = $85 ; Offset of first visible character in video RAM FIRSTVISC = $85 ; Offset of first visible character in video RAM
LINEDIST = $20 ; Offset in video RAM between two lines LINEDIST = $20 ; Offset in video RAM between two lines
ldy #<$0000
lda #<load_addr lda #<load_addr
ldx #>load_addr ldx #>load_addr
tay sta load
stx load+1 stx load+1
lda #<load_size lda #<load_size
eor #$FF eor #$FF
@@ -105,11 +106,12 @@ CR = $0D
; ASCII-coded hexadecimal translation of the above assembly code. ; ASCII-coded hexadecimal translation of the above assembly code.
; It was copied from the assembler listing. ; It was copied from the assembler listing.
.byte "A0", CR, "00", CR
.byte "A9", CR .byte "A9", CR
hex2 <load_addr hex2 <load_addr
.byte CR, "A2", CR .byte CR, "A2", CR
hex2 >load_addr hex2 >load_addr
.byte CR, "A8", CR .byte CR, "85", CR, "08", CR
.byte "86", CR, "09", CR .byte "86", CR, "09", CR
.byte "A9", CR .byte "A9", CR
hex2 <load_size hex2 <load_size