diff --git a/.vscode/launch.json b/.vscode/launch.json index 1856298..43d3fca 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -17,6 +17,7 @@ }, "cwd": "${workspaceRoot}", "gdb": "riscv64-unknown-elf-gdb", + "openGdbConsole": true, "presentation": { "hidden": false, "group": "FW Debug", @@ -30,11 +31,16 @@ "cwd": "${workspaceRoot}", "program": "${workspaceFolder}/build/Debug/src/riscv-vp", "arguments": "--isa 'rv32gc|msu_vp' -v DEBUG --disass -f fw/hello-world/hello.elf -g 10000", - "presentation": { - "hidden": false, - "group": "FW Debug", - "order": 1 - } + "openGdbConsole": true + }, + { + "type": "gdb", + "request": "launch", + "name": "Launch 64bit VP with gdbserver", + "cwd": "${workspaceRoot}", + "program": "${workspaceFolder}/build/Debug/src/riscv-vp", + "arguments": "--isa 'rv64gc|msu_vp' -v TRACEALL --disass -f fw/hello-world/hello.elf -g 10000", + "openGdbConsole": true }, { "type": "gdb", @@ -42,7 +48,7 @@ "name": "Launch VP", "cwd": "${workspaceRoot}", "program": "${workspaceFolder}/build/Debug/src/riscv-vp", - "arguments": "-v DEBUG -t 3 --isa tgc5c -f fw/hello-world/hello.elf", + "arguments": "-v DEBUG -t 3 --isa 'tgc5c|mu_p' -f fw/hello-world/hello.elf", "openGdbConsole": true }, { diff --git a/dbt-rise-riscv b/dbt-rise-riscv index f4bfd06..48f8983 160000 --- a/dbt-rise-riscv +++ b/dbt-rise-riscv @@ -1 +1 @@ -Subproject commit f4bfd06d7eaa3369fde9db3cb3cc28ab9b4bcf35 +Subproject commit 48f8983d7ee71cfcccc8216ff159ce5367f4c6a4 diff --git a/fw/hello-world/Makefile b/fw/hello-world/Makefile index e344dd1..f980993 100644 --- a/fw/hello-world/Makefile +++ b/fw/hello-world/Makefile @@ -8,6 +8,8 @@ BOARD=riscv_vp LINK_TARGET=flash RISCV_ARCH:=rv32imc RISCV_ABI:=ilp32 +#RISCV_ARCH:=rv64imc +#RISCV_ABI:=lp64 LDFLAGS := -g -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) compiler := $(shell which riscv64-unknown-elf-gcc)