From 03659d9195689b0f7655d852922a0b6be063c78f Mon Sep 17 00:00:00 2001
From: Risto Pejasinovic <risto.pejasinovic@gmail.com>
Date: Sat, 29 Apr 2023 18:26:57 +0200
Subject: [PATCH] store strobed data and the strobe in wbuf_storage

---
 src/peakrdl_regblock/write_buffering/template.sv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/peakrdl_regblock/write_buffering/template.sv b/src/peakrdl_regblock/write_buffering/template.sv
index b2d01cd..9235642 100644
--- a/src/peakrdl_regblock/write_buffering/template.sv
+++ b/src/peakrdl_regblock/write_buffering/template.sv
@@ -14,8 +14,8 @@ always_ff {{get_always_ff_event(cpuif.reset)}} begin
             {{wbuf_prefix}}.data{{segment.bslice}} <= decoded_wr_data_bswap;
             {{wbuf_prefix}}.biten{{segment.bslice}} <= decoded_wr_biten_bswap;
             {%- else %}
-            {{wbuf_prefix}}.data{{segment.bslice}} <= decoded_wr_data;
-            {{wbuf_prefix}}.biten{{segment.bslice}} <= decoded_wr_biten;
+            {{wbuf_prefix}}.data{{segment.bslice}} <= ({{wbuf_prefix}}.data{{segment.bslice}} & ~decoded_wr_biten{{segment.bslice}}) | (decoded_wr_data{{segment.bslice}} & decoded_wr_biten{{segment.bslice}});
+            {{wbuf_prefix}}.biten{{segment.bslice}} <= decoded_wr_biten | {{wbuf_prefix}}.biten{{segment.bslice}};
             {%- endif %}
         end
         {%- endfor %}