Merge branch 'develop' into feature/multi_threading

This commit is contained in:
2025-10-07 19:18:50 +02:00
2 changed files with 59 additions and 23 deletions

80
.vscode/launch.json vendored
View File

@@ -11,7 +11,16 @@
}, },
"target": { "target": {
"server": "${workspaceFolder}/build/RelWithDebInfo/src/riscv-vp", "server": "${workspaceFolder}/build/RelWithDebInfo/src/riscv-vp",
"serverParameters": ["--isa", "rv32gc_msu", "-v", "INFO", "-f", "fw/hello-world/hello.elf", "-g", "10000"], "serverParameters": [
"--isa",
"rv32gc_msu",
"-v",
"INFO",
"-f",
"fw/hello-world/hello.elf",
"-g",
"10000"
],
"watchServerProcess": true, "watchServerProcess": true,
"port": "10000" "port": "10000"
}, },
@@ -22,7 +31,45 @@
"hidden": false, "hidden": false,
"group": "FW Debug", "group": "FW Debug",
"order": 2 "order": 2
},"initCommands": ["b main"] },
"initCommands": [
"b main"
]
},
{
"type": "gdbtarget",
"request": "launch",
"name": "Debug hello world 32bit",
"program": "fw/hello-world/hello.elf",
"imageAndSymbols": {
"symbolFileName": "fw/hello-world/hello.elf"
},
"target": {
"server": "${workspaceFolder}/build/RelWithDebInfo/src/riscv-vp",
"serverParameters": [
"--isa",
"rv32gc_msu",
"-v",
"INFO",
"-f",
"fw/hello-world/hello.elf",
"-g",
"10000"
],
"watchServerProcess": true,
"port": "10000"
},
"cwd": "${workspaceRoot}",
"gdb": "riscv64-unknown-elf-gdb",
"openGdbConsole": false,
"presentation": {
"hidden": false,
"group": "FW Debug",
"order": 2
},
"initCommands": [
"b main"
]
}, },
{ {
"type": "gdbtarget", "type": "gdbtarget",
@@ -53,23 +100,6 @@
"arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf -g 10000", "arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf -g 10000",
"openGdbConsole": true "openGdbConsole": true
}, },
{
"type": "gdb",
"request": "launch",
"name": "32bit VP",
"cwd": "${workspaceRoot}",
"program": "${workspaceFolder}/build/Debug/src/riscv-vp",
"arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf"
},
{
"type": "gdb",
"request": "launch",
"name": "32bit VP",
"cwd": "${workspaceRoot}",
"program": "${workspaceFolder}/build/Debug/src/riscv-vp",
"arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf",
"initCommands": ["info break"]
},
{ {
"type": "gdb", "type": "gdb",
"request": "launch", "request": "launch",
@@ -119,11 +149,17 @@
"compounds": [ "compounds": [
{ {
"name": "FW-Debug 32bit", "name": "FW-Debug 32bit",
"configurations": ["32bit VP with gdbserver", "Attach GDB to VP"] "configurations": [
"32bit VP with gdbserver",
"Attach GDB to VP"
]
}, },
{ {
"name": "FW-Debug 64bit", "name": "FW-Debug 64bit",
"configurations": ["64bit VP with gdbserver", "Attach GDB to VP"] "configurations": [
"64bit VP with gdbserver",
"Attach GDB to VP"
]
} }
] ]
} }