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

- fixed issues with GHDL

Browse Source 
- fixed not closing file

git-svn-id: http://moon:8086/svn/vhdl/trunk@1388 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2021-03-19 11:06:38 +00:00
parent 88975a56a0
commit c5d7d2fe3b
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CPUs/JCpu/src/core/cpu.vhd
+1 -1
View File
@@ -218,7 +218,7 @@ begin
xmem_dout <= mem_data; xmem_dout <= mem_data;
xmem_addr <= mem_addr; xmem_addr <= mem_addr;
cmem_din <= creg_ctrl_out.cmem_high & mem_data; cmem_din <= creg_ctrl_out.cmem_high & mem_data;
cmem_addr <= '1' & creg_ctrl_out.bank_sel & mem_addr(MIN(cmem_addr'length-creg_ctrl_out.bank_sel'length-1, mem_addr'length)-1 downto 0); cmem_addr <= '1' & creg_ctrl_out.bank_sel & mem_addr(JMIN(cmem_addr'length-creg_ctrl_out.bank_sel'length-1, mem_addr'length)-1 downto 0);
-------------------------------------------------------------------- --------------------------------------------------------------------
mem_ctrl_lines: mem_ctrl_lines:
lib/CPUs/JCpu/src/core/cpu_pkg.vhd
+6 -6
View File
@@ -225,8 +225,8 @@ package cpu_pkg is
function idecoder(opcode : opcode_t; iphase : iphase_t; status : cpu_status_t) return ctrl_lines_t; function idecoder(opcode : opcode_t; iphase : iphase_t; status : cpu_status_t) return ctrl_lines_t;
function gen_murom return murom_t; function gen_murom return murom_t;
function get_muromaddr (opcode : opcode_t; iphase : iphase_t; status : cpu_status_t) return unsigned; function get_muromaddr (opcode : opcode_t; iphase : iphase_t; status : cpu_status_t) return unsigned;
function MIN (X, Y: INTEGER) return INTEGER; function JMIN (X, Y: INTEGER) return INTEGER;
function MAX (X, Y: INTEGER) return INTEGER; function JMAX (X, Y: INTEGER) return INTEGER;
end cpu_pkg; end cpu_pkg;
@@ -824,7 +824,7 @@ package body cpu_pkg is
end get_muromaddr; end get_muromaddr;
------------------------------------------------------------- -------------------------------------------------------------
function MIN (X, Y: INTEGER) return INTEGER is function JMIN (X, Y: INTEGER) return INTEGER is
variable res : integer := X; variable res : integer := X;
begin begin
if Y < X then if Y < X then
@@ -833,10 +833,10 @@ package body cpu_pkg is
return res; return res;
end MIN; end JMIN;
------------------------------------------------------------- -------------------------------------------------------------
function MAX (X, Y: INTEGER) return INTEGER is function JMAX (X, Y: INTEGER) return INTEGER is
variable res : integer := X; variable res : integer := X;
begin begin
if Y > X then if Y > X then
@@ -845,7 +845,7 @@ package body cpu_pkg is
return res; return res;
end MAX; end JMAX;
end cpu_pkg; end cpu_pkg;
lib/CPUs/JCpu/src/tb_cpu_itest.vhd
+5 -2
View File
@@ -135,10 +135,11 @@ CLK_GEN: process
end process; end process;
STIMULUS: process STIMULUS: process
file RESULT: text open write_mode is "../tools/opc.list"; file RESULT: text;
variable L: line; variable L: line;
begin begin
file_open(RESULT, "../tools/opc.list", WRITE_MODE);
for i in 0 to instr_name_array'length-1 loop for i in 0 to instr_name_array'length-1 loop
fprint(RESULT, L,"%d %s\n", fo(i), instr_name_array(i)); fprint(RESULT, L,"%d %s\n", fo(i), instr_name_array(i));
@@ -151,7 +152,9 @@ STIMULUS: process
wait until rising_edge(clk); wait until rising_edge(clk);
ce <= '1'; ce <= '1';
assert false report "Test finished" severity error; file_close(RESULT);
assert false report "Test finished" severity failure;
wait; wait;
end process; end process;