From fc3d55d196ef1857274b8e5807c389452fef3149 Mon Sep 17 00:00:00 2001 From: izydorst Date: Tue, 4 Jun 2002 22:49:09 +0000 Subject: [PATCH] put segment keywords so bss, data and rodata are used for storage git-svn-id: svn://svn.cc65.org/cc65/trunk@1301 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos/dlgbox/dlgboxfileselect.s | 14 ++++++++++---- libsrc/geos/dlgbox/dlgboxgetstring.s | 6 +++++- libsrc/geos/dlgbox/dlgboxok.s | 6 +++++- libsrc/geos/dlgbox/dlgboxokcancel.s | 6 +++++- libsrc/geos/dlgbox/dlgboxyesno.s | 6 +++++- libsrc/geos/file/findftypes.s | 6 +++++- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/libsrc/geos/dlgbox/dlgboxfileselect.s b/libsrc/geos/dlgbox/dlgboxfileselect.s index ac4548959..92f97848e 100644 --- a/libsrc/geos/dlgbox/dlgboxfileselect.s +++ b/libsrc/geos/dlgbox/dlgboxfileselect.s @@ -1,6 +1,6 @@ ; -; Maciej 'YTM/Alliance' Witkowiak +; Maciej 'YTM/Elysium' Witkowiak ; ; 25.12.99 @@ -15,6 +15,8 @@ .include "../inc/const.inc" .include "../inc/geosmac.ca65.inc" +.code + _DlgBoxFileSelect: sta tmp_r5 @@ -40,6 +42,8 @@ DB_FS_reload: beq DB_FS_reload DB_FS_Fin: rts +.rodata + paramStrFileSelect: .byte DEF_DB_POS | 1 .byte DBGETFILES, 4, 4 @@ -48,6 +52,8 @@ paramStrFileSelect: .byte CANCEL, DBI_X_2, DBI_Y_0+64+3 .byte NULL -tmp_r5: .word 0 -tmp_r7L: .byte 0 -tmp_r10: .word 0 +.bss + +tmp_r5: .res 2 +tmp_r7L: .res 1 +tmp_r10: .res 2 diff --git a/libsrc/geos/dlgbox/dlgboxgetstring.s b/libsrc/geos/dlgbox/dlgboxgetstring.s index 68471ea3f..a7c78063b 100644 --- a/libsrc/geos/dlgbox/dlgboxgetstring.s +++ b/libsrc/geos/dlgbox/dlgboxgetstring.s @@ -1,6 +1,6 @@ ; -; Maciej 'YTM/Alliance' Witkowiak +; Maciej 'YTM/Elysium' Witkowiak ; ; 25.12.99 @@ -14,6 +14,8 @@ .include "../inc/geossym.inc" .include "../inc/const.inc" +.code + _DlgBoxGetString: jsr DB_get2lines jsr popa @@ -25,6 +27,8 @@ _DlgBoxGetString: ldx #>paramStrGetString jmp _DoDlgBox +.data + paramStrGetString: .byte DEF_DB_POS | 1 .byte DBVARSTR, TXT_LN_X, TXT_LN_1_Y, ptr3 diff --git a/libsrc/geos/dlgbox/dlgboxok.s b/libsrc/geos/dlgbox/dlgboxok.s index 17872744a..abaf86fed 100644 --- a/libsrc/geos/dlgbox/dlgboxok.s +++ b/libsrc/geos/dlgbox/dlgboxok.s @@ -1,6 +1,6 @@ ; -; Maciej 'YTM/Alliance' Witkowiak +; Maciej 'YTM/Elysium' Witkowiak ; ; 25.12.99 @@ -13,12 +13,16 @@ .include "../inc/geossym.inc" .include "../inc/const.inc" +.code + _DlgBoxOk: jsr DB_get2lines lda #paramStrOk jmp _DoDlgBox +.rodata + paramStrOk: .byte DEF_DB_POS | 1 .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 diff --git a/libsrc/geos/dlgbox/dlgboxokcancel.s b/libsrc/geos/dlgbox/dlgboxokcancel.s index 76316f0c4..e38eccd26 100644 --- a/libsrc/geos/dlgbox/dlgboxokcancel.s +++ b/libsrc/geos/dlgbox/dlgboxokcancel.s @@ -1,6 +1,6 @@ ; -; Maciej 'YTM/Alliance' Witkowiak +; Maciej 'YTM/Elysium' Witkowiak ; ; 25.12.99 @@ -13,12 +13,16 @@ .include "../inc/geossym.inc" .include "../inc/const.inc" +.code + _DlgBoxOkCancel: jsr DB_get2lines lda #paramStrOkCancel jmp _DoDlgBox +.rodata + paramStrOkCancel: .byte DEF_DB_POS | 1 .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 diff --git a/libsrc/geos/dlgbox/dlgboxyesno.s b/libsrc/geos/dlgbox/dlgboxyesno.s index d378094f6..09f697c99 100644 --- a/libsrc/geos/dlgbox/dlgboxyesno.s +++ b/libsrc/geos/dlgbox/dlgboxyesno.s @@ -1,6 +1,6 @@ ; -; Maciej 'YTM/Alliance' Witkowiak +; Maciej 'YTM/Elysium' Witkowiak ; ; 25.12.99 @@ -13,12 +13,16 @@ .include "../inc/geossym.inc" .include "../inc/const.inc" +.code + _DlgBoxYesNo: jsr DB_get2lines lda #paramStrYesNo jmp _DoDlgBox +.rodata + paramStrYesNo: .byte DEF_DB_POS | 1 .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 diff --git a/libsrc/geos/file/findftypes.s b/libsrc/geos/file/findftypes.s index 8c020985d..6b5b260d4 100644 --- a/libsrc/geos/file/findftypes.s +++ b/libsrc/geos/file/findftypes.s @@ -11,6 +11,8 @@ .include "../inc/jumptab.inc" .include "../inc/geossym.inc" + +.code _FindFTypes: sta r10L @@ -31,4 +33,6 @@ _FindFTypes: sbc r7H rts -tmpFileMax: .byte 0 +.bss + +tmpFileMax: .res 1