X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=cpu%2Fsrc%2Fcommon_pkg.vhd;h=ec18a20b975d1b6157081cc31a6611a46c9a20ff;hb=7b04055757bc6a71bf5ae5b35cba6fb61471bb01;hp=03e61cd8c39c07cfa79967462c103d42d80fd625;hpb=37835209871e507ea3956c9fd616a6546b39d991;p=calu.git

diff --git a/cpu/src/common_pkg.vhd b/cpu/src/common_pkg.vhd
index 03e61cd..ec18a20 100755
--- a/cpu/src/common_pkg.vhd
+++ b/cpu/src/common_pkg.vhd
@@ -30,10 +30,12 @@ package common_pkg is
 	
 	constant NUM_OP_OPT_WIDTH	: INTEGER := 6;
 	constant COND_WIDTH : INTEGER := 4;
+	constant DATA_END_ADDR 		: integer := ((2**DATA_ADDR_WIDTH)-1);
 
 	
 	subtype instruction_word_t is std_logic_vector(WORD_WIDTH-1 downto 0);
 	subtype instruction_addr_t is std_logic_vector(INSTR_ADDR_WIDTH-1 downto 0);
+	subtype instr_addr_t is instruction_addr_t;
 	
 	subtype gp_addr_t	is std_logic_vector(REG_ADDR_WIDTH-1 downto 0);
 	subtype data_ram_word_t is std_logic_vector(WORD_WIDTH-1 downto 0);
@@ -55,7 +57,8 @@ package common_pkg is
 
 	constant RIGHT_OPT : integer := 3;
 	constant JMP_REG_OPT : integer := 3;
-	constant ST_OPT  : integer := 3;
+	constant ST_OPT  : integer := 3; -- store opt
+	constant RET_OPT : integer := 3;
 	
 	constant NO_PSW_OPT : integer := 4;--no sharing
 	constant NO_DST_OPT : integer := 5; --no sharing