decode: Fix mixup of bytes vs samples

[pulseview.git] / pv / data / logicsnapshot.cpp

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index f203e8b674fb57fb37c556edc593c5e1798873a8..797a00bc54789f2cd4de2f7067448cf98aec0b96 100644 (file)
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -27,6 +27,7 @@
 
 #include <boost/foreach.hpp>
 
+#include "config.h"
 #include "logicsnapshot.h"
 
 using boost::lock_guard;
@@ -43,10 +44,13 @@ const int LogicSnapshot::MipMapScaleFactor = 1 << MipMapScalePower;
 const float LogicSnapshot::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSnapshot::MipMapDataUnit = 64*1024;        // bytes
 
-LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic) :
+LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic,
+                             const uint64_t expected_num_samples) :
        Snapshot(logic.unitsize),
        _last_append_sample(0)
 {
+       set_capacity(expected_num_samples);
+
        lock_guard<recursive_mutex> lock(_mutex);
        memset(_mip_map, 0, sizeof(_mip_map));
        append_payload(logic);
@@ -59,6 +63,80 @@ LogicSnapshot::~LogicSnapshot()
                free(l.data);
 }
 
+uint64_t LogicSnapshot::unpack_sample(const uint8_t *ptr) const
+{
+#ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
+       return *(uint64_t*)ptr;
+#else
+       uint64_t value = 0;
+       switch(_unit_size) {
+       default:
+               value |= ((uint64_t)ptr[7]) << 56;
+               /* FALLTHRU */
+       case 7:
+               value |= ((uint64_t)ptr[6]) << 48;
+               /* FALLTHRU */
+       case 6:
+               value |= ((uint64_t)ptr[5]) << 40;
+               /* FALLTHRU */
+       case 5:
+               value |= ((uint64_t)ptr[4]) << 32;
+               /* FALLTHRU */
+       case 4:
+               value |= ((uint32_t)ptr[3]) << 24;
+               /* FALLTHRU */
+       case 3:
+               value |= ((uint32_t)ptr[2]) << 16;
+               /* FALLTHRU */
+       case 2:
+               value |= ptr[1] << 8;
+               /* FALLTHRU */
+       case 1:
+               value |= ptr[0];
+               /* FALLTHRU */
+       case 0:
+               break;
+       }
+       return value;
+#endif
+}
+
+void LogicSnapshot::pack_sample(uint8_t *ptr, uint64_t value)
+{
+#ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
+       *(uint64_t*)ptr = value;
+#else
+       switch(_unit_size) {
+       default:
+               ptr[7] = value >> 56;
+               /* FALLTHRU */
+       case 7:
+               ptr[6] = value >> 48;
+               /* FALLTHRU */
+       case 6:
+               ptr[5] = value >> 40;
+               /* FALLTHRU */
+       case 5:
+               ptr[4] = value >> 32;
+               /* FALLTHRU */
+       case 4:
+               ptr[3] = value >> 24;
+               /* FALLTHRU */
+       case 3:
+               ptr[2] = value >> 16;
+               /* FALLTHRU */
+       case 2:
+               ptr[1] = value >> 8;
+               /* FALLTHRU */
+       case 1:
+               ptr[0] = value;
+               /* FALLTHRU */
+       case 0:
+               break;
+       }
+#endif
+}
+
 void LogicSnapshot::append_payload(
        const sr_datafeed_logic &logic)
 {
@@ -86,7 +164,7 @@ void LogicSnapshot::get_samples(uint8_t *const data,
        lock_guard<recursive_mutex> lock(_mutex);
 
        const size_t size = (end_sample - start_sample) * _unit_size;
-       memcpy(data, (const uint8_t*)_data + start_sample, size);
+       memcpy(data, (const uint8_t*)_data + start_sample * _unit_size, size);
 }
 
 void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m)
@@ -136,13 +214,13 @@ void LogicSnapshot::append_payload_to_mipmap()
                diff_counter = MipMapScaleFactor;
                while (diff_counter-- > 0)
                {
-                       const uint64_t sample = *(uint64_t*)src_ptr;
+                       const uint64_t sample = unpack_sample(src_ptr);
                        accumulator |= _last_append_sample ^ sample;
                        _last_append_sample = sample;
                        src_ptr += _unit_size;
                }
 
-               *(uint64_t*)dest_ptr = accumulator;
+               pack_sample(dest_ptr, accumulator);
                dest_ptr += _unit_size;
        }
 
@@ -176,11 +254,11 @@ void LogicSnapshot::append_payload_to_mipmap()
                        diff_counter = MipMapScaleFactor;
                        while (diff_counter-- > 0)
                        {
-                               accumulator |= *(uint64_t*)src_ptr;
+                               accumulator |= unpack_sample(src_ptr);
                                src_ptr += _unit_size;
                        }
 
-                       *(uint64_t*)dest_ptr = accumulator;
+                       pack_sample(dest_ptr, accumulator);
                }
        }
 }
@@ -190,7 +268,7 @@ uint64_t LogicSnapshot::get_sample(uint64_t index) const
        assert(_data);
        assert(index < _sample_count);
 
-       return *(uint64_t*)((uint8_t*)_data + index * _unit_size);
+       return unpack_sample((uint8_t*)_data + index * _unit_size);
 }
 
 void LogicSnapshot::get_subsampled_edges(
@@ -376,7 +454,7 @@ uint64_t LogicSnapshot::get_subsample(int level, uint64_t offset) const
 {
        assert(level >= 0);
        assert(_mip_map[level].data);
-       return *(uint64_t*)((uint8_t*)_mip_map[level].data +
+       return unpack_sample((uint8_t*)_mip_map[level].data +
                _unit_size * offset);
 }