fmax incr

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

diff --git a/cpu/src/core_top.vhd b/cpu/src/core_top.vhd
index bb9578936f77f1307fb83f91b983ddbaf144c095..1002989d03e2fcbca282ee82d7e221219f24bc14 100644 (file)
--- a/cpu/src/core_top.vhd
+++ b/cpu/src/core_top.vhd
@@ -4,6 +4,7 @@ use IEEE.numeric_std.all;
 
 use work.common_pkg.all;
 use work.core_pkg.all;
+use work.extension_pkg.all;
 
 entity core_top is
 
@@ -11,9 +12,9 @@ entity core_top is
                --System input pins
                        sys_clk : in std_logic;
                        sys_res : in std_logic;
-                       result : out gp_register_t;
-                       jump_result : out instruction_addr_t;
-                       reg_wr_data : out gp_register_t
+--                     result : out gp_register_t;
+                       jump_result : out instruction_addr_t
+--                     reg_wr_data : out gp_register_t
                        
                );
 
@@ -47,10 +48,12 @@ architecture behav of core_top is
                  signal dmem_wr_en_pin : std_logic;
                  signal hword_pin  : std_logic;
                  signal byte_s_pin : std_logic;
+                                
+                signal gpm_in_pin : extmod_rec;
+                signal gpm_out_pin : gp_register_t;
                 signal nop_pin : std_logic;
 
 
-
 begin
 
        fetch_st : fetch_stage
@@ -105,8 +108,8 @@ begin
 
           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);
+                port map(sys_clk, sys_res,to_next_stage, reg_wr_data_pin, reg_we_pin, reg_w_addr_pin, gpm_in_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, gpm_out_pin);
 
           writeback_st : writeback_stage
                 generic map('0', '1')
@@ -129,10 +132,10 @@ begin
        
 --end process;
        
-       result <= result_pin;
+--     result <= result_pin;
        nop_pin <= (alu_jump_bit_pin); -- xor brpr_pin);
 
-       jump_result <= jump_result_pin;
+       jump_result <= prog_cnt_pin; --jump_result_pin;
 
-       reg_wr_data <= reg_wr_data_pin;
+--     reg_wr_data <= reg_wr_data_pin;
 end behav;