mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-10-12 02:08:45 +00:00
Debugger: Show ID of waited object in thread list
This commit is contained in:
@@ -62,6 +62,8 @@ QVariant ThreadModel::data(const QModelIndex& index, int role) const
|
||||
|
||||
return tr("INVALID");
|
||||
}
|
||||
case ThreadModel::WAIT_ID:
|
||||
return QtUtils::FilledQStringFromValue(thread->WaitId(), 16);
|
||||
}
|
||||
}
|
||||
else if (role == Qt::UserRole)
|
||||
@@ -85,6 +87,8 @@ QVariant ThreadModel::data(const QModelIndex& index, int role) const
|
||||
return static_cast<u32>(thread->Status());
|
||||
case ThreadModel::WAIT_TYPE:
|
||||
return static_cast<u32>(thread->Wait());
|
||||
case ThreadModel::WAIT_ID:
|
||||
return QString::number(thread->WaitId());
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
@@ -116,6 +120,9 @@ QVariant ThreadModel::headerData(int section, Qt::Orientation orientation, int r
|
||||
case ThreadColumns::WAIT_TYPE:
|
||||
//: Warning: short space limit. Abbreviate if needed.
|
||||
return tr("WAIT TYPE");
|
||||
case ThreadColumns::WAIT_ID:
|
||||
//: Warning: short space limit. Abbreviate if needed.
|
||||
return tr("WAIT ID");
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ public:
|
||||
PRIORITY,
|
||||
STATE,
|
||||
WAIT_TYPE,
|
||||
WAIT_ID,
|
||||
COLUMN_COUNT
|
||||
};
|
||||
|
||||
@@ -34,6 +35,7 @@ public:
|
||||
QHeaderView::ResizeMode::ResizeToContents,
|
||||
QHeaderView::ResizeMode::Stretch,
|
||||
QHeaderView::ResizeMode::Stretch,
|
||||
QHeaderView::ResizeMode::Stretch,
|
||||
};
|
||||
|
||||
explicit ThreadModel(DebugInterface& cpu, QObject* parent = nullptr);
|
||||
|
||||
@@ -96,6 +96,7 @@ public:
|
||||
[[nodiscard]] virtual u32 PC() const = 0;
|
||||
[[nodiscard]] virtual ThreadStatus Status() const = 0;
|
||||
[[nodiscard]] virtual WaitState Wait() const = 0;
|
||||
[[nodiscard]] virtual u32 WaitId() const = 0;
|
||||
[[nodiscard]] virtual u32 EntryPoint() const = 0;
|
||||
[[nodiscard]] virtual u32 StackTop() const = 0;
|
||||
[[nodiscard]] virtual u32 Priority() const = 0;
|
||||
@@ -128,6 +129,7 @@ public:
|
||||
}
|
||||
return WaitState::NONE;
|
||||
};
|
||||
[[nodiscard]] u32 WaitId() const override { return data.semaId; };
|
||||
[[nodiscard]] u32 EntryPoint() const override { return data.entry_init; };
|
||||
[[nodiscard]] u32 StackTop() const override { return data.stack; };
|
||||
[[nodiscard]] u32 Priority() const override { return data.currentPriority; };
|
||||
@@ -171,6 +173,7 @@ public:
|
||||
}
|
||||
return WaitState::NONE;
|
||||
};
|
||||
[[nodiscard]] u32 WaitId() const override { return data.waitId; };
|
||||
[[nodiscard]] u32 EntryPoint() const override { return data.entrypoint; };
|
||||
[[nodiscard]] u32 StackTop() const override { return data.stackTop; };
|
||||
[[nodiscard]] u32 Priority() const override { return data.initPriority; };
|
||||
|
||||
Reference in New Issue
Block a user