feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Re-fix QCbor dumper with Qt6

Browse Source 
Change-Id: Icb2372fc9465b752a6709bf1d422ee3b1d79b2d6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2020-12-04 16:58:11 +01:00
parent 6187998090
commit 8044e7c505
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
share/qtcreator/debugger/qttypes.py
View File

@@ -3246,12 +3246,13 @@ def qdump__qfloat16(d, value):
def qdumpHelper_QCbor_string(d, container_ptr, element_index, is_bytes): def qdumpHelper_QCbor_string(d, container_ptr, element_index, is_bytes):
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize()) elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
element_at_n_addr = elements_data_ptr + element_index * 16 # sizeof(QtCbor::Element) == 15 elements_data_ptr, elements_size = d.vectorData(elements_pos)
element_at_n_addr = elements_data_ptr + element_index * 16 # sizeof(QtCbor::Element) == 16
element_value, _, element_flags = d.split('qII', element_at_n_addr) element_value, _, element_flags = d.split('qII', element_at_n_addr)
enc = 'latin1' if is_bytes or (element_flags & 8) else 'utf16' enc = 'latin1' if is_bytes or (element_flags & 8) else 'utf16'
bytedata, _, _ = d.qArrayData(pos) bytedata, _, _ = d.qArrayData(data_pos)
bytedata += element_value bytedata += element_value
if d.qtVersion() >= 0x060000: if d.qtVersion() >= 0x060000:
bytedata_len = d.extractInt64(bytedata) bytedata_len = d.extractInt64(bytedata)
@@ -3282,11 +3283,12 @@ def qdumpHelper_QCbor_array(d, container_ptr, is_cbor):
return return
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize()) elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
elements_data_ptr, elements_size = d.vectorData(elements_pos)
d.putItemCount(elements_size) d.putItemCount(elements_size)
if d.isExpanded(): if d.isExpanded():
bytedata, _, _ = d.qArrayData(pos) bytedata, _, _ = d.qArrayData(data_pos)
with Children(d, maxNumChild=1000): with Children(d, maxNumChild=1000):
for i in range(elements_size): for i in range(elements_size):
d.putSubItem(i, qdumpHelper_QCborArray_valueAt(d, container_ptr, elements_data_ptr, i, bytedata, is_cbor)) d.putSubItem(i, qdumpHelper_QCborArray_valueAt(d, container_ptr, elements_data_ptr, i, bytedata, is_cbor))
@@ -3303,12 +3305,13 @@ def qdumpHelper_QCbor_map(d, container_ptr, is_cbor):
return return
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize()) elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
elements_data_ptr, elements_size = d.vectorData(elements_pos)
elements_size = int(elements_size / 2) elements_size = int(elements_size / 2)
d.putItemCount(elements_size) d.putItemCount(elements_size)
if d.isExpanded(): if d.isExpanded():
bytedata, _, _ = d.qArrayDataHelper(pos) bytedata, _, _ = d.qArrayDataHelper(data_pos)
with Children(d, maxNumChild=1000): with Children(d, maxNumChild=1000):
for i in range(elements_size): for i in range(elements_size):
key = qdumpHelper_QCborArray_valueAt(d, container_ptr, elements_data_ptr, 2 * i, bytedata, is_cbor) key = qdumpHelper_QCborArray_valueAt(d, container_ptr, elements_data_ptr, 2 * i, bytedata, is_cbor)
@@ -3324,6 +3327,7 @@ def qdump__QCborMap(d, value):
def qdump__QCborValue(d, value): def qdump__QCborValue(d, value):
item_data, container_ptr, item_type = value.split('qpi') item_data, container_ptr, item_type = value.split('qpi')
d.putItem(d.createProxyValue((item_data, container_ptr, item_type, True), 'QCborValue_proxy')) d.putItem(d.createProxyValue((item_data, container_ptr, item_type, True), 'QCborValue_proxy'))
d.putPlainChildren(value)
def qdump__QCborValue_proxy(d, value): def qdump__QCborValue_proxy(d, value):
item_data, container_ptr, item_type, is_cbor = value.data() item_data, container_ptr, item_type, is_cbor = value.data()