Merge pull request #257 from antonblanchard/nofpu-fix

Fully initialize FPU buses when FPU is disabled
cache-tlb-parameters-2
Paul Mackerras 4 years ago committed by GitHub
commit f4831507b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -471,6 +471,7 @@ package common is
interrupt : std_ulogic; interrupt : std_ulogic;
illegal : std_ulogic; illegal : std_ulogic;
end record; end record;
constant FPUToExecute1Init : FPUToExecute1Type := (others => '0');


type FPUToWritebackType is record type FPUToWritebackType is record
valid : std_ulogic; valid : std_ulogic;
@ -481,6 +482,7 @@ package common is
write_cr_mask : std_ulogic_vector(7 downto 0); write_cr_mask : std_ulogic_vector(7 downto 0);
write_cr_data : std_ulogic_vector(31 downto 0); write_cr_data : std_ulogic_vector(31 downto 0);
end record; end record;
constant FPUToWritebackInit : FPUToWritebackType := (valid => '0', write_enable => '0', write_cr_enable => '0', others => (others => '0'));


type DividerToExecute1Type is record type DividerToExecute1Type is record
valid: std_ulogic; valid: std_ulogic;

@ -350,13 +350,8 @@ begin


no_fpu: if not HAS_FPU generate no_fpu: if not HAS_FPU generate
begin begin
fpu_to_execute1.busy <= '0'; fpu_to_execute1 <= FPUToExecute1Init;
fpu_to_execute1.exception <= '0'; fpu_to_writeback <= FPUToWritebackInit;
fpu_to_execute1.interrupt <= '0';
fpu_to_execute1.illegal <= '0';
fpu_to_writeback.valid <= '0';
fpu_to_writeback.write_enable <= '0';
fpu_to_writeback.write_cr_enable <= '0';
end generate; end generate;


loadstore1_0: entity work.loadstore1 loadstore1_0: entity work.loadstore1

Loading…
Cancel
Save