Removed generic macpack

git-svn-id: svn://svn.cc65.org/cc65/trunk@4429 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/apple2/apple2-40-48-16.s b/libsrc/apple2/apple2-40-48-16.s
index 9728f63bbe89a61cca221eb1e617b9cc94d7fea1..f1c0d576b5295a195d806648d8f18c1cbed9b8cb 100644 (file)
--- a/libsrc/apple2/apple2-40-48-16.s
+++ b/libsrc/apple2/apple2-40-48-16.s
@@ -12,8 +12,6 @@
        .include        "tgi-error.inc"
        .include        "apple2.inc"
 
-       .macpack        generic
-
 ; ------------------------------------------------------------------------
 
 ; Zero page stuff
@@ -284,8 +282,9 @@ GETPIXEL:
 ; Must set an error code: NO
 LINE:
        ; nx = abs (x2 - x1)
+       sec
        lda     X2
-       sub     X1
+       sbc     X1
        sta     NX
        lda     X2+1
        sbc     X1+1
@@ -296,8 +295,9 @@ LINE:
        sty     NX+1
 
        ; ny = abs (y2 - y1)
+       sec
        lda     Y2
-       sub     Y1
+       sbc     Y1
        sta     NY
        lda     Y2+1
        sbc     Y1+1
@@ -397,8 +397,9 @@ for:        lda     COUNT           ; count > 0
 :      jsr     SETPIXEL
 
        ;    pb = err + ny
+       clc
        lda     ERR
-       add     NY
+       adc     NY
        sta     PB
        lda     ERR+1
        adc     NY+1
@@ -406,8 +407,9 @@ for:        lda     COUNT           ; count > 0
        tax
 
        ;    ub = pb + nx
+       clc
        lda     PB
-       add     NX
+       adc     NX
        sta     UB
        txa
        adc     NX+1
@@ -418,7 +420,8 @@ for:        lda     COUNT           ; count > 0
        lda     DX
        bpl     :+
        dex
-:      add     X1
+:      clc
+       adc     X1
        sta     X1
        txa
        adc     X1+1
@@ -429,7 +432,8 @@ for:        lda     COUNT           ; count > 0
        lda     AY
        bpl     :+
        dex
-:      add     Y1
+:      clc
+       adc     Y1
        sta     Y1
        txa
        adc     Y1+1
@@ -458,7 +462,8 @@ for:        lda     COUNT           ; count > 0
        lda     AX
        bpl     :+
        dex
-:      add     X1
+:      clc
+       adc     X1
        sta     X1
        txa
        adc     X1+1
@@ -469,7 +474,8 @@ for:        lda     COUNT           ; count > 0
        lda     DY
        bpl     :+
        dex
-:      add     Y1
+:      clc
+       adc     Y1
        sta     Y1
        txa
        adc     Y1+1
@@ -483,7 +489,8 @@ next:       sta     ERR
 
        ; } (--count)
        lda     COUNT
-       sub     #$01
+       sec
+       sbc     #$01
        sta     COUNT
        bcc     :+
        jmp     for
@@ -548,7 +555,8 @@ icmp:
        tax
        tya                     ; X/A - arg1 (a = high)
 
-       sub     TEMP2
+       sec
+       sbc     TEMP2
        bne     :++
        cpx     TEMP
        beq     :+

diff --git a/libsrc/apple2/apple2-auxmem.s b/libsrc/apple2/apple2-auxmem.s
index 665833124509791568c61a7c6633c7e3d49a5b4d..7a72cfc8577195ec2bc6fb80e75c2149042742c4 100644 (file)
--- a/libsrc/apple2/apple2-auxmem.s
+++ b/libsrc/apple2/apple2-auxmem.s
@@ -10,10 +10,6 @@
        .include        "em-kernel.inc"
        .include        "em-error.inc"
 
-
-       .macpack        generic
-
-
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
@@ -98,7 +94,8 @@ PAGECOUNT:
 
 MAP:   sta     curpage                 ; Remember the new page
 
-       add     #>BASE
+       clc
+       adc     #>BASE
        sta     ptr1+1
        ldy     #$00
        sty     ptr1
@@ -137,7 +134,8 @@ COMMIT: lda curpage                 ; Get the current page
        cmp     #$FF
        beq     done                    ; Jump if no page mapped
 
-       add     #>BASE
+       clc
+       adc     #>BASE
        sta     ptr2+1
        ldy     #$00
        sty     ptr2
@@ -156,9 +154,10 @@ COMMIT: lda        curpage                 ; Get the current page
 
 transfer:
        php
+       clc
        lda     ptr1
        sta     $3C
-       add     ptr4
+       adc     ptr4
        sta     $3E
        lda     ptr1+1
        sta     $3D
@@ -186,7 +185,8 @@ COPYFROM:
        sta     ptr1
        ldy     #EM_COPY::PAGE
        lda     (ptr3),y
-       add     #>BASE
+       clc
+       adc     #>BASE
        sta     ptr1+1                  ; From
 
        ldy     #EM_COPY::BUF
@@ -220,7 +220,8 @@ COPYTO: sta ptr3
        sta     ptr2
        ldy     #EM_COPY::PAGE
        lda     (ptr3),y
-       add     #>BASE
+       clc
+       adc     #>BASE
        sta     ptr2+1                  ; To
 
        ldy     #EM_COPY::BUF

diff --git a/libsrc/apple2/apple2-stdjoy.s b/libsrc/apple2/apple2-stdjoy.s
index 9f51ac8e3bd7747eefd520d6d08be13e232b9fab..1608f5accfaee60ebd03bcd99b433b5d113b1175 100644 (file)
--- a/libsrc/apple2/apple2-stdjoy.s
+++ b/libsrc/apple2/apple2-stdjoy.s
@@ -13,8 +13,6 @@
         .include        "joy-error.inc"
         .include        "apple2.inc"
 
-        .macpack        generic
-
 ; ------------------------------------------------------------------------
 
 ; Constants