[lldb-dap] Migrate disassemble request to structured handler #140482
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -534,14 +534,17 @@ class LocationsRequestHandler : public LegacyRequestHandler { | |
| void operator()(const llvm::json::Object &request) const override; | ||
| }; | ||
|
|
||
| class DisassembleRequestHandler final | ||
| : public RequestHandler<protocol::DisassembleArguments, | ||
| llvm::Expected<protocol::DisassembleResponseBody>> { | ||
| public: | ||
| using RequestHandler::RequestHandler; | ||
| static llvm::StringLiteral GetCommand() { return "disassemble"; } | ||
| FeatureSet GetSupportedFeatures() const override { | ||
| return {protocol::eAdapterFeatureDisassembleRequest}; | ||
| } | ||
| llvm::Expected<protocol::DisassembleResponseBody> | ||
| Run(const protocol::DisassembleArguments &args) const override; | ||
| }; | ||
|
|
||
| class ReadMemoryRequestHandler : public LegacyRequestHandler { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -460,4 +460,22 @@ llvm::json::Value toJSON(const SetDataBreakpointsResponseBody &SDBR) { | |
| return result; | ||
| } | ||
|
|
||
| bool fromJSON(const llvm::json::Value &Params, DisassembleArguments &DA, | ||
| llvm::json::Path P) { | ||
| json::ObjectMapper O(Params, P); | ||
| return O && O.map("memoryReference", DA.memoryReference) && | ||
| O.mapOptional("offset", DA.offset) && | ||
| O.mapOptional("instructionOffset", DA.instructionOffset) && | ||
| O.map("instructionCount", DA.instructionCount) && | ||
| O.mapOptional("resolveSymbols", DA.resolveSymbols); | ||
| } | ||
|
|
||
| llvm::json::Value toJSON(const DisassembleResponseBody &DRB) { | ||
| llvm::json::Array instructions; | ||
| for (const auto &instruction : DRB.instructions) { | ||
| instructions.push_back(toJSON(instruction)); | ||
| } | ||
| return llvm::json::Object{{"instructions", std::move(instructions)}}; | ||
| } | ||
|
|
||
| } // namespace lldb_dap::protocol | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -726,6 +726,41 @@ struct SetDataBreakpointsResponseBody { | |
| }; | ||
| llvm::json::Value toJSON(const SetDataBreakpointsResponseBody &); | ||
|
|
||
| /// Arguments to `disassemble` request. | ||
| struct DisassembleArguments { | ||
| /// Memory reference to the base location containing the instructions to | ||
| /// disassemble. | ||
| std::string memoryReference; | ||
|
|
||
| /// Offset (in bytes) to be applied to the reference location before | ||
| /// disassembling. Can be negative. | ||
| std::optional<int64_t> offset; | ||
|
|
||
| /// Offset (in instructions) to be applied after the byte offset (if any) | ||
| /// before disassembling. Can be negative. | ||
| std::optional<int64_t> instructionOffset; | ||
|
|
||
| /// Number of instructions to disassemble starting at the specified location | ||
| /// and offset. | ||
| /// An adapter must return exactly this number of instructions - any | ||
| /// unavailable instructions should be replaced with an implementation-defined | ||
| /// 'invalid instruction' value. | ||
| uint32_t instructionCount; | ||
|
|
||
| /// If true, the adapter should attempt to resolve memory addresses and other | ||
| /// values to symbolic names. | ||
| std::optional<bool> resolveSymbols; | ||
| }; | ||
| bool fromJSON(const llvm::json::Value &, DisassembleArguments &, | ||
| llvm::json::Path); | ||
|
Comment on lines
+754
to
+755
Member
There was a problem hiding this comment. Add the toJSON forward declaration. |
||
|
|
||
| /// Response to `disassemble` request. | ||
| struct DisassembleResponseBody { | ||
| /// The list of disassembled instructions. | ||
| std::vector<DisassembledInstruction> instructions; | ||
| }; | ||
| llvm::json::Value toJSON(const DisassembleResponseBody &); | ||
|
Member
There was a problem hiding this comment. Add the fromJSON forward declaration. |
||
|
|
||
| } // namespace lldb_dap::protocol | ||
|
|
||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -782,4 +782,38 @@ bool fromJSON(const llvm::json::Value &Params, InstructionBreakpoint &IB, | |
| O.mapOptional("mode", IB.mode); | ||
| } | ||
|
|
||
| llvm::json::Value toJSON(const DisassembledInstruction::PresentationHint &PH) { | ||
| switch (PH) { | ||
| case DisassembledInstruction::eSourcePresentationHintNormal: | ||
| return "normal"; | ||
| case DisassembledInstruction::eSourcePresentationHintInvalid: | ||
| return "invalid"; | ||
| } | ||
| llvm_unreachable("unhandled presentation hint."); | ||
| } | ||
|
|
||
| llvm::json::Value toJSON(const DisassembledInstruction &DI) { | ||
| llvm::json::Object result{{"address", DI.address}, | ||
| {"instruction", DI.instruction}}; | ||
|
|
||
| if (DI.instructionBytes) | ||
| result.insert({"instructionBytes", *DI.instructionBytes}); | ||
| if (DI.symbol) | ||
| result.insert({"symbol", *DI.symbol}); | ||
| if (DI.location) | ||
| result.insert({"location", *DI.location}); | ||
| if (DI.line) | ||
| result.insert({"line", *DI.line}); | ||
| if (DI.column) | ||
| result.insert({"column", *DI.column}); | ||
| if (DI.endLine) | ||
| result.insert({"endLine", *DI.endLine}); | ||
| if (DI.endColumn) | ||
| result.insert({"endColumn", *DI.endColumn}); | ||
| if (DI.presentationHint) | ||
| result.insert({"presentationHint", *DI.presentationHint}); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| } // namespace lldb_dap::protocol | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is existing code, but since you're touching it, let's use the actual type here. (auto in llvm)