Fix branching and jump instructions

src/main/scala/components/hazardmemstall.scala

@@ -73,14 +73,6 @@ class HazardUnitMemStall extends Module {
     io.idex_bubble := true.B
   }
 
-  // branch flush
-  when (io.exmem_taken && io.imem_ready && io.dmem_ready) {
-    io.pcwrite := 1.U // use the PC from mem stage
-    io.ifid_flush   := true.B
-    io.idex_bubble  := true.B
-    io.exmem_bubble := true.B
-  }
-
   // imem stall:
   // Freeze the PC to preserve the current PC for the entire stall period,
   // so that on un-stall the next PC points to the next instruction
@@ -100,4 +92,13 @@ class HazardUnitMemStall extends Module {
     io.idex_bubble  := true.B
     io.exmem_bubble := true.B
   }
+
+  // branch flush
+  when (io.exmem_taken) {
+    printf ("Hazard: ex_mem is taken\n")
+    io.pcwrite := 1.U // use the PC from mem stage
+    io.ifid_flush   := true.B
+    io.idex_bubble  := true.B
+    io.exmem_bubble := true.B
+  }
 }