Added overridePreEndSessionCommands, and try 'monitor exit' before target-disconnect first

Author: haneefdm

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.13.0-pre6",
+    "version": "1.13.0-pre7",
     "preview": false,
     "activationEvents": [
         "onDebugResolve:cortex-debug",
@@ -628,6 +628,12 @@
                                 "deprecated": true,
                                 "description": "Deprecated: Restart is now handled by VSCode and it is pretty much the same as Start"
                             },
+                            "overridePreEndSessionCommands": {
+                                "default": [],
+                                "type": "array",
+                                "items": "string",
+                                "description": "Override the commands that are normally executed at the start of ending a debug session (e.g. when stopping debugging)."
+                            },
                             "overrideGDBServerStartedRegex": {
                                 "description": "You can supply a regular expression (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) in the configuration property to override the output from the GDB Server that is looked for to determine if the GDB Server has started. Under most circumstances this will not be necessary - but could be needed as a result of a change in the output of a GDB Server making it incompatible with cortex-debug. This property has no effect for bmp or external GDB Server types.",
                                 "type": "string",
@@ -1761,6 +1767,12 @@
                                 "items": "string",
                                 "description": "Additional GDB Commands to be executed at the end of the reset sequence"
                             },
+                            "overridePreEndSessionCommands": {
+                                "default": [],
+                                "type": "array",
+                                "items": "string",
+                                "description": "Override the commands that are normally executed at the start of ending a debug session (e.g. when stopping debugging)."
+                            },
                             "overrideGDBServerStartedRegex": {
                                 "description": "You can supply a regular expression (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) in the configuration property to override the output from the GDB Server that is looked for to determine if the GDB Server has started. Under most circumstances this will not be necessary - but could be needed as a result of a change in the output of a GDB Server making it incompatible with cortex-debug. This property has no effect for bmp or external GDB Server types.",
                                 "type": "string",

src/backend/mi2/mi2.ts

@@ -403,7 +403,7 @@ export class MI2 extends EventEmitter implements IBackend {
         }
     }
 
-    // stop() can get called twice ... once by the disconnect sequence and once by the server existing because
+    // stop() can get called twice ... once by the disconnect sequence and once by the server exiting because
     // we called disconnect. And the sleeps don't help that cause
     private exiting = false;
     public async stop() {
@@ -439,8 +439,16 @@ export class MI2 extends EventEmitter implements IBackend {
             // program is in paused state
             try {
                 startKillTimeout(500);
-                await new Promise((res) => setTimeout(res, 100));       // For some people delay was needed. Doesn't hurt I guess
-                await this.sendCommand('target-disconnect');            // Yes, this can fail
+                try {
+                    await this.sendCommand('interpreter-exec console "monitor exit"');
+                } catch (e) {
+                    // It is possible gdb server has not implemented this
+                    ServerConsoleLog('GDB "monitor exit" failed, continue to disconnect anyway', this.pid);
+                }
+                await new Promise(() => setTimeout(() => {}, 50));          // For some people delay was needed. Doesn't hurt I guess
+                if (!this.exited) {
+                    await this.sendCommand('target-disconnect');            // Yes, this can fail
+                }
             } catch (e) {
                 if (this.exited) {
                     ServerConsoleLog('GDB already exited during a target-disconnect', this.pid);

src/common.ts

@@ -270,6 +270,7 @@ export interface ConfigurationArguments extends DebugProtocol.LaunchRequestArgum
     loadFiles: string[];
     symbolFiles: SymbolFile[];
     debuggerArgs: string[];
+    overridePreEndSessionCommands: null | string[];
     preLaunchCommands: string[];
     postLaunchCommands: string[];
     overrideLaunchCommands: string[];

src/frontend/configprovider.ts

@@ -130,6 +130,7 @@ export class CortexDebugConfigurationProvider implements vscode.DebugConfigurati
         if (!config.postAttachCommands) { config.postAttachCommands = []; }
         if (!config.preResetCommands) { config.preResetCommands = config.preRestartCommands || []; }
         if (!config.postResetCommands) { config.postResetCommands = config.postRestartCommands || []; }
+        if (config.overridePreEndSessionCommands === undefined) { config.overridePreEndSessionCommands = null; }
         if (!config.postResetSessionCommands) { config.postResetSessionCommands = config.postRestartSessionCommands || null; }
         if (config.runToEntryPoint) { config.runToEntryPoint = config.runToEntryPoint.trim(); } else if (config.runToMain) {
             config.runToEntryPoint = 'main';

src/gdb.ts

@@ -333,6 +333,20 @@ export class GDBDebugSession extends LoggingDebugSession {
         response.body.supportsInstructionBreakpoints = true;
         response.body.supportsReadMemoryRequest = true;
         response.body.supportsWriteMemoryRequest = true;
+
+        const bptAppliesTo: DebugProtocol.BreakpointModeApplicability[] = ['source', /* 'exception' , */ 'data', 'instruction'];
+        response.body.breakpointModes = [
+            {
+                mode: 'default',
+                label: 'Let GDB decide which breakpoint method (HW or SW) to chose',
+                appliesTo: []
+            },
+            {
+                mode: 'hardware',
+                label: 'Request GDB to set a hardware breakpoint',
+                appliesTo: []
+            }
+        ];
         this.sendResponse(response);
     }
 
@@ -1475,7 +1489,7 @@ export class GDBDebugSession extends LoggingDebugSession {
     }
 
     private waitForServerExitAndRespond(response: DebugProtocol.DisconnectResponse) {
-        if (!this.server.isExternal()) {
+        if (!this.server.isExternal() && this.server.isProcessRunning()) {
             let nTimes = 60;
             let to = setInterval(() => {
                 if ((nTimes === 0) || this.quit) {
@@ -1499,11 +1513,14 @@ export class GDBDebugSession extends LoggingDebugSession {
                 }
             });
             // Note: If gdb exits first, then we kill the server anyways
-        } else {
+        } else if (this.miDebugger.isRunning()) {
             this.miDebugger.once('quit', () => {
                 this.serverConsoleLog('disconnectRequest sendResponse 1');
                 this.sendResponse(response);
             });
+        } else {
+            this.serverConsoleLog('disconnectRequest sendResponse 3');
+            this.sendResponse(response);
         }
     }
 
@@ -1563,6 +1580,16 @@ export class GDBDebugSession extends LoggingDebugSession {
                 await this.tryDeleteBreakpoints();
                 this.disableSendStoppedEvents = false;
                 this.attached = false;
+                if (this.args.overridePreEndSessionCommands) {
+                    for (const cmd of this.args.overridePreEndSessionCommands) {
+                        try {
+                            await this.miDebugger.sendCommand(cmd);
+                        } catch (e) {
+                            this.handleMsg('log', 'GDB commands overridePreEndSessionCommands failed ' + (e ? e.toString() : 'Unknown error') + '\n');
+                        }
+                    }
+                    await new Promise(() => setTimeout(() => {}, 5));
+                }
                 this.waitForServerExitAndRespond(response);     // Will wait asynchronously until the following actions are done
                 if (args.terminateDebuggee || args.suspendDebuggee) {
                     // There is no such thing as terminate for us. Hopefully, the gdb-server will