Shrink hex dumps

diff --git a/isa/Makefile b/isa/Makefile
index 53c11ad6763ec3f51d5d382d673e3040a4838618..8cecab932071674272f6d7327151090b314221d8 100644 (file)
--- 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 30d3f7965b36bd0843ee61ebbf12b92de861e652..5f331c5997117ca4bdb119cd81938764c1733df8 100644 (file)
--- 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 3204f1c3a5ab142f81ebd27986248f14e93fcd10..37cb46ac774c91be8a841f911c43f9521e326215 100644 (file)
--- 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 a7fc95a9593fbfcd5541f75a6516b89ae44df702..d71baa0eafa81b689b0cf5eab0d6b355b474c3c4 100644 (file)
--- 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 ca8045d1be141e39f1a282ce379f0355406f4a6f..8295b73503a9dd7c9b37cea5aac8bd289fc48bd2 100644 (file)
--- 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 3cbf08cead18a67aa2a8b64079d3878098cb051a..40fd769ac482685bc648f88720f6aa05b8bb8b6a 100644 (file)
--- 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 3809d1c57dd50d10ae9bd9c0a90eae6be70906d8..1f8abb1e10f3c979c8dd054b61d29a670f67c0e5 100644 (file)
--- 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 6df4da49f32e9acfe0d2b5a856b0f6869a9dbd41..ece7a9130c4f3fc78d03ac3b044129ef722b3c27 100644 (file)
--- 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 bf034d118e1cb059404f2803421be5d9b751d11c..118c92d4eb2827cde21c740b57158a24bf167185 100644 (file)
--- 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 21d534c9073b5c800fa328ee2c8fc63c16accb6d..92b7bb65c1997d7ab6ce04ea0513dc3cb133a310 100644 (file)
--- 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 4c71ac8ac957a6e9c316b1ba8c22fd5c30bb93d6..b46628b00a3271849ee7f130da3b322181e3f1a4 100644 (file)
--- 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 0c4985ce97e7a79846aac63ab40ca42df8db7a3f..ad0d3d223bfaeefec1f97c7a8ffe6ade0a7dfdbe 100644 (file)
--- 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 0433860b32dd3ff0feaafb75802683bf5d1b8c52..f141d02dd3551631d64ec29e3c1481f341bd47b9 100644 (file)
--- 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 a0dc2aaa91a4be44a760b52c2a17b635e1f9b36b..1d1a7cbc8f2f1d12ff80742e4094a276dd75b6cf 100644 (file)
--- 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 0fe3352ab02409acba50a2def84fa5d4a4579d49..c91f5b395076babf03d2b923e1b7f585e0e52235 100644 (file)
--- 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 9dc13e474b6a4ace90040dc59a37b16392b15480..7bd8ba2bf6c107785269cc68a9d39e4b424adbae 100644 (file)
--- 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 8e774b6e2fc61c76ff2220e77ae65a8990e21f65..6ff2213ac6dcc343e6d5eb6856e530d35389370c 100644 (file)
--- 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 168ae3cabfebb72ef53a37bab7caf26b9fb8335e..99ca0095b9ae3dd61885ce88900a2292e2138933 100644 (file)
--- 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 e6822d86b565cce076c19dc4ca858fe69c5e66a6..1c68f119a08bda839a60cadcda55ffe3ac81f27e 100644 (file)
--- 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 9572d95bad2ec2f1f26b83eb9482add70a14adb8..b1e7e3e48cb4d6da44be16333bb6b6ede72f8251 100644 (file)
--- 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 cf2f516e711223f88dd026831d5580e27535c202..b23049fab91cba4771da71485b65f9ac7bd39bbd 100644 (file)
--- 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 ce1a843c65726ce3f727effca2c1990c6219c287..31cf612145230cd38662a76ab847e5a332ef9fa0 100644 (file)
--- 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 784aee7d456b59354e9beed6bbf48273dfe00202..8902c17a1f8f994be96c8b3f0058616d1f3a2546 100644 (file)
--- 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 b78e65325a3538c10e84c7d557a2204959b3de26..cd8d26932f0c7558b28abb401c3367ab56a4fae6 100644 (file)
--- 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 174676bc9a7a4a3302521c6b06757f9c16cf83f4..6e4d77b8fc2df83d818bc93da44e74fdc948595e 100644 (file)
--- 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 81ebe005abb2e3fd56721c93a3b2959792d9dc6f..9c31b70914dc98cd52dfb823fa9e954e9946316d 100644 (file)
--- 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 79579d277906976cbee64291096cd7f2f36a6cab..d199047c930ef1b9f48540e6ea452251f301ac9a 100644 (file)
--- 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