3 files changed, 118 insertions, 2 deletions
diff --git a/isa/rv64uv/Makefrag b/isa/rv64uv/Makefrag
index 53c6525..fbc1024 100644
--- a/isa/rv64uv/Makefrag
+++ b/isa/rv64uv/Makefrag
@@ -11,8 +11,8 @@ rv64uv_sc_tests = \
 	sb sh sw sd \
 	fld flw \
 	fsd fsw \
-	amoadd_d amoand_d amomax_d amomaxu_d amomin_d amominu_d amoor_d amoswap_d \
-	amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoswap_w \
+	amoadd_d amoand_d amomax_d amomaxu_d amomin_d amominu_d amoor_d amoswap_d amoxor_d \
+	amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoswap_w amoxor_w \
 	imul \
 	movn movz \
 	fcvt fma \
diff --git a/isa/rv64uv/amoxor_d.S b/isa/rv64uv/amoxor_d.S
new file mode 100644
index 0000000..f67bccf
--- /dev/null
+++ b/isa/rv64uv/amoxor_d.S
@@ -0,0 +1,58 @@
+#*****************************************************************************
+# amoxor_d.S
+#-----------------------------------------------------------------------------
+#
+# Test amoxor.d instruction in a vf block.
+#
+
+#include "riscv_test.h"
+#include "test_macros.h"
+
+RVTEST_RV64UV
+RVTEST_CODE_BEGIN
+
+  vsetcfg 4,0
+  li a4,2048
+  vsetvl a4,a4
+
+  la a5,amodest
+  vmsv vx2,a5
+  lui a0,%hi(vtcode)
+  vf %lo(vtcode)(a0)
+  la a6,dest
+  vsd vx1,a6
+  fence
+
+  li a1,0
+  li a2,-1
+  li t0,0xaaaaaaaaaaaaaaaa
+loop:
+  ld a0,0(a6)
+  addi x28,a1,2
+  bne a0,a2,fail
+  addi a6,a6,8
+  addi a1,a1,1
+  xor a2,a2,t0
+  bne a1,a4,loop
+  j pass
+
+vtcode:
+  li x3,0xaaaaaaaaaaaaaaaa
+  amoxor.d x1,x3,0(x2)
+  stop
+
+  TEST_PASSFAIL
+
+RVTEST_CODE_END
+
+  .data
+RVTEST_DATA_BEGIN
+
+  TEST_DATA
+
+amodest:
+  .dword -1
+dest:
+  .skip 16384
+
+RVTEST_DATA_END
diff --git a/isa/rv64uv/amoxor_w.S b/isa/rv64uv/amoxor_w.S
new file mode 100644
index 0000000..fac070f
--- /dev/null
+++ b/isa/rv64uv/amoxor_w.S
@@ -0,0 +1,58 @@
+#*****************************************************************************
+# amoxor_w.S
+#-----------------------------------------------------------------------------
+#
+# Test amoxor.w instruction in a vf block.
+#
+
+#include "riscv_test.h"
+#include "test_macros.h"
+
+RVTEST_RV64UV
+RVTEST_CODE_BEGIN
+
+  vsetcfg 4,0
+  li a4,2048
+  vsetvl a4,a4
+
+  la a5,amodest
+  vmsv vx2,a5
+  lui a0,%hi(vtcode)
+  vf %lo(vtcode)(a0)
+  la a6,dest
+  vsw vx1,a6
+  fence
+
+  li a1,0
+  li a2,-1
+loop:
+  lw a0,0(a6)
+  addi x28,a1,2
+  bne a0,a2,fail
+  addi a6,a6,4
+  addi a1,a1,1
+  li t0,0xcafe
+  xor a2,a2,t0
+  bne a1,a4,loop
+  j pass
+
+vtcode:
+  li x3,0xcafe
+  amoxor.w x1,x3,0(x2)
+  stop
+
+  TEST_PASSFAIL
+
+RVTEST_CODE_END
+
+  .data
+RVTEST_DATA_BEGIN
+
+  TEST_DATA
+
+amodest:
+  .word -1
+dest:
+  .skip 16384
+
+RVTEST_DATA_END