Add Xh3bextm extension from Hazard3

6 files changed, 68 insertions, 0 deletions

diff --git a/assembly/xh3bextm-test/Makefile b/assembly/xh3bextm-test/Makefile
new file mode 100644
index 0000000..62a1190
--- /dev/null
+++ b/assembly/xh3bextm-test/Makefile
@@ -0,0 +1,24 @@
+MARCH ?= rv32imacbzicntr_zicond_zicsr_zifencei_zihintpause_zilsd_zclsd_zabha_zacas_zbkb_zbkx_zcb_zcmp_zcmt
+
+.PHONY: all dump load clean
+
+all: xh3bextm-test.hex
+
+xh3bextm-test.o: xh3bextm-test.S
+	riscv32-none-elf-as -I../rvcontroller-libraries -march=${MARCH} -o xh3bextm-test.o xh3bextm-test.S
+
+xh3bextm-test.elf:  xh3bextm-test.o
+	riscv32-none-elf-ld -T rvcontroller.ld --no-warn-rwx-segments -o xh3bextm-test.elf xh3bextm-test.o
+
+dump: xh3bextm-test.elf
+	riscv32-none-elf-objdump -d xh3bextm-test.elf
+
+xh3bextm-test.hex: xh3bextm-test.elf
+	riscv32-none-elf-objcopy -O ihex xh3bextm-test.elf xh3bextm-test.hex
+
+load: xh3bextm-test.hex
+	bash -c "wl-copy < xh3bextm-test.hex"
+
+clean:
+	rm -f xh3bextm-test.bin xh3bextm-test.elf xh3bextm-test.o
+
diff --git a/assembly/xh3bextm-test/rvcontroller.ld b/assembly/xh3bextm-test/rvcontroller.ld
new file mode 120000
index 0000000..bc01402
--- /dev/null
+++ b/assembly/xh3bextm-test/rvcontroller.ld
@@ -0,0 +1 @@
+../../rvcontroller.ld
\ No newline at end of file
diff --git a/assembly/xh3bextm-test/xh3bextm-test.S b/assembly/xh3bextm-test/xh3bextm-test.S
new file mode 100644
index 0000000..20ae6c2
--- /dev/null
+++ b/assembly/xh3bextm-test/xh3bextm-test.S
@@ -0,0 +1,40 @@
+# Xh3bextm macros are from the Hazard3 reference manual, slightly modified
+.macro h3.bextm rd rs1 rs2 nbits
+	.if (\nbits < 1) || (\nbits > 8)
+		.err
+	.endif
+	.insn r 0x0b, 0x0, (((\nbits - 1) & 0x7 ) << 1), \rd, \rs1, \rs2
+.endm
+
+.macro h3.bextmi rd rs1 shamt nbits
+	.if (\nbits < 1) || (\nbits > 8)
+		.err
+	.endif
+	.if (\shamt < 0) || (\shamt > 31)
+		.err
+	.endif
+	.insn i 0x0b, 0x4, \rd, \rs1, (\shamt & 0x1f) | (((\nbits - 1) & 0x7 ) << 6)
+.endm
+
+li t0,0xdeadbeef
+li t1,4
+
+h3.bextm s0,t0,t1,6
+
+# 0xDEADBEEF = 1101 1110 1010 1101 1011 1110 1110 1111   (rs1)
+#                                         vv vvvv
+#                                         10 1110 = 0x2E
+#                                        |---6---|       (imm)
+#                                                |--4-|  (rs2)
+
+
+h3.bextmi s1,t0,16,3
+
+# 0xDEADBEEF = 1101 1110 1010 1101 1011 1110 1110 1111   (rs1)
+#                              vvv
+#                              101 = 0x5
+#                             |-3-|                      (imm2)
+#                                 |--------16--------|   (imm1)
+
+li a7,10
+ecall
diff --git a/assembly/xh3bextm-test/xh3bextm-test.elf b/assembly/xh3bextm-test/xh3bextm-test.elf
new file mode 100755
index 0000000..b0c4daa
--- /dev/null
+++ b/assembly/xh3bextm-test/xh3bextm-test.elf
diff --git a/assembly/xh3bextm-test/xh3bextm-test.hex b/assembly/xh3bextm-test/xh3bextm-test.hex
new file mode 100644
index 0000000..d52c119
--- /dev/null
+++ b/assembly/xh3bextm-test/xh3bextm-test.hex
@@ -0,0 +1,3 @@
+:10000000B7C2ADDE9382F2EE11430B8462148BC44F

+:080010000209A9487300000079

+:00000001FF

diff --git a/assembly/xh3bextm-test/xh3bextm-test.o b/assembly/xh3bextm-test/xh3bextm-test.o
new file mode 100644
index 0000000..99fbe2d
--- /dev/null
+++ b/assembly/xh3bextm-test/xh3bextm-test.o