X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=a5634b30e5d6f93fd0495ae26e9e56dc5325e716;hp=e56a8371093555ef66b5d3804c8c8f4fdf284d0c;hb=c28fa62bc89656ba3b1b01011a45e941d6c7d42a;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index e56a8371..a5634b30 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -47,7 +47,7 @@ const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSegment::MipMapDataUnit = 64*1024;	// bytes
 
 LogicSegment::LogicSegment(shared_ptr<Logic> logic, uint64_t samplerate,
-                             const uint64_t expected_num_samples) :
+				const uint64_t expected_num_samples) :
 	Segment(samplerate, logic->unit_size()),
 	last_append_sample_(0)
 {
@@ -71,7 +71,7 @@ uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
 	return *(uint64_t*)ptr;
 #else
 	uint64_t value = 0;
-	switch(unit_size_) {
+	switch (unit_size_) {
 	default:
 		value |= ((uint64_t)ptr[7]) << 56;
 		/* FALLTHRU */
@@ -108,7 +108,7 @@ void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
 #ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
 	*(uint64_t*)ptr = value;
 #else
-	switch(unit_size_) {
+	switch (unit_size_) {
 	default:
 		ptr[7] = value >> 56;
 		/* FALLTHRU */
@@ -173,8 +173,7 @@ void LogicSegment::reallocate_mipmap_level(MipMapLevel &m)
 {
 	const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
 		MipMapDataUnit) * MipMapDataUnit;
-	if (new_data_length > m.data_length)
-	{
+	if (new_data_length > m.data_length) {
 		m.data_length = new_data_length;
 
 		// Padding is added to allow for the uint64_t write word
@@ -208,14 +207,12 @@ void LogicSegment::append_payload_to_mipmap()
 	const uint8_t *const end_src_ptr = (uint8_t*)data_.data() +
 		m0.length * unit_size_ * MipMapScaleFactor;
 	for (src_ptr = (uint8_t*)data_.data() +
-		prev_length * unit_size_ * MipMapScaleFactor;
-		src_ptr < end_src_ptr;)
-	{
+			prev_length * unit_size_ * MipMapScaleFactor;
+			src_ptr < end_src_ptr;) {
 		// Accumulate transitions which have occurred in this sample
 		accumulator = 0;
 		diff_counter = MipMapScaleFactor;
-		while (diff_counter-- > 0)
-		{
+		while (diff_counter-- > 0) {
 			const uint64_t sample = unpack_sample(src_ptr);
 			accumulator |= last_append_sample_ ^ sample;
 			last_append_sample_ = sample;
@@ -227,8 +224,7 @@ void LogicSegment::append_payload_to_mipmap()
 	}
 
 	// Compute higher level mipmaps
-	for (unsigned int level = 1; level < ScaleStepCount; level++)
-	{
+	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		MipMapLevel &m = mip_map_[level];
 		const MipMapLevel &ml = mip_map_[level-1];
 
@@ -248,14 +244,12 @@ void LogicSegment::append_payload_to_mipmap()
 		const uint8_t *const end_dest_ptr =
 			(uint8_t*)m.data + unit_size_ * m.length;
 		for (dest_ptr = (uint8_t*)m.data +
-			unit_size_ * prev_length;
-			dest_ptr < end_dest_ptr;
-			dest_ptr += unit_size_)
-		{
+				unit_size_ * prev_length;
+				dest_ptr < end_dest_ptr;
+				dest_ptr += unit_size_) {
 			accumulator = 0;
 			diff_counter = MipMapScaleFactor;
-			while (diff_counter-- > 0)
-			{
+			while (diff_counter-- > 0) {
 				accumulator |= unpack_sample(src_ptr);
 				src_ptr += unit_size_;
 			}
@@ -299,26 +293,23 @@ void LogicSegment::get_subsampled_edges(
 	last_sample = (get_sample(start) & sig_mask) != 0;
 	edges.push_back(pair<int64_t, bool>(index++, last_sample));
 
-	while (index + block_length <= end)
-	{
+	while (index + block_length <= end) {
 		//----- Continue to search -----//
 		level = min_level;
 
 		// We cannot fast-forward if there is no mip-map data at
 		// at the minimum level.
-		fast_forward = (mip_map_[level].data != NULL);
+		fast_forward = (mip_map_[level].data != nullptr);
 
-		if (min_length < MipMapScaleFactor)
-		{
+		if (min_length < MipMapScaleFactor) {
 			// Search individual samples up to the beginning of
 			// the next first level mip map block
 			const uint64_t final_index = min(end,
 				pow2_ceil(index, MipMapScalePower));
 
 			for (; index < final_index &&
-				(index & ~(~0 << MipMapScalePower)) != 0;
-				index++)
-			{
+					(index & ~((uint64_t)(~0) << MipMapScalePower)) != 0;
+					index++) {
 				const bool sample =
 					(get_sample(index) & sig_mask) != 0;
 
@@ -328,9 +319,7 @@ void LogicSegment::get_subsampled_edges(
 					break;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// If resolution is less than a mip map block,
 			// round up to the beginning of the mip-map block
 			// for this level of detail
@@ -369,7 +358,7 @@ void LogicSegment::get_subsampled_edges(
 						sig_mask))
 					break;
 
-				if ((offset & ~(~0 << MipMapScalePower)) == 0) {
+				if ((offset & ~((uint64_t)(~0) << MipMapScalePower)) == 0) {
 					// If we are now at the beginning of a
 					// higher level mip-map block ascend one
 					// level
@@ -399,7 +388,7 @@ void LogicSegment::get_subsampled_edges(
 				// Check if we reached the last block at this
 				// level, or if there was a change in this block
 				if (offset >= mip_map_[level].length ||
-					(get_subsample(level, offset) &
+						(get_subsample(level, offset) &
 						sig_mask)) {
 					// Zoom in unless we reached the minimum
 					// zoom