From 7928c2cb34469e3a55cbfeb2c9d9b6f8f32a7201 Mon Sep 17 00:00:00 2001 From: Lucian Mogosanu Date: Sun, 14 Dec 2014 01:39:39 +0200 Subject: [PATCH] Z80: ISA: Adjust to decoding needs --- src/Z80/ISA.hs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Z80/ISA.hs b/src/Z80/ISA.hs index f710fa1..2ec3c73 100644 --- a/src/Z80/ISA.hs +++ b/src/Z80/ISA.hs @@ -4,7 +4,7 @@ import Data.Word import Data.Int -- regs, as seen by the programmer -data Reg = A | B | C | D | E | H | L deriving (Show, Eq) +data Reg = B | C | D | E | H | L | PHL | A deriving (Show, Eq) -- reg pairs specified in the z80 manual data BC = BC @@ -174,10 +174,11 @@ data Instruction = | JP_NN Word16 | JP_CC_NN Cond Word16 | JR_E Int8 - | JR_C_E Int8 - | JR_NC_E Int8 - | JR_Z_E Int8 - | JR_NZ_E Int8 +-- | JR_C_E Int8 +-- | JR_NC_E Int8 +-- | JR_Z_E Int8 +-- | JR_NZ_E Int8 + | JR_CC_E Cond Int8 | JP_HL | JP_IX | JP_IY @@ -197,10 +198,10 @@ data Instruction = | INIR | IND | INDR - | OUT_N_A Word8 + | OUT_PN_A Word8 | OUT_PC_R Reg | OUTI | OUTIR | OUTD | OUTDR - | IllegalInstruction + | IllegalInstruction String -- 1.7.10.4