Skip to content

[lldb] Use the correct Wasm register context (#162942) #11623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2025
+7 −20
Merged

[lldb] Use the correct Wasm register context (#162942) #11623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/source/Plugins/Process/wasm/RegisterContextWasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using namespace lldb_private::process_gdb_remote;
using namespace lldb_private::wasm;

RegisterContextWasm::RegisterContextWasm(
wasm::ThreadWasm &thread, uint32_t concrete_frame_idx,
ThreadGDBRemote &thread, uint32_t concrete_frame_idx,
GDBRemoteDynamicRegisterInfoSP reg_info_sp)
: GDBRemoteRegisterContext(thread, concrete_frame_idx, reg_info_sp, false,
false) {}
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Plugins/Process/wasm/RegisterContextWasm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#define LLDB_SOURCE_PLUGINS_PROCESS_WASM_REGISTERCONTEXTWASM_H

#include "Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h"
#include "Plugins/Process/gdb-remote/ThreadGDBRemote.h"
#include "ThreadWasm.h"
#include "Utility/WasmVirtualRegisters.h"
#include "lldb/lldb-private-types.h"
Expand All @@ -34,7 +35,7 @@ class RegisterContextWasm
: public process_gdb_remote::GDBRemoteRegisterContext {
public:
RegisterContextWasm(
wasm::ThreadWasm &thread, uint32_t concrete_frame_idx,
process_gdb_remote::ThreadGDBRemote &thread, uint32_t concrete_frame_idx,
process_gdb_remote::GDBRemoteDynamicRegisterInfoSP reg_info_sp);

~RegisterContextWasm() override;
Expand Down
22 changes: 4 additions & 18 deletions lldb/source/Plugins/Process/wasm/UnwindWasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "UnwindWasm.h"
#include "Plugins/Process/gdb-remote/ThreadGDBRemote.h"
#include "ProcessWasm.h"
#include "RegisterContextWasm.h"
#include "ThreadWasm.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
Expand All @@ -18,21 +19,6 @@ using namespace lldb_private;
using namespace process_gdb_remote;
using namespace wasm;

class WasmGDBRemoteRegisterContext : public GDBRemoteRegisterContext {
public:
WasmGDBRemoteRegisterContext(ThreadGDBRemote &thread,
uint32_t concrete_frame_idx,
GDBRemoteDynamicRegisterInfoSP &reg_info_sp,
uint64_t pc)
: GDBRemoteRegisterContext(thread, concrete_frame_idx, reg_info_sp, false,
false) {
// Wasm does not have a fixed set of registers but relies on a mechanism
// named local and global variables to store information such as the stack
// pointer. The only actual register is the PC.
PrivateSetRegisterValue(0, pc);
}
};

lldb::RegisterContextSP
UnwindWasm::DoCreateRegisterContextForFrame(lldb_private::StackFrame *frame) {
if (m_frames.size() <= frame->GetFrameIndex())
Expand All @@ -43,9 +29,9 @@ UnwindWasm::DoCreateRegisterContextForFrame(lldb_private::StackFrame *frame) {
ProcessWasm *wasm_process =
static_cast<ProcessWasm *>(thread->GetProcess().get());

return std::make_shared<WasmGDBRemoteRegisterContext>(
*gdb_thread, frame->GetConcreteFrameIndex(),
wasm_process->GetRegisterInfo(), m_frames[frame->GetFrameIndex()]);
return std::make_shared<RegisterContextWasm>(*gdb_thread,
frame->GetConcreteFrameIndex(),
wasm_process->GetRegisterInfo());
}

uint32_t UnwindWasm::DoGetFrameCount() {
Expand Down