Commit df22d163 authored by hjk's avatar hjk
Browse files

Debugger: Use backend-agnostic readRawMemory



Change-Id: Iacc95753b85f87b7ece903d9c5b89570714d0d17
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent b2c80665
...@@ -1523,7 +1523,7 @@ def qdump__QStringRef(d, value): ...@@ -1523,7 +1523,7 @@ def qdump__QStringRef(d, value):
data, size, alloc = qStringData(s) data, size, alloc = qStringData(s)
data += int(value["m_position"]) data += int(value["m_position"])
size = value["m_size"] size = value["m_size"]
s = readRawMemory(data, 2 * size) s = d.readRawMemory(data, 2 * size)
d.putValue(s, Hex4EncodedLittleEndian) d.putValue(s, Hex4EncodedLittleEndian)
d.putNumChild(3) d.putNumChild(3)
if d.isExpanded(): if d.isExpanded():
...@@ -1893,7 +1893,7 @@ def qdump____c_style_array__(d, value): ...@@ -1893,7 +1893,7 @@ def qdump____c_style_array__(d, value):
format = d.currentItemFormat() format = d.currentItemFormat()
isDefault = format == None and str(targetType.unqualified()) == "char" isDefault = format == None and str(targetType.unqualified()) == "char"
if isDefault or (format >= 0 and format <= 2): if isDefault or (format >= 0 and format <= 2):
blob = readRawMemory(value.address, type.sizeof) blob = d.readRawMemory(value.address, type.sizeof)
if isDefault: if isDefault:
# Use Latin1 as default for char []. # Use Latin1 as default for char [].
...@@ -2167,7 +2167,7 @@ def qdump__std__string(d, value): ...@@ -2167,7 +2167,7 @@ def qdump__std__string(d, value):
d.putType("std::wstring", 1) d.putType("std::wstring", 1)
n = min(size, qqStringCutOff) n = min(size, qqStringCutOff)
mem = readRawMemory(p, n * charType.sizeof) mem = d.readRawMemory(p, n * charType.sizeof)
if charType.sizeof == 1: if charType.sizeof == 1:
encodingType = Hex2EncodedLatin1 encodingType = Hex2EncodedLatin1
displayType = DisplayLatin1String displayType = DisplayLatin1String
...@@ -2188,7 +2188,7 @@ def qdump__std__string(d, value): ...@@ -2188,7 +2188,7 @@ def qdump__std__string(d, value):
elif format == 2: elif format == 2:
d.putField("editformat", displayType) d.putField("editformat", displayType)
if n != size: if n != size:
mem = readRawMemory(p, size * charType.sizeof) mem = d.readRawMemory(p, size * charType.sizeof)
d.putField("editvalue", mem) d.putField("editvalue", mem)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment