Support cpx and cpy.

README.markdown

@@ -171,10 +171,10 @@ In these, `absolute` must be a `reserve`d or `locate`d address.
       cmp absolute
     X cmp #immediate
       
-    X cpx absolute
+      cpx absolute
     X cpx #immediate
     
-    X cpy absolute
+      cpy absolute
     X cpy #immediate
     
     X dec absolute
@@ -364,8 +364,10 @@ No duplicate declarations.
     |    sty score
     |    cmp score
     |    ldx score
+    |    cpx screen
     |    txa
     |    ldy score
+    |    cpy screen
     |    tya
     |    sta screen
     | }
@@ -384,8 +386,10 @@ No duplicate declarations.
     =   sty score
     =   cmp score
     =   ldx score
+    =   cpx screen
     =   txa
     =   ldy score
+    =   cpy screen
     =   tya
     =   sta screen
     =   rts

src/SixtyPical/Emitter.hs

@@ -46,8 +46,9 @@ emitInstr p r (COPY (NamedLocation label) A) = "lda " ++ label
 emitInstr p r (COPY (NamedLocation label) X) = "ldx " ++ label
 emitInstr p r (COPY (NamedLocation label) Y) = "ldy " ++ label
 
-
 emitInstr p r (CMP A (NamedLocation label)) = "cmp " ++ label
+emitInstr p r (CMP X (NamedLocation label)) = "cpx " ++ label
+emitInstr p r (CMP Y (NamedLocation label)) = "cpy " ++ label
 
 emitInstr p r (COPY A X) = "tax"
 emitInstr p r (COPY A Y) = "tay"

src/SixtyPical/Parser.hs

@@ -19,6 +19,8 @@ Command  := "if" Branch Block "else" Block
           | "ldy" (LocationName | Immediate)
           | "txa" | "tax" | "tya" | "tay"
           | "cmp" (LocationName | Immediate)
+          | "cpx" (LocationName | Immediate)
+          | "cpy" (LocationName | Immediate)
           | "nop".
 Branch   := "bcc" | "bcs" | "beq" | "bmi" | "bne" | "bpl" | "bvc" | "bvs".
 
@@ -74,9 +76,10 @@ block = do
     return cs
 
 command :: Parser Instruction
-command = cmp <|> (try lda) <|> (try ldx) <|> (try ldy) <|>
+command = (try lda) <|> (try ldx) <|> (try ldy) <|>
           (try sta) <|> (try stx) <|> (try sty) <|>
           (try txa) <|> (try tax) <|> (try tya) <|> (try tay) <|>
+          (try cmp) <|> (try cpx) <|> (try cpy) <|>
           if_statement <|> nop
 
 nop :: Parser Instruction
@@ -92,6 +95,20 @@ cmp = do
     l <- locationName
     return (CMP A (NamedLocation l))
 
+cpx :: Parser Instruction
+cpx = do
+    string "cpx"
+    spaces
+    l <- locationName
+    return (CMP X (NamedLocation l))
+
+cpy :: Parser Instruction
+cpy = do
+    string "cpy"
+    spaces
+    l <- locationName
+    return (CMP Y (NamedLocation l))
+
 lda :: Parser Instruction
 lda = do
     string "lda"