From f0cecc45d4162b59583d58dd25c3733b2aec37a3 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Mon, 25 Mar 2019 15:24:40 +0100
Subject: [PATCH] Convert tests to jit_load_args

---
 tests/test-addi.c   |  9 ++++++---
 tests/test-addr.c   | 10 ++++++----
 tests/test-addr_d.c | 10 ++++++----
 tests/test-addr_f.c | 10 ++++++----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/tests/test-addi.c b/tests/test-addi.c
index 586dc1c18..9b1a82b0c 100644
--- a/tests/test-addi.c
+++ b/tests/test-addi.c
@@ -5,11 +5,14 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
 {
   jit_begin(j, arena_base, arena_size);
 
-  jit_arg_abi_t abi[] = { JIT_ARG_ABI_INT32 };
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_INTMAX };
   jit_arg_t args[1];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_R0 } };
+
   jit_receive(j, 1, abi, args);
-  ASSERT(args[0].kind == JIT_ARG_LOC_GPR);
-  jit_addi(j, JIT_R0, args[0].loc.gpr, 69);
+  jit_load_args(j, 1, abi, args, regs);
+
+  jit_addi(j, JIT_R0, JIT_R0, 69);
   jit_retr(j, JIT_R0);
 
   size_t size = 0;
diff --git a/tests/test-addr.c b/tests/test-addr.c
index 8ead832dd..236fcd18a 100644
--- a/tests/test-addr.c
+++ b/tests/test-addr.c
@@ -5,12 +5,14 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
 {
   jit_begin(j, arena_base, arena_size);
 
-  jit_arg_abi_t abi[] = { JIT_ARG_ABI_INT32, JIT_ARG_ABI_INT32 };
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_INTMAX, JIT_ARG_ABI_INTMAX };
   jit_arg_t args[2];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_R0 }, { .gpr=JIT_R1 }};
+
   jit_receive(j, 2, abi, args);
-  ASSERT(args[0].kind == JIT_ARG_LOC_GPR);
-  ASSERT(args[1].kind == JIT_ARG_LOC_GPR);
-  jit_addr(j, JIT_R0, args[0].loc.gpr, args[1].loc.gpr);
+  jit_load_args(j, 2, abi, args, regs);
+
+  jit_addr(j, JIT_R0, JIT_R0, JIT_R1);
   jit_retr(j, JIT_R0);
 
   size_t size = 0;
diff --git a/tests/test-addr_d.c b/tests/test-addr_d.c
index cae33cd89..21a9dddae 100644
--- a/tests/test-addr_d.c
+++ b/tests/test-addr_d.c
@@ -5,12 +5,14 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
 {
   jit_begin(j, arena_base, arena_size);
 
-  jit_arg_abi_t abi[] = { JIT_ARG_ABI_DOUBLE, JIT_ARG_ABI_DOUBLE };
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_DOUBLE, JIT_ARG_ABI_DOUBLE };
   jit_arg_t args[2];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_F0 }, { .gpr=JIT_F1 }};
+
   jit_receive(j, 2, abi, args);
-  ASSERT(args[0].kind == JIT_ARG_LOC_FPR);
-  ASSERT(args[1].kind == JIT_ARG_LOC_FPR);
-  jit_addr_d(j, JIT_F0, args[0].loc.fpr, args[1].loc.fpr);
+  jit_load_args(j, 2, abi, args, regs);
+
+  jit_addr_d(j, JIT_F0, JIT_F0, JIT_F1);
   jit_retr_d(j, JIT_F0);
 
   size_t size = 0;
diff --git a/tests/test-addr_f.c b/tests/test-addr_f.c
index c85394a8f..4bcd533df 100644
--- a/tests/test-addr_f.c
+++ b/tests/test-addr_f.c
@@ -5,12 +5,14 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
 {
   jit_begin(j, arena_base, arena_size);
 
-  jit_arg_abi_t abi[] = { JIT_ARG_ABI_FLOAT, JIT_ARG_ABI_FLOAT };
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_FLOAT, JIT_ARG_ABI_FLOAT };
   jit_arg_t args[2];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_F0 }, { .gpr=JIT_F1 }};
+
   jit_receive(j, 2, abi, args);
-  ASSERT(args[0].kind == JIT_ARG_LOC_FPR);
-  ASSERT(args[1].kind == JIT_ARG_LOC_FPR);
-  jit_addr_f(j, JIT_F0, args[0].loc.fpr, args[1].loc.fpr);
+  jit_load_args(j, 2, abi, args, regs);
+
+  jit_addr_f(j, JIT_F0, JIT_F0, JIT_F1);
   jit_retr_f(j, JIT_F0);
 
   size_t size = 0;