update T80 ip

diff --git a/galaxian/t80_ip/T80.vhd b/galaxian/t80_ip/T80.vhd
index 398fa0dff71a28a767d5c0087d0880ac65d89686..da01f6b437a3dd0c9e9bea007b4dcd5e8b76c9d6 100644 (file)
--- a/galaxian/t80_ip/T80.vhd
+++ b/galaxian/t80_ip/T80.vhd
@@ -1,3 +1,13 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup. Rmoved some auto_wait bits from 0247 which caused problems
+--
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****

 --
 -- Z80 compatible microprocessor core
 --
 --
 -- Z80 compatible microprocessor core
 --


@@ -38,33 +48,33 @@
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:

---     http://www.opencores.org/cvsweb.shtml/t80/
+--      http://www.opencores.org/cvsweb.shtml/t80/

 --
 -- Limitations :
 --
 -- File history :
 --
 --
 -- Limitations :
 --
 -- File history :
 --

---     0208 : First complete release
+--      0208 : First complete release

 --
 --

---     0210 : Fixed wait and halt
+--      0210 : Fixed wait and halt

 --
 --

---     0211 : Fixed Refresh addition and IM 1
+--      0211 : Fixed Refresh addition and IM 1

 --
 --

---     0214 : Fixed mostly flags, only the block instructions now fail the zex regression test
+--      0214 : Fixed mostly flags, only the block instructions now fail the zex regression test

 --
 --

---     0232 : Removed refresh address output for Mode > 1 and added DJNZ M1_n fix by Mike Johnson
+--      0232 : Removed refresh address output for Mode > 1 and added DJNZ M1_n fix by Mike Johnson

 --
 --

---     0235 : Added clock enable and IM 2 fix by Mike Johnson
+--      0235 : Added clock enable and IM 2 fix by Mike Johnson

 --
 --

---     0237 : Changed 8080 I/O address output, added IntE output
+--      0237 : Changed 8080 I/O address output, added IntE output

 --
 --

---     0238 : Fixed (IX/IY+d) timing and 16 bit ADC and SBC zero flag
+--      0238 : Fixed (IX/IY+d) timing and 16 bit ADC and SBC zero flag

 --
 --

---     0240 : Added interrupt ack fix by Mike Johnson, changed (IX/IY+d) timing and changed flags in GB mode
+--      0240 : Added interrupt ack fix by Mike Johnson, changed (IX/IY+d) timing and changed flags in GB mode

 --
 --

---     0242 : Added I/O wait, fixed refresh address, moved some registers to RAM
+--      0242 : Added I/O wait, fixed refresh address, moved some registers to RAM

 --
 --

---     0247 : Fixed bus req/ack cycle
+--      0247 : Fixed bus req/ack cycle

 --
 
 library IEEE;
 --
 
 library IEEE;


@@ -74,8 +84,8 @@ use work.T80_Pack.all;
 
 entity T80 is
        generic(
 
 entity T80 is
        generic(

-               Mode : integer := 0;    -- 0 => Z80, 1 => Fast Z80, 2 => 8080, 3 => GB
-               IOWait : integer := 0;  -- 1 => Single cycle I/O, 1 => Std I/O cycle
+               Mode   : integer := 0;  -- 0 => Z80, 1 => Fast Z80, 2 => 8080, 3 => GB
+               IOWait : integer := 0;  -- 1 => Single cycle I/O, 1 => Std I/O cycle

                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;
                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;


@@ -86,164 +96,165 @@ entity T80 is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               RESET_n         : in std_logic;
-               CLK_n           : in std_logic;
-               CEN                     : in std_logic;
-               WAIT_n          : in std_logic;
-               INT_n           : in std_logic;
-               NMI_n           : in std_logic;
-               BUSRQ_n         : in std_logic;
-               M1_n            : out std_logic;
-               IORQ            : out std_logic;
-               NoRead          : out std_logic;
-               Write           : out std_logic;
-               RFSH_n          : out std_logic;
-               HALT_n          : out std_logic;
-               BUSAK_n         : out std_logic;
-               A                       : out std_logic_vector(15 downto 0);
-               DInst           : in std_logic_vector(7 downto 0);
-               DI                      : in std_logic_vector(7 downto 0);
-               DO                      : out std_logic_vector(7 downto 0);
-               MC                      : out std_logic_vector(2 downto 0);
-               TS                      : out std_logic_vector(2 downto 0);
-               IntCycle_n      : out std_logic;
-               IntE            : out std_logic;
-               Stop            : out std_logic
+               RESET_n         : in  std_logic;
+               CLK_n           : in  std_logic;
+               CEN             : in  std_logic;
+               WAIT_n          : in  std_logic;
+               INT_n           : in  std_logic;
+               NMI_n           : in  std_logic;
+               BUSRQ_n         : in  std_logic;
+               M1_n            : out std_logic;
+               IORQ            : out std_logic;
+               NoRead          : out std_logic;
+               Write           : out std_logic;
+               RFSH_n          : out std_logic;
+               HALT_n          : out std_logic;
+               BUSAK_n         : out std_logic;
+               A               : out std_logic_vector(15 downto 0);
+               DInst           : in  std_logic_vector(7 downto 0);
+               DI              : in  std_logic_vector(7 downto 0);
+               DO              : out std_logic_vector(7 downto 0);
+               MC              : out std_logic_vector(2 downto 0);
+               TS              : out std_logic_vector(2 downto 0);
+               IntCycle_n      : out std_logic;
+               IntE            : out std_logic;
+               Stop            : out std_logic

        );
 end T80;
 
 architecture rtl of T80 is
 
        );
 end T80;
 
 architecture rtl of T80 is
 

-       constant aNone  : std_logic_vector(2 downto 0) := "111";
-       constant aBC    : std_logic_vector(2 downto 0) := "000";
-       constant aDE    : std_logic_vector(2 downto 0) := "001";
-       constant aXY    : std_logic_vector(2 downto 0) := "010";
-       constant aIOA   : std_logic_vector(2 downto 0) := "100";
-       constant aSP    : std_logic_vector(2 downto 0) := "101";
-       constant aZI    : std_logic_vector(2 downto 0) := "110";
+       constant aNone              : std_logic_vector(2 downto 0) := "111";
+       constant aBC                : std_logic_vector(2 downto 0) := "000";
+       constant aDE                : std_logic_vector(2 downto 0) := "001";
+       constant aXY                : std_logic_vector(2 downto 0) := "010";
+       constant aIOA               : std_logic_vector(2 downto 0) := "100";
+       constant aSP                : std_logic_vector(2 downto 0) := "101";
+       constant aZI                : std_logic_vector(2 downto 0) := "110";

 
        -- Registers
 
        -- Registers

-       signal ACC, F                   : std_logic_vector(7 downto 0);
-       signal Ap, Fp                   : std_logic_vector(7 downto 0);
-       signal I                                : std_logic_vector(7 downto 0);
-       signal R                                : unsigned(7 downto 0);
-       signal SP, PC                   : unsigned(15 downto 0);
-       signal RegDIH                   : std_logic_vector(7 downto 0);
-       signal RegDIL                   : std_logic_vector(7 downto 0);
-       signal RegBusA                  : std_logic_vector(15 downto 0);
-       signal RegBusB                  : std_logic_vector(15 downto 0);
-       signal RegBusC                  : std_logic_vector(15 downto 0);
-       signal RegAddrA_r               : std_logic_vector(2 downto 0);
-       signal RegAddrA                 : std_logic_vector(2 downto 0);
-       signal RegAddrB_r               : std_logic_vector(2 downto 0);
-       signal RegAddrB                 : std_logic_vector(2 downto 0);
-       signal RegAddrC                 : std_logic_vector(2 downto 0);
-       signal RegWEH                   : std_logic;
-       signal RegWEL                   : std_logic;
-       signal Alternate                : std_logic;
+       signal ACC, F               : std_logic_vector(7 downto 0);
+       signal Ap, Fp               : std_logic_vector(7 downto 0);
+       signal I                    : std_logic_vector(7 downto 0);
+       signal R                    : unsigned(7 downto 0);
+       signal SP, PC               : unsigned(15 downto 0);
+
+       signal RegDIH               : std_logic_vector(7 downto 0);
+       signal RegDIL               : std_logic_vector(7 downto 0);
+       signal RegBusA              : std_logic_vector(15 downto 0);
+       signal RegBusB              : std_logic_vector(15 downto 0);
+       signal RegBusC              : std_logic_vector(15 downto 0);
+       signal RegAddrA_r           : std_logic_vector(2 downto 0);
+       signal RegAddrA             : std_logic_vector(2 downto 0);
+       signal RegAddrB_r           : std_logic_vector(2 downto 0);
+       signal RegAddrB             : std_logic_vector(2 downto 0);
+       signal RegAddrC             : std_logic_vector(2 downto 0);
+       signal RegWEH               : std_logic;
+       signal RegWEL               : std_logic;
+       signal Alternate            : std_logic;

 
        -- Help Registers
 
        -- Help Registers

-       signal TmpAddr                  : std_logic_vector(15 downto 0);        -- Temporary address register
-       signal IR                               : std_logic_vector(7 downto 0);         -- Instruction register
-       signal ISet                             : std_logic_vector(1 downto 0);         -- Instruction set selector
-       signal RegBusA_r                : std_logic_vector(15 downto 0);
-
-       signal ID16                             : signed(15 downto 0);
-       signal Save_Mux                 : std_logic_vector(7 downto 0);
-
-       signal TState                   : unsigned(2 downto 0);
-       signal MCycle                   : std_logic_vector(2 downto 0);
-       signal IntE_FF1                 : std_logic;
-       signal IntE_FF2                 : std_logic;
-       signal Halt_FF                  : std_logic;
-       signal BusReq_s                 : std_logic;
-       signal BusAck                   : std_logic;
-       signal ClkEn                    : std_logic;
-       signal NMI_s                    : std_logic;
-       signal INT_s                    : std_logic;
-       signal IStatus                  : std_logic_vector(1 downto 0);
-
-       signal DI_Reg                   : std_logic_vector(7 downto 0);
-       signal T_Res                    : std_logic;
-       signal XY_State                 : std_logic_vector(1 downto 0);
-       signal Pre_XY_F_M               : std_logic_vector(2 downto 0);
-       signal NextIs_XY_Fetch  : std_logic;
-       signal XY_Ind                   : std_logic;
-       signal No_BTR                   : std_logic;
-       signal BTR_r                    : std_logic;
-       signal Auto_Wait                : std_logic;
-       signal Auto_Wait_t1             : std_logic;
-       signal Auto_Wait_t2             : std_logic;
-       signal IncDecZ                  : std_logic;
+       signal TmpAddr              : std_logic_vector(15 downto 0);        -- Temporary address register
+       signal IR                   : std_logic_vector(7 downto 0);         -- Instruction register
+       signal ISet                 : std_logic_vector(1 downto 0);         -- Instruction set selector
+       signal RegBusA_r            : std_logic_vector(15 downto 0);
+
+       signal ID16                 : signed(15 downto 0);
+       signal Save_Mux             : std_logic_vector(7 downto 0);
+
+       signal TState               : unsigned(2 downto 0);
+       signal MCycle               : std_logic_vector(2 downto 0);
+       signal IntE_FF1             : std_logic;
+       signal IntE_FF2             : std_logic;
+       signal Halt_FF              : std_logic;
+       signal BusReq_s             : std_logic;
+       signal BusAck               : std_logic;
+       signal ClkEn                : std_logic;
+       signal NMI_s                : std_logic;
+       signal INT_s                : std_logic;
+       signal IStatus              : std_logic_vector(1 downto 0);
+
+       signal DI_Reg               : std_logic_vector(7 downto 0);
+       signal T_Res                : std_logic;
+       signal XY_State             : std_logic_vector(1 downto 0);
+       signal Pre_XY_F_M           : std_logic_vector(2 downto 0);
+       signal NextIs_XY_Fetch      : std_logic;
+       signal XY_Ind               : std_logic;
+       signal No_BTR               : std_logic;
+       signal BTR_r                : std_logic;
+       signal Auto_Wait            : std_logic;
+       signal Auto_Wait_t1         : std_logic;
+       signal Auto_Wait_t2         : std_logic;
+       signal IncDecZ              : std_logic;

 
        -- ALU signals
 
        -- ALU signals

-       signal BusB                             : std_logic_vector(7 downto 0);
-       signal BusA                             : std_logic_vector(7 downto 0);
-       signal ALU_Q                    : std_logic_vector(7 downto 0);
-       signal F_Out                    : std_logic_vector(7 downto 0);
+       signal BusB                 : std_logic_vector(7 downto 0);
+       signal BusA                 : std_logic_vector(7 downto 0);
+       signal ALU_Q                : std_logic_vector(7 downto 0);
+       signal F_Out                : std_logic_vector(7 downto 0);

 
        -- Registered micro code outputs
 
        -- Registered micro code outputs

-       signal Read_To_Reg_r    : std_logic_vector(4 downto 0);
-       signal Arith16_r                : std_logic;
-       signal Z16_r                    : std_logic;
-       signal ALU_Op_r                 : std_logic_vector(3 downto 0);
-       signal Save_ALU_r               : std_logic;
-       signal PreserveC_r              : std_logic;
-       signal MCycles                  : std_logic_vector(2 downto 0);
+       signal Read_To_Reg_r        : std_logic_vector(4 downto 0);
+       signal Arith16_r            : std_logic;
+       signal Z16_r                : std_logic;
+       signal ALU_Op_r             : std_logic_vector(3 downto 0);
+       signal Save_ALU_r           : std_logic;
+       signal PreserveC_r          : std_logic;
+       signal MCycles              : std_logic_vector(2 downto 0);

 
        -- Micro code outputs
 
        -- Micro code outputs

-       signal MCycles_d                : std_logic_vector(2 downto 0);
-       signal TStates                  : std_logic_vector(2 downto 0);
-       signal IntCycle                 : std_logic;
-       signal NMICycle                 : std_logic;
-       signal Inc_PC                   : std_logic;
-       signal Inc_WZ                   : std_logic;
-       signal IncDec_16                : std_logic_vector(3 downto 0);
-       signal Prefix                   : std_logic_vector(1 downto 0);
-       signal Read_To_Acc              : std_logic;
-       signal Read_To_Reg              : std_logic;
-       signal Set_BusB_To              : std_logic_vector(3 downto 0);
-       signal Set_BusA_To              : std_logic_vector(3 downto 0);
-       signal ALU_Op                   : std_logic_vector(3 downto 0);
-       signal Save_ALU                 : std_logic;
-       signal PreserveC                : std_logic;
-       signal Arith16                  : std_logic;
-       signal Set_Addr_To              : std_logic_vector(2 downto 0);
-       signal Jump                             : std_logic;
-       signal JumpE                    : std_logic;
-       signal JumpXY                   : std_logic;
-       signal Call                             : std_logic;
-       signal RstP                             : std_logic;
-       signal LDZ                              : std_logic;
-       signal LDW                              : std_logic;
-       signal LDSPHL                   : std_logic;
-       signal IORQ_i                   : std_logic;
-       signal Special_LD               : std_logic_vector(2 downto 0);
-       signal ExchangeDH               : std_logic;
-       signal ExchangeRp               : std_logic;
-       signal ExchangeAF               : std_logic;
-       signal ExchangeRS               : std_logic;
-       signal I_DJNZ                   : std_logic;
-       signal I_CPL                    : std_logic;
-       signal I_CCF                    : std_logic;
-       signal I_SCF                    : std_logic;
-       signal I_RETN                   : std_logic;
-       signal I_BT                             : std_logic;
-       signal I_BC                             : std_logic;
-       signal I_BTR                    : std_logic;
-       signal I_RLD                    : std_logic;
-       signal I_RRD                    : std_logic;
-       signal I_INRC                   : std_logic;
-       signal SetDI                    : std_logic;
-       signal SetEI                    : std_logic;
-       signal IMode                    : std_logic_vector(1 downto 0);
-       signal Halt                             : std_logic;
+       signal MCycles_d            : std_logic_vector(2 downto 0);
+       signal TStates              : std_logic_vector(2 downto 0);
+       signal IntCycle             : std_logic;
+       signal NMICycle             : std_logic;
+       signal Inc_PC               : std_logic;
+       signal Inc_WZ               : std_logic;
+       signal IncDec_16            : std_logic_vector(3 downto 0);
+       signal Prefix               : std_logic_vector(1 downto 0);
+       signal Read_To_Acc          : std_logic;
+       signal Read_To_Reg          : std_logic;
+       signal Set_BusB_To          : std_logic_vector(3 downto 0);
+       signal Set_BusA_To          : std_logic_vector(3 downto 0);
+       signal ALU_Op               : std_logic_vector(3 downto 0);
+       signal Save_ALU             : std_logic;
+       signal PreserveC            : std_logic;
+       signal Arith16              : std_logic;
+       signal Set_Addr_To          : std_logic_vector(2 downto 0);
+       signal Jump                 : std_logic;
+       signal JumpE                : std_logic;
+       signal JumpXY               : std_logic;
+       signal Call                 : std_logic;
+       signal RstP                 : std_logic;
+       signal LDZ                  : std_logic;
+       signal LDW                  : std_logic;
+       signal LDSPHL               : std_logic;
+       signal IORQ_i               : std_logic;
+       signal Special_LD           : std_logic_vector(2 downto 0);
+       signal ExchangeDH           : std_logic;
+       signal ExchangeRp           : std_logic;
+       signal ExchangeAF           : std_logic;
+       signal ExchangeRS           : std_logic;
+       signal I_DJNZ               : std_logic;
+       signal I_CPL                : std_logic;
+       signal I_CCF                : std_logic;
+       signal I_SCF                : std_logic;
+       signal I_RETN               : std_logic;
+       signal I_BT                 : std_logic;
+       signal I_BC                 : std_logic;
+       signal I_BTR                : std_logic;
+       signal I_RLD                : std_logic;
+       signal I_RRD                : std_logic;
+       signal I_INRC               : std_logic;
+       signal SetDI                : std_logic;
+       signal SetEI                : std_logic;
+       signal IMode                : std_logic_vector(1 downto 0);
+       signal Halt                 : std_logic;

 
 begin
 
        mcode : T80_MCode
                generic map(
 
 begin
 
        mcode : T80_MCode
                generic map(

-                       Mode => Mode,
+                       Mode   => Mode,

                        Flag_C => Flag_C,
                        Flag_N => Flag_N,
                        Flag_P => Flag_P,
                        Flag_C => Flag_C,
                        Flag_N => Flag_N,
                        Flag_P => Flag_P,


@@ -253,62 +264,62 @@ begin
                        Flag_Z => Flag_Z,
                        Flag_S => Flag_S)
                port map(
                        Flag_Z => Flag_Z,
                        Flag_S => Flag_S)
                port map(

-                       IR => IR,
-                       ISet => ISet,
-                       MCycle => MCycle,
-                       F => F,
-                       NMICycle => NMICycle,
-                       IntCycle => IntCycle,
-                       MCycles => MCycles_d,
-                       TStates => TStates,
-                       Prefix => Prefix,
-                       Inc_PC => Inc_PC,
-                       Inc_WZ => Inc_WZ,
-                       IncDec_16 => IncDec_16,
+                       IR          => IR,
+                       ISet        => ISet,
+                       MCycle      => MCycle,
+                       F           => F,
+                       NMICycle    => NMICycle,
+                       IntCycle    => IntCycle,
+                       MCycles     => MCycles_d,
+                       TStates     => TStates,
+                       Prefix      => Prefix,
+                       Inc_PC      => Inc_PC,
+                       Inc_WZ      => Inc_WZ,
+                       IncDec_16   => IncDec_16,

                        Read_To_Acc => Read_To_Acc,
                        Read_To_Reg => Read_To_Reg,
                        Set_BusB_To => Set_BusB_To,
                        Set_BusA_To => Set_BusA_To,
                        Read_To_Acc => Read_To_Acc,
                        Read_To_Reg => Read_To_Reg,
                        Set_BusB_To => Set_BusB_To,
                        Set_BusA_To => Set_BusA_To,

-                       ALU_Op => ALU_Op,
-                       Save_ALU => Save_ALU,
-                       PreserveC => PreserveC,
-                       Arith16 => Arith16,
+                       ALU_Op      => ALU_Op,
+                       Save_ALU    => Save_ALU,
+                       PreserveC   => PreserveC,
+                       Arith16     => Arith16,

                        Set_Addr_To => Set_Addr_To,
                        Set_Addr_To => Set_Addr_To,

-                       IORQ => IORQ_i,
-                       Jump => Jump,
-                       JumpE => JumpE,
-                       JumpXY => JumpXY,
-                       Call => Call,
-                       RstP => RstP,
-                       LDZ => LDZ,
-                       LDW => LDW,
-                       LDSPHL => LDSPHL,
-                       Special_LD => Special_LD,
-                       ExchangeDH => ExchangeDH,
-                       ExchangeRp => ExchangeRp,
-                       ExchangeAF => ExchangeAF,
-                       ExchangeRS => ExchangeRS,
-                       I_DJNZ => I_DJNZ,
-                       I_CPL => I_CPL,
-                       I_CCF => I_CCF,
-                       I_SCF => I_SCF,
-                       I_RETN => I_RETN,
-                       I_BT => I_BT,
-                       I_BC => I_BC,
-                       I_BTR => I_BTR,
-                       I_RLD => I_RLD,
-                       I_RRD => I_RRD,
-                       I_INRC => I_INRC,
-                       SetDI => SetDI,
-                       SetEI => SetEI,
-                       IMode => IMode,
-                       Halt => Halt,
-                       NoRead => NoRead,
-                       Write => Write);
+                       IORQ        => IORQ_i,
+                       Jump        => Jump,
+                       JumpE       => JumpE,
+                       JumpXY      => JumpXY,
+                       Call        => Call,
+                       RstP        => RstP,
+                       LDZ         => LDZ,
+                       LDW         => LDW,
+                       LDSPHL      => LDSPHL,
+                       Special_LD  => Special_LD,
+                       ExchangeDH  => ExchangeDH,
+                       ExchangeRp  => ExchangeRp,
+                       ExchangeAF  => ExchangeAF,
+                       ExchangeRS  => ExchangeRS,
+                       I_DJNZ      => I_DJNZ,
+                       I_CPL       => I_CPL,
+                       I_CCF       => I_CCF,
+                       I_SCF       => I_SCF,
+                       I_RETN      => I_RETN,
+                       I_BT        => I_BT,
+                       I_BC        => I_BC,
+                       I_BTR       => I_BTR,
+                       I_RLD       => I_RLD,
+                       I_RRD       => I_RRD,
+                       I_INRC      => I_INRC,
+                       SetDI       => SetDI,
+                       SetEI       => SetEI,
+                       IMode       => IMode,
+                       Halt        => Halt,
+                       NoRead      => NoRead,
+                       Write       => Write);

 
        alu : T80_ALU
                generic map(
 
        alu : T80_ALU
                generic map(

-                       Mode => Mode,
+                       Mode   => Mode,

                        Flag_C => Flag_C,
                        Flag_N => Flag_N,
                        Flag_P => Flag_P,
                        Flag_C => Flag_C,
                        Flag_N => Flag_N,
                        Flag_P => Flag_P,


@@ -319,15 +330,15 @@ begin
                        Flag_S => Flag_S)
                port map(
                        Arith16 => Arith16_r,
                        Flag_S => Flag_S)
                port map(
                        Arith16 => Arith16_r,

-                       Z16 => Z16_r,
-                       ALU_Op => ALU_Op_r,
-                       IR => IR(5 downto 0),
-                       ISet => ISet,
-                       BusA => BusA,
-                       BusB => BusB,
-                       F_In => F,
-                       Q => ALU_Q,
-                       F_Out => F_Out);
+                       Z16     => Z16_r,
+                       ALU_Op  => ALU_Op_r,
+                       IR      => IR(5 downto 0),
+                       ISet    => ISet,
+                       BusA    => BusA,
+                       BusB    => BusB,
+                       F_In    => F,
+                       Q       => ALU_Q,
+                       F_Out   => F_Out);

 
        ClkEn <= CEN and not BusAck;
 
 
        ClkEn <= CEN and not BusAck;
 


@@ -643,7 +654,7 @@ begin
                                        DI_Reg(4) xor DI_Reg(5) xor DI_Reg(6) xor DI_Reg(7));
                        end if;
 
                                        DI_Reg(4) xor DI_Reg(5) xor DI_Reg(6) xor DI_Reg(7));
                        end if;
 

-                       if TState = 1 and Auto_Wait_t1 = '0' then
+                       if TState = 1 then

                                DO <= BusB;
                                if I_RLD = '1' then
                                        DO(3 downto 0) <= BusA(3 downto 0);
                                DO <= BusB;
                                if I_RLD = '1' then
                                        DO(3 downto 0) <= BusA(3 downto 0);


@@ -674,7 +685,7 @@ begin
                                F(Flag_P) <= IncDecZ;
                        end if;
 
                                F(Flag_P) <= IncDecZ;
                        end if;
 

-                       if (TState = 1 and Save_ALU_r = '0' and Auto_Wait_t1 = '0') or
+                       if (TState = 1 and Save_ALU_r = '0') or

                                (Save_ALU_r = '1' and ALU_OP_r /= "0111") then
                                case Read_To_Reg_r is
                                when "10111" =>
                                (Save_ALU_r = '1' and ALU_OP_r /= "0111") then
                                case Read_To_Reg_r is
                                when "10111" =>


@@ -770,7 +781,7 @@ begin
        begin
                RegWEH <= '0';
                RegWEL <= '0';
        begin
                RegWEH <= '0';
                RegWEL <= '0';

-               if (TState = 1 and Save_ALU_r = '0' and Auto_Wait_t1 = '0') or
+               if (TState = 1 and Save_ALU_r = '0') or

                        (Save_ALU_r = '1' and ALU_OP_r /= "0111") then
                        case Read_To_Reg_r is
                        when "10000" | "10001" | "10010" | "10011" | "10100" | "10101" =>
                        (Save_ALU_r = '1' and ALU_OP_r /= "0111") then
                        case Read_To_Reg_r is
                        when "10000" | "10001" | "10010" | "10011" | "10100" | "10101" =>


@@ -976,11 +987,7 @@ begin
                        M1_n <= '1';
                elsif CLK_n'event and CLK_n = '1' then
                        if CEN = '1' then
                        M1_n <= '1';
                elsif CLK_n'event and CLK_n = '1' then
                        if CEN = '1' then

-                       if T_Res = '1' then
-                               Auto_Wait_t1 <= '0';
-                       else
-                               Auto_Wait_t1 <= Auto_Wait or IORQ_i;
-                       end if;
+                       Auto_Wait_t1 <= Auto_Wait;

                        Auto_Wait_t2 <= Auto_Wait_t1;
                        No_BTR <= (I_BT and (not IR(4) or not F(Flag_P))) or
                                        (I_BC and (not IR(4) or F(Flag_Z) or not F(Flag_P))) or
                        Auto_Wait_t2 <= Auto_Wait_t1;
                        No_BTR <= (I_BT and (not IR(4) or not F(Flag_P))) or
                                        (I_BC and (not IR(4) or F(Flag_Z) or not F(Flag_P))) or


@@ -1047,8 +1054,8 @@ begin
                                                end if;
                                        end if;
                                else
                                                end if;
                                        end if;
                                else

-                                       if (Auto_Wait = '1' and Auto_Wait_t2 = '0') nor
-                                               (IOWait = 1 and IORQ_i = '1' and Auto_Wait_t1 = '0') then
+                                       if Auto_Wait = '1' nand Auto_Wait_t2 = '0' then
+

                                                TState <= TState + 1;
                                        end if;
                                end if;
                                                TState <= TState + 1;
                                        end if;
                                end if;

diff --git a/galaxian/t80_ip/T80_ALU.vhd b/galaxian/t80_ip/T80_ALU.vhd
index 86fddce7dd7b846baa48650f1167b367f45022d7..95c98dab9753aaf7a9a8ad54c49ffc2cad10be4e 100644 (file)
--- a/galaxian/t80_ip/T80_ALU.vhd
+++ b/galaxian/t80_ip/T80_ALU.vhd
@@ -1,3 +1,13 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 301 parity flag is just parity for 8080, also overflow for Z80, by Sean Riddle
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****

 --
 -- Z80 compatible microprocessor core
 --
 --
 -- Z80 compatible microprocessor core
 --


@@ -38,21 +48,21 @@
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:

---     http://www.opencores.org/cvsweb.shtml/t80/
+--      http://www.opencores.org/cvsweb.shtml/t80/

 --
 -- Limitations :
 --
 -- File history :
 --
 --
 -- Limitations :
 --
 -- File history :
 --

---     0214 : Fixed mostly flags, only the block instructions now fail the zex regression test
+--      0214 : Fixed mostly flags, only the block instructions now fail the zex regression test

 --
 --

---     0238 : Fixed zero flag for 16 bit SBC and ADC
+--      0238 : Fixed zero flag for 16 bit SBC and ADC

 --
 --

---     0240 : Added GB operations
+--      0240 : Added GB operations

 --
 --

---     0242 : Cleanup
+--      0242 : Cleanup

 --
 --

---     0247 : Cleanup
+--      0247 : Cleanup

 --
 
 library IEEE;
 --
 
 library IEEE;


@@ -72,66 +82,77 @@ entity T80_ALU is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               Arith16         : in std_logic;
-               Z16                     : in std_logic;
-               ALU_Op          : in std_logic_vector(3 downto 0);
-               IR                      : in std_logic_vector(5 downto 0);
-               ISet            : in std_logic_vector(1 downto 0);
-               BusA            : in std_logic_vector(7 downto 0);
-               BusB            : in std_logic_vector(7 downto 0);
-               F_In            : in std_logic_vector(7 downto 0);
-               Q                       : out std_logic_vector(7 downto 0);
-               F_Out           : out std_logic_vector(7 downto 0)
+               Arith16         : in  std_logic;
+               Z16             : in  std_logic;
+               ALU_Op          : in  std_logic_vector(3 downto 0);
+               IR              : in  std_logic_vector(5 downto 0);
+               ISet            : in  std_logic_vector(1 downto 0);
+               BusA            : in  std_logic_vector(7 downto 0);
+               BusB            : in  std_logic_vector(7 downto 0);
+               F_In            : in  std_logic_vector(7 downto 0);
+               Q               : out std_logic_vector(7 downto 0);
+               F_Out           : out std_logic_vector(7 downto 0)

        );
 end T80_ALU;
 
 architecture rtl of T80_ALU is
 
        );
 end T80_ALU;
 
 architecture rtl of T80_ALU is
 

-       procedure AddSub(A : std_logic_vector;
-                                       B : std_logic_vector;
-                                       Sub : std_logic;
-                                       Carry_In : std_logic;
-                                       signal Res : out std_logic_vector;
-                                       signal Carry : out std_logic) is
-               variable B_i            : unsigned(A'length - 1 downto 0);
-               variable Res_i          : unsigned(A'length + 1 downto 0);
+       procedure AddSub(A        : std_logic_vector;
+                                        B        : std_logic_vector;
+                                        Sub      : std_logic;
+                                        Carry_In : std_logic;
+                         signal Res      : out std_logic_vector;
+                         signal Carry    : out std_logic) is
+
+               variable B_i          : unsigned(A'length - 1 downto 0);
+               variable Res_i        : unsigned(A'length + 1 downto 0);

        begin
                if Sub = '1' then
                        B_i := not unsigned(B);
                else
        begin
                if Sub = '1' then
                        B_i := not unsigned(B);
                else

-                       B_i := unsigned(B);
+                       B_i :=     unsigned(B);

                end if;
                end if;

+

                Res_i := unsigned("0" & A & Carry_In) + unsigned("0" & B_i & "1");
                Carry <= Res_i(A'length + 1);
                Res <= std_logic_vector(Res_i(A'length downto 1));
        end;
 
        -- AddSub variables (temporary signals)
                Res_i := unsigned("0" & A & Carry_In) + unsigned("0" & B_i & "1");
                Carry <= Res_i(A'length + 1);
                Res <= std_logic_vector(Res_i(A'length downto 1));
        end;
 
        -- AddSub variables (temporary signals)

-       signal  UseCarry                : std_logic;
-       signal  Carry7_v                : std_logic;
-       signal  Overflow_v              : std_logic;
-       signal  HalfCarry_v             : std_logic;
-       signal  Carry_v                 : std_logic;
-       signal  Q_v                             : std_logic_vector(7 downto 0);
+       signal UseCarry                : std_logic;
+       signal Carry7_v                : std_logic;
+       signal Overflow_v              : std_logic;
+       signal HalfCarry_v             : std_logic;
+       signal Carry_v                 : std_logic;
+       signal Q_v                     : std_logic_vector(7 downto 0);

 
 

-       signal  BitMask                 : std_logic_vector(7 downto 0);
+       signal BitMask                 : std_logic_vector(7 downto 0);

 
 begin
 
        with IR(5 downto 3) select BitMask <= "00000001" when "000",
 
 begin
 
        with IR(5 downto 3) select BitMask <= "00000001" when "000",

-                                                                       "00000010" when "001",
-                                                                       "00000100" when "010",
-                                                                       "00001000" when "011",
-                                                                       "00010000" when "100",
-                                                                       "00100000" when "101",
-                                                                       "01000000" when "110",
-                                                                       "10000000" when others;
+                                                                                 "00000010" when "001",
+                                                                                 "00000100" when "010",
+                                                                                 "00001000" when "011",
+                                                                                 "00010000" when "100",
+                                                                                 "00100000" when "101",
+                                                                                 "01000000" when "110",
+                                                                                 "10000000" when others;

 
        UseCarry <= not ALU_Op(2) and ALU_Op(0);
        AddSub(BusA(3 downto 0), BusB(3 downto 0), ALU_Op(1), ALU_Op(1) xor (UseCarry and F_In(Flag_C)), Q_v(3 downto 0), HalfCarry_v);
        AddSub(BusA(6 downto 4), BusB(6 downto 4), ALU_Op(1), HalfCarry_v, Q_v(6 downto 4), Carry7_v);
        AddSub(BusA(7 downto 7), BusB(7 downto 7), ALU_Op(1), Carry7_v, Q_v(7 downto 7), Carry_v);
 
        UseCarry <= not ALU_Op(2) and ALU_Op(0);
        AddSub(BusA(3 downto 0), BusB(3 downto 0), ALU_Op(1), ALU_Op(1) xor (UseCarry and F_In(Flag_C)), Q_v(3 downto 0), HalfCarry_v);
        AddSub(BusA(6 downto 4), BusB(6 downto 4), ALU_Op(1), HalfCarry_v, Q_v(6 downto 4), Carry7_v);
        AddSub(BusA(7 downto 7), BusB(7 downto 7), ALU_Op(1), Carry7_v, Q_v(7 downto 7), Carry_v);

-       OverFlow_v <= Carry_v xor Carry7_v;
+
+       -- bug fix - parity flag is just parity for 8080, also overflow for Z80
+       process (Carry_v, Carry7_v, Q_v)
+       begin
+               if(Mode=2) then
+                       OverFlow_v <= not (Q_v(0) xor Q_v(1) xor Q_v(2) xor Q_v(3) xor
+                                          Q_v(4) xor Q_v(5) xor Q_v(6) xor Q_v(7));  else
+                       OverFlow_v <= Carry_v xor Carry7_v;
+               end if;
+       end process;

 
        process (Arith16, ALU_OP, F_In, BusA, BusB, IR, Q_v, Carry_v, HalfCarry_v, OverFlow_v, BitMask, ISet, Z16)
                variable Q_t : std_logic_vector(7 downto 0);
 
        process (Arith16, ALU_OP, F_In, BusA, BusB, IR, Q_v, Carry_v, HalfCarry_v, OverFlow_v, BitMask, ISet, Z16)
                variable Q_t : std_logic_vector(7 downto 0);


@@ -176,7 +197,7 @@ begin
                        if Q_t(7 downto 0) = "00000000" then
                                F_Out(Flag_Z) <= '1';
                                if Z16 = '1' then
                        if Q_t(7 downto 0) = "00000000" then
                                F_Out(Flag_Z) <= '1';
                                if Z16 = '1' then

-                                       F_Out(Flag_Z) <= F_In(Flag_Z);  -- 16 bit ADC,SBC
+                                       F_Out(Flag_Z) <= F_In(Flag_Z);      -- 16 bit ADC,SBC

                                end if;
                        else
                                F_Out(Flag_Z) <= '0';
                                end if;
                        else
                                F_Out(Flag_Z) <= '0';


@@ -347,5 +368,4 @@ begin
                end case;
                Q <= Q_t;
        end process;
                end case;
                Q <= Q_t;
        end process;

-

 end;
 end;

diff --git a/galaxian/t80_ip/T80_MCode.vhd b/galaxian/t80_ip/T80_MCode.vhd
index 4cc30f3534d8a938d87fdc72be713b69fd13b14d..43cea1b5b52015b2e1d76ee9671d5f53594ce8c4 100644 (file)
--- a/galaxian/t80_ip/T80_MCode.vhd
+++ b/galaxian/t80_ip/T80_MCode.vhd
@@ -1,3 +1,12 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****

 --
 -- Z80 compatible microprocessor core
 --
 --
 -- Z80 compatible microprocessor core
 --


@@ -38,32 +47,35 @@
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:

---     http://www.opencores.org/cvsweb.shtml/t80/
+--      http://www.opencores.org/cvsweb.shtml/t80/

 --
 -- Limitations :
 --
 -- File history :
 --
 --
 -- Limitations :
 --
 -- File history :
 --

---     0208 : First complete release
+--      0208 : First complete release

 --
 --

---     0211 : Fixed IM 1
+--      0211 : Fixed IM 1

 --
 --

---     0214 : Fixed mostly flags, only the block instructions now fail the zex regression test
+--      0214 : Fixed mostly flags, only the block instructions now fail the zex regression test

 --
 --

---     0235 : Added IM 2 fix by Mike Johnson
+--      0235 : Added IM 2 fix by Mike Johnson

 --
 --

---     0238 : Added NoRead signal
+--      0238 : Added NoRead signal

 --
 --

---     0238b: Fixed instruction timing for POP and DJNZ
+--      0238b: Fixed instruction timing for POP and DJNZ

 --
 --

---     0240 : Added (IX/IY+d) states, removed op-codes from mode 2 and added all remaining mode 3 op-codes
+--      0240 : Added (IX/IY+d) states, removed op-codes from mode 2 and added all remaining mode 3 op-codes
+
+--      0240mj1 fix for HL inc/dec for INI, IND, INIR, INDR, OUTI, OUTD, OTIR, OTDR

 --
 --

---     0242 : Fixed I/O instruction timing, cleanup
+--      0242 : Fixed I/O instruction timing, cleanup

 --
 
 library IEEE;
 use IEEE.std_logic_1164.all;
 use IEEE.numeric_std.all;
 --
 
 library IEEE;
 use IEEE.std_logic_1164.all;
 use IEEE.numeric_std.all;

+use work.T80_Pack.all;

 
 entity T80_MCode is
        generic(
 
 entity T80_MCode is
        generic(


@@ -78,78 +90,71 @@ entity T80_MCode is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               IR                              : in std_logic_vector(7 downto 0);
-               ISet                    : in std_logic_vector(1 downto 0);
-               MCycle                  : in std_logic_vector(2 downto 0);
-               F                               : in std_logic_vector(7 downto 0);
-               NMICycle                : in std_logic;
-               IntCycle                : in std_logic;
-               MCycles                 : out std_logic_vector(2 downto 0);
-               TStates                 : out std_logic_vector(2 downto 0);
-               Prefix                  : out std_logic_vector(1 downto 0); -- None,BC,ED,DD/FD
-               Inc_PC                  : out std_logic;
-               Inc_WZ                  : out std_logic;
-               IncDec_16               : out std_logic_vector(3 downto 0); -- BC,DE,HL,SP   0 is inc
-               Read_To_Reg             : out std_logic;
-               Read_To_Acc             : out std_logic;
-               Set_BusA_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI/DB,A,SP(L),SP(M),0,F
-               Set_BusB_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI,A,SP(L),SP(M),1,F,PC(L),PC(M),0
-               ALU_Op                  : out std_logic_vector(3 downto 0);
+               IR                              : in std_logic_vector(7 downto 0);
+               ISet                    : in std_logic_vector(1 downto 0);
+               MCycle                  : in std_logic_vector(2 downto 0);
+               F                               : in std_logic_vector(7 downto 0);
+               NMICycle                : in std_logic;
+               IntCycle                : in std_logic;
+               MCycles                 : out std_logic_vector(2 downto 0);
+               TStates                 : out std_logic_vector(2 downto 0);
+               Prefix                  : out std_logic_vector(1 downto 0); -- None,BC,ED,DD/FD
+               Inc_PC                  : out std_logic;
+               Inc_WZ                  : out std_logic;
+               IncDec_16               : out std_logic_vector(3 downto 0); -- BC,DE,HL,SP   0 is inc
+               Read_To_Reg             : out std_logic;
+               Read_To_Acc             : out std_logic;
+               Set_BusA_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI/DB,A,SP(L),SP(M),0,F
+               Set_BusB_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI,A,SP(L),SP(M),1,F,PC(L),PC(M),0
+               ALU_Op                  : out std_logic_vector(3 downto 0);

                        -- ADD, ADC, SUB, SBC, AND, XOR, OR, CP, ROT, BIT, SET, RES, DAA, RLD, RRD, None
                        -- ADD, ADC, SUB, SBC, AND, XOR, OR, CP, ROT, BIT, SET, RES, DAA, RLD, RRD, None

-               Save_ALU                : out std_logic;
-               PreserveC               : out std_logic;
-               Arith16                 : out std_logic;
-               Set_Addr_To             : out std_logic_vector(2 downto 0); -- aNone,aXY,aIOA,aSP,aBC,aDE,aZI
-               IORQ                    : out std_logic;
-               Jump                    : out std_logic;
-               JumpE                   : out std_logic;
-               JumpXY                  : out std_logic;
-               Call                    : out std_logic;
-               RstP                    : out std_logic;
-               LDZ                             : out std_logic;
-               LDW                             : out std_logic;
-               LDSPHL                  : out std_logic;
-               Special_LD              : out std_logic_vector(2 downto 0); -- A,I;A,R;I,A;R,A;None
-               ExchangeDH              : out std_logic;
-               ExchangeRp              : out std_logic;
-               ExchangeAF              : out std_logic;
-               ExchangeRS              : out std_logic;
-               I_DJNZ                  : out std_logic;
-               I_CPL                   : out std_logic;
-               I_CCF                   : out std_logic;
-               I_SCF                   : out std_logic;
-               I_RETN                  : out std_logic;
-               I_BT                    : out std_logic;
-               I_BC                    : out std_logic;
-               I_BTR                   : out std_logic;
-               I_RLD                   : out std_logic;
-               I_RRD                   : out std_logic;
-               I_INRC                  : out std_logic;
-               SetDI                   : out std_logic;
-               SetEI                   : out std_logic;
-               IMode                   : out std_logic_vector(1 downto 0);
-               Halt                    : out std_logic;
-               NoRead                  : out std_logic;
-               Write                   : out std_logic
+               Save_ALU                : out std_logic;
+               PreserveC               : out std_logic;
+               Arith16                 : out std_logic;
+               Set_Addr_To             : out std_logic_vector(2 downto 0); -- aNone,aXY,aIOA,aSP,aBC,aDE,aZI
+               IORQ                    : out std_logic;
+               Jump                    : out std_logic;
+               JumpE                   : out std_logic;
+               JumpXY                  : out std_logic;
+               Call                    : out std_logic;
+               RstP                    : out std_logic;
+               LDZ                             : out std_logic;
+               LDW                             : out std_logic;
+               LDSPHL                  : out std_logic;
+               Special_LD              : out std_logic_vector(2 downto 0); -- A,I;A,R;I,A;R,A;None
+               ExchangeDH              : out std_logic;
+               ExchangeRp              : out std_logic;
+               ExchangeAF              : out std_logic;
+               ExchangeRS              : out std_logic;
+               I_DJNZ                  : out std_logic;
+               I_CPL                   : out std_logic;
+               I_CCF                   : out std_logic;
+               I_SCF                   : out std_logic;
+               I_RETN                  : out std_logic;
+               I_BT                    : out std_logic;
+               I_BC                    : out std_logic;
+               I_BTR                   : out std_logic;
+               I_RLD                   : out std_logic;
+               I_RRD                   : out std_logic;
+               I_INRC                  : out std_logic;
+               SetDI                   : out std_logic;
+               SetEI                   : out std_logic;
+               IMode                   : out std_logic_vector(1 downto 0);
+               Halt                    : out std_logic;
+               NoRead                  : out std_logic;
+               Write                   : out std_logic

        );
 end T80_MCode;
 
 architecture rtl of T80_MCode is
 
        );
 end T80_MCode;
 
 architecture rtl of T80_MCode is
 

-       constant aNone  : std_logic_vector(2 downto 0) := "111";
-       constant aBC    : std_logic_vector(2 downto 0) := "000";
-       constant aDE    : std_logic_vector(2 downto 0) := "001";
-       constant aXY    : std_logic_vector(2 downto 0) := "010";
-       constant aIOA   : std_logic_vector(2 downto 0) := "100";
-       constant aSP    : std_logic_vector(2 downto 0) := "101";
-       constant aZI    : std_logic_vector(2 downto 0) := "110";
---     constant aNone  : std_logic_vector(2 downto 0) := "000";
---     constant aXY    : std_logic_vector(2 downto 0) := "001";
---     constant aIOA   : std_logic_vector(2 downto 0) := "010";
---     constant aSP    : std_logic_vector(2 downto 0) := "011";
---     constant aBC    : std_logic_vector(2 downto 0) := "100";
---     constant aDE    : std_logic_vector(2 downto 0) := "101";
---     constant aZI    : std_logic_vector(2 downto 0) := "110";
+       constant aNone      : std_logic_vector(2 downto 0) := "111";
+       constant aBC        : std_logic_vector(2 downto 0) := "000";
+       constant aDE        : std_logic_vector(2 downto 0) := "001";
+       constant aXY        : std_logic_vector(2 downto 0) := "010";
+       constant aIOA       : std_logic_vector(2 downto 0) := "100";
+       constant aSP        : std_logic_vector(2 downto 0) := "101";
+       constant aZI        : std_logic_vector(2 downto 0) := "110";

 
        function is_cc_true(
                F : std_logic_vector(7 downto 0);
 
        function is_cc_true(
                F : std_logic_vector(7 downto 0);


@@ -250,7 +255,7 @@ begin
 
 ------------------------------------------------------------------------------
 --
 
 ------------------------------------------------------------------------------
 --

---     Unprefixed instructions
+--      Unprefixed instructions

 --
 ------------------------------------------------------------------------------
 
 --
 ------------------------------------------------------------------------------
 


@@ -924,7 +929,7 @@ begin
                                        case to_integer(unsigned(MCycle)) is
                                        when 1 =>
                                                Set_Addr_To <= aBC;
                                        case to_integer(unsigned(MCycle)) is
                                        when 1 =>
                                                Set_Addr_To <= aBC;

-                                               Set_BusB_To     <= "0111";
+                                               Set_BusB_To     <= "0111";

                                        when 2 =>
                                                Write <= '1';
                                                IORQ <= '1';
                                        when 2 =>
                                                Write <= '1';
                                                IORQ <= '1';


@@ -1178,7 +1183,7 @@ begin
                                        when 2 =>
                                                Inc_PC <= '1';
                                                Set_Addr_To <= aIOA;
                                        when 2 =>
                                                Inc_PC <= '1';
                                                Set_Addr_To <= aIOA;

-                                               Set_BusB_To     <= "0111";
+                                               Set_BusB_To     <= "0111";

                                        when 3 =>
                                                Write <= '1';
                                        when others => null;
                                        when 3 =>
                                                Write <= '1';
                                        when others => null;


@@ -1200,7 +1205,7 @@ begin
                                                Save_ALU <= '1';
                                                ALU_Op <= "0001";
                                                Set_BusA_To <= "1001";
                                                Save_ALU <= '1';
                                                ALU_Op <= "0001";
                                                Set_BusA_To <= "1001";

-                                               Set_BusB_To <= "1110";  -- Incorrect unsigned !!!!!!!!!!!!!!!!!!!!!
+                                               Set_BusB_To <= "1110";  -- Incorrect unsigned !!!!!!!!!!!!!!!!!!!!!

                                        when others =>
                                        end case;
                                when "10" =>
                                        when others =>
                                        end case;
                                when "10" =>


@@ -1215,7 +1220,7 @@ begin
                                        when others => null;
                                        end case;
                                when "11" =>
                                        when others => null;
                                        end case;
                                when "11" =>

-                                       -- LD HL,SP+n   -- Not correct !!!!!!!!!!!!!!!!!!!
+                                       -- LD HL,SP+n       -- Not correct !!!!!!!!!!!!!!!!!!!

                                        MCycles <= "101";
                                        case to_integer(unsigned(MCycle)) is
                                        when 2 =>
                                        MCycles <= "101";
                                        case to_integer(unsigned(MCycle)) is
                                        when 2 =>


@@ -1300,7 +1305,7 @@ begin
                                when 2 =>
                                        Inc_PC <= '1';
                                        Set_Addr_To <= aIOA;
                                when 2 =>
                                        Inc_PC <= '1';
                                        Set_Addr_To <= aIOA;

-                                       Set_BusB_To     <= "0111";
+                                       Set_BusB_To <= "0111";

                                when 3 =>
                                        Write <= '1';
                                        IORQ <= '1';
                                when 3 =>
                                        Write <= '1';
                                        IORQ <= '1';


@@ -1335,7 +1340,7 @@ begin
 
 ------------------------------------------------------------------------------
 --
 
 ------------------------------------------------------------------------------
 --

---     CB prefixed instructions
+--      CB prefixed instructions

 --
 ------------------------------------------------------------------------------
 
 --
 ------------------------------------------------------------------------------
 


@@ -1360,9 +1365,9 @@ begin
                                -- SRL r
                                -- SLL r (Undocumented) / SWAP r
                                if MCycle = "001" then
                                -- SRL r
                                -- SLL r (Undocumented) / SWAP r
                                if MCycle = "001" then

-                                       ALU_Op <= "1000";
-                                       Read_To_Reg <= '1';
-                                       Save_ALU <= '1';
+                                 ALU_Op <= "1000";
+                                 Read_To_Reg <= '1';
+                                 Save_ALU <= '1';

                                end if;
                        when "00000110"|"00010110"|"00001110"|"00011110"|"00101110"|"00111110"|"00100110"|"00110110" =>
                                -- RLC (HL)
                                end if;
                        when "00000110"|"00010110"|"00001110"|"00011110"|"00101110"|"00111110"|"00100110"|"00110110" =>
                                -- RLC (HL)


@@ -1397,19 +1402,19 @@ begin
                                |"01111000"|"01111001"|"01111010"|"01111011"|"01111100"|"01111101"|"01111111" =>
                                -- BIT b,r
                                if MCycle = "001" then
                                |"01111000"|"01111001"|"01111010"|"01111011"|"01111100"|"01111101"|"01111111" =>
                                -- BIT b,r
                                if MCycle = "001" then

-                                       Set_BusB_To(2 downto 0) <= IR(2 downto 0);
-                                       ALU_Op <= "1001";
+                                 Set_BusB_To(2 downto 0) <= IR(2 downto 0);
+                                 ALU_Op <= "1001";

                                end if;
                        when "01000110"|"01001110"|"01010110"|"01011110"|"01100110"|"01101110"|"01110110"|"01111110" =>
                                -- BIT b,(HL)
                                MCycles <= "010";
                                case to_integer(unsigned(MCycle)) is
                                end if;
                        when "01000110"|"01001110"|"01010110"|"01011110"|"01100110"|"01101110"|"01110110"|"01111110" =>
                                -- BIT b,(HL)
                                MCycles <= "010";
                                case to_integer(unsigned(MCycle)) is

-                               when 1 | 7 =>
+                               when 1 | 7=>

                                        Set_Addr_To <= aXY;
                                when 2 =>
                                        ALU_Op <= "1001";
                                        TStates <= "100";
                                        Set_Addr_To <= aXY;
                                when 2 =>
                                        ALU_Op <= "1001";
                                        TStates <= "100";

-                               when others =>
+                               when others => null;

                                end case;
                        when "11000000"|"11000001"|"11000010"|"11000011"|"11000100"|"11000101"|"11000111"
                                |"11001000"|"11001001"|"11001010"|"11001011"|"11001100"|"11001101"|"11001111"
                                end case;
                        when "11000000"|"11000001"|"11000010"|"11000011"|"11000100"|"11000101"|"11000111"
                                |"11001000"|"11001001"|"11001010"|"11001011"|"11001100"|"11001101"|"11001111"


@@ -1421,15 +1426,15 @@ begin
                                |"11111000"|"11111001"|"11111010"|"11111011"|"11111100"|"11111101"|"11111111" =>
                                -- SET b,r
                                if MCycle = "001" then
                                |"11111000"|"11111001"|"11111010"|"11111011"|"11111100"|"11111101"|"11111111" =>
                                -- SET b,r
                                if MCycle = "001" then

-                                       ALU_Op <= "1010";
-                                       Read_To_Reg <= '1';
-                                       Save_ALU <= '1';
+                                 ALU_Op <= "1010";
+                                 Read_To_Reg <= '1';
+                                 Save_ALU <= '1';

                                end if;
                        when "11000110"|"11001110"|"11010110"|"11011110"|"11100110"|"11101110"|"11110110"|"11111110" =>
                                -- SET b,(HL)
                                MCycles <= "011";
                                case to_integer(unsigned(MCycle)) is
                                end if;
                        when "11000110"|"11001110"|"11010110"|"11011110"|"11100110"|"11101110"|"11110110"|"11111110" =>
                                -- SET b,(HL)
                                MCycles <= "011";
                                case to_integer(unsigned(MCycle)) is

-                               when 1 | 7 =>
+                               when 1 | 7=>

                                        Set_Addr_To <= aXY;
                                when 2 =>
                                        ALU_Op <= "1010";
                                        Set_Addr_To <= aXY;
                                when 2 =>
                                        ALU_Op <= "1010";


@@ -1439,7 +1444,7 @@ begin
                                        TStates <= "100";
                                when 3 =>
                                        Write <= '1';
                                        TStates <= "100";
                                when 3 =>
                                        Write <= '1';

-                               when others =>
+                               when others => null;

                                end case;
                        when "10000000"|"10000001"|"10000010"|"10000011"|"10000100"|"10000101"|"10000111"
                                |"10001000"|"10001001"|"10001010"|"10001011"|"10001100"|"10001101"|"10001111"
                                end case;
                        when "10000000"|"10000001"|"10000010"|"10000011"|"10000100"|"10000101"|"10000111"
                                |"10001000"|"10001001"|"10001010"|"10001011"|"10001100"|"10001101"|"10001111"


@@ -1469,7 +1474,7 @@ begin
                                        TStates <= "100";
                                when 3 =>
                                        Write <= '1';
                                        TStates <= "100";
                                when 3 =>
                                        Write <= '1';

-                               when others =>
+                               when others => null;

                                end case;
                        end case;
 
                                end case;
                        end case;
 


@@ -1477,7 +1482,7 @@ begin
 
 ------------------------------------------------------------------------------
 --
 
 ------------------------------------------------------------------------------
 --

---     ED prefixed instructions
+--      ED prefixed instructions

 --
 ------------------------------------------------------------------------------
 
 --
 ------------------------------------------------------------------------------
 


@@ -1811,7 +1816,7 @@ begin
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>
                                        Set_Addr_To <= aBC;
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>
                                        Set_Addr_To <= aBC;

-                                       Set_BusB_To(2 downto 0) <= IR(5 downto 3);
+                                       Set_BusB_To(2 downto 0)     <= IR(5 downto 3);

                                        if IR(5 downto 3) = "110" then
                                                Set_BusB_To(3) <= '1';
                                        end if;
                                        if IR(5 downto 3) = "110" then
                                                Set_BusB_To(3) <= '1';
                                        end if;


@@ -1822,6 +1827,7 @@ begin
                                end case;
                        when "10100010" | "10101010" | "10110010" | "10111010" =>
                                -- INI, IND, INIR, INDR
                                end case;
                        when "10100010" | "10101010" | "10110010" | "10111010" =>
                                -- INI, IND, INIR, INDR

+                               -- note B is decremented AFTER being put on the bus

                                MCycles <= "100";
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>
                                MCycles <= "100";
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>


@@ -1837,9 +1843,11 @@ begin
                                        Set_Addr_To <= aXY;
                                when 3 =>
                                        if IR(3) = '0' then
                                        Set_Addr_To <= aXY;
                                when 3 =>
                                        if IR(3) = '0' then

-                                               IncDec_16 <= "0010";
+                                               --IncDec_16 <= "0010";
+                                               IncDec_16 <= "0110";

                                        else
                                        else

-                                               IncDec_16 <= "1010";
+                                               --IncDec_16 <= "1010";
+                                               IncDec_16 <= "1110";

                                        end if;
                                        TStates <= "100";
                                        Write <= '1';
                                        end if;
                                        TStates <= "100";
                                        Write <= '1';


@@ -1851,6 +1859,8 @@ begin
                                end case;
                        when "10100011" | "10101011" | "10110011" | "10111011" =>
                                -- OUTI, OUTD, OTIR, OTDR
                                end case;
                        when "10100011" | "10101011" | "10110011" | "10111011" =>
                                -- OUTI, OUTD, OTIR, OTDR

+                               -- note B is decremented BEFORE being put on the bus.
+                               -- mikej fix for hl inc

                                MCycles <= "100";
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>
                                MCycles <= "100";
                                case to_integer(unsigned(MCycle)) is
                                when 1 =>


@@ -1866,9 +1876,9 @@ begin
                                        Set_Addr_To <= aBC;
                                when 3 =>
                                        if IR(3) = '0' then
                                        Set_Addr_To <= aBC;
                                when 3 =>
                                        if IR(3) = '0' then

-                                               IncDec_16 <= "0010";
+                                               IncDec_16 <= "0110"; -- mikej

                                        else
                                        else

-                                               IncDec_16 <= "1010";
+                                               IncDec_16 <= "1110"; -- mikej

                                        end if;
                                        IORQ <= '1';
                                        Write <= '1';
                                        end if;
                                        IORQ <= '1';
                                        Write <= '1';


@@ -1884,7 +1894,7 @@ begin
 
                if Mode = 1 then
                        if MCycle = "001" then
 
                if Mode = 1 then
                        if MCycle = "001" then

---                             TStates <= "100";
+--              TStates <= "100";

                        else
                                TStates <= "011";
                        end if;
                        else
                                TStates <= "011";
                        end if;


@@ -1892,7 +1902,7 @@ begin
 
                if Mode = 3 then
                        if MCycle = "001" then
 
                if Mode = 3 then
                        if MCycle = "001" then

---                             TStates <= "100";
+--              TStates <= "100";

                        else
                                TStates <= "100";
                        end if;
                        else
                                TStates <= "100";
                        end if;

diff --git a/galaxian/t80_ip/T80_Pack.vhd b/galaxian/t80_ip/T80_Pack.vhd
index ac7d34dabb579b24dabc6e0e29bd10ba442e68e1..42cf610510320e0b2b217af66fdb189db9f0e9fd 100644 (file)
--- a/galaxian/t80_ip/T80_Pack.vhd
+++ b/galaxian/t80_ip/T80_Pack.vhd
@@ -1,3 +1,12 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****

 --
 -- Z80 compatible microprocessor core
 --
 --
 -- Z80 compatible microprocessor core
 --


@@ -38,7 +47,7 @@
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:

---     http://www.opencores.org/cvsweb.shtml/t80/
+--      http://www.opencores.org/cvsweb.shtml/t80/

 --
 -- Limitations :
 --
 --
 -- Limitations :
 --


@@ -52,8 +61,8 @@ package T80_Pack is
 
        component T80
        generic(
 
        component T80
        generic(

-               Mode : integer := 0;    -- 0 => Z80, 1 => Fast Z80, 2 => 8080, 3 => GB
-               IOWait : integer := 0;  -- 1 => Single cycle I/O, 1 => Std I/O cycle
+               Mode : integer := 0;    -- 0 => Z80, 1 => Fast Z80, 2 => 8080, 3 => GB
+               IOWait : integer := 0;  -- 1 => Single cycle I/O, 1 => Std I/O cycle

                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;
                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;


@@ -64,55 +73,55 @@ package T80_Pack is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               RESET_n         : in std_logic;
-               CLK_n           : in std_logic;
-               CEN                     : in std_logic;
-               WAIT_n          : in std_logic;
-               INT_n           : in std_logic;
-               NMI_n           : in std_logic;
-               BUSRQ_n         : in std_logic;
-               M1_n            : out std_logic;
-               IORQ            : out std_logic;
-               NoRead          : out std_logic;
-               Write           : out std_logic;
-               RFSH_n          : out std_logic;
-               HALT_n          : out std_logic;
-               BUSAK_n         : out std_logic;
-               A                       : out std_logic_vector(15 downto 0);
-               DInst           : in std_logic_vector(7 downto 0);
-               DI                      : in std_logic_vector(7 downto 0);
-               DO                      : out std_logic_vector(7 downto 0);
-               MC                      : out std_logic_vector(2 downto 0);
-               TS                      : out std_logic_vector(2 downto 0);
-               IntCycle_n      : out std_logic;
-               IntE            : out std_logic;
-               Stop            : out std_logic
+               RESET_n         : in std_logic;
+               CLK_n           : in std_logic;
+               CEN                     : in std_logic;
+               WAIT_n          : in std_logic;
+               INT_n           : in std_logic;
+               NMI_n           : in std_logic;
+               BUSRQ_n         : in std_logic;
+               M1_n            : out std_logic;
+               IORQ            : out std_logic;
+               NoRead          : out std_logic;
+               Write           : out std_logic;
+               RFSH_n          : out std_logic;
+               HALT_n          : out std_logic;
+               BUSAK_n         : out std_logic;
+               A                       : out std_logic_vector(15 downto 0);
+               DInst           : in std_logic_vector(7 downto 0);
+               DI                      : in std_logic_vector(7 downto 0);
+               DO                      : out std_logic_vector(7 downto 0);
+               MC                      : out std_logic_vector(2 downto 0);
+               TS                      : out std_logic_vector(2 downto 0);
+               IntCycle_n      : out std_logic;
+               IntE            : out std_logic;
+               Stop            : out std_logic

        );
        end component;
 
        component T80_Reg
        port(
        );
        end component;
 
        component T80_Reg
        port(

-               Clk                     : in std_logic;
-               CEN                     : in std_logic;
-               WEH                     : in std_logic;
-               WEL                     : in std_logic;
-               AddrA           : in std_logic_vector(2 downto 0);
-               AddrB           : in std_logic_vector(2 downto 0);
-               AddrC           : in std_logic_vector(2 downto 0);
-               DIH                     : in std_logic_vector(7 downto 0);
-               DIL                     : in std_logic_vector(7 downto 0);
-               DOAH            : out std_logic_vector(7 downto 0);
-               DOAL            : out std_logic_vector(7 downto 0);
-               DOBH            : out std_logic_vector(7 downto 0);
-               DOBL            : out std_logic_vector(7 downto 0);
-               DOCH            : out std_logic_vector(7 downto 0);
-               DOCL            : out std_logic_vector(7 downto 0)
+               Clk                     : in std_logic;
+               CEN                     : in std_logic;
+               WEH                     : in std_logic;
+               WEL                     : in std_logic;
+               AddrA           : in std_logic_vector(2 downto 0);
+               AddrB           : in std_logic_vector(2 downto 0);
+               AddrC           : in std_logic_vector(2 downto 0);
+               DIH                     : in std_logic_vector(7 downto 0);
+               DIL                     : in std_logic_vector(7 downto 0);
+               DOAH            : out std_logic_vector(7 downto 0);
+               DOAL            : out std_logic_vector(7 downto 0);
+               DOBH            : out std_logic_vector(7 downto 0);
+               DOBL            : out std_logic_vector(7 downto 0);
+               DOCH            : out std_logic_vector(7 downto 0);
+               DOCL            : out std_logic_vector(7 downto 0)

        );
        end component;
 
        component T80_MCode
        generic(
        );
        end component;
 
        component T80_MCode
        generic(

-               Mode : integer := 0;
+               Mode   : integer := 0;

                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;
                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;


@@ -123,65 +132,65 @@ package T80_Pack is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               IR                              : in std_logic_vector(7 downto 0);
-               ISet                    : in std_logic_vector(1 downto 0);
-               MCycle                  : in std_logic_vector(2 downto 0);
-               F                               : in std_logic_vector(7 downto 0);
-               NMICycle                : in std_logic;
-               IntCycle                : in std_logic;
-               MCycles                 : out std_logic_vector(2 downto 0);
-               TStates                 : out std_logic_vector(2 downto 0);
-               Prefix                  : out std_logic_vector(1 downto 0); -- None,BC,ED,DD/FD
-               Inc_PC                  : out std_logic;
-               Inc_WZ                  : out std_logic;
-               IncDec_16               : out std_logic_vector(3 downto 0); -- BC,DE,HL,SP   0 is inc
-               Read_To_Reg             : out std_logic;
-               Read_To_Acc             : out std_logic;
-               Set_BusA_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI/DB,A,SP(L),SP(M),0,F
-               Set_BusB_To     : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI,A,SP(L),SP(M),1,F,PC(L),PC(M),0
-               ALU_Op                  : out std_logic_vector(3 downto 0);
+               IR                      : in  std_logic_vector(7 downto 0);
+               ISet                    : in  std_logic_vector(1 downto 0);
+               MCycle                  : in  std_logic_vector(2 downto 0);
+               F                       : in  std_logic_vector(7 downto 0);
+               NMICycle                : in  std_logic;
+               IntCycle                : in  std_logic;
+               MCycles                 : out std_logic_vector(2 downto 0);
+               TStates                 : out std_logic_vector(2 downto 0);
+               Prefix                  : out std_logic_vector(1 downto 0); -- None,BC,ED,DD/FD
+               Inc_PC                  : out std_logic;
+               Inc_WZ                  : out std_logic;
+               IncDec_16               : out std_logic_vector(3 downto 0); -- BC,DE,HL,SP   0 is inc
+               Read_To_Reg             : out std_logic;
+               Read_To_Acc             : out std_logic;
+               Set_BusA_To             : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI/DB,A,SP(L),SP(M),0,F
+               Set_BusB_To             : out std_logic_vector(3 downto 0); -- B,C,D,E,H,L,DI,A,SP(L),SP(M),1,F,PC(L),PC(M),0
+               ALU_Op                  : out std_logic_vector(3 downto 0);

                        -- ADD, ADC, SUB, SBC, AND, XOR, OR, CP, ROT, BIT, SET, RES, DAA, RLD, RRD, None
                        -- ADD, ADC, SUB, SBC, AND, XOR, OR, CP, ROT, BIT, SET, RES, DAA, RLD, RRD, None

-               Save_ALU                : out std_logic;
-               PreserveC               : out std_logic;
-               Arith16                 : out std_logic;
-               Set_Addr_To             : out std_logic_vector(2 downto 0); -- aNone,aXY,aIOA,aSP,aBC,aDE,aZI
-               IORQ                    : out std_logic;
-               Jump                    : out std_logic;
-               JumpE                   : out std_logic;
-               JumpXY                  : out std_logic;
-               Call                    : out std_logic;
-               RstP                    : out std_logic;
-               LDZ                             : out std_logic;
-               LDW                             : out std_logic;
-               LDSPHL                  : out std_logic;
-               Special_LD              : out std_logic_vector(2 downto 0); -- A,I;A,R;I,A;R,A;None
-               ExchangeDH              : out std_logic;
-               ExchangeRp              : out std_logic;
-               ExchangeAF              : out std_logic;
-               ExchangeRS              : out std_logic;
-               I_DJNZ                  : out std_logic;
-               I_CPL                   : out std_logic;
-               I_CCF                   : out std_logic;
-               I_SCF                   : out std_logic;
-               I_RETN                  : out std_logic;
-               I_BT                    : out std_logic;
-               I_BC                    : out std_logic;
-               I_BTR                   : out std_logic;
-               I_RLD                   : out std_logic;
-               I_RRD                   : out std_logic;
-               I_INRC                  : out std_logic;
-               SetDI                   : out std_logic;
-               SetEI                   : out std_logic;
-               IMode                   : out std_logic_vector(1 downto 0);
-               Halt                    : out std_logic;
-               NoRead                  : out std_logic;
-               Write                   : out std_logic
+               Save_ALU                : out std_logic;
+               PreserveC               : out std_logic;
+               Arith16                 : out std_logic;
+               Set_Addr_To             : out std_logic_vector(2 downto 0); -- aNone,aXY,aIOA,aSP,aBC,aDE,aZI
+               IORQ                    : out std_logic;
+               Jump                    : out std_logic;
+               JumpE                   : out std_logic;
+               JumpXY                  : out std_logic;
+               Call                    : out std_logic;
+               RstP                    : out std_logic;
+               LDZ                     : out std_logic;
+               LDW                     : out std_logic;
+               LDSPHL                  : out std_logic;
+               Special_LD              : out std_logic_vector(2 downto 0); -- A,I;A,R;I,A;R,A;None
+               ExchangeDH              : out std_logic;
+               ExchangeRp              : out std_logic;
+               ExchangeAF              : out std_logic;
+               ExchangeRS              : out std_logic;
+               I_DJNZ                  : out std_logic;
+               I_CPL                   : out std_logic;
+               I_CCF                   : out std_logic;
+               I_SCF                   : out std_logic;
+               I_RETN                  : out std_logic;
+               I_BT                    : out std_logic;
+               I_BC                    : out std_logic;
+               I_BTR                   : out std_logic;
+               I_RLD                   : out std_logic;
+               I_RRD                   : out std_logic;
+               I_INRC                  : out std_logic;
+               SetDI                   : out std_logic;
+               SetEI                   : out std_logic;
+               IMode                   : out std_logic_vector(1 downto 0);
+               Halt                    : out std_logic;
+               NoRead                  : out std_logic;
+               Write                   : out std_logic

        );
        end component;
 
        component T80_ALU
        generic(
        );
        end component;
 
        component T80_ALU
        generic(

-               Mode : integer := 0;
+               Mode   : integer := 0;

                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;
                Flag_C : integer := 0;
                Flag_N : integer := 1;
                Flag_P : integer := 2;


@@ -192,16 +201,16 @@ package T80_Pack is
                Flag_S : integer := 7
        );
        port(
                Flag_S : integer := 7
        );
        port(

-               Arith16         : in std_logic;
-               Z16                     : in std_logic;
-               ALU_Op          : in std_logic_vector(3 downto 0);
-               IR                      : in std_logic_vector(5 downto 0);
-               ISet            : in std_logic_vector(1 downto 0);
-               BusA            : in std_logic_vector(7 downto 0);
-               BusB            : in std_logic_vector(7 downto 0);
-               F_In            : in std_logic_vector(7 downto 0);
-               Q                       : out std_logic_vector(7 downto 0);
-               F_Out           : out std_logic_vector(7 downto 0)
+               Arith16         : in  std_logic;
+               Z16             : in  std_logic;
+               ALU_Op          : in  std_logic_vector(3 downto 0);
+               IR              : in  std_logic_vector(5 downto 0);
+               ISet            : in  std_logic_vector(1 downto 0);
+               BusA            : in  std_logic_vector(7 downto 0);
+               BusB            : in  std_logic_vector(7 downto 0);
+               F_In            : in  std_logic_vector(7 downto 0);
+               Q               : out std_logic_vector(7 downto 0);
+               F_Out           : out std_logic_vector(7 downto 0)

        );
        end component;
 
        );
        end component;
 

diff --git a/galaxian/t80_ip/T80_Reg.vhd b/galaxian/t80_ip/T80_Reg.vhd
index 828485fbfb04e90f9205540367f51f7cac46a56f..1c0f26384492b79c74105a1edb40fd5030c7c932 100644 (file)
--- a/galaxian/t80_ip/T80_Reg.vhd
+++ b/galaxian/t80_ip/T80_Reg.vhd
@@ -1,3 +1,12 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****

 --
 -- T80 Registers, technology independent
 --
 --
 -- T80 Registers, technology independent
 --


@@ -38,15 +47,15 @@
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:
 -- you have the latest version of this file.
 --
 -- The latest version of this file can be found at:

---     http://www.opencores.org/cvsweb.shtml/t51/
+--      http://www.opencores.org/cvsweb.shtml/t51/

 --
 -- Limitations :
 --
 -- File history :
 --
 --
 -- Limitations :
 --
 -- File history :
 --

---     0242 : Initial release
+--      0242 : Initial release

 --
 --

---     0244 : Changed to single register file
+--      0244 : Changed to single register file

 --
 
 library IEEE;
 --
 
 library IEEE;


@@ -55,29 +64,29 @@ use IEEE.numeric_std.all;
 
 entity T80_Reg is
        port(
 
 entity T80_Reg is
        port(

-               Clk                     : in std_logic;
-               CEN                     : in std_logic;
-               WEH                     : in std_logic;
-               WEL                     : in std_logic;
-               AddrA           : in std_logic_vector(2 downto 0);
-               AddrB           : in std_logic_vector(2 downto 0);
-               AddrC           : in std_logic_vector(2 downto 0);
-               DIH                     : in std_logic_vector(7 downto 0);
-               DIL                     : in std_logic_vector(7 downto 0);
-               DOAH            : out std_logic_vector(7 downto 0);
-               DOAL            : out std_logic_vector(7 downto 0);
-               DOBH            : out std_logic_vector(7 downto 0);
-               DOBL            : out std_logic_vector(7 downto 0);
-               DOCH            : out std_logic_vector(7 downto 0);
-               DOCL            : out std_logic_vector(7 downto 0)
+               Clk                     : in std_logic;
+               CEN                     : in std_logic;
+               WEH                     : in std_logic;
+               WEL                     : in std_logic;
+               AddrA           : in std_logic_vector(2 downto 0);
+               AddrB           : in std_logic_vector(2 downto 0);
+               AddrC           : in std_logic_vector(2 downto 0);
+               DIH                     : in std_logic_vector(7 downto 0);
+               DIL                     : in std_logic_vector(7 downto 0);
+               DOAH            : out std_logic_vector(7 downto 0);
+               DOAL            : out std_logic_vector(7 downto 0);
+               DOBH            : out std_logic_vector(7 downto 0);
+               DOBL            : out std_logic_vector(7 downto 0);
+               DOCH            : out std_logic_vector(7 downto 0);
+               DOCL            : out std_logic_vector(7 downto 0)

        );
 end T80_Reg;
 
 architecture rtl of T80_Reg is
 
        type Register_Image is array (natural range <>) of std_logic_vector(7 downto 0);
        );
 end T80_Reg;
 
 architecture rtl of T80_Reg is
 
        type Register_Image is array (natural range <>) of std_logic_vector(7 downto 0);

-       signal  RegsH   : Register_Image(0 to 7);
-       signal  RegsL   : Register_Image(0 to 7);
+       signal      RegsH   : Register_Image(0 to 7);
+       signal      RegsL   : Register_Image(0 to 7);

 
 begin
 
 
 begin
 

diff --git a/galaxian/t80_ip/T80_RegX.vhd b/galaxian/t80_ip/T80_RegX.vhd
new file mode 100644 (file)
index 0000000..ebeee09
--- /dev/null
+++ b/galaxian/t80_ip/T80_RegX.vhd
@@ -0,0 +1,176 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****
+--
+-- T80 Registers for Xilinx Select RAM
+--
+-- Version : 0244
+--
+-- Copyright (c) 2002 Daniel Wallner (jesus@opencores.org)
+--
+-- All rights reserved
+--
+-- Redistribution and use in source and synthezised forms, with or without
+-- modification, are permitted provided that the following conditions are met:
+--
+-- Redistributions of source code must retain the above copyright notice,
+-- this list of conditions and the following disclaimer.
+--
+-- Redistributions in synthesized form must reproduce the above copyright
+-- notice, this list of conditions and the following disclaimer in the
+-- documentation and/or other materials provided with the distribution.
+--
+-- Neither the name of the author nor the names of other contributors may
+-- be used to endorse or promote products derived from this software without
+-- specific prior written permission.
+--
+-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+-- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+-- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+-- POSSIBILITY OF SUCH DAMAGE.
+--
+-- Please report bugs to the author, but before you do so, please
+-- make sure that this is not a derivative work and that
+-- you have the latest version of this file.
+--
+-- The latest version of this file can be found at:
+--      http://www.opencores.org/cvsweb.shtml/t51/
+--
+-- Limitations :
+--
+-- File history :
+--
+--      0242 : Initial release
+--
+--      0244 : Removed UNISIM library and added componet declaration
+--
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity T80_Reg is
+       port(
+               Clk                     : in std_logic;
+               CEN                     : in std_logic;
+               WEH                     : in std_logic;
+               WEL                     : in std_logic;
+               AddrA           : in std_logic_vector(2 downto 0);
+               AddrB           : in std_logic_vector(2 downto 0);
+               AddrC           : in std_logic_vector(2 downto 0);
+               DIH                     : in std_logic_vector(7 downto 0);
+               DIL                     : in std_logic_vector(7 downto 0);
+               DOAH            : out std_logic_vector(7 downto 0);
+               DOAL            : out std_logic_vector(7 downto 0);
+               DOBH            : out std_logic_vector(7 downto 0);
+               DOBL            : out std_logic_vector(7 downto 0);
+               DOCH            : out std_logic_vector(7 downto 0);
+               DOCL            : out std_logic_vector(7 downto 0)
+       );
+end T80_Reg;
+
+architecture rtl of T80_Reg is
+
+       component RAM16X1D
+               port(
+                       DPO         : out std_ulogic;
+                       SPO         : out std_ulogic;
+                       A0          : in std_ulogic;
+                       A1          : in std_ulogic;
+                       A2          : in std_ulogic;
+                       A3          : in std_ulogic;
+                       D           : in std_ulogic;
+                       DPRA0       : in std_ulogic;
+                       DPRA1       : in std_ulogic;
+                       DPRA2       : in std_ulogic;
+                       DPRA3       : in std_ulogic;
+                       WCLK        : in std_ulogic;
+                       WE          : in std_ulogic);
+       end component;
+
+       signal      ENH             : std_logic;
+       signal      ENL             : std_logic;
+
+begin
+
+       ENH <= CEN and WEH;
+       ENL <= CEN and WEL;
+
+       bG1: for I in 0 to 7 generate
+       begin
+               Reg1H : RAM16X1D
+                       port map(
+                       DPO => DOBH(i),
+                       SPO => DOAH(i),
+                       A0 => AddrA(0),
+                       A1 => AddrA(1),
+                       A2 => AddrA(2),
+                       A3 => '0',
+                       D => DIH(i),
+                       DPRA0 => AddrB(0),
+                       DPRA1 => AddrB(1),
+                       DPRA2 => AddrB(2),
+                       DPRA3 => '0',
+                       WCLK => Clk,
+                       WE => ENH);
+               Reg1L : RAM16X1D
+                       port map(
+                       DPO => DOBL(i),
+                       SPO => DOAL(i),
+                       A0 => AddrA(0),
+                       A1 => AddrA(1),
+                       A2 => AddrA(2),
+                       A3 => '0',
+                       D => DIL(i),
+                       DPRA0 => AddrB(0),
+                       DPRA1 => AddrB(1),
+                       DPRA2 => AddrB(2),
+                       DPRA3 => '0',
+                       WCLK => Clk,
+                       WE => ENL);
+               Reg2H : RAM16X1D
+                       port map(
+                       DPO => DOCH(i),
+                       SPO => open,
+                       A0 => AddrA(0),
+                       A1 => AddrA(1),
+                       A2 => AddrA(2),
+                       A3 => '0',
+                       D => DIH(i),
+                       DPRA0 => AddrC(0),
+                       DPRA1 => AddrC(1),
+                       DPRA2 => AddrC(2),
+                       DPRA3 => '0',
+                       WCLK => Clk,
+                       WE => ENH);
+               Reg2L : RAM16X1D
+                       port map(
+                       DPO => DOCL(i),
+                       SPO => open,
+                       A0 => AddrA(0),
+                       A1 => AddrA(1),
+                       A2 => AddrA(2),
+                       A3 => '0',
+                       D => DIL(i),
+                       DPRA0 => AddrC(0),
+                       DPRA1 => AddrC(1),
+                       DPRA2 => AddrC(2),
+                       DPRA3 => '0',
+                       WCLK => Clk,
+                       WE => ENL);
+       end generate;
+
+end;

diff --git a/galaxian/t80_ip/T80sed.vhd b/galaxian/t80_ip/T80sed.vhd
new file mode 100644 (file)
index 0000000..0c28ec2
--- /dev/null
+++ b/galaxian/t80_ip/T80sed.vhd
@@ -0,0 +1,179 @@
+-- ****
+-- T80(b) core. In an effort to merge and maintain bug fixes ....
+--
+--
+-- Ver 300 started tidyup
+-- MikeJ March 2005
+-- Latest version from www.fpgaarcade.com (original www.opencores.org)
+--
+-- ****
+-- ** CUSTOM 2 CLOCK MEMORY ACCESS FOR PACMAN, MIKEJ **
+--
+-- Z80 compatible microprocessor core, synchronous top level with clock enable
+-- Different timing than the original z80
+-- Inputs needs to be synchronous and outputs may glitch
+--
+-- Version : 0238
+--
+-- Copyright (c) 2001-2002 Daniel Wallner (jesus@opencores.org)
+--
+-- All rights reserved
+--
+-- Redistribution and use in source and synthezised forms, with or without
+-- modification, are permitted provided that the following conditions are met:
+--
+-- Redistributions of source code must retain the above copyright notice,
+-- this list of conditions and the following disclaimer.
+--
+-- Redistributions in synthesized form must reproduce the above copyright
+-- notice, this list of conditions and the following disclaimer in the
+-- documentation and/or other materials provided with the distribution.
+--
+-- Neither the name of the author nor the names of other contributors may
+-- be used to endorse or promote products derived from this software without
+-- specific prior written permission.
+--
+-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+-- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+-- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+-- POSSIBILITY OF SUCH DAMAGE.
+--
+-- Please report bugs to the author, but before you do so, please
+-- make sure that this is not a derivative work and that
+-- you have the latest version of this file.
+--
+-- The latest version of this file can be found at:
+--      http://www.opencores.org/cvsweb.shtml/t80/
+--
+-- Limitations :
+--
+-- File history :
+--
+--      0235 : First release
+--
+--      0236 : Added T2Write generic
+--
+--      0237 : Fixed T2Write with wait state
+--
+--      0238 : Updated for T80 interface change
+--
+--      0242 : Updated for T80 interface change
+--
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+use work.T80_Pack.all;
+
+entity T80sed is
+       port(
+               RESET_n         : in  std_logic;
+               CLK_n           : in  std_logic;
+               CLKEN           : in  std_logic;
+               WAIT_n          : in  std_logic;
+               INT_n           : in  std_logic;
+               NMI_n           : in  std_logic;
+               BUSRQ_n         : in  std_logic;
+               M1_n            : out std_logic;
+               MREQ_n          : out std_logic;
+               IORQ_n          : out std_logic;
+               RD_n            : out std_logic;
+               WR_n            : out std_logic;
+               RFSH_n          : out std_logic;
+               HALT_n          : out std_logic;
+               BUSAK_n         : out std_logic;
+               A               : out std_logic_vector(15 downto 0);
+               DI              : in  std_logic_vector(7 downto 0);
+               DO              : out std_logic_vector(7 downto 0)
+       );
+end T80sed;
+
+architecture rtl of T80sed is
+
+       signal IntCycle_n   : std_logic;
+       signal NoRead       : std_logic;
+       signal Write        : std_logic;
+       signal IORQ         : std_logic;
+       signal DI_Reg       : std_logic_vector(7 downto 0);
+       signal MCycle       : std_logic_vector(2 downto 0);
+       signal TState       : std_logic_vector(2 downto 0);
+
+begin
+
+       u0 : T80
+               generic map(
+                       Mode      => 0,
+                       IOWait    => 1)
+               port map(
+                       CEN        => CLKEN,
+                       M1_n       => M1_n,
+                       IORQ       => IORQ,
+                       NoRead     => NoRead,
+                       Write      => Write,
+                       RFSH_n     => RFSH_n,
+                       HALT_n     => HALT_n,
+                       WAIT_n     => Wait_n,
+                       INT_n      => INT_n,
+                       NMI_n      => NMI_n,
+                       RESET_n    => RESET_n,
+                       BUSRQ_n    => BUSRQ_n,
+                       BUSAK_n    => BUSAK_n,
+                       CLK_n      => CLK_n,
+                       A          => A,
+                       DInst      => DI,
+                       DI         => DI_Reg,
+                       DO         => DO,
+                       MC         => MCycle,
+                       TS         => TState,
+                       IntCycle_n => IntCycle_n);
+
+       process (RESET_n, CLK_n)
+       begin
+               if RESET_n = '0' then
+                       RD_n <= '1';
+                       WR_n <= '1';
+                       IORQ_n <= '1';
+                       MREQ_n <= '1';
+                       DI_Reg <= "00000000";
+               elsif CLK_n'event and CLK_n = '1' then
+                       if CLKEN = '1' then
+                               RD_n <= '1';
+                               WR_n <= '1';
+                               IORQ_n <= '1';
+                               MREQ_n <= '1';
+                               if MCycle = "001" then
+                                       if TState = "001" or (TState = "010" and Wait_n = '0') then
+                                               RD_n <= not IntCycle_n;
+                                               MREQ_n <= not IntCycle_n;
+                                               IORQ_n <= IntCycle_n;
+                                       end if;
+                                       if TState = "011" then
+                                               MREQ_n <= '0';
+                                       end if;
+                               else
+                                       if (TState = "001" or TState = "010") and NoRead = '0' and Write = '0' then
+                                               RD_n <= '0';
+                                               IORQ_n <= not IORQ;
+                                               MREQ_n <= IORQ;
+                                       end if;
+                                               if ((TState = "001") or (TState = "010")) and Write = '1' then
+                                                       WR_n <= '0';
+                                                       IORQ_n <= not IORQ;
+                                                       MREQ_n <= IORQ;
+                                               end if;
+                               end if;
+                               if TState = "010" and Wait_n = '1' then
+                                       DI_Reg <= DI;
+                               end if;
+                       end if;
+               end if;
+       end process;
+
+end;