From 54fa97814d58f282e2897f8d8a253bcebd52c8ba Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 15 Nov 2022 16:31:56 -0600 Subject: Mpve combinational logic out of arm810.sv --- rtl/core/arm810.sv | 1 - rtl/core/fetch/fetch.sv | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'rtl') diff --git a/rtl/core/arm810.sv b/rtl/core/arm810.sv index 2600e51..eb5ebe1 100644 --- a/rtl/core/arm810.sv +++ b/rtl/core/arm810.sv @@ -28,7 +28,6 @@ module arm810 .addr(insn_addr), .insn(fetch_insn), .fetch(insn_start), - .branch(explicit_branch || wr_pc), .fetched(insn_ready), .insn_pc(fetch_insn_pc), .fetch_data(insn_data_rd), diff --git a/rtl/core/fetch/fetch.sv b/rtl/core/fetch/fetch.sv index 63cb936..acc8e9d 100644 --- a/rtl/core/fetch/fetch.sv +++ b/rtl/core/fetch/fetch.sv @@ -6,8 +6,8 @@ module core_fetch input logic clk, rst_n, stall, - branch, fetched, + explicit_branch, wr_pc, prefetch_flush, input ptr branch_target, @@ -23,10 +23,11 @@ module core_fetch ); ptr next_pc, hold_addr, target; - logic prefetch_ready, fetched_valid, discard, pending, next_pending; + logic branch, prefetch_ready, fetched_valid, discard, pending, next_pending; assign fetch = prefetch_ready && !discard; assign flush = branch || prefetch_flush; + assign branch = explicit_branch || wr_pc; assign target = wr_pc ? wr_current[31:2] : branch_target; //TODO: alignment exception assign next_pending = fetch || (pending && !fetched); assign fetched_valid = fetched && !discard; -- cgit v1.2.3