Fix for all registers view.

Dman95 · Jan 27, 2016 · 7c72776 · 7c72776
1 parent 5f49be3
commit 7c72776
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/debugger.cpp b/debugger.cpp
@@ -434,11 +434,19 @@ void Debugger::processAction(QString output, QString error)
  info.hexValue = "";
  } else if (i >= 41) {
  registersStream >> info.name;
- QRegExp r("v8_int8 = \\{[^\\{\\}]+\\}{1}");
- QString s = registersStream.readLine();
- while (r.indexIn(s) == -1)
- s = registersStream.readLine();
- info.decValue = r.capturedTexts().at(0).mid(QString("v8_int8 = ").length());
+ QString endLine("}}");
+ QString s = "";
+ do {
+ s += registersStream.readLine();
+ } while (!s.contains(endLine));
+ s = s.simplified();
+ QRegExp r("v8_int8 = (\\{.*\\})");
+ r.setMinimal(true);
+ if (r.indexIn(s) != -1) {
+ info.decValue = r.cap(1);
+ } else {
+ info.decValue = "";
+ }
  info.hexValue = "";
  } else {
  registersStream >> info.name >> info.hexValue >> info.decValue;

diff --git a/debugtablewidget.cpp b/debugtablewidget.cpp
@@ -182,22 +182,20 @@ void DebugTableWidget::addRegister(const QString &name, const QString &hexValue,
 {
  empty = false;
  if (type == registersTable) {
- QString zeroes;
- zeroes.fill('0', 10 - hexValue.length());
  if (item(rowNumber, 2)) {
  item(rowNumber, 0)->setText(name);
  if (hexValue.isEmpty())
  item(rowNumber, 1)->setText("");
  else
- item(rowNumber, 1)->setText("0x" + zeroes + hexValue.right(hexValue.length() - 2));
+ item(rowNumber, 1)->setText(hexValue);
  item(rowNumber, 2)->setText(decValue);
  } else {
  QTableWidgetItem *nameItem = new QTableWidgetItem(name);
  QTableWidgetItem *hexValueItem;
  if (hexValue.isEmpty())
  hexValueItem = new QTableWidgetItem("");
  else
- hexValueItem = new QTableWidgetItem("0x" + zeroes + hexValue.right(hexValue.length() - 2));
+ hexValueItem = new QTableWidgetItem(hexValue);
  QTableWidgetItem *decValueItem = new QTableWidgetItem(decValue);
  QFont monoFont("Courier");
  monoFont.setStyleHint(QFont::Monospace);