X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fbeh_parser_tb.vhd;h=eb452058d5ef5794cf4c630c63c56dd0c1b71d84;hb=b42b2b9d669e1d12db43c70704b4657901d1ab02;hp=70ed098ad03a685d6df3353048ed4a47148bdc06;hpb=83b5b662c8e556783f8c02088f8c72003e38ee24;p=hwmod.git

diff --git a/src/beh_parser_tb.vhd b/src/beh_parser_tb.vhd
index 70ed098..eb45205 100644
--- a/src/beh_parser_tb.vhd
+++ b/src/beh_parser_tb.vhd
@@ -10,15 +10,8 @@ architecture sim of beh_parser_tb is
 	-- system
 	signal sys_clk, sys_res_n : std_logic;
 	-- history
-	signal p_rw, p_rget, p_rdone, p_wtake, p_wdone, p_finished : std_logic;
+	signal p_rget, p_rdone, p_wtake, p_wdone, p_finished : std_logic;
 	signal p_read, p_write : hbyte;
-	signal p_spalte : hspalte;
-
-	-- alu
-	signal opcode : alu_ops;
-	signal op1, op2, op3 : csigned;
-	signal do_calc, calc_done : std_logic;
-
 	--scanner
 	signal do_it : std_logic;
 	signal finished : std_logic;
@@ -30,8 +23,7 @@ begin
 	(
 		sys_clk => sys_clk,
 		sys_res_n => sys_res_n,
-		p_rw => p_rw,
-		p_spalte => p_spalte,
+		-- history
 		p_rget => p_rget,
 		p_rdone => p_rdone,
 		p_read => p_read,
@@ -39,32 +31,11 @@ begin
 		p_wdone => p_wdone,
 		p_write => p_write,
 		p_finished => p_finished,
-		-- ALU
-		opcode => opcode,
-		op1 => op1,
-		op2 => op2,
-		op3 => op3,
-		do_calc => do_calc,
-		calc_done => calc_done,
-		-- TODO: calc_error : in std_logic;
 		-- Scanner
 		do_it => do_it,
 		finished => finished
 	);
 
-	instalu : entity work.alu(beh)
-	port map
-	(
-		sys_clk => sys_clk,
-		sys_res_n => sys_res_n,
-		do_calc => do_calc,
-		calc_done => calc_done,
-		op1 => op1,
-		op2 => op2,
-		op3 => op3,
-		opcode => opcode
-	);
-
 	process
 	begin
 		sys_clk <= '0';
@@ -103,12 +74,12 @@ begin
 
 		i := 1;
 		f_loop : while not endfile(f) loop
-			realresult := (71 => character'val(0), others => character'val(32));
+			realresult := (HSPALTE_MAX+1 => nul, others => ' ');
 
 			f1_loop : while not endfile(f) loop
 				readline (f, l);
-				input := (others => character'val(0));
-				if (l'length <= 72) then
+				input := (others => nul);
+				if (l'length <= HSPALTE_MAX+1) then
 					input(1 to l'length) := l.all;
 					if (input(1) = '#') then
 						next f1_loop;
@@ -123,8 +94,8 @@ begin
 
 			f2_loop : while not endfile(f) loop
 				readline (f, l);
-				expectedresult := (others => character'val(0));
-				if (l'length <= 72) then
+				expectedresult := (others => nul);
+				if (l'length <= HSPALTE_MAX+1) then
 					expectedresult(1 to l'length) := l.all;
 					if (expectedresult(1) = '#') then
 						next f2_loop;
@@ -140,10 +111,10 @@ begin
 
 			-- ergebnis string richtig formatieren
 			hstrtmp := expectedresult;
-			expectedresult := (71 => character'val(0), others => character'val(32));
-			for x in 1 to 70 loop
-				if hstrtmp(x) /= character'val(0) then
-					expectedresult((70-y) + x) := hstrtmp(x);
+			expectedresult := (HSPALTE_MAX+1 => nul, others => ' ');
+			for x in 1 to HSPALTE_MAX loop
+				if hstrtmp(x) /= nul then
+					expectedresult((HSPALTE_MAX-y) + x) := hstrtmp(x);
 				end if;
 			end loop;
 
@@ -155,7 +126,7 @@ begin
 			icwait(sys_clk, 5);
 			do_it <= '1';
 			run_tc := true;
-			j := 1; k := 70;
+			j := 1; k := HSPALTE_MAX;
 
 			while run_tc loop
 				wait on p_rget, p_wtake, p_finished, finished;