Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2

# Conflicts: # lab2CA.xpr
2019-03-24 16:06:29 -04:00
parent e8ada91e08 eac5d71dd6
commit ace0eca65a
3 changed files with 32 additions and 24 deletions
--- a/lab2CA.srcs/sources_1/new/ControlUnit.v
+++ b/lab2CA.srcs/sources_1/new/ControlUnit.v
@@ -127,7 +127,7 @@ module ControlUnit(
                     js <= 1'b0;
                end
            4'b0110: begin
-                     aluOut <= 4'b0000;
+                     aluOut <= 4'b1010;
                     addi <= 1'b1; // addi
                     RegEn <= 1'b0;
                     FU <= 3'b001; // Disable Branching