diff options
| -rw-r--r-- | debug/Makefile | 3 | ||||
| -rw-r--r-- | debug/README.md | 9 | ||||
| -rwxr-xr-x | debug/gdbserver.py | 4 | ||||
| -rw-r--r-- | debug/targets.py | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/debug/Makefile b/debug/Makefile index 172defe..5741362 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -1,4 +1,3 @@ -RISCV_SIM ?= spike XLEN ?= 64 src_dir ?= . @@ -22,8 +21,6 @@ run.%: $(word 3, $(subst ., ,$@)) \ --isolate \ --print-failures \ - --sim_cmd $(RISCV)/bin/$(RISCV_SIM) \ - --server_cmd $(RISCV)/bin/openocd \ $(if $(EXCLUDE_TESTS),--exclude-tests $(EXCLUDE_TESTS)) # Target to check all the multicore options. diff --git a/debug/README.md b/debug/README.md index 7dd6790..b98d8c2 100644 --- a/debug/README.md +++ b/debug/README.md @@ -9,11 +9,10 @@ confident that the actual debug interface is functioning correctly. Requirements ============ The following should be in the user's path: -* riscv64-unknown-elf-gcc (`rvv-0.9.x` branch for riscv-gnu-toolchain should - work if master does not have vector support yet) -* riscv64-unknown-elf-gdb (can be overridden with `--gdb` when running - gdbserver.py manually), which should be the latest from - git://sourceware.org/git/binutils-gdb.git. +* riscv64-unknown-elf-gcc (GCC 12 and later should work). If your binary has a + different name, you can set the RISCV_TESTS_DEBUG_GCC environment variable. +* riscv64-unknown-elf-gdb. If your binary has a + different name, you can set the RISCV_TESTS_DEBUG_GDB environment variable. * spike (can be overridden with `--sim_cmd` when running gdbserver.py manually), which should be the latest from https://github.com/riscv/riscv-isa-sim.git. diff --git a/debug/gdbserver.py b/debug/gdbserver.py index b4c62ee..46d65df 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -1926,8 +1926,8 @@ class FreeRtosTest(GdbTest): bp = self.gdb.b("vTaskStartScheduler") self.gdb.c() self.gdb.command(f"delete {bp}") - # 'Current Execution' is still there before the scheduler has been started. - # Now there are 3 threads: Current Execution, Rx, Tx. + # 'Current Execution' is still there before the scheduler has been + # started. Now there are 3 threads: Current Execution, Rx, Tx. threads = self.gdb.threads() assertEqual(len(threads), 3) diff --git a/debug/targets.py b/debug/targets.py index 0ba12db..1952749 100644 --- a/debug/targets.py +++ b/debug/targets.py @@ -196,7 +196,7 @@ class Target: "-o", binary_name] if hart.extensionSupported('e'): - args.append("-march=rv32e") + args.append("-march=rv32e_zicsr") args.append("-mabi=ilp32e") args.append("-DRV32E") else: @@ -206,7 +206,7 @@ class Target: march += letter if hart.extensionSupported("v") and self.compiler_supports_v: march += "v" - args.append(f"-march={march}") + args.append(f"-march={march}_zicsr") if hart.xlen == 32: args.append("-mabi=ilp32") else: |