Merge branch 'master' of https://github.com/Marus/cortex-debug

Marus · Aug 28, 2022 · ae9d388 · ae9d388
2 parents adf9f74 + 299a07e
commit ae9d388
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/backend/server.ts b/src/backend/server.ts
@@ -18,7 +18,7 @@ export function ServerConsoleLog(str: string, usePid?: number) {
             GdbPid = usePid;
         }
         str = `[${date.toISOString()}] ppid=${process.pid} pid=${GdbPid} ` + str;
-        console.log(str);
+        // console.log(str);
         if (true) {
             if (!str.endsWith('\n')) {
                 str += '\n';

diff --git a/src/backend/symbols.ts b/src/backend/symbols.ts
@@ -140,6 +140,9 @@ export class SymbolTable {
                 this.objdumpPath = tmp || this.objdumpPath;
             }
         }
+        if (this.objdumpPath) {
+            this.objdumpPath = this.objdumpPath.replace(/\\/g, '/');
+        }
     }
 
     private createSymtableSerializedFName(exeName: string) {

diff --git a/src/frontend/server_console.ts b/src/frontend/server_console.ts
@@ -193,7 +193,7 @@ export class GDBServerConsole {
         try {
             const date = new Date();
             msg = `[${date.toISOString()}] SERVER CONSOLE DEBUG: ` + msg;
-            console.log(msg);
+            // console.log(msg);
             if (ptyTerm) {
                 msg += msg.endsWith('\n') ? '' : '\n';
                 magentaWrite(msg, ptyTerm);
@@ -241,7 +241,7 @@ export class GDBServerConsole {
                     // help if the user kills the terminal. But we would have lost previous data anyways
                     const date = new Date();
                     const msg = `[${date.toISOString()}] SERVER CONSOLE DEBUG: ******* Terminal not yet ready, buffering... ******`;
-                    console.log(msg);
+                    // console.log(msg);
                     // fs.writeFileSync(logFd, msg);
                 }
                 fs.writeFileSync(consoleLogFd, data.toString());