# HG changeset patch
# User boisy
# Date 1026706601 0
# Node ID 7dea3d77ba0b34f3b6ead6b7b7f9a5c4f2378e8d
# Parent  1692ff7ca3502eb1c3e967997539255a5fac657a
Used symbolics for andcc/orcc

diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/asm.asm
--- a/level1/cmds/asm.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/asm.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -610,13 +610,13 @@
          cmpa  #$5A
          bhi   L03AD
 L03A8    anda  #$5F
-         andcc #$FE
+         andcc #^Carry
          rts   
 L03AD    cmpa  #$61
          bcs   L03B5
          cmpa  #$7A
          bls   L03A8
-L03B5    orcc  #$01
+L03B5    orcc  #Carry
 L03B7    rts   
 L03B8    fcs   "ORG"
          fdb   $000C
@@ -1136,9 +1136,9 @@
          fdb   $05D8
          fdb   $05DD
 L0932    fcb   $17,$08,$2f,$81,$23,$26,$05,$30,$01
-         andcc #$FE
+         andcc #^Carry
          rts   
-L093E    orcc  #$01
+L093E    orcc  #Carry
          rts   
 L0941    ldb   <u0047
          bitb  #$40
@@ -1180,12 +1180,12 @@
          leay  $03,y
          decb  
          bne   L0973
-         orcc  #$01
+         orcc  #Carry
          puls  pc,x
 L099A    decb  
          leas  $02,s
          lda   $02,y
-         andcc #$FE
+         andcc #^Carry
          rts   
 L09A2    lsra  
          negb  
@@ -1347,10 +1347,10 @@
          ldb   #$60
          cmpa  #$53
          bne   L0AE5
-L0AE2    andcc #$FE
+L0AE2    andcc #^Carry
          rts   
 L0AE5    leax  -$01,x
-         orcc  #$01
+         orcc  #Carry
          rts   
 L0AEA    ldb   #$20
          orb   <u0062
@@ -1758,7 +1758,7 @@
 L0E21    lbsr  L10B4
          bcc   L0E2B
          lbsr  L02FA
-         orcc  #$01
+         orcc  #Carry
 L0E2B    rts   
 L0E2C    ldb   #$30
          stb   <u002B
@@ -1955,9 +1955,9 @@
          beq   L0F9E
          std   $09,x
          ldb   #$0A
-L0F9A    orcc  #$01
+L0F9A    orcc  #Carry
          puls  pc,u,y,x
-L0F9E    andcc #$FE
+L0F9E    andcc #^Carry
          puls  pc,u,y,x
 L0FA2    pshs  u,y,x
          bsr   L0FC3
@@ -2002,7 +2002,7 @@
          bra   L0FF7
 L0FF3    ldx   $0D,y
          bne   L0FCD
-L0FF7    orcc  #$01
+L0FF7    orcc  #Carry
          rts   
 L0FFA    ldx   <u0016
          ldb   ,x
@@ -2179,22 +2179,22 @@
          bcs   L1145
          cmpb  #$39
          bls   L1148
-L1145    orcc  #$01
+L1145    orcc  #Carry
          rts   
 L1148    subb  #$30
-         andcc #$FE
+         andcc #^Carry
          rts   
 L114D    leax  -$01,x
          tst   $01,s
          beq   L1159
          ldd   $02,s
-         andcc #$FE
+         andcc #^Carry
          bra   L115D
-L1159    orcc  #$04
-L115B    orcc  #$01
+L1159    orcc  #Zero
+L115B    orcc  #Carry
 L115D    leas  $04,s
          rts   
-L1160    andcc #$FB
+L1160    andcc #^Zero
          bra   L115B
 L1164    lda   ,x+
          cmpa  #$20
@@ -2222,7 +2222,7 @@
 L118E    pshs  y,x,b,a
          ldd   ,s
          bne   L1198
-         orcc  #$01
+         orcc  #Carry
          bra   L11B8
 L1198    ldd   #$0010
          stb   $04,s
@@ -2240,7 +2240,7 @@
          bne   L119E
          tfr   d,x
          ldd   $02,s
-         andcc #$FE
+         andcc #^Carry
 L11B8    leas  $06,s
          rts   
 L11BB    sta   ,x+
@@ -2251,7 +2251,7 @@
          leau  ,s
          bsr   L1164
          bsr   L11D0
-         andcc #$FE
+         andcc #^Carry
          puls  pc,u,y
 L11CE    leax  $01,x
 L11D0    bsr   L1211
@@ -2284,7 +2284,7 @@
          beq   L120D
 L1205    ldb   #$06
 L1207    leas  ,u
-         orcc  #$01
+         orcc  #Carry
          puls  pc,u,y
 L120D    puls  pc,b,a
 L120F    leax  $01,x
@@ -2399,7 +2399,7 @@
          bcs   L12D6
          lbsr  L0FA2
          bcs   L129F
-L12EE    andcc #$FE
+L12EE    andcc #^Carry
          rts   
 L12F1    lbsr  L11C2
          bcs   L1304
@@ -2413,7 +2413,7 @@
          ldb   #$0E
 L1304    lbsr  L02FA
          ldd   #$FFFF
-         orcc  #$01
+         orcc  #Carry
          rts   
 L130D    bsr   L134D
          pshs  x,b,a
@@ -2663,7 +2663,7 @@
 L156C    ldu   <u001F
 L156E    cmpu  <u0006
          bne   L1576
-         orcc  #$01
+         orcc  #Carry
          rts   
 L1576    lda   <u0018
          pulu  b
diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/drvr51.asm
--- a/level1/cmds/drvr51.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/drvr51.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -143,7 +143,7 @@
          lda   #$10
          sta   <u0037,u
          pshs  cc
-         orcc  #$50
+         orcc  #IntMasks
          leay  >L00AD,pcr
          sty   >$0032
          ldx   #$FF00
@@ -195,7 +195,7 @@
          lbsr  L0027
          bcs   L011C
 L00F9    leax  <u003A,u
-         orcc  #$10
+         orcc  #IRQMask
          ldb   <u001D,u
          cmpb  <u001E,u
          beq   L00D2
@@ -205,7 +205,7 @@
          bcs   L010E
          clrb  
 L010E    stb   <u001D,u
-         andcc #$EE
+         andcc #^(IRQMask+Carry)
          tst   u000E,u
          beq   L011C
          clr   u000E,u
diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/edit.asm
--- a/level1/cmds/edit.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/edit.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -369,7 +369,7 @@
          std   <u0002
          bra   L0260
 L0259    ldb   #$D8
-L025B    orcc  #$01
+L025B    orcc  #Carry
          os9   F$Exit   
 L0260    ldy   #$0000
          sty   <u0024
@@ -589,10 +589,10 @@
          ldd   -$02,y
          ldy   <u004B
          addd  $02,y
-         orcc  #$04
+         orcc  #Zero
          puls  pc,y
 L045D    leax  -$01,x
-         andcc #$FB
+         andcc #^Zero
          rts   
 L0462    lda   ,y+
          cmpa  #$0D
@@ -621,9 +621,9 @@
          bsr   L04DA
          beq   L049D
          stx   $02,s
-         orcc  #$04
+         orcc  #Zero
          bra   L049F
-L049D    andcc #$FB
+L049D    andcc #^Zero
 L049F    puls  pc,y,x,b,a
 L04A1    pshs  u
          ldu   <u0014
@@ -639,12 +639,12 @@
          leau  d,u
          cmpu  <u001C
          bcs   L04A8
-L04C0    orcc  #$04
+L04C0    orcc  #Zero
          puls  pc,u
 L04C4    lbsr  L069A
          lbsr  L0691
          tfr   u,d
-         andcc #$FB
+         andcc #^Zero
          puls  pc,u
 L04D0    cmpa  #$61
          bcs   L04DA
@@ -661,9 +661,9 @@
          bcs   L04F1
          cmpa  #$7A
          bhi   L04F1
-L04EE    orcc  #$04
+L04EE    orcc  #Zero
          rts   
-L04F1    andcc #$FB
+L04F1    andcc #^Zero
          rts   
 L04F4    clr   <u0042
          pshs  b,a
@@ -802,9 +802,9 @@
          leay  -$01,y
          bne   L0612
          std   ,s
-         andcc #$FB
+         andcc #^Zero
          puls  pc,y,b,a
-L0622    orcc  #$04
+L0622    orcc  #Zero
          puls  pc,y,b,a
 L0626    pshs  y,x,b,a
          leax  >L05F4,pcr
@@ -840,7 +840,7 @@
          beq   L0683
          cmpd  #$FFFF
          bne   L067E
-         andcc #$FB
+         andcc #^Zero
          bra   L0683
 L067E    subd  #$0001
          std   -$02,x
@@ -873,7 +873,7 @@
          lda   ,x+
          cmpa  #$0D
          bne   L06B4
-         andcc #$FB
+         andcc #^Zero
 L06C0    puls  pc,a
 L06C2    cmpx  <u001C
          beq   L06CE
@@ -881,7 +881,7 @@
          cmpx  <u0018
          beq   L06CE
          leax  -$01,x
-L06CE    andcc #$FB
+L06CE    andcc #^Zero
          rts   
 L06D1    bsr   L06D7
          beq   L06E9
@@ -893,7 +893,7 @@
          cmpa  #$0D
          bne   L06D9
          leax  $01,x
-         andcc #$FB
+         andcc #^Zero
 L06E7    puls  a
 L06E9    rts   
 L06EA    pshs  y,x,b,a
@@ -969,7 +969,7 @@
          beq   L0788
 L0781    lbsr  L089B
          bcs   L0774
-         andcc #$FB
+         andcc #^Zero
 L0788    puls  pc,b,a
          ldx   <u0012
          ldd   u0005,u
@@ -1245,9 +1245,9 @@
          beq   L09E9
          bsr   L09C0
          bra   L09E9
-L0A05    orcc  #$01
+L0A05    orcc  #Carry
          bra   L0A0B
-         andcc #$FE
+         andcc #^Carry
 L0A0B    puls  y,x
          puls  pc,y,b,a
 L0A0F    lbsr  L1126
@@ -1263,7 +1263,7 @@
 L0A29    pulu  pc,u
 L0A2B    pshs  y,x,b,a
          lbsr  L0660
-         andcc #$FE
+         andcc #^Carry
          beq   L0A4E
          ldx   u0005,u
          lbsr  L0122
@@ -1275,11 +1275,11 @@
          stx   <u001A
          lbsr  L0668
          bne   L0A39
-         andcc #$FE
+         andcc #^Carry
 L0A4E    puls  pc,y,x,b,a
 L0A50    pshs  y,x,b,a
          lbsr  L0660
-         andcc #$FE
+         andcc #^Carry
          beq   L0A94
          ldx   u0005,u
          lbsr  L0122
@@ -1304,7 +1304,7 @@
          lbsr  L0082
          lbsr  L0668
          bne   L0A67
-         andcc #$FE
+         andcc #^Carry
 L0A92    leas  $04,s
 L0A94    puls  pc,y,x,b,a
          lbsr  L0A2B
@@ -1427,9 +1427,9 @@
          sta   ,y+
          leau  -u0001,u
          bra   L0B9A
-L0BAD    andcc #$FB
+L0BAD    andcc #^Zero
          puls  pc,u,x,b,a
-L0BB1    orcc  #$04
+L0BB1    orcc  #Zero
          puls  pc,u,x,b,a
 L0BB5    pshs  x,b,a
          tfr   s,x
@@ -1782,9 +1782,9 @@
          bcs   L0EE1
          cmpy  ,s++
          bcc   L0EE1
-         orcc  #$04
+         orcc  #Zero
          puls  pc,y,x
-L0EE1    andcc #$FB
+L0EE1    andcc #^Zero
          puls  pc,y,x
          ldx   #$FFFF
          pshs  x
@@ -2026,7 +2026,7 @@
          lda   ,x+
          cmpa  ,y+
          beq   L10F9
-L1108    andcc #$FB
+L1108    andcc #^Zero
 L110A    rts   
          tst   <u0005
          bne   L10B3
diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/format.asm
--- a/level1/cmds/format.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/format.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -1180,9 +1180,9 @@
          leay  -$01,y
          bne   L08C1
          std   ,s
-         andcc #$FB
+         andcc #^Zero
 L08CD    puls  pc,y,b,a
-L08CF    orcc  #$04
+L08CF    orcc  #Zero
          puls  pc,y,b,a
 
 ErrExit  lda   #$02
diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/format_d64.asm
--- a/level1/cmds/format_d64.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/format_d64.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -1186,9 +1186,9 @@
          leay  -$01,y
          bne   L08D2
          std   ,s
-         andcc #$FB
+         andcc #^Zero
 L08DE    puls  pc,y,b,a
-L08E0    orcc  #$04
+L08E0    orcc  #Zero
          puls  pc,y,b,a
 
 ErrExit  lda   #$02
diff -r 1692ff7ca350 -r 7dea3d77ba0b level1/cmds/go51.asm
--- a/level1/cmds/go51.asm	Mon Jul 15 03:56:46 2002 +0000
+++ b/level1/cmds/go51.asm	Mon Jul 15 04:16:41 2002 +0000
@@ -48,7 +48,7 @@
          ldd   $02,x
          std   u0004,u
          pshs  u,cc
-         orcc  #$50
+         orcc  #IntMasks
          ldx   >$006B
          stx   >$0032
          ldy   ,u