From: ol.sc Date: Thu, 9 Feb 2012 09:13:34 +0000 (+0000) Subject: Removed '.c65' from include file name. X-Git-Tag: V2.14~554 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed92935ef7bb7e9da013dcfb20325df43bdeab75;p=cc65 Removed '.c65' from include file name. git-svn-id: svn://svn.cc65.org/cc65/trunk@5509 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/libsrc/geos-common/dlgbox/dlgboxfileselect.s b/libsrc/geos-common/dlgbox/dlgboxfileselect.s index 7acb6b9ed..b9a073c0c 100644 --- a/libsrc/geos-common/dlgbox/dlgboxfileselect.s +++ b/libsrc/geos-common/dlgbox/dlgboxfileselect.s @@ -11,8 +11,8 @@ .include "jumptab.inc" .include "geossym.inc" + .include "geosmac.inc" .include "const.inc" - .include "geosmac.ca65.inc" .code diff --git a/libsrc/geos-common/geosmac.ca65.inc b/libsrc/geos-common/geosmac.ca65.inc deleted file mode 100644 index 00ac67754..000000000 --- a/libsrc/geos-common/geosmac.ca65.inc +++ /dev/null @@ -1,320 +0,0 @@ -; -;GEOS macros -;reassembled for 6502TASM/MMS by Maciej 'YTM/Elysium' Witkowiak -;4-2-99 - -;28-6-99 - ca65 port -;macro 'sub' renamed to 'ssub' due to 65816 mnemonics - -;------------------------------------------------------------------------- - -.macro LoadB dest, value - lda #value - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro LoadW dest, value - LoadB dest+1, >(value) - LoadB dest+0, <(value) -.endmacro - -;------------------------------------------------------------------------- - -.macro MoveB source, dest - lda source - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro MoveW source, dest - MoveB source+1, dest+1 - MoveB source+0, dest+0 -.endmacro - -;------------------------------------------------------------------------- - -.macro add source - clc - adc source -.endmacro - -;------------------------------------------------------------------------- - -.macro AddB source, dest - lda source - add dest - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro AddW source, dest - AddB source+0, dest+0 - lda source+1 - adc dest+1 - sta dest+1 -.endmacro - -;------------------------------------------------------------------------- - -.macro AddVB value, dest - lda dest - clc - adc #(value) - sta dest - .endmacro - -;------------------------------------------------------------------------- - -.macro AddVW value, dest -.local Skip - AddVB <(value), dest+0 - .if (>(value))=0 - bcc Skip - inc dest+1 - .else - lda #>(value) - adc dest+1 - sta dest+1 - .endif -Skip: -.endmacro - -;------------------------------------------------------------------------- - -.macro ssub source - sec - sbc source -.endmacro - -;------------------------------------------------------------------------- - -.macro SubB source, dest - lda dest - ssub source - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro SubW source, dest - SubB source+0, dest+0 - lda dest+1 - sbc source+1 - sta dest+1 -.endmacro - -;------------------------------------------------------------------------- - -.macro SubVW value, dest - sec - lda dest+0 - sbc #<(value) - sta dest+0 - lda dest+1 - sbc #>(value) - sta dest+1 -.endmacro - -;------------------------------------------------------------------------- - -.macro CmpB source, dest - lda source - cmp dest -.endmacro - -;------------------------------------------------------------------------- - -.macro CmpBI source, immed - lda source - cmp #(immed) -.endmacro - -;------------------------------------------------------------------------- - -.macro CmpW source, dest -.local Skip - CmpB source+1, dest+1 - bne Skip - CmpB source+0, dest+0 -Skip: -.endmacro - -;------------------------------------------------------------------------- - -.macro CmpWI source, immed -.local Skip - CmpBI source+1, >(immed) - bne Skip - CmpBI source+0, <(immed) -Skip: -.endmacro - -;------------------------------------------------------------------------- - -.macro PushB source - lda source - pha -.endmacro - -;------------------------------------------------------------------------- - -.macro PushW source - PushB source+1 - PushB source+0 -.endmacro - -;------------------------------------------------------------------------- - -.macro PopB dest - pla - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro PopW dest - PopB dest+0 - PopB dest+1 -.endmacro - -;------------------------------------------------------------------------- - -.macro smb bitNumber, dest - pha - lda #(1 << bitNumber) - ora dest - sta dest - pla -.endmacro - -;------------------------------------------------------------------------- - -.macro smbf bitNumber, dest - lda #(1 << bitNumber) - ora dest - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro rmb bitNumber, dest - pha - lda #(1 << bitNumber) ^ $ff - and dest - sta dest - pla -.endmacro - -;------------------------------------------------------------------------- - -.macro rmbf bitNumber, dest - lda #(1 << bitNumber) ^ $ff - and dest - sta dest -.endmacro - -;------------------------------------------------------------------------- - -.macro bbs bitNumber, source, addr -.local Skip - php - pha - lda source - and #(1 << bitNumber) - beq Skip - pla - plp - bra addr -Skip: pla - plp -.endmacro - -;------------------------------------------------------------------------- - -.macro bbsf bitNumber, source, addr - .if bitNumber=7 - bit source - bmi addr - .else - .if bitNumber=6 - bit source - bvs addr - .else - lda source - and #(1 << bitNumber) - bne addr - .endif - .endif -.endmacro - -;------------------------------------------------------------------------- - -.macro bbr bitNumber, source, addr -.local Skip - php - pha - lda source - and #(1 << bitNumber) - bne Skip - pla - plp - bra addr -Skip: pla - plp -.endmacro - -;------------------------------------------------------------------------- - -.macro bbrf bitNumber, source, addr - .if bitNumber=7 - bit source - bpl addr - .else - .if bitNumber=6 - bit source - bvc addr - .else - lda source - and #(1 << bitNumber) - beq addr - .endif - .endif -.endmacro - -;------------------------------------------------------------------------- - -;03.03.99 by Maciej Witkowiak - -;------------------------------------------------------------------------- - -.macro addv value - clc - adc #(value) -.endmacro - -;------------------------------------------------------------------------- - -.macro subv value - sec - sbc #(value) -.endmacro - -;------------------------------------------------------------------------- - -.macro bnex addr - txa - bne addr -.endmacro - -;------------------------------------------------------------------------- - -.macro beqx addr - txa - beq addr -.endmacro - -;------------------------------------------------------------------------- diff --git a/libsrc/geos-common/geosmac.inc b/libsrc/geos-common/geosmac.inc new file mode 100644 index 000000000..00ac67754 --- /dev/null +++ b/libsrc/geos-common/geosmac.inc @@ -0,0 +1,320 @@ +; +;GEOS macros +;reassembled for 6502TASM/MMS by Maciej 'YTM/Elysium' Witkowiak +;4-2-99 + +;28-6-99 - ca65 port +;macro 'sub' renamed to 'ssub' due to 65816 mnemonics + +;------------------------------------------------------------------------- + +.macro LoadB dest, value + lda #value + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro LoadW dest, value + LoadB dest+1, >(value) + LoadB dest+0, <(value) +.endmacro + +;------------------------------------------------------------------------- + +.macro MoveB source, dest + lda source + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro MoveW source, dest + MoveB source+1, dest+1 + MoveB source+0, dest+0 +.endmacro + +;------------------------------------------------------------------------- + +.macro add source + clc + adc source +.endmacro + +;------------------------------------------------------------------------- + +.macro AddB source, dest + lda source + add dest + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro AddW source, dest + AddB source+0, dest+0 + lda source+1 + adc dest+1 + sta dest+1 +.endmacro + +;------------------------------------------------------------------------- + +.macro AddVB value, dest + lda dest + clc + adc #(value) + sta dest + .endmacro + +;------------------------------------------------------------------------- + +.macro AddVW value, dest +.local Skip + AddVB <(value), dest+0 + .if (>(value))=0 + bcc Skip + inc dest+1 + .else + lda #>(value) + adc dest+1 + sta dest+1 + .endif +Skip: +.endmacro + +;------------------------------------------------------------------------- + +.macro ssub source + sec + sbc source +.endmacro + +;------------------------------------------------------------------------- + +.macro SubB source, dest + lda dest + ssub source + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro SubW source, dest + SubB source+0, dest+0 + lda dest+1 + sbc source+1 + sta dest+1 +.endmacro + +;------------------------------------------------------------------------- + +.macro SubVW value, dest + sec + lda dest+0 + sbc #<(value) + sta dest+0 + lda dest+1 + sbc #>(value) + sta dest+1 +.endmacro + +;------------------------------------------------------------------------- + +.macro CmpB source, dest + lda source + cmp dest +.endmacro + +;------------------------------------------------------------------------- + +.macro CmpBI source, immed + lda source + cmp #(immed) +.endmacro + +;------------------------------------------------------------------------- + +.macro CmpW source, dest +.local Skip + CmpB source+1, dest+1 + bne Skip + CmpB source+0, dest+0 +Skip: +.endmacro + +;------------------------------------------------------------------------- + +.macro CmpWI source, immed +.local Skip + CmpBI source+1, >(immed) + bne Skip + CmpBI source+0, <(immed) +Skip: +.endmacro + +;------------------------------------------------------------------------- + +.macro PushB source + lda source + pha +.endmacro + +;------------------------------------------------------------------------- + +.macro PushW source + PushB source+1 + PushB source+0 +.endmacro + +;------------------------------------------------------------------------- + +.macro PopB dest + pla + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro PopW dest + PopB dest+0 + PopB dest+1 +.endmacro + +;------------------------------------------------------------------------- + +.macro smb bitNumber, dest + pha + lda #(1 << bitNumber) + ora dest + sta dest + pla +.endmacro + +;------------------------------------------------------------------------- + +.macro smbf bitNumber, dest + lda #(1 << bitNumber) + ora dest + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro rmb bitNumber, dest + pha + lda #(1 << bitNumber) ^ $ff + and dest + sta dest + pla +.endmacro + +;------------------------------------------------------------------------- + +.macro rmbf bitNumber, dest + lda #(1 << bitNumber) ^ $ff + and dest + sta dest +.endmacro + +;------------------------------------------------------------------------- + +.macro bbs bitNumber, source, addr +.local Skip + php + pha + lda source + and #(1 << bitNumber) + beq Skip + pla + plp + bra addr +Skip: pla + plp +.endmacro + +;------------------------------------------------------------------------- + +.macro bbsf bitNumber, source, addr + .if bitNumber=7 + bit source + bmi addr + .else + .if bitNumber=6 + bit source + bvs addr + .else + lda source + and #(1 << bitNumber) + bne addr + .endif + .endif +.endmacro + +;------------------------------------------------------------------------- + +.macro bbr bitNumber, source, addr +.local Skip + php + pha + lda source + and #(1 << bitNumber) + bne Skip + pla + plp + bra addr +Skip: pla + plp +.endmacro + +;------------------------------------------------------------------------- + +.macro bbrf bitNumber, source, addr + .if bitNumber=7 + bit source + bpl addr + .else + .if bitNumber=6 + bit source + bvc addr + .else + lda source + and #(1 << bitNumber) + beq addr + .endif + .endif +.endmacro + +;------------------------------------------------------------------------- + +;03.03.99 by Maciej Witkowiak + +;------------------------------------------------------------------------- + +.macro addv value + clc + adc #(value) +.endmacro + +;------------------------------------------------------------------------- + +.macro subv value + sec + sbc #(value) +.endmacro + +;------------------------------------------------------------------------- + +.macro bnex addr + txa + bne addr +.endmacro + +;------------------------------------------------------------------------- + +.macro beqx addr + txa + beq addr +.endmacro + +;------------------------------------------------------------------------- diff --git a/libsrc/geos-common/graph/drawline.s b/libsrc/geos-common/graph/drawline.s index ebbdc645d..74cb67b74 100644 --- a/libsrc/geos-common/graph/drawline.s +++ b/libsrc/geos-common/graph/drawline.s @@ -12,7 +12,7 @@ .include "jumptab.inc" .include "geossym.inc" - .include "geosmac.ca65.inc" + .include "geosmac.inc" _DrawLine: tay diff --git a/testcode/grc/vlir0.s b/testcode/grc/vlir0.s index 302f4396b..bdb38b51b 100644 --- a/testcode/grc/vlir0.s +++ b/testcode/grc/vlir0.s @@ -8,7 +8,7 @@ .include "../../libsrc/geos/inc/const.inc" .include "../../libsrc/geos/inc/jumptab.inc" .include "../../libsrc/geos/inc/geossym.inc" - .include "../../libsrc/geos/inc/geosmac.ca65.inc" + .include "../../libsrc/geos/inc/geosmac.inc" ; import load addresses for all VLIR chains ; these labels are defined upon linking with ld65 diff --git a/testcode/grc/vlir1.s b/testcode/grc/vlir1.s index 530de4ec4..bebb028b3 100644 --- a/testcode/grc/vlir1.s +++ b/testcode/grc/vlir1.s @@ -8,7 +8,7 @@ .include "../../libsrc/geos/inc/const.inc" .include "../../libsrc/geos/inc/jumptab.inc" .include "../../libsrc/geos/inc/geossym.inc" - .include "../../libsrc/geos/inc/geosmac.ca65.inc" + .include "../../libsrc/geos/inc/geosmac.inc" ; export names of functions that will be used in the main program diff --git a/testcode/grc/vlir2.s b/testcode/grc/vlir2.s index d3fb28264..d376eee1b 100644 --- a/testcode/grc/vlir2.s +++ b/testcode/grc/vlir2.s @@ -8,7 +8,7 @@ .include "../../libsrc/geos/inc/const.inc" .include "../../libsrc/geos/inc/jumptab.inc" .include "../../libsrc/geos/inc/geossym.inc" - .include "../../libsrc/geos/inc/geosmac.ca65.inc" + .include "../../libsrc/geos/inc/geosmac.inc" .export OVERLAY2_Function1 .export OVERLAY2_Function2