Merge branch 'main' of https://github.com/JingJerYen/SystemC-Components

into JingJerYen-main

Author: eyck

src/interfaces/axi/pin/axi4_target.h

@@ -437,10 +437,12 @@ template <typename CFG> inline void axi::pin::axi4_target<CFG>::wdata_t() {
             // TODO: assuming consecutive write (not scattered)
             auto strobe = strb.to_uint();
             if(last) {
-                auto act_data_len = CFG::IS_LITE ? util::bit_count(strobe) : (beat_count + 1) * size;
+                // If it is axi lite, number of strobes define the size, for axi4 aligned accesses, axsize & axburst determine size,
+                // for unaligned accesses strobe count determines size
+                auto act_data_len = CFG::IS_LITE ? util::bit_count(strobe) : offset == 0 ? (beat_count + 1) * size : fsm_hndl->aux.i32.i0;
                 gp->set_data_length(act_data_len);
                 gp->set_streaming_width(act_data_len);
-                if (fsm_hndl->aux.i32.i0 == act_data_len) {
+                if(fsm_hndl->aux.i32.i0 == act_data_len) {
                     gp->set_byte_enable_length(0);
                 } else {
                     gp->set_byte_enable_length(act_data_len);