Skip to content

Commit 3f7ae81

Browse files
bors[bot]noppej
andauthored
Merge #31
31: Debugger: Add SVD Peripherals and prep for multi-core r=Yatekii a=noppej This PR is part of a trio of PR's that depend on each other: - [Debugger in probe-rs](probe-rs/probe-rs#1072) - Part I of preparing for multi-core support. This will require future PR's to complete. - Restructured source files - large files broken up into smaller units. - Support for loading CMSIS-SVD files and making peripheral values available to the VSCode extension. - [VSCode extension](#31) - A draft version of the extension [probe-rs-debugger-0.4.0.vsix](https://github.com/probe-rs/vscode/releases/tag/v0.4.0) is available to facilitate testing of these PR's. - Changes to `launch.json` configuration to support SVD Peripheral files and core specific configuration. - Updated various development dependencies. - Updated the Debug Adapter Protocol to version 1.55.1. - [Documentation on probe.rs](probe-rs/webpage#47) - Document changes to VSCode `launch.json`. - GIF to demonstrate how to navigate and monitor SVD Peripheral register values. Co-authored-by: JackN <[email protected]>
2 parents 2357c71 + f9d0d44 commit 3f7ae81

File tree

3 files changed

+323
-222
lines changed

3 files changed

+323
-222
lines changed

src/debugProtocol.json renamed to dap/debugProtocol.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@
10351035
"DisconnectRequest": {
10361036
"allOf": [ { "$ref": "#/definitions/Request" }, {
10371037
"type": "object",
1038-
"description": "The 'disconnect' request is sent from the client to the debug adapter in order to stop debugging.\nIt asks the debug adapter to disconnect from the debuggee and to terminate the debug adapter.\nIf the debuggee has been started with the 'launch' request, the 'disconnect' request terminates the debuggee.\nIf the 'attach' request was used to connect to the debuggee, 'disconnect' does not terminate the debuggee.\nThis behavior can be controlled with the 'terminateDebuggee' argument (if supported by the debug adapter).",
1038+
"description": "The 'disconnect' request asks the debug adapter to disconnect from the debuggee (thus ending the debug session) and then to shut down itself (the debug adapter).\nIn addition, the debug adapter must terminate the debuggee if it was started with the 'launch' request. If an 'attach' request was used to connect to the debuggee, then the debug adapter must not terminate the debuggee.\nThis implicit behavior of when to terminate the debuggee can be overridden with the optional argument 'terminateDebuggee' (which is only supported by a debug adapter if the corresponding capability 'supportTerminateDebuggee' is true).",
10391039
"properties": {
10401040
"command": {
10411041
"type": "string",
@@ -1076,7 +1076,7 @@
10761076
"TerminateRequest": {
10771077
"allOf": [ { "$ref": "#/definitions/Request" }, {
10781078
"type": "object",
1079-
"description": "The 'terminate' request is sent from the client to the debug adapter in order to give the debuggee a chance for terminating itself.\nClients should only call this request if the capability 'supportsTerminateRequest' is true.",
1079+
"description": "The 'terminate' request is sent from the client to the debug adapter in order to shut down the debuggee gracefully. Clients should only call this request if the capability 'supportsTerminateRequest' is true.\nTypically a debug adapter implements 'terminate' by sending a software signal which the debuggee intercepts in order to clean things up properly before terminating itself.\nPlease note that this request does not directly affect the state of the debug session: if the debuggee decides to veto the graceful shutdown for any reason by not terminating itself, then the debug session will just continue.\nClients can surface the 'terminate' request as an explicit command or they can integrate it into a two stage Stop command that first sends 'terminate' to request a graceful shutdown, and if that fails uses 'disconnect' for a forceful shutdown.",
10801080
"properties": {
10811081
"command": {
10821082
"type": "string",
@@ -1195,7 +1195,7 @@
11951195
"properties": {
11961196
"source": {
11971197
"$ref": "#/definitions/Source",
1198-
"description": "The source location of the breakpoints; either 'source.path' or 'source.reference' must be specified."
1198+
"description": "The source location of the breakpoints; either 'source.path' or 'source.sourceReference' must be specified."
11991199
},
12001200
"breakpoints": {
12011201
"type": "array",
@@ -2417,18 +2417,19 @@
24172417
},
24182418
"context": {
24192419
"type": "string",
2420-
"_enum": [ "watch", "repl", "hover", "clipboard" ],
2420+
"_enum": [ "variables", "watch", "repl", "hover", "clipboard" ],
24212421
"enumDescriptions": [
2422-
"evaluate is run in a watch.",
2423-
"evaluate is run from REPL console.",
2424-
"evaluate is run from a data hover.",
2425-
"evaluate is run to generate the value that will be stored in the clipboard.\nThe attribute is only honored by a debug adapter if the capability 'supportsClipboardContext' is true."
2422+
"evaluate is called from a variables view context.",
2423+
"evaluate is called from a watch view context.",
2424+
"evaluate is called from a REPL context.",
2425+
"evaluate is called to generate the debug hover contents.\nThis value should only be used if the capability 'supportsEvaluateForHovers' is true.",
2426+
"evaluate is called to generate clipboard contents.\nThis value should only be used if the capability 'supportsClipboardContext' is true."
24262427
],
2427-
"description": "The context in which the evaluate request is run."
2428+
"description": "The context in which the evaluate request is used."
24282429
},
24292430
"format": {
24302431
"$ref": "#/definitions/ValueFormat",
2431-
"description": "Specifies details on how to format the Evaluate result.\nThe attribute is only honored by a debug adapter if the capability 'supportsValueFormattingOptions' is true."
2432+
"description": "Specifies details on how to format the result.\nThe attribute is only honored by a debug adapter if the capability 'supportsValueFormattingOptions' is true."
24322433
}
24332434
},
24342435
"required": [ "expression" ]
@@ -3940,7 +3941,7 @@
39403941

39413942
"ExceptionFilterOptions": {
39423943
"type": "object",
3943-
"description": "An ExceptionFilterOptions is used to specify an exception filter together with a condition for the setExceptionsFilter request.",
3944+
"description": "An ExceptionFilterOptions is used to specify an exception filter together with a condition for the 'setExceptionBreakpoints' request.",
39443945
"properties": {
39453946
"filterId": {
39463947
"type": "string",

0 commit comments

Comments
 (0)