parser: kleinere anpassungen. eine aenderung verursacht zwar mehr logic

[hwmod.git] / src / beh_history_tb.vhd

diff --git a/src/beh_history_tb.vhd b/src/beh_history_tb.vhd
index c1e9a7dc5d5c81cd2469de5862ceccea858fa4cd..f76e2c4ec1745d128f869455d91799a8dbab4546 100644 (file)
--- a/src/beh_history_tb.vhd
+++ b/src/beh_history_tb.vhd
@@ -13,7 +13,7 @@ architecture sim of beh_history_tb is
        -- system
        signal sys_clk, sys_res_n : std_logic;
        -- history/display
-       signal d_new_eingabe, d_new_result : std_logic;
+       signal d_new_eingabe, d_new_result, d_new_bs : std_logic;
        signal d_zeile : hzeile;
        signal d_spalte : hspalte;
        signal d_get, d_done : std_logic;
@@ -28,8 +28,15 @@ architecture sim of beh_history_tb is
        signal free : std_logic;
        signal command : std_logic_vector(COMMAND_SIZE - 1 downto 0);
        signal command_data : std_logic_vector(3 * COLOR_SIZE + CHAR_SIZE -1 downto 0);
-
-       -- tmp: history<>scanner
+       -- history/parser
+       signal p_rget : std_logic;
+       signal p_rdone : std_logic;
+       signal p_read : hbyte;
+       signal p_wtake : std_logic;
+       signal p_wdone : std_logic;
+       signal p_write : hbyte;
+       signal p_finished : std_logic;
+       -- parser/scanner
        signal do_it, finished : std_logic;
 
        signal stop : boolean := false;
@@ -47,14 +54,20 @@ begin
                -- display
                d_new_eingabe => d_new_eingabe,
                d_new_result => d_new_result,
+               d_new_bs => d_new_bs,
                d_zeile => d_zeile,
                d_spalte => d_spalte,
                d_get => d_get,
                d_done => d_done,
                d_char => d_char,
-               -- TODO: tmp only!
-               do_it => do_it,
-               finished => finished
+               -- parser
+               p_rget => p_rget,
+               p_rdone => p_rdone,
+               p_read => p_read,
+               p_wtake => p_wtake,
+               p_wdone => p_wdone,
+               p_write => p_write,
+               p_finished => p_finished
        );
 
        -- display
@@ -65,6 +78,7 @@ begin
                -- history
                d_new_eingabe => d_new_eingabe,
                d_new_result => d_new_result,
+               d_new_bs => d_new_bs,
                d_zeile => d_zeile,
                d_spalte => d_spalte,
                d_get => d_get,
@@ -76,6 +90,24 @@ begin
                free => free
        );
 
+       -- parser
+       inst_parser : entity work.parser(beh)
+       port map (
+               sys_clk => sys_clk,
+               sys_res_n => sys_res_n,
+               -- history
+               p_rget => p_rget,
+               p_rdone => p_rdone,
+               p_read => p_read,
+               p_wtake => p_wtake,
+               p_wdone => p_wdone,
+               p_write => p_write,
+               p_finished => p_finished,
+               -- scanner
+               do_it => do_it,
+               finished => finished
+       );
+
        -- scanner
        inst_scan : entity work.scanner(beh)
        port map (
@@ -109,9 +141,9 @@ begin
        process
        begin
                free <= '0';
-               icwait(sys_clk, 2);
+               wait for 15 ns;
                free <= '1';
-               icwait(sys_clk, 2);
+               wait for 30 ns;
                if stop = true then
                        wait;
                end if;
@@ -144,7 +176,7 @@ begin
                        return y;
                end function;
 
-               function valid_char (x : std_logic_vector(7 downto 0); last : std_logic_vector(7 downto 0)) return boolean is
+               function valid_char (x : std_logic_vector(7 downto 0)) return boolean is
                                variable y : boolean;
                begin
                        case x is
@@ -165,20 +197,17 @@ begin
                file f : text open read_mode is "../../src/history.test";
                variable l : line;
 
-               variable input : hstring;
+               variable input : string(1 to 100);
 
                variable run_tc, run_inner : boolean := true;
                variable i, j, y : natural;
-               variable last : std_logic_vector(7 downto 0);
        begin
                -- init & reset
                sys_res_n <= '0';
                new_data <= '0';
                data <= (others => '0');
-               s_done <= '0';
-               finished <= '0';
 
-               icwait(sys_clk, 5);
+               icwait(sys_clk, 20);
                sys_res_n <= '1';
 
                i := 1;
@@ -188,7 +217,7 @@ begin
                        f1_loop : while not endfile(f) loop
                                readline (f, l);
                                input := (others => nul);
-                               if (l'length <= 72) then
+                               if (l'length <= 100) then
                                        input(1 to l'length) := l.all;
                                        if (input(1) = '#') then
                                                next f1_loop;
@@ -209,11 +238,10 @@ begin
                        j := 0;
 
                        mainl : while run_tc loop
-                               last := data;
-                               icwait(sys_clk, 1);
+                               icwait(sys_clk, 10);
                                j := j + 1;
 
-                               if j = 73 then
+                               if j = 101 then
                                        run_tc := false;
                                        assert(false) report "wtf @ schleife";
                                        next mainl;
@@ -237,7 +265,7 @@ begin
 
                                -- ack'en skippen, falls es ein "spezielles" zeichen ist (steht
                                -- in abhaengigkeit zum vorherigen zeichen)
-                               if(not valid_char(data, last)) then
+                               if(not valid_char(data)) then
                                        next mainl;
                                end if;
 
@@ -264,6 +292,7 @@ begin
                                                wait on do_it; -- = '0'
                                                icwait(sys_clk, 1);
                                                finished <= '0';
+                                               icwait(sys_clk, 850);
 
                                                run_tc := false;
                                        else
@@ -275,7 +304,7 @@ begin
                        report "==================";
                end loop f_loop;
 
-               icwait(sys_clk, 20);
+               icwait(sys_clk, 850);
                stop <= true;
                wait;
        end process;