From 9b8a903378197c8ca831ca1d6edc6bf770d231db Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Thu, 9 Apr 2020 14:56:40 +0100 Subject: [PATCH] FLXRHMH5-42 - Fixed bug with CPU set vector --- .../16/src/generic_sequencer_16.vhd | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/generic_ip/generic_sequencer/16/src/generic_sequencer_16.vhd b/generic_ip/generic_sequencer/16/src/generic_sequencer_16.vhd index 528fb83..6e9a03f 100644 --- a/generic_ip/generic_sequencer/16/src/generic_sequencer_16.vhd +++ b/generic_ip/generic_sequencer/16/src/generic_sequencer_16.vhd @@ -6,7 +6,7 @@ -- Author : Robbie Temple (original) -- Company : Global Inkjet Systems -- Created : 2016-05-12 --- Last update: 2020-02-20 +-- Last update: 2020-04-09 -- SVN ID : Git -- Standard : VHDL'2008 ------------------------------------------------------------------------------- @@ -556,22 +556,18 @@ begin vector_out_i <= (others => '0'); elsif (ld_vec = '1') then vector_out_i <= operand_comp(VECTOR_WIDTH - 1 downto 0); - elsif(VECT_RAMP_EN = true) then - if(ld_ramp = '1') then - if(ramp_up = '1' and ramp_next(ramp_next'high) = '0' and vector_out_i(ramp_next'high) = '1') then - vector_out_i(RAMP_WIDTH-1 downto 0) <= (others => '1'); - elsif(ramp_up = '0' and ramp_next(ramp_next'high) = '1' and vector_out_i(ramp_next'high) = '0') then - vector_out_i(RAMP_WIDTH-1 downto 0) <= (others => '0'); - elsif(ramp_to_val = '1' and ramp_done = '1') then - vector_out_i(RAMP_WIDTH-1 downto 0) <= ramp_final; - else - vector_out_i(RAMP_WIDTH-1 downto 0) <= ramp_next; - end if; - end if; - elsif (VECT_CPU_EN = true) then - if(vector_val_cpu = '1') then - vector_out_i <= vector_cpu; - end if; + elsif(VECT_RAMP_EN = true and ld_ramp = '1') then + if(ramp_up = '1' and ramp_next(ramp_next'high) = '0' and vector_out_i(ramp_next'high) = '1') then + vector_out_i(RAMP_WIDTH-1 downto 0) <= (others => '1'); + elsif(ramp_up = '0' and ramp_next(ramp_next'high) = '1' and vector_out_i(ramp_next'high) = '0') then + vector_out_i(RAMP_WIDTH-1 downto 0) <= (others => '0'); + elsif(ramp_to_val = '1' and ramp_done = '1') then + vector_out_i(RAMP_WIDTH-1 downto 0) <= ramp_final; + else + vector_out_i(RAMP_WIDTH-1 downto 0) <= ramp_next; + end if; + elsif (VECT_CPU_EN = true and vector_val_cpu = '1') then + vector_out_i <= vector_cpu; end if; if(VECT_RAMP_EN = true and decode = '1') then if(opcode = CMD_VEC_RAMP) then