From: Andrew Waterman Date: Mon, 5 Jan 2015 05:31:18 +0000 (-0800) Subject: Avoid deprecated "b" pseudo-op; use "j" instead X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=350b03e6dd18616146cf43b9d5daa98db059822b;p=riscv-tests.git Avoid deprecated "b" pseudo-op; use "j" instead --- diff --git a/benchmarks/dhrystone/dhrystone_main.c b/benchmarks/dhrystone/dhrystone_main.c index a755743..bed4155 100644 --- a/benchmarks/dhrystone/dhrystone_main.c +++ b/benchmarks/dhrystone/dhrystone_main.c @@ -241,7 +241,7 @@ int main (int argc, char** argv) do_fprintf (stderr, "Arr_2_Glob[8][7]: %d\n", Arr_2_Glob[8][7]); do_fprintf (stderr, " should be: Number_Of_Runs + 10\n"); do_fprintf (stderr, "Ptr_Glob->\n"); - do_fprintf (stderr, " Ptr_Comp: %d\n", (int) Ptr_Glob->Ptr_Comp); + do_fprintf (stderr, " Ptr_Comp: %d\n", (long) Ptr_Glob->Ptr_Comp); do_fprintf (stderr, " should be: (implementation-dependent)\n"); do_fprintf (stderr, " Discr: %d\n", Ptr_Glob->Discr); do_fprintf (stderr, " should be: %d\n", 0); @@ -252,7 +252,7 @@ int main (int argc, char** argv) do_fprintf (stderr, " Str_Comp: %s\n", Ptr_Glob->variant.var_1.Str_Comp); do_fprintf (stderr, " should be: DHRYSTONE PROGRAM, SOME STRING\n"); do_fprintf (stderr, "Next_Ptr_Glob->\n"); - do_fprintf (stderr, " Ptr_Comp: %d\n", (int) Next_Ptr_Glob->Ptr_Comp); + do_fprintf (stderr, " Ptr_Comp: %d\n", (long) Next_Ptr_Glob->Ptr_Comp); do_fprintf (stderr, " should be: (implementation-dependent), same as above\n"); do_fprintf (stderr, " Discr: %d\n", Next_Ptr_Glob->Discr); do_fprintf (stderr, " should be: %d\n", 0); diff --git a/env b/env index 9be3535..1a95807 160000 --- a/env +++ b/env @@ -1 +1 @@ -Subproject commit 9be35353ecb3252ec62b86d446c43ba89843b0b4 +Subproject commit 1a95807a08d3d87e3fb9176f275a5ca6bfbd0afe diff --git a/isa/macros/scalar/test_macros.h b/isa/macros/scalar/test_macros.h index 5b2b8e5..0f50118 100644 --- a/isa/macros/scalar/test_macros.h +++ b/isa/macros/scalar/test_macros.h @@ -540,7 +540,7 @@ test_ ## testnum: \ fsflags x0; \ fmv.x.s a0, f0; \ bne a0, a3, fail; \ - b 1f; \ + j 1f; \ .align 2; \ test_ ## testnum ## _data: \ .float result; \ @@ -556,7 +556,7 @@ test_ ## testnum: \ fsflags x0; \ fmv.x.d a0, f0; \ bne a0, a3, fail; \ - b 1f; \ + j 1f; \ .align 3; \ test_ ## testnum ## _data: \ .double result; \ diff --git a/isa/macros/vector/test_macros.h b/isa/macros/vector/test_macros.h index f5dd276..68e39ae 100644 --- a/isa/macros/vector/test_macros.h +++ b/isa/macros/vector/test_macros.h @@ -247,7 +247,7 @@ skip ## testnum : \ addi a4,a4,4; \ addi a2,a2,1; \ bne a2,a3,test_loop ## testnum; \ - b 1f; \ + j 1f; \ vtcode ## testnum : \ code; \ stop; \ @@ -287,7 +287,7 @@ skip ## testnum : \ addi a4,a4,8; \ addi a2,a2,1; \ bne a2,a3,test_loop ## testnum; \ - b 1f; \ + j 1f; \ vtcode ## testnum : \ code; \ stop; \ @@ -361,7 +361,7 @@ skip ## testnum : \ addi a4,a4,4; \ addi a2,a2,1; \ bne a2,a3,test_loop ## testnum; \ - b 1f; \ + j 1f; \ vtcode ## testnum : \ li x1, val1; \ inst f0, x1; \ @@ -394,7 +394,7 @@ skip ## testnum : \ addi a4,a4,8; \ addi a2,a2,1; \ bne a2,a3,test_loop ## testnum; \ - b 1f; \ + j 1f; \ vtcode ## testnum : \ li x1, val1; \ inst f0, x1; \ diff --git a/isa/rv64si/ipi.S b/isa/rv64si/ipi.S index 3b03348..753a182 100644 --- a/isa/rv64si/ipi.S +++ b/isa/rv64si/ipi.S @@ -32,7 +32,7 @@ RVTEST_CODE_BEGIN add a0, a0, 1 rem a0, a0, a3 csrw send_ipi, a0 - 1: b 1b + 1: j 1b handler: csrr a0, hartid @@ -44,7 +44,7 @@ RVTEST_CODE_BEGIN 2: add a0, a0, 1 rem a0, a0, a3 csrw send_ipi, a0 - 1: b 1b + 1: j 1b RVTEST_CODE_END diff --git a/isa/rv64uf/structural.S b/isa/rv64uf/structural.S index 61baa54..e27cc28 100644 --- a/isa/rv64uf/structural.S +++ b/isa/rv64uf/structural.S @@ -22,7 +22,7 @@ li x1, 0x3F800000 fmv.s.x f3, x0 ;\ fmv.d.x f2, x2 ;\ fmv.s.x f1, x1 ;\ - b 1f ;\ + j 1f ;\ .align 5 ;\ 1:fmul.d f4, f2, f2 ;\ nops ;\