From f2e4b9d3c2f858f5ce7e317b2974d74353abb2a2 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 21 Sep 2023 10:42:18 +0200 Subject: cmd/exception: support RISC-V compressed instruction Eliminating the C extension on application processors is under discussion. Support emitting a compressed instruction. This will lead to an illegal instruction exception if the C extension is not implemented. For testing build qemu-riscv64_defconfig with CONFIG_RISCV_ISA_C=n and run with qemu-system-riscv64 -M virt -bios u-boot -nographic -cpu rv64,c=false => exception compressed Unhandled exception: Illegal instruction EPC: 0000000087731708 RA: 000000008773fe44 TVAL: 0000000000004501 EPC: 000000008001b708 RA: 0000000080029e44 reloc adjusted Code: 0b93 0000 0493 0000 0993 0000 f06f ccdf (4501) Signed-off-by: Heinrich Schuchardt Reviewed-by: Leo Yu-Chi Liang --- cmd/riscv/exception.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'cmd/riscv/exception.c') diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index 7a08061d120..db8d8af0483 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -8,6 +8,15 @@ #include #include +static int do_compressed(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + /* c.li a0, 0; c.li a0, 0 */ + asm volatile (".long 0x45014501\n"); + printf("The system supports compressed instructions.\n"); + return CMD_RET_SUCCESS; +} + static int do_ebreak(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -35,6 +44,8 @@ static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, } static struct cmd_tbl cmd_sub[] = { + U_BOOT_CMD_MKENT(compressed, CONFIG_SYS_MAXARGS, 1, do_compressed, + "", ""), U_BOOT_CMD_MKENT(ebreak, CONFIG_SYS_MAXARGS, 1, do_ebreak, "", ""), U_BOOT_CMD_MKENT(unaligned, CONFIG_SYS_MAXARGS, 1, do_unaligned, @@ -46,9 +57,10 @@ static struct cmd_tbl cmd_sub[] = { static char exception_help_text[] = "\n" " The following exceptions are available:\n" - " ebreak - breakpoint\n" - " undefined - illegal instruction\n" - " unaligned - load address misaligned\n" + " compressed - compressed instruction\n" + " ebreak - breakpoint\n" + " undefined - illegal instruction\n" + " unaligned - load address misaligned\n" ; #include -- cgit v1.2.3 From ef5ccaae64b670bc3183e20378d1fa31c86c9f44 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 21 Sep 2023 12:39:29 +0200 Subject: cmd/exception: test RISC-V 16 bit aligned instruction A 16 bit aligned instruction should generated an exception if the C extension is not available. Provide an 'extension ialign16' command for testing exception handling. For testing build qemu-riscv64_defconfig with CONFIG_RISCV_ISA_C=n and run with qemu-system-riscv64 -M virt -bios u-boot -nographic -cpu rv64,c=false => exception ialign16 Unhandled exception: Instruction address misaligned EPC: 0000000087719138 RA: 0000000087719218 TVAL: 000000008771913e EPC: 0000000080020138 RA: 0000000080020218 reloc adjusted Code: 0113 0101 8067 0000 0113 ff01 3423 0011 (006f 0060) Signed-off-by: Heinrich Schuchardt Reviewed-by: Leo Yu-Chi Liang --- cmd/riscv/exception.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'cmd/riscv/exception.c') diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index db8d8af0483..f38f454a0b1 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -24,6 +24,19 @@ static int do_ebreak(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } +static int do_ialign16(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + asm volatile ( + /* jump skipping 2 bytes */ + ".long 0x0060006f\n" + ".long 0x006f0000\n" + ".long 0x00000060\n" + ); + printf("The system supports 16 bit aligned instructions.\n"); + return CMD_RET_SUCCESS; +} + static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -48,6 +61,8 @@ static struct cmd_tbl cmd_sub[] = { "", ""), U_BOOT_CMD_MKENT(ebreak, CONFIG_SYS_MAXARGS, 1, do_ebreak, "", ""), + U_BOOT_CMD_MKENT(ialign16, CONFIG_SYS_MAXARGS, 1, do_ialign16, + "", ""), U_BOOT_CMD_MKENT(unaligned, CONFIG_SYS_MAXARGS, 1, do_unaligned, "", ""), U_BOOT_CMD_MKENT(undefined, CONFIG_SYS_MAXARGS, 1, do_undefined, @@ -59,6 +74,7 @@ static char exception_help_text[] = " The following exceptions are available:\n" " compressed - compressed instruction\n" " ebreak - breakpoint\n" + " ialign16 - 16 bit aligned instruction\n" " undefined - illegal instruction\n" " unaligned - load address misaligned\n" ; -- cgit v1.2.3