Merge branch 'master' of iis-git.ee.ethz.ch:kerbin/ariane

This commit is contained in:
Florian Zaruba 2017-07-15 11:49:53 +02:00
commit 8394046c28
2 changed files with 3 additions and 1 deletions

View file

@ -21,9 +21,11 @@ import ariane_pkg::*;
`ifndef verilator
`ifndef SYNTHESIS
import instruction_tracer_pkg::*;
`timescale 1ns / 1ps
`endif
`endif
module ariane
#(
parameter N_EXT_PERF_COUNTERS = 0

View file

@ -55,7 +55,7 @@ module controller (
flush_id_o = 1'b0;
flush_ex_o = 1'b0;
flush_tlb_o = 1'b0;
flush_icache_o = 1'b0;
// ------------
// Mis-predict
// ------------