- fixed wrong parameters for <, >

[cc65] / libsrc / geos / inc / geosmac.ca65.inc

diff --git a/libsrc/geos/inc/geosmac.ca65.inc b/libsrc/geos/inc/geosmac.ca65.inc
index e233ef977f4d64630b2ef76de0bbd99814cd393d..b932e3cc6df93addfabf51a463cc08c0af703a3d 100644 (file)
--- a/libsrc/geos/inc/geosmac.ca65.inc
+++ b/libsrc/geos/inc/geosmac.ca65.inc
@@ -1,6 +1,6 @@
 
 ;GEOS macros
-;reassembled for 6502TASM/MMS by Maciej 'YTM/Alliance' Witkowiak
+;reassembled for 6502TASM/MMS by Maciej 'YTM/Elysium' Witkowiak
 ;4-2-99
 
 ;28-6-99 - ca65 port
@@ -11,106 +11,99 @@
        lda #value
        sta dest
        .endmacro
-       
+
        .macro          LoadW dest, value
-       lda #>value
-       sta dest+1
-       .if (>value)<>(<value)
-           lda #<value
-       .endif
-       sta dest+0
+       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
+       adc #(value)
        sta dest
        .endmacro
-       
+
        .macro          AddVW value, dest
 .local Skip
-       clc
-       lda #<value
-       adc dest+0
-       sta dest+0
-       .if (>value)=0
+       AddVB <(value), dest+0
+       .if (>(value))=0
            bcc Skip
            inc dest+1
        .else
-           lda #>value
+           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
+       sbc #<(value)
        sta dest+0
        lda dest+1
-       sbc #>value
+       sbc #>(value)
        sta dest+1
        .endmacro
-       
+
        .macro          CmpB source, dest
        lda source
        cmp dest
        .endmacro
-       
+
        .macro          CmpBI source, immed
        lda source
-       cmp #immed
+       cmp #(immed)
        .endmacro
-       
+
        .macro          CmpW source, dest
 .local Skip    
        CmpB source+1, dest+1
@@ -118,40 +111,40 @@ Skip:
        CmpB source+0, dest+0
 Skip:
        .endmacro
-       
+
        .macro          CmpWI source, immed
 .local Skip
-       CmpBI source+1, >immed
+       CmpBI source+1, >(immed)
        bne Skip
-       CmpBI source+0, <immed
+       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          bra addr
        clv
        bvc addr
        .endmacro
-       
+
        .macro          smb bitNumber, dest
        pha
        lda #(1 << bitNumber)
@@ -159,27 +152,27 @@ Skip:
        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 
-       ora dest
+       and dest
        sta dest
        pla
        .endmacro
-       
+
        .macro          rmbf bitNumber, dest
        lda #(1 << bitNumber) ^ $ff
-       ora dest
+       and dest
        sta dest
        .endmacro
-       
+
        .macro          bbs bitNumber, source, addr
 .local Skip
        php
@@ -193,7 +186,7 @@ Skip:
 Skip:  pla
        plp
        .endmacro
-       
+
        .macro          bbsf bitNumber, source, addr
        .if     bitNumber=7
                bit source
@@ -209,7 +202,7 @@ Skip:       pla
                .endif
        .endif
        .endmacro
-       
+
        .macro          bbr bitNumber, source, addr
 .local Skip
        php
@@ -223,7 +216,7 @@ Skip:       pla
 Skip:  pla
        plp
        .endmacro
-       
+
        .macro          bbrf bitNumber, source, addr
        .if bitNumber=7
            bit source
@@ -239,25 +232,25 @@ Skip:     pla
                .endif
        .endif
        .endmacro
-       
+
 ;03.03.99 by Maciej Witkowiak
 
        .macro          addv value
        clc
-       adc #value
+       adc #(value)
        .endmacro
-       
+
        .macro          subv value
        sec
-       sbc #value
+       sbc #(value)
        .endmacro
-       
+
        .macro          bnex addr
        txa
        bne addr
        .endmacro
-       
+
        .macro          beqx addr
        txa
        beq addr
-       .endmacro
\ No newline at end of file
+       .endmacro