From 9ace1577e33842f2622d865f14c815d1b87f1a26 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 23 Nov 2018 10:31:26 +0000 Subject: [PATCH] remove sync set output_state --- cpu_fetch_stage.py | 1 - cpudefs.py | 45 +++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cpu_fetch_stage.py b/cpu_fetch_stage.py index 7c699bd..820591e 100644 --- a/cpu_fetch_stage.py +++ b/cpu_fetch_stage.py @@ -67,7 +67,6 @@ class CPUFetchStage(Module): delayed_instruction_valid = Signal(reset=0) self.sync += delayed_instruction.eq(self.output_instruction) - self.sync += self.output_state.eq(fetch_output_state_empty) self.comb += If(delayed_instruction_valid, self.output_instruction.eq(delayed_instruction) diff --git a/cpudefs.py b/cpudefs.py index 9877e36..9a58cff 100644 --- a/cpudefs.py +++ b/cpudefs.py @@ -23,34 +23,35 @@ */ """ +from migen import Constant fetch_action = 3 -fetch_action_default = 0x0 -fetch_action_fence = 0x1 -fetch_action_jump = 0x2 -fetch_action_wait = 0x3 -fetch_action_error_trap = 0x4 -fetch_action_noerror_trap = 0x5 -fetch_action_ack_trap = 0x6 +fetch_action_default = Constant(0x0, fetch_action) +fetch_action_fence = Constant(0x1, fetch_action) +fetch_action_jump = Constant(0x2, fetch_action) +fetch_action_wait = Constant(0x3, fetch_action) +fetch_action_error_trap = Constant(0x4, fetch_action) +fetch_action_noerror_trap = Constant(0x5, fetch_action) +fetch_action_ack_trap = Constant(0x6, fetch_action) fetch_output_state = 2 -fetch_output_state_empty = 0x0 -fetch_output_state_valid = 0x1 -fetch_output_state_trap = 0x2 +fetch_output_state_empty = Constant(0x0, fetch_output_state) +fetch_output_state_valid = Constant(0x1, fetch_output_state) +fetch_output_state_trap = Constant(0x2, fetch_output_state) decode_action = 12 -decode_action_trap_illegal_instruction = 0x1 -decode_action_load = 0x2 -decode_action_fence = 0x4 -decode_action_fence_i = 0x8 -decode_action_op_op_imm = 0x10 -decode_action_lui_auipc = 0x20 -decode_action_store = 0x40 -decode_action_branch = 0x80 -decode_action_jalr = 0x100 -decode_action_jal = 0x200 -decode_action_trap_ecall_ebreak = 0x400 -decode_action_csr = 0x800 +decode_action_trap_illegal_instruction = Constant(0x1, decode_action) +decode_action_load = Constant(0x2, decode_action) +decode_action_fence = Constant(0x4, decode_action) +decode_action_fence_i = Constant(0x8, decode_action) +decode_action_op_op_imm = Constant(0x10, decode_action) +decode_action_lui_auipc = Constant(0x20, decode_action) +decode_action_store = Constant(0x40, decode_action) +decode_action_branch = Constant(0x80, decode_action) +decode_action_jalr = Constant(0x100, decode_action) +decode_action_jal = Constant(0x200, decode_action) +decode_action_trap_ecall_ebreak = Constant(0x400, decode_action) +decode_action_csr = Constant(0x800, decode_action) -- 2.30.2