From a14881a1f15e88a73cb0914b619d6503fc995e8b Mon Sep 17 00:00:00 2001 From: Nikolaj Date: Wed, 22 Dec 2021 14:58:29 +0100 Subject: [PATCH] small change --- A5/main.c | 2 +- A5/sim | Bin 63912 -> 63904 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/A5/main.c b/A5/main.c index 5da946f..1c6eaae 100644 --- a/A5/main.c +++ b/A5/main.c @@ -156,7 +156,7 @@ int main(int argc, char* argv[]) { // unimplemented control signals: bool is_load = (is_mem_access && !pick_one(3,minor_op)); bool is_store = (is_mem_access && pick_one(3,minor_op)); - bool is_conditional = (is_cflow || is_imm_cbranch) && !(is(0xE, minor_op) || is(0xF, minor_op)); + bool is_conditional = ((is_cflow && !(is(0xE, minor_op) || is(0xF, minor_op))) || is_imm_cbranch); // setting up operand fetch and register read and write for the datapath: bool use_imm = is_imm_movq | is_imm_arithmetic | is_imm_cbranch; diff --git a/A5/sim b/A5/sim index c1bbf2906b2e1d4d031a086f3881b6bd119c7df2..25117d59d15e3fb1a39a3563f9486e3b2111aa89 100755 GIT binary patch delta 3894 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 EA7WCH5&!@I delta 3888 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 Gs{a9#vR&o?