27 files changed, 2 insertions, 28 deletions
diff --git a/isa/Makefile b/isa/Makefile
index 53c11ad..8cecab9 100644
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -29,7 +29,7 @@ vpath %.S $(isa_src_dir)
 # Build assembly tests
 
 %.hex: %
-	elf2hex 16 16384 $< > $@
+	(elf2hex 16 8192 $< 2> /dev/null || elf2hex 16 16384 $<) > $@
 
 %.dump: %
 	$(RISCV_OBJDUMP) $< > $@
diff --git a/isa/rv32ui/amoadd_w.S b/isa/rv32ui/amoadd_w.S
index 30d3f79..5f331c5 100644
--- a/isa/rv32ui/amoadd_w.S
+++ b/isa/rv32ui/amoadd_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
     .align 3
 amo_operand:
     .dword 0
-    .skip 65536
diff --git a/isa/rv32ui/amoand_w.S b/isa/rv32ui/amoand_w.S
index 3204f1c..37cb46a 100644
--- a/isa/rv32ui/amoand_w.S
+++ b/isa/rv32ui/amoand_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amomax_w.S b/isa/rv32ui/amomax_w.S
index a7fc95a..d71baa0 100644
--- a/isa/rv32ui/amomax_w.S
+++ b/isa/rv32ui/amomax_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amomaxu_w.S b/isa/rv32ui/amomaxu_w.S
index ca8045d..8295b73 100644
--- a/isa/rv32ui/amomaxu_w.S
+++ b/isa/rv32ui/amomaxu_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amomin_w.S b/isa/rv32ui/amomin_w.S
index 3cbf08c..40fd769 100644
--- a/isa/rv32ui/amomin_w.S
+++ b/isa/rv32ui/amomin_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amominu_w.S b/isa/rv32ui/amominu_w.S
index 3809d1c..1f8abb1 100644
--- a/isa/rv32ui/amominu_w.S
+++ b/isa/rv32ui/amominu_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amoor_w.S b/isa/rv32ui/amoor_w.S
index 6df4da4..ece7a91 100644
--- a/isa/rv32ui/amoor_w.S
+++ b/isa/rv32ui/amoor_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv32ui/amoswap_w.S b/isa/rv32ui/amoswap_w.S
index bf034d1..118c92d 100644
--- a/isa/rv32ui/amoswap_w.S
+++ b/isa/rv32ui/amoswap_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoadd_d.S b/isa/rv64ui/amoadd_d.S
index 21d534c..92b7bb6 100644
--- a/isa/rv64ui/amoadd_d.S
+++ b/isa/rv64ui/amoadd_d.S
@@ -58,5 +58,4 @@ RVTEST_DATA_END
   .bss
   .align 3
 amo_operand:
-  .dword 0
-  .skip 65536
+  .dword 0
+\ No newline at end of file
diff --git a/isa/rv64ui/amoadd_w.S b/isa/rv64ui/amoadd_w.S
index 4c71ac8..b46628b 100644
--- a/isa/rv64ui/amoadd_w.S
+++ b/isa/rv64ui/amoadd_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
     .align 3
 amo_operand:
     .dword 0
-    .skip 65536
diff --git a/isa/rv64ui/amoand_d.S b/isa/rv64ui/amoand_d.S
index 0c4985c..ad0d3d2 100644
--- a/isa/rv64ui/amoand_d.S
+++ b/isa/rv64ui/amoand_d.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoand_w.S b/isa/rv64ui/amoand_w.S
index 0433860..f141d02 100644
--- a/isa/rv64ui/amoand_w.S
+++ b/isa/rv64ui/amoand_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomax_d.S b/isa/rv64ui/amomax_d.S
index a0dc2aa..1d1a7cb 100644
--- a/isa/rv64ui/amomax_d.S
+++ b/isa/rv64ui/amomax_d.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomax_w.S b/isa/rv64ui/amomax_w.S
index 0fe3352..c91f5b3 100644
--- a/isa/rv64ui/amomax_w.S
+++ b/isa/rv64ui/amomax_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomaxu_d.S b/isa/rv64ui/amomaxu_d.S
index 9dc13e4..7bd8ba2 100644
--- a/isa/rv64ui/amomaxu_d.S
+++ b/isa/rv64ui/amomaxu_d.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomaxu_w.S b/isa/rv64ui/amomaxu_w.S
index 8e774b6..6ff2213 100644
--- a/isa/rv64ui/amomaxu_w.S
+++ b/isa/rv64ui/amomaxu_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomin_d.S b/isa/rv64ui/amomin_d.S
index 168ae3c..99ca009 100644
--- a/isa/rv64ui/amomin_d.S
+++ b/isa/rv64ui/amomin_d.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amomin_w.S b/isa/rv64ui/amomin_w.S
index e6822d8..1c68f11 100644
--- a/isa/rv64ui/amomin_w.S
+++ b/isa/rv64ui/amomin_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amominu_d.S b/isa/rv64ui/amominu_d.S
index 9572d95..b1e7e3e 100644
--- a/isa/rv64ui/amominu_d.S
+++ b/isa/rv64ui/amominu_d.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amominu_w.S b/isa/rv64ui/amominu_w.S
index cf2f516..b23049f 100644
--- a/isa/rv64ui/amominu_w.S
+++ b/isa/rv64ui/amominu_w.S
@@ -44,4 +44,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoor_d.S b/isa/rv64ui/amoor_d.S
index ce1a843..31cf612 100644
--- a/isa/rv64ui/amoor_d.S
+++ b/isa/rv64ui/amoor_d.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoor_w.S b/isa/rv64ui/amoor_w.S
index 784aee7..8902c17 100644
--- a/isa/rv64ui/amoor_w.S
+++ b/isa/rv64ui/amoor_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoswap_d.S b/isa/rv64ui/amoswap_d.S
index b78e653..cd8d269 100644
--- a/isa/rv64ui/amoswap_d.S
+++ b/isa/rv64ui/amoswap_d.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoswap_w.S b/isa/rv64ui/amoswap_w.S
index 174676b..6e4d77b 100644
--- a/isa/rv64ui/amoswap_w.S
+++ b/isa/rv64ui/amoswap_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoxor_d.S b/isa/rv64ui/amoxor_d.S
index 81ebe00..9c31b70 100644
--- a/isa/rv64ui/amoxor_d.S
+++ b/isa/rv64ui/amoxor_d.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536
diff --git a/isa/rv64ui/amoxor_w.S b/isa/rv64ui/amoxor_w.S
index 79579d2..d199047 100644
--- a/isa/rv64ui/amoxor_w.S
+++ b/isa/rv64ui/amoxor_w.S
@@ -60,4 +60,3 @@ RVTEST_DATA_END
   .align 3
 amo_operand:
   .dword 0
-  .skip 65536