From ed5faa7b551f9b722bb47a767468576c940e47ab Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 May 2023 06:05:26 +0300 Subject: [PATCH] Update vscode configs --- .vscode/c_cpp_properties.json | 2 ++ .vscode/launch.json | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 685fdcdc..377187d0 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -15,6 +15,7 @@ "GIT_COMMIT=\"0000000000000000000000000000000000000000\"", "GIT_COMMIT_SHORT=\"0000000\"", "a64", + "a86", "DEBUG=\"1\"" ], "compilerPath": "${workspaceFolder}/../tools/cross/bin/amd64-elf-gcc", @@ -66,6 +67,7 @@ "GIT_COMMIT=\"0000000000000000000000000000000000000000\"", "GIT_COMMIT_SHORT=\"0000000\"", "a32", + "a86", "DEBUG=\"1\"" ], "compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-elf-gcc", diff --git a/.vscode/launch.json b/.vscode/launch.json index 133b8a7d..2508335d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,15 +5,15 @@ "name": "/init", "type": "cppdbg", "request": "launch", - "program": "${workspaceRoot}/out/init", - "cwd": "${workspaceRoot}", + "program": "${workspaceFolder}/out/bin/init", + "cwd": "${workspaceFolder}", "args": [], "targetArchitecture": "x64", "MIMode": "gdb", "miDebuggerPath": "/usr/bin/gdb", "miDebuggerArgs": "", "externalConsole": false, - "additionalSOLibSearchPath": "${workspaceRoot}", + "additionalSOLibSearchPath": "${workspaceFolder}", "customLaunchSetupCommands": [ { "text": "target remote localhost:1234", @@ -31,24 +31,28 @@ "description": "Make breakpoint pending on future shared library load." }, { - "text": "file ${workspaceRoot}/out/init", + "text": "file ${workspaceFolder}/out/bin/init", "description": "Load binary." }, + { + "text": "add-symbol-file ${workspaceFolder}/../Kernel/kernel.fsys", + "description": "Load kernel binary." + }, ] }, { "name": "/bin/doom", "type": "cppdbg", "request": "launch", - "program": "${workspaceRoot}/out/bin/doom", - "cwd": "${workspaceRoot}", + "program": "${workspaceFolder}/out/usr/bin/doom", + "cwd": "${workspaceFolder}", "args": [], "targetArchitecture": "x64", "MIMode": "gdb", "miDebuggerPath": "/usr/bin/gdb", "miDebuggerArgs": "", "externalConsole": false, - "additionalSOLibSearchPath": "${workspaceRoot}", + "additionalSOLibSearchPath": "${workspaceFolder}", "customLaunchSetupCommands": [ { "text": "target remote localhost:1234", @@ -66,9 +70,13 @@ "description": "Make breakpoint pending on future shared library load." }, { - "text": "file ${workspaceRoot}/out/bin/doom", + "text": "file ${workspaceFolder}/out/usr/bin/doom", "description": "Load binary." }, + { + "text": "add-symbol-file ${workspaceFolder}/../Kernel/kernel.fsys", + "description": "Load kernel binary." + }, ] } ]