extension: instanziert in tb und toplvlentity sowie in den vsim dofiles

[calu.git] / cpu / src / core_top.vhd

diff --git a/cpu/src/core_top.vhd b/cpu/src/core_top.vhd
index a63616049cfa6dec151ab3649c00edda0cc505e9..80a87b5afd8aa74fe295bf7dc561654a0a4876f3 100644 (file)
--- a/cpu/src/core_top.vhd
+++ b/cpu/src/core_top.vhd
@@ -11,9 +11,9 @@ entity core_top is
                --System input pins
                        sys_clk : in std_logic;
                        sys_res : in std_logic;
-                       reg1_rd_data : out gp_register_t;
-                       reg2_rd_data : out gp_register_t
-
+                       result : out gp_register_t;
+                       jump_result : out instruction_addr_t;
+                       reg_wr_data : out gp_register_t
                        
                );
 
@@ -30,9 +30,30 @@ architecture behav of core_top is
                signal reg_w_addr_pin : std_logic_vector(REG_ADDR_WIDTH-1 downto 0);
                signal reg_wr_data_pin : gp_register_t;
                signal reg_we_pin : std_logic;
+               signal to_next_stage : dec_op;
+
 --             signal reg1_rd_data_pin : gp_register_t;
 --             signal reg2_rd_data_pin : gp_register_t;
 
+                 signal result_pin : gp_register_t;--reg
+                 signal result_addr_pin : gp_addr_t;--reg
+                 signal addr_pin : word_t; --memaddr
+                 signal data_pin : gp_register_t; --mem data --ureg
+                 signal alu_jump_pin : std_logic;--reg
+                 signal brpr_pin  : std_logic;  --reg
+                 signal wr_en_pin : std_logic;--regop --reg
+                 signal dmem_pin  : std_logic;--memop
+                 signal dmem_wr_en_pin : std_logic;
+                 signal hword_pin  : std_logic;
+                 signal byte_s_pin : std_logic;
+                signal nop_pin : std_logic;
+               -- extension signals
+               signal ext_gpmp :  extmod_rec;
+               signal pointer : pointer_count;
+               signal dec_in,p_en : std_logic;
+               signal data_out    : gp_register_t;
+               signal pointer_val : gp_register_t;
+
 
 begin
 
@@ -76,12 +97,37 @@ begin
                        reg_w_addr => reg_w_addr_pin, --: in std_logic_vector(REG_ADDR_WIDTH-1 downto 0);
                        reg_wr_data => reg_wr_data_pin, --: in gp_register_t;
                        reg_we => reg_we_pin, --: in std_logic;
+                       nop => nop_pin,
 
                --Data outputs
-                       reg1_rd_data => reg1_rd_data, --: gp_register_t;
-                       reg2_rd_data => reg2_rd_data, --: gp_register_t;
                        branch_prediction_res => prediction_result_pin, --: instruction_word_t;
-                       branch_prediction_bit => branch_prediction_bit_pin --: std_logic
+                       branch_prediction_bit => branch_prediction_bit_pin, --: std_logic
+                       to_next_stage => to_next_stage
+               );
+
+          exec_st : execute_stage
+                generic map('0')
+                port map(sys_clk, sys_res,to_next_stage, reg_wr_data_pin, reg_we_pin, reg_w_addr_pin, result_pin, result_addr_pin,addr_pin,
+                data_pin, alu_jump_pin,brpr_pin, wr_en_pin, dmem_pin,dmem_wr_en_pin,hword_pin,byte_s_pin);
+
+          writeback_st : writeback_stage
+                generic map('0', '1')
+                port map(sys_clk, sys_res, result_pin, result_addr_pin, addr_pin, data_pin, alu_jump_pin, brpr_pin, 
+                wr_en_pin, dmem_pin, dmem_wr_en_pin, hword_pin, byte_s_pin,
+                reg_wr_data_pin, reg_we_pin, reg_w_addr_pin, jump_result_pin, alu_jump_bit_pin);
+
+
+       gpmp_inst :  extension
+               generic map ('0')
+               port map (
+                       sys_clk,
+                       sys_reset,
+                       ext_gpmp,
+                       pointer,
+                       dec_in,
+                       p_en,
+                       data_out,
+                       pointer_val
                        
                );
 
@@ -89,13 +135,18 @@ begin
 --init : process(all)
 
 --begin
-       jump_result_pin <= (others => '0');
-       alu_jump_bit_pin <= '0';
-       reg_w_addr_pin <= (others => '0');
-       reg_wr_data_pin <= (others => '0');
-       reg_we_pin <= '0';
+--     jump_result_pin <= (others => '0');
+--     alu_jump_bit_pin <= '0';
+--     reg_w_addr_pin <= (others => '0');
+--     reg_wr_data_pin <= (others => '0');
+--     reg_we_pin <= '0';
        
 --end process;
        
+       result <= result_pin;
+       nop_pin <= (alu_jump_bit_pin xor brpr_pin);
+
+       jump_result <= jump_result_pin;
 
+       reg_wr_data <= reg_wr_data_pin;
 end behav;