projects
/
hwmod.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f62802
)
hstring: length fix
author
Bernhard Urban
<lewurm@gmail.com>
Sun, 16 May 2010 19:02:29 +0000
(21:02 +0200)
committer
Bernhard Urban
<lewurm@gmail.com>
Sun, 16 May 2010 19:02:29 +0000
(21:02 +0200)
.gitignore
patch
|
blob
|
history
src/beh_display_tb.vhd
patch
|
blob
|
history
src/beh_history_tb.vhd
patch
|
blob
|
history
src/beh_parser_tb.vhd
patch
|
blob
|
history
src/beh_scanner_tb.vhd
patch
|
blob
|
history
src/parser.vhd
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index b150b26e1f7d02ef7570c2cbb3e9d8ca09f56810..a27ea25a8801184e18fa5a7f36c29a991ebdf5a2 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-24,3
+24,6
@@
quartus/calc/
src/quartus*.tmp
quartus/project_web.tcl
quartus/project_tilab.tcl
src/quartus*.tmp
quartus/project_web.tcl
quartus/project_tilab.tcl
+
+#stuff
+tags
diff --git
a/src/beh_display_tb.vhd
b/src/beh_display_tb.vhd
index 02a82575956046e5d2bff6d96ecce5835e335750..e7ef5e2a4344c25b01f3aea4ddfef5ea633a5730 100644
(file)
--- a/
src/beh_display_tb.vhd
+++ b/
src/beh_display_tb.vhd
@@
-59,7
+59,7
@@
begin
end process;
process
end process;
process
- variable input : hstring := "123513 ";
+ variable input : hstring := "123513
";
variable ctmp : character;
variable checkall : boolean := true;
variable ctmp : character;
variable checkall : boolean := true;
diff --git
a/src/beh_history_tb.vhd
b/src/beh_history_tb.vhd
index 7eb302978718866da6ba5754b1cdebdd464efd45..cdd6e2ac1bdb926d149acd4326a136f5f916c97f 100644
(file)
--- a/
src/beh_history_tb.vhd
+++ b/
src/beh_history_tb.vhd
@@
-59,7
+59,7
@@
begin
end process;
process
end process;
process
- variable input : hstring := "12345678 ";
+ variable input : hstring := "12345678
";
variable ctmp : character;
variable checkall : boolean := true;
variable ctmp : character;
variable checkall : boolean := true;
diff --git
a/src/beh_parser_tb.vhd
b/src/beh_parser_tb.vhd
index 92b685c5dc31176dcf2e6aada8487b0281f7932c..cb4c5b5c21188f5fa0756f69955ff4e8d1bcfd6d 100644
(file)
--- a/
src/beh_parser_tb.vhd
+++ b/
src/beh_parser_tb.vhd
@@
-76,12
+76,12
@@
begin
i := 1;
f_loop : while not endfile(f) loop
i := 1;
f_loop : while not endfile(f) loop
- realresult := (7
1
=> nul, others => ' ');
+ realresult := (7
2
=> nul, others => ' ');
f1_loop : while not endfile(f) loop
readline (f, l);
input := (others => nul);
f1_loop : while not endfile(f) loop
readline (f, l);
input := (others => nul);
- if (l'length <= 7
1
) then
+ if (l'length <= 7
2
) then
input(1 to l'length) := l.all;
if (input(1) = '#') then
next f1_loop;
input(1 to l'length) := l.all;
if (input(1) = '#') then
next f1_loop;
@@
-97,7
+97,7
@@
begin
f2_loop : while not endfile(f) loop
readline (f, l);
expectedresult := (others => nul);
f2_loop : while not endfile(f) loop
readline (f, l);
expectedresult := (others => nul);
- if (l'length <= 7
1
) then
+ if (l'length <= 7
2
) then
expectedresult(1 to l'length) := l.all;
if (expectedresult(1) = '#') then
next f2_loop;
expectedresult(1 to l'length) := l.all;
if (expectedresult(1) = '#') then
next f2_loop;
@@
-113,10
+113,10
@@
begin
-- ergebnis string richtig formatieren
hstrtmp := expectedresult;
-- ergebnis string richtig formatieren
hstrtmp := expectedresult;
- expectedresult := (7
1
=> nul, others => ' ');
- for x in 1 to 7
0
loop
+ expectedresult := (7
2
=> nul, others => ' ');
+ for x in 1 to 7
1
loop
if hstrtmp(x) /= nul then
if hstrtmp(x) /= nul then
- expectedresult((7
0
-y) + x) := hstrtmp(x);
+ expectedresult((7
1
-y) + x) := hstrtmp(x);
end if;
end loop;
end if;
end loop;
@@
-128,7
+128,7
@@
begin
icwait(sys_clk, 5);
do_it <= '1';
run_tc := true;
icwait(sys_clk, 5);
do_it <= '1';
run_tc := true;
- j := 1; k := 7
0
;
+ j := 1; k := 7
1
;
while run_tc loop
wait on p_rget, p_wtake, p_finished, finished;
while run_tc loop
wait on p_rget, p_wtake, p_finished, finished;
diff --git
a/src/beh_scanner_tb.vhd
b/src/beh_scanner_tb.vhd
index e904d76024c941a461b090932b5742f68b5403ab..f0704d5fe64b7544e5ec818f4286d96a2026867c 100644
(file)
--- a/
src/beh_scanner_tb.vhd
+++ b/
src/beh_scanner_tb.vhd
@@
-127,7
+127,7
@@
begin
f1_loop : while not endfile(f) loop
readline (f, l);
input := (others => nul);
f1_loop : while not endfile(f) loop
readline (f, l);
input := (others => nul);
- if (l'length <= 7
1
) then
+ if (l'length <= 7
2
) then
input(1 to l'length) := l.all;
if (input(1) = '#') then
next f1_loop;
input(1 to l'length) := l.all;
if (input(1) = '#') then
next f1_loop;
@@
-143,7
+143,7
@@
begin
f2_loop : while not endfile(f) loop
readline (f, l);
expectedresult := (others => nul);
f2_loop : while not endfile(f) loop
readline (f, l);
expectedresult := (others => nul);
- if (l'length <= 7
1
) then
+ if (l'length <= 7
2
) then
expectedresult(1 to l'length) := l.all;
if (expectedresult(1) = '#') then
next f2_loop;
expectedresult(1 to l'length) := l.all;
if (expectedresult(1) = '#') then
next f2_loop;
diff --git
a/src/parser.vhd
b/src/parser.vhd
index 54aebe61eb3ecd39ef22e467042ab617b0f998db..fe7bda1db28e20521bc82b2f56f654d792912843 100644
(file)
--- a/
src/parser.vhd
+++ b/
src/parser.vhd
@@
-98,7
+98,7
@@
begin
aktop_int <= ALU_NOP;
opp_int <= ALU_NOP;
err_int <= 0;
aktop_int <= ALU_NOP;
opp_int <= ALU_NOP;
err_int <= 0;
- errc_int <= 7
0
;
+ errc_int <= 7
1
;
errc_tmp_int <= 0;
firstz_int <= true;
-- out ports
errc_tmp_int <= 0;
firstz_int <= true;
-- out ports
@@
-557,7
+557,7
@@
begin
when SDONE =>
err_next <= 0;
when SDONE =>
err_next <= 0;
- errc_next <= 7
0
;
+ errc_next <= 7
1
;
p_finished_next <= '1';
end case;
p_finished_next <= '1';
end case;