|
|
|
library ieee;
|
|
|
|
use ieee.std_logic_1164.all;
|
|
|
|
use ieee.numeric_std.all;
|
|
|
|
|
|
|
|
library work;
|
|
|
|
use work.common.all;
|
|
|
|
use work.wishbone_types.all;
|
|
|
|
|
|
|
|
entity fetch2 is
|
|
|
|
port(
|
|
|
|
clk : in std_ulogic;
|
|
|
|
rst : in std_ulogic;
|
|
|
|
|
|
|
|
stall_in : in std_ulogic;
|
|
|
|
flush_in : in std_ulogic;
|
|
|
|
|
|
|
|
-- Results from icache
|
|
|
|
i_in : in IcacheToFetch2Type;
|
|
|
|
|
|
|
|
-- Output to decode
|
|
|
|
f_out : out Fetch2ToDecode1Type
|
|
|
|
);
|
|
|
|
end entity fetch2;
|
|
|
|
|
|
|
|
architecture behaviour of fetch2 is
|
|
|
|
|
|
|
|
-- The icache cannot stall, so we need to stash a cycle
|
|
|
|
-- of output from it when we stall.
|
|
|
|
type reg_internal_type is record
|
|
|
|
stash : IcacheToFetch2Type;
|
|
|
|
stash_valid : std_ulogic;
|
|
|
|
stopped : std_ulogic;
|
|
|
|
end record;
|
|
|
|
|
|
|
|
signal r_int, rin_int : reg_internal_type;
|
|
|
|
signal r, rin : Fetch2ToDecode1Type;
|
|
|
|
|
|
|
|
begin
|
|
|
|
regs : process(clk)
|
|
|
|
begin
|
|
|
|
if rising_edge(clk) then
|
|
|
|
|
|
|
|
if (r /= rin) then
|
|
|
|
report "fetch2 rst:" & std_ulogic'image(rst) &
|
|
|
|
" S:" & std_ulogic'image(stall_in) &
|
|
|
|
" F:" & std_ulogic'image(flush_in) &
|
|
|
|
" T:" & std_ulogic'image(rin.stop_mark) &
|
|
|
|
" V:" & std_ulogic'image(rin.valid) &
|
Add TLB to icache
This adds a direct-mapped TLB to the icache, with 64 entries by default.
Execute1 now sends a "virt_mode" signal from MSR[IR] to fetch1 along
with redirects to indicate whether instruction addresses should be
translated through the TLB, and fetch1 sends that on to icache.
Similarly a "priv_mode" signal is sent to indicate the privilege
mode for instruction fetches. This means that changes to MSR[IR]
or MSR[PR] don't take effect until the next redirect, meaning an
isync, rfid, branch, etc.
The icache uses a hash of the effective address (i.e. next instruction
address) to index the TLB. The hash is an XOR of three fields of the
address; with a 64-entry TLB, the fields are bits 12--17, 18--23 and
24--29 of the address. TLB invalidations simply invalidate the
indexed TLB entry without checking the contents.
If the icache detects a TLB miss with virt_mode=1, it will send a
fetch_failed indication through fetch2 to decode1, which will turn it
into a special OP_FETCH_FAILED opcode with unit=LDST. That will get
sent down to loadstore1 which will currently just raise a Instruction
Storage Interrupt (0x400) exception.
One bit in the PTE obtained from the TLB is used to check whether an
instruction access is allowed -- the privilege bit (bit 3). If bit 3
is 1 and priv_mode=0, then a fetch_failed indication is sent down to
fetch2 and to decode1, which generates an OP_FETCH_FAILED. Any PTEs
with PTE bit 0 (EAA[3]) clear or bit 8 (R) clear should not be put
into the iTLB since such PTEs would not allow execution by any
context.
Tlbie operations get sent from mmu to icache over a new connection.
Unfortunately the privileged instruction tests are broken for now.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
5 years ago
|
|
|
" FF:" & std_ulogic'image(rin.fetch_failed) &
|
|
|
|
" nia:" & to_hstring(rin.nia);
|
|
|
|
end if;
|
|
|
|
|
|
|
|
-- 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;
|
|
|
|
|
|
|
|
-- Internal state is updated on every clock
|
|
|
|
r_int <= rin_int;
|
|
|
|
end if;
|
|
|
|
end process;
|
|
|
|
|
|
|
|
comb : process(all)
|
|
|
|
variable v : Fetch2ToDecode1Type;
|
|
|
|
variable v_int : reg_internal_type;
|
|
|
|
variable v_i_in : IcacheToFetch2Type;
|
|
|
|
begin
|
|
|
|
v := r;
|
|
|
|
v_int := r_int;
|
|
|
|
|
|
|
|
-- If stalling, stash away the current input from the icache
|
|
|
|
if stall_in = '1' and v_int.stash_valid = '0' then
|
|
|
|
v_int.stash := i_in;
|
|
|
|
v_int.stash_valid := '1';
|
|
|
|
end if;
|
|
|
|
|
|
|
|
-- If unstalling, source input from the stash and invalidate it,
|
|
|
|
-- otherwise source normally from the icache.
|
|
|
|
--
|
|
|
|
v_i_in := i_in;
|
|
|
|
if v_int.stash_valid = '1' and stall_in = '0' then
|
|
|
|
v_i_in := v_int.stash;
|
|
|
|
v_int.stash_valid := '0';
|
|
|
|
end if;
|
|
|
|
|
|
|
|
v.valid := v_i_in.valid;
|
|
|
|
v.stop_mark := v_i_in.stop_mark;
|
Add TLB to icache
This adds a direct-mapped TLB to the icache, with 64 entries by default.
Execute1 now sends a "virt_mode" signal from MSR[IR] to fetch1 along
with redirects to indicate whether instruction addresses should be
translated through the TLB, and fetch1 sends that on to icache.
Similarly a "priv_mode" signal is sent to indicate the privilege
mode for instruction fetches. This means that changes to MSR[IR]
or MSR[PR] don't take effect until the next redirect, meaning an
isync, rfid, branch, etc.
The icache uses a hash of the effective address (i.e. next instruction
address) to index the TLB. The hash is an XOR of three fields of the
address; with a 64-entry TLB, the fields are bits 12--17, 18--23 and
24--29 of the address. TLB invalidations simply invalidate the
indexed TLB entry without checking the contents.
If the icache detects a TLB miss with virt_mode=1, it will send a
fetch_failed indication through fetch2 to decode1, which will turn it
into a special OP_FETCH_FAILED opcode with unit=LDST. That will get
sent down to loadstore1 which will currently just raise a Instruction
Storage Interrupt (0x400) exception.
One bit in the PTE obtained from the TLB is used to check whether an
instruction access is allowed -- the privilege bit (bit 3). If bit 3
is 1 and priv_mode=0, then a fetch_failed indication is sent down to
fetch2 and to decode1, which generates an OP_FETCH_FAILED. Any PTEs
with PTE bit 0 (EAA[3]) clear or bit 8 (R) clear should not be put
into the iTLB since such PTEs would not allow execution by any
context.
Tlbie operations get sent from mmu to icache over a new connection.
Unfortunately the privileged instruction tests are broken for now.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
5 years ago
|
|
|
v.fetch_failed := v_i_in.fetch_failed;
|
|
|
|
v.nia := v_i_in.nia;
|
|
|
|
v.insn := v_i_in.insn;
|
|
|
|
|
|
|
|
-- Clear stash internal valid bit on flush. We still mark
|
|
|
|
-- the stash itself as valid since we still want to override
|
|
|
|
-- whatever comes form icache when unstalling, but we'll
|
|
|
|
-- override it with something invalid.
|
|
|
|
--
|
|
|
|
if flush_in = '1' then
|
|
|
|
v_int.stash.valid := '0';
|
Add TLB to icache
This adds a direct-mapped TLB to the icache, with 64 entries by default.
Execute1 now sends a "virt_mode" signal from MSR[IR] to fetch1 along
with redirects to indicate whether instruction addresses should be
translated through the TLB, and fetch1 sends that on to icache.
Similarly a "priv_mode" signal is sent to indicate the privilege
mode for instruction fetches. This means that changes to MSR[IR]
or MSR[PR] don't take effect until the next redirect, meaning an
isync, rfid, branch, etc.
The icache uses a hash of the effective address (i.e. next instruction
address) to index the TLB. The hash is an XOR of three fields of the
address; with a 64-entry TLB, the fields are bits 12--17, 18--23 and
24--29 of the address. TLB invalidations simply invalidate the
indexed TLB entry without checking the contents.
If the icache detects a TLB miss with virt_mode=1, it will send a
fetch_failed indication through fetch2 to decode1, which will turn it
into a special OP_FETCH_FAILED opcode with unit=LDST. That will get
sent down to loadstore1 which will currently just raise a Instruction
Storage Interrupt (0x400) exception.
One bit in the PTE obtained from the TLB is used to check whether an
instruction access is allowed -- the privilege bit (bit 3). If bit 3
is 1 and priv_mode=0, then a fetch_failed indication is sent down to
fetch2 and to decode1, which generates an OP_FETCH_FAILED. Any PTEs
with PTE bit 0 (EAA[3]) clear or bit 8 (R) clear should not be put
into the iTLB since such PTEs would not allow execution by any
context.
Tlbie operations get sent from mmu to icache over a new connection.
Unfortunately the privileged instruction tests are broken for now.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
5 years ago
|
|
|
v_int.stash.fetch_failed := '0';
|
|
|
|
end if;
|
|
|
|
|
|
|
|
-- If we are flushing or the instruction comes with a stop mark
|
|
|
|
-- we tag it as invalid so it doesn't get decoded and executed
|
|
|
|
if flush_in = '1' or v.stop_mark = '1' then
|
|
|
|
v.valid := '0';
|
Add TLB to icache
This adds a direct-mapped TLB to the icache, with 64 entries by default.
Execute1 now sends a "virt_mode" signal from MSR[IR] to fetch1 along
with redirects to indicate whether instruction addresses should be
translated through the TLB, and fetch1 sends that on to icache.
Similarly a "priv_mode" signal is sent to indicate the privilege
mode for instruction fetches. This means that changes to MSR[IR]
or MSR[PR] don't take effect until the next redirect, meaning an
isync, rfid, branch, etc.
The icache uses a hash of the effective address (i.e. next instruction
address) to index the TLB. The hash is an XOR of three fields of the
address; with a 64-entry TLB, the fields are bits 12--17, 18--23 and
24--29 of the address. TLB invalidations simply invalidate the
indexed TLB entry without checking the contents.
If the icache detects a TLB miss with virt_mode=1, it will send a
fetch_failed indication through fetch2 to decode1, which will turn it
into a special OP_FETCH_FAILED opcode with unit=LDST. That will get
sent down to loadstore1 which will currently just raise a Instruction
Storage Interrupt (0x400) exception.
One bit in the PTE obtained from the TLB is used to check whether an
instruction access is allowed -- the privilege bit (bit 3). If bit 3
is 1 and priv_mode=0, then a fetch_failed indication is sent down to
fetch2 and to decode1, which generates an OP_FETCH_FAILED. Any PTEs
with PTE bit 0 (EAA[3]) clear or bit 8 (R) clear should not be put
into the iTLB since such PTEs would not allow execution by any
context.
Tlbie operations get sent from mmu to icache over a new connection.
Unfortunately the privileged instruction tests are broken for now.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
5 years ago
|
|
|
v.fetch_failed := '0';
|
|
|
|
end if;
|
|
|
|
|
|
|
|
-- Clear stash on reset
|
|
|
|
if rst = '1' then
|
|
|
|
v_int.stash_valid := '0';
|
|
|
|
end if;
|
|
|
|
|
|
|
|
-- Update registers
|
|
|
|
rin <= v;
|
|
|
|
rin_int <= v_int;
|
|
|
|
|
|
|
|
-- Update outputs
|
|
|
|
f_out <= r;
|
|
|
|
end process;
|
|
|
|
|
|
|
|
end architecture behaviour;
|