From 8b55fc4d9e2acbedcdde0e143744b5847dabee6e Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 25 Sep 2019 11:28:20 +1000 Subject: [PATCH] Reformat fetch2 Signed-off-by: Benjamin Herrenschmidt --- fetch2.vhdl | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/fetch2.vhdl b/fetch2.vhdl index 9573761..2b34836 100644 --- a/fetch2.vhdl +++ b/fetch2.vhdl @@ -7,60 +7,60 @@ use work.common.all; use work.wishbone_types.all; entity fetch2 is - port( - clk : in std_ulogic; - rst : in std_ulogic; + port( + clk : in std_ulogic; + rst : in std_ulogic; - stall_in : in std_ulogic; - stall_out : out std_ulogic; + stall_in : in std_ulogic; + stall_out : out std_ulogic; - flush_in : in std_ulogic; - stop_in : in std_ulogic; + flush_in : in std_ulogic; + stop_in : in std_ulogic; - i_in : in IcacheToFetch2Type; - i_out : out Fetch2ToIcacheType; + i_in : in IcacheToFetch2Type; + i_out : out Fetch2ToIcacheType; - f_in : in Fetch1ToFetch2Type; + f_in : in Fetch1ToFetch2Type; - f_out : out Fetch2ToDecode1Type + f_out : out Fetch2ToDecode1Type ); end entity fetch2; architecture behaviour of fetch2 is - signal r, rin : Fetch2ToDecode1Type; + signal r, rin : Fetch2ToDecode1Type; begin - regs : process(clk) - begin - if rising_edge(clk) then - -- Output state remains unchanged on stall, unless we are flushing - if rst = '1' or flush_in = '1' or stall_in = '0' then - r <= rin; - end if; - end if; - end process; + regs : process(clk) + begin + if rising_edge(clk) then + -- Output state remains unchanged on stall, unless we are flushing + if rst = '1' or flush_in = '1' or stall_in = '0' then + r <= rin; + end if; + end if; + end process; - comb : process(all) - variable v : Fetch2ToDecode1Type; - begin - v := r; + comb : process(all) + variable v : Fetch2ToDecode1Type; + begin + v := r; - -- asynchronous icache lookup - i_out.req <= '1'; - i_out.addr <= f_in.nia; - v.valid := i_in.ack; - v.nia := f_in.nia; - v.insn := i_in.insn; - stall_out <= stop_in or not i_in.ack; + -- asynchronous icache lookup + i_out.req <= '1'; + i_out.addr <= f_in.nia; + v.valid := i_in.ack; + v.nia := f_in.nia; + v.insn := i_in.insn; + stall_out <= stop_in or not i_in.ack; - if flush_in = '1' or stop_in = '1' then - v.valid := '0'; - end if; - v.stop_mark := stop_in; + if flush_in = '1' or stop_in = '1' then + v.valid := '0'; + end if; + v.stop_mark := stop_in; - -- Update registers - rin <= v; + -- Update registers + rin <= v; - -- Update outputs - f_out <= r; - end process; + -- Update outputs + f_out <= r; + end process; end architecture behaviour; -- 2.30.2