jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- removed interrupt polarity capabilty

Browse Source 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@366 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2009-02-28 13:17:32 +00:00
parent 92a1179fee
commit 548c2b4e94
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CPUs/JCpu/src/core/chipreg.vhd
+1 -5
View File
@@ -68,17 +68,13 @@ proc_reg_write:
reg_cmem_high <= (others => '0'); reg_cmem_high <= (others => '0');
reg_bank_sel <= (others => '0'); reg_bank_sel <= (others => '0');
reg_int_ctrl.enable <= '0'; reg_int_ctrl.enable <= '0';
reg_int_ctrl.polarity <= '1';
elsif rising_edge(clk) then elsif rising_edge(clk) then
reg_int_ctrl.request <= '0';
if we = '1' then if we = '1' then
case addr is case addr is
when X"01" => when X"01" =>
reg_bank_sel(bank_sel_t'range) <= din(bank_sel_t'range); reg_bank_sel(bank_sel_t'range) <= din(bank_sel_t'range);
when X"03" => when X"03" =>
reg_int_ctrl.enable <= din(0); reg_int_ctrl.enable <= din(0);
reg_int_ctrl.polarity <= din(1);
reg_int_ctrl.request <= din(7);
when X"04" => when X"04" =>
reg_cmem_high <= din(IMEM_ADDR_WIDTH-DMEM_ADDR_WIDTH-1 downto 0); reg_cmem_high <= din(IMEM_ADDR_WIDTH-DMEM_ADDR_WIDTH-1 downto 0);
when X"05" => when X"05" =>
@@ -101,7 +97,7 @@ proc_reg_read:
when X"02" => -- CPU status when X"02" => -- CPU status
dout <= "000000" & ctrl_in.alu.carry & ctrl_in.alu.zero; dout <= "000000" & ctrl_in.alu.carry & ctrl_in.alu.zero;
when X"03" => -- Interrupt control when X"03" => -- Interrupt control
dout <= "000000" & reg_int_ctrl.polarity & reg_int_ctrl.enable; dout <= "0000000" & reg_int_ctrl.enable;
when X"04" => -- Upper stack bits out when X"04" => -- Upper stack bits out
dout <= "0000" & reg_cmem_high; dout <= "0000" & reg_cmem_high;
when X"05" => -- Upper cmem bits out when X"05" => -- Upper cmem bits out
lib/CPUs/JCpu/src/core/cpu_pkg.vhd
-2
View File
@@ -132,8 +132,6 @@ package cpu_pkg is
type int_ctrl_in_t is record type int_ctrl_in_t is record
enable : std_logic; enable : std_logic;
polarity : std_logic;
request : std_logic;
end record; end record;
type creg_ctrl_out_t is record type creg_ctrl_out_t is record
lib/CPUs/JCpu/src/core/int_ctrl.vhd
+1 -1
View File
@@ -120,7 +120,7 @@ pin_sample:
if rising_edge(clk) then if rising_edge(clk) then
int_request <= '0'; int_request <= '0';
if ctrl_in.enable = '1' then if ctrl_in.enable = '1' then
int_request <= (int_in xor (not ctrl_in.polarity)) or ctrl_in.request; int_request <= int_in;
end if; end if;
end if; end if;
end process; end process;