Merge branch 'master' into compressed

Conflicts:
	picorv32.v

1 files changed, 2 insertions, 1 deletions

diff --git a/picorv32.v b/picorv32.v
index 5e9d539..8a6dbbb 100644
--- a/picorv32.v
+++ b/picorv32.v
@@ -353,7 +353,7 @@ module picorv32 #(
 			0: begin
 				mem_addr <= mem_la_addr;
 				mem_wdata <= mem_la_wdata;
-				mem_wstrb <= mem_la_wstrb;
+				mem_wstrb <= mem_la_wstrb & {4{mem_la_write}};
 				if (mem_do_prefetch || mem_do_rinst) begin
 					current_insn_addr <= next_pc;
 				end
@@ -945,6 +945,7 @@ module picorv32 #(
 			latched_is_lh <= 0;
 			latched_is_lb <= 0;
 			pcpi_valid <= 0;
+			pcpi_timeout <= 0;
 			irq_active <= 0;
 			irq_mask <= ~0;
 			next_irq_pending = 0;