Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Completed loop mode function

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-05-06 15:28:00 +08:00
parent 5c37d9201d
commit 1305114079
3 changed files with 21 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
DSView/pv/data/logicsnapshot.cpp
View File

@ -181,7 +181,6 @@ void LogicSnapshot::first_payload(const sr_datafeed_logic &logic, uint64_t total
_last_sample[i] = *rd_data++; _last_sample[i] = *rd_data++;
_last_calc_count[i] = 0; _last_calc_count[i] = 0;
} }
_wr_num = 0;
append_payload(logic); append_payload(logic);
_last_ended = false; _last_ended = false;
@ -223,9 +222,9 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
_sample_count = _total_sample_count; _sample_count = _total_sample_count;
} }
if (_loop_offset >= LeafBlockSamples){ if (_is_loop && (_loop_offset + samples >= LeafBlockSamples * Scale)){
dsv_info("---------buffer is full."); move_first_node_to_last();
return; _loop_offset -= LeafBlockSamples * Scale;
} }
_ring_sample_count += _loop_offset; _ring_sample_count += _loop_offset;
@ -233,7 +232,6 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
// bit align // bit align
while ((_ch_fraction != 0 || _byte_fraction != 0) && len > 0) while ((_ch_fraction != 0 || _byte_fraction != 0) && len > 0)
{ {
//assert(0);//!!!
if (_dest_ptr == NULL) if (_dest_ptr == NULL)
assert(false); assert(false);
@ -314,22 +312,8 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
uint64_t *write_ptr = (uint64_t*)lbp + offset / Scale; uint64_t *write_ptr = (uint64_t*)lbp + offset / Scale;
while (len >= 8) while (len >= 8)
{ {
if (_is_loop) *write_ptr++ = *read_ptr;
{
if (fill_chan == 0){
*write_ptr++ = 0xfef0f0f0f0f0f0f1;
_wr_num++;
}
else{
*write_ptr++ = 0;
}
}
else{
*write_ptr++ = *read_ptr;
}
//*write_ptr++ = *read_ptr;
read_ptr += _channel_num; read_ptr += _channel_num;
len -= 8; len -= 8;
filled_sample += Scale; filled_sample += Scale;
@ -341,7 +325,6 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
if (filled_sample == LeafBlockSamples) if (filled_sample == LeafBlockSamples)
{ {
// assert(0);//!!!
calc_mipmap(fill_chan, index0, index1, LeafBlockSamples, true); calc_mipmap(fill_chan, index0, index1, LeafBlockSamples, true);
if (fill_chan + 1 == _channel_num) if (fill_chan + 1 == _channel_num)
@ -409,8 +392,7 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
if (align_sample_count > _total_sample_count){ if (align_sample_count > _total_sample_count){
_loop_offset = align_sample_count - _total_sample_count; _loop_offset = align_sample_count - _total_sample_count;
_ring_sample_count = _total_sample_count; _ring_sample_count = _total_sample_count;
dsv_info("---------_loop_offset:%llu", _loop_offset);
} }
_ch_fraction = last_chan; _ch_fraction = last_chan;
@ -430,8 +412,7 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
if (len > 0){ if (len > 0){
uint8_t *src_ptr = (uint8_t*)end_read_ptr - len; uint8_t *src_ptr = (uint8_t*)end_read_ptr - len;
_byte_fraction += len; _byte_fraction += len;
//assert(0);//!!!
while (len > 0){ while (len > 0){
*_dest_ptr++ = *src_ptr++; *_dest_ptr++ = *src_ptr++;
@ -450,7 +431,7 @@ void LogicSnapshot::capture_ended()
_mipmap_sample_count = _ring_sample_count; _mipmap_sample_count = _ring_sample_count;
_ring_sample_count += _loop_offset; _ring_sample_count += _loop_offset;
uint64_t index0 = _ring_sample_count / LeafBlockSamples / RootScale; uint64_t index0 = _ring_sample_count / LeafBlockSamples / RootScale;
uint64_t index1 = (_ring_sample_count / LeafBlockSamples) % RootScale; uint64_t index1 = (_ring_sample_count / LeafBlockSamples) % RootScale;
uint64_t offset = (_ring_sample_count % LeafBlockSamples) / 8; uint64_t offset = (_ring_sample_count % LeafBlockSamples) / 8;
@ -557,11 +538,6 @@ void LogicSnapshot::calc_mipmap(unsigned int order, uint8_t index0, uint8_t inde
if (*((uint64_t*)level3_ptr) != 0){ if (*((uint64_t*)level3_ptr) != 0){
_ch_data[order][index0].tog |= 1ULL << index1; _ch_data[order][index0].tog |= 1ULL << index1;
/*
if (order == 0){
dsv_info("tog:%llu,index0:%d,index1:%d, offset:%llu",
_ch_data[order][index0].tog , index0, index1, _loop_offset);
}*/
} }
else if (isEnd){ else if (isEnd){
free(_ch_data[order][index0].lbp[index1]); free(_ch_data[order][index0].lbp[index1]);
@ -702,21 +678,21 @@ bool LogicSnapshot::get_display_edges(std::vector<std::pair<bool, bool> > &edges
assert(start <= end); assert(start <= end);
assert(min_length > 0); assert(min_length > 0);
start += _loop_offset; // start += _loop_offset;
end += _loop_offset; // end += _loop_offset;
_ring_sample_count += _loop_offset; // _ring_sample_count += _loop_offset;
uint64_t index = start; uint64_t index = start;
bool last_sample; bool last_sample;
bool start_sample; bool start_sample;
// Get the initial state // Get the initial state
start_sample = last_sample = get_sample_self(index++, sig_index); start_sample = last_sample = get_sample(index++, sig_index);
togs.push_back(pair<uint16_t, bool>(0, last_sample)); togs.push_back(pair<uint16_t, bool>(0, last_sample));
while(edges.size() < width) { while(edges.size() < width) {
// search next edge // search next edge
bool has_edge = get_nxt_edge_self(index, last_sample, end, 0, sig_index); bool has_edge = get_nxt_edge(index, last_sample, end, 0, sig_index);
// calc the edge position // calc the edge position
int64_t gap = (index / min_length) - pixels_offset; int64_t gap = (index / min_length) - pixels_offset;
@ -727,9 +703,9 @@ bool LogicSnapshot::get_display_edges(std::vector<std::pair<bool, bool> > &edges
} }
if (index > end) if (index > end)
last_sample = get_sample_self(end, sig_index); last_sample = get_sample(end, sig_index);
else else
last_sample = get_sample_self(index - 1, sig_index); last_sample = get_sample(index - 1, sig_index);
if (has_edge) { if (has_edge) {
edges.push_back(pair<bool, bool>(true, last_sample)); edges.push_back(pair<bool, bool>(true, last_sample));
@ -742,11 +718,11 @@ bool LogicSnapshot::get_display_edges(std::vector<std::pair<bool, bool> > &edges
} }
if (togs.size() < max_togs) { if (togs.size() < max_togs) {
last_sample = get_sample_self(end, sig_index); last_sample = get_sample(end, sig_index);
togs.push_back(pair<uint16_t, bool>(edges.size() - 1, last_sample)); togs.push_back(pair<uint16_t, bool>(edges.size() - 1, last_sample));
} }
_ring_sample_count -= _loop_offset; // _ring_sample_count -= _loop_offset;
return start_sample; return start_sample;
} }

1
DSView/pv/data/logicsnapshot.h
View File

@ -218,7 +218,6 @@ private:
uint64_t _mipmap_sample_count; uint64_t _mipmap_sample_count;
bool _is_loop; bool _is_loop;
uint64_t _loop_offset; uint64_t _loop_offset;
uint64_t _wr_num;
friend class LogicSnapshotTest::Pow2; friend class LogicSnapshotTest::Pow2;
friend class LogicSnapshotTest::Basic; friend class LogicSnapshotTest::Basic;

8
DSView/pv/toolbars/samplingbar.cpp
View File

@ -1067,8 +1067,8 @@ namespace pv
_session->set_operation_mode(OPT_SINGLE); _session->set_operation_mode(OPT_SINGLE);
} }
// if (_device_agent->is_stream_mode() || _device_agent->is_demo()) if (_device_agent->is_stream_mode() || _device_agent->is_demo())
// _action_loop->setVisible(true); _action_loop->setVisible(true);
} }
_run_stop_action->setVisible(true); _run_stop_action->setVisible(true);
_instant_action->setVisible(true); _instant_action->setVisible(true);
@ -1222,8 +1222,8 @@ namespace pv
} }
if (_device_agent->have_instance()){ if (_device_agent->have_instance()){
// if (_device_agent->is_stream_mode() || _device_agent->is_demo()) if (_device_agent->is_stream_mode() || _device_agent->is_demo())
// _action_loop->setVisible(true); _action_loop->setVisible(true);
} }
} }