projects
/
hwmod.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
220628e
)
parser: unnoetiges signal entfernt
author
Bernhard Urban
<lewurm@gmail.com>
Sat, 29 May 2010 10:00:47 +0000
(12:00 +0200)
committer
Bernhard Urban
<lewurm@gmail.com>
Sat, 29 May 2010 10:00:47 +0000
(12:00 +0200)
logic: 2993 -> 2980
src/parser.vhd
patch
|
blob
|
history
diff --git
a/src/parser.vhd
b/src/parser.vhd
index 0867dea7b947005c9d683be0a739acf37ece840d..4ad14cc9246a34443f2aa2ebeb710632d5294eaa 100644
(file)
--- a/
src/parser.vhd
+++ b/
src/parser.vhd
@@
-46,7
+46,6
@@
architecture beh of parser is
signal firstz_next, firstz_int : boolean;
signal err_next, err_int : hstr_int;
signal errc_next, errc_int : hstr_int;
signal firstz_next, firstz_int : boolean;
signal err_next, err_int : hstr_int;
signal errc_next, errc_int : hstr_int;
- signal errc_tmp_next, errc_tmp_int : hstr_int;
-- ALU
signal opcode : alu_ops;
signal op1 : csigned;
-- ALU
signal opcode : alu_ops;
signal op1 : csigned;
@@
-96,7
+95,6
@@
begin
opp_int <= ALU_NOP;
err_int <= 0;
errc_int <= HSPALTE_MAX;
opp_int <= ALU_NOP;
err_int <= 0;
errc_int <= HSPALTE_MAX;
- errc_tmp_int <= 0;
firstz_int <= true;
-- out ports
p_rget_int <= '0';
firstz_int <= true;
-- out ports
p_rget_int <= '0';
@@
-121,7
+119,6
@@
begin
opp_int <= opp_next;
err_int <= err_next;
errc_int <= errc_next;
opp_int <= opp_next;
err_int <= err_next;
errc_int <= errc_next;
- errc_tmp_int <= errc_tmp_next;
firstz_int <= firstz_next;
-- out ports
p_rget_int <= p_rget_next;
firstz_int <= firstz_next;
-- out ports
p_rget_int <= p_rget_next;
@@
-141,7
+138,7
@@
begin
calc_done, wtmp_int, opp_int, z_sign_int, err_int, errc_int,
calc_error, op2_int, state_int, p_write_int, z_int, rbyte_int,
p_rget_int, opcode_int, op1_int, op3, opM, do_calc_int,
calc_done, wtmp_int, opp_int, z_sign_int, err_int, errc_int,
calc_error, op2_int, state_int, p_write_int, z_int, rbyte_int,
p_rget_int, opcode_int, op1_int, op3, opM, do_calc_int,
-
errc_tmp_int,
firstz_int)
+ firstz_int)
function hbyte2csigned (x : hbyte) return csigned is
variable y : csigned;
begin
function hbyte2csigned (x : hbyte) return csigned is
variable y : csigned;
begin
@@
-202,7
+199,6
@@
begin
opp_next <= opp_int;
err_next <= err_int;
errc_next <= errc_int;
opp_next <= opp_int;
err_next <= err_int;
errc_next <= errc_int;
- errc_tmp_next <= errc_tmp_int;
firstz_next <= firstz_int;
-- signals
p_rget_next <= '0';
firstz_next <= firstz_int;
-- signals
p_rget_next <= '0';
@@
-493,8
+489,8
@@
begin
when SBLANK1 =>
p_wtake_next <= '1';
p_write_next <= x"20";
when SBLANK1 =>
p_wtake_next <= '1';
p_write_next <= x"20";
- errc_tmp_next <= errc_int - 1;
if p_wdone = '1' then
if p_wdone = '1' then
+ errc_next <= errc_int - 1;
if errc_int <= 2 then
state_next <= SDONE;
else
if errc_int <= 2 then
state_next <= SDONE;
else
@@
-502,7
+498,6
@@
begin
end if;
end if;
when SBLANK2 =>
end if;
end if;
when SBLANK2 =>
- errc_next <= errc_tmp_int;
if p_wdone = '0' then
state_next <= SBLANK1;
end if;
if p_wdone = '0' then
state_next <= SBLANK1;
end if;
@@
-510,8
+505,8
@@
begin
when SERROR1 =>
p_wtake_next <= '1';
p_write_next <= hbyte(to_unsigned (character'pos(error_str(err_int)(errc_int)),8));
when SERROR1 =>
p_wtake_next <= '1';
p_write_next <= hbyte(to_unsigned (character'pos(error_str(err_int)(errc_int)),8));
- errc_tmp_next <= errc_int - 1;
if p_wdone = '1' then
if p_wdone = '1' then
+ errc_next <= errc_int - 1;
if errc_int <= 2 then
state_next <= SDONE;
else
if errc_int <= 2 then
state_next <= SDONE;
else
@@
-519,7
+514,6
@@
begin
end if;
end if;
when SERROR2 =>
end if;
end if;
when SERROR2 =>
- errc_next <= errc_tmp_int;
if p_wdone = '0' then
state_next <= SERROR1;
end if;
if p_wdone = '0' then
state_next <= SERROR1;
end if;