From e9d1567f7ff18f9386d726654b357e93c6e0cfc4 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 26 Apr 2019 15:00:29 +0200 Subject: [PATCH] Use jit_word_t for register-sized values instead of intmax_t --- lightening.h | 4 ++-- lightening/lightening.c | 2 +- tests/Makefile | 2 +- tests/addi.c | 2 +- tests/addr.c | 4 ++-- tests/addx.c | 6 +++--- tests/andi.c | 4 ++-- tests/andr.c | 6 +++--- tests/beqi.c | 4 ++-- tests/beqr.c | 6 +++--- tests/beqr_d.c | 2 +- tests/beqr_f.c | 2 +- tests/bgei.c | 4 ++-- tests/bgei_u.c | 4 ++-- tests/bger.c | 6 +++--- tests/bger_d.c | 2 +- tests/bger_f.c | 2 +- tests/bger_u.c | 6 +++--- tests/bgti.c | 4 ++-- tests/bgti_u.c | 4 ++-- tests/bgtr.c | 6 +++--- tests/bgtr_d.c | 2 +- tests/bgtr_f.c | 2 +- tests/bgtr_u.c | 6 +++--- tests/blei.c | 4 ++-- tests/blei_u.c | 4 ++-- tests/bler.c | 6 +++--- tests/bler_d.c | 2 +- tests/bler_f.c | 2 +- tests/bler_u.c | 6 +++--- tests/bltgtr_d.c | 2 +- tests/bltgtr_f.c | 2 +- tests/blti.c | 4 ++-- tests/blti_u.c | 4 ++-- tests/bltr.c | 6 +++--- tests/bltr_d.c | 2 +- tests/bltr_f.c | 2 +- tests/bltr_u.c | 6 +++--- tests/bmci.c | 4 ++-- tests/bmcr.c | 6 +++--- tests/bmsi.c | 4 ++-- tests/bmsr.c | 6 +++--- tests/bnei.c | 4 ++-- tests/bner.c | 6 +++--- tests/bner_d.c | 2 +- tests/bner_f.c | 2 +- tests/boaddi.c | 6 +++--- tests/boaddi_u.c | 6 +++--- tests/boaddr.c | 8 ++++---- tests/boaddr_u.c | 8 ++++---- tests/bordr_d.c | 2 +- tests/bordr_f.c | 2 +- tests/bosubi.c | 6 +++--- tests/bosubi_u.c | 6 +++--- tests/bosubr.c | 8 ++++---- tests/bosubr_u.c | 8 ++++---- tests/bswapr_ui.c | 4 ++-- tests/bswapr_ul.c | 4 ++-- tests/bswapr_us.c | 4 ++-- tests/buneqr_d.c | 2 +- tests/buneqr_f.c | 2 +- tests/bunger_d.c | 2 +- tests/bunger_f.c | 2 +- tests/bungtr_d.c | 2 +- tests/bungtr_f.c | 2 +- tests/bunler_d.c | 2 +- tests/bunler_f.c | 2 +- tests/bunltr_d.c | 2 +- tests/bunltr_f.c | 2 +- tests/bunordr_d.c | 2 +- tests/bunordr_f.c | 2 +- tests/bxaddi.c | 6 +++--- tests/bxaddi_u.c | 6 +++--- tests/bxaddr.c | 8 ++++---- tests/bxaddr_u.c | 8 ++++---- tests/bxsubi.c | 6 +++--- tests/bxsubi_u.c | 6 +++--- tests/bxsubr.c | 8 ++++---- tests/bxsubr_u.c | 8 ++++---- tests/comr.c | 4 ++-- tests/divr.c | 6 +++--- tests/divr_u.c | 6 +++--- tests/extr_c.c | 4 ++-- tests/extr_d.c | 4 ++-- tests/extr_f.c | 4 ++-- tests/extr_i.c | 4 ++-- tests/extr_s.c | 4 ++-- tests/extr_uc.c | 4 ++-- tests/extr_ui.c | 4 ++-- tests/extr_us.c | 4 ++-- tests/ldi_c.c | 2 +- tests/ldi_i.c | 2 +- tests/ldi_l.c | 2 +- tests/ldi_s.c | 2 +- tests/ldi_uc.c | 2 +- tests/ldi_ui.c | 2 +- tests/ldi_us.c | 2 +- tests/ldr_c.c | 2 +- tests/ldr_i.c | 2 +- tests/ldr_l.c | 2 +- tests/ldr_s.c | 2 +- tests/ldr_uc.c | 2 +- tests/ldr_ui.c | 2 +- tests/ldr_us.c | 2 +- tests/ldxi_c.c | 4 ++-- tests/ldxi_d.c | 4 ++-- tests/ldxi_f.c | 4 ++-- tests/ldxi_i.c | 2 +- tests/ldxi_l.c | 4 ++-- tests/ldxi_s.c | 4 ++-- tests/ldxi_uc.c | 4 ++-- tests/ldxi_ui.c | 4 ++-- tests/ldxi_us.c | 4 ++-- tests/ldxr_c.c | 4 ++-- tests/ldxr_d.c | 4 ++-- tests/ldxr_f.c | 4 ++-- tests/ldxr_i.c | 4 ++-- tests/ldxr_l.c | 4 ++-- tests/ldxr_s.c | 4 ++-- tests/ldxr_uc.c | 4 ++-- tests/ldxr_ui.c | 4 ++-- tests/ldxr_us.c | 4 ++-- tests/lshi.c | 4 ++-- tests/lshr.c | 6 +++--- tests/mulr.c | 6 +++--- tests/negr.c | 4 ++-- tests/nop.c | 2 +- tests/ori.c | 4 ++-- tests/orr.c | 6 +++--- tests/pushpop.c | 4 ++-- tests/qdivr.c | 8 ++++---- tests/qdivr_u.c | 9 ++++----- tests/qmulr.c | 8 ++++---- tests/qmulr_u.c | 8 ++++---- tests/remr.c | 6 +++--- tests/remr_u.c | 6 +++--- tests/rshi.c | 4 ++-- tests/rshi_u.c | 4 ++-- tests/rshr.c | 6 +++--- tests/rshr_u.c | 6 +++--- tests/stxi_c.c | 4 ++-- tests/stxi_d.c | 4 ++-- tests/stxi_f.c | 4 ++-- tests/stxi_i.c | 4 ++-- tests/stxi_l.c | 4 ++-- tests/stxi_s.c | 4 ++-- tests/stxr_c.c | 4 ++-- tests/stxr_d.c | 4 ++-- tests/stxr_f.c | 4 ++-- tests/stxr_i.c | 4 ++-- tests/stxr_l.c | 4 ++-- tests/stxr_s.c | 4 ++-- tests/subr.c | 4 ++-- tests/subx.c | 6 +++--- tests/xori.c | 4 ++-- tests/xorr.c | 6 +++--- 156 files changed, 322 insertions(+), 323 deletions(-) diff --git a/lightening.h b/lightening.h index 437ba1872..db327fc45 100644 --- a/lightening.h +++ b/lightening.h @@ -124,8 +124,8 @@ enum jit_operand_abi JIT_OPERAND_ABI_POINTER, JIT_OPERAND_ABI_FLOAT, JIT_OPERAND_ABI_DOUBLE, - JIT_OPERAND_ABI_INTMAX = CHOOSE_32_64(JIT_OPERAND_ABI_INT32, - JIT_OPERAND_ABI_INT64) + JIT_OPERAND_ABI_WORD = CHOOSE_32_64(JIT_OPERAND_ABI_INT32, + JIT_OPERAND_ABI_INT64) }; enum jit_operand_kind diff --git a/lightening/lightening.c b/lightening/lightening.c index 3b71654ff..de945e02f 100644 --- a/lightening/lightening.c +++ b/lightening/lightening.c @@ -565,7 +565,7 @@ abi_mem_to_fpr(jit_state_t *_jit, enum jit_operand_abi abi, static void abi_imm_to_mem(jit_state_t *_jit, enum jit_operand_abi abi, jit_gpr_t base, - ptrdiff_t offset, intmax_t imm) + ptrdiff_t offset, jit_imm_t imm) { ASSERT(!is_fpr_arg(abi)); diff --git a/tests/Makefile b/tests/Makefile index f068308c7..4ba054afd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -27,7 +27,7 @@ test-native-%: %.c lightening-native.o test.h test-ia32-%: CC = $(CC_IA32) test-ia32-%: %.c lightening-ia32.o test.h - $(CC) -m32 $(CFLAGS) $(CPPFLAGS) -I.. -o $@ lightening-ia32.o $< + $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ lightening-ia32.o $< clean: rm -f $(foreach TARGET,$(TARGETS),$(addprefix test-$(TARGET)-,$(TESTS))) diff --git a/tests/addi.c b/tests/addi.c index f0e632c94..85d4d8e9b 100644 --- a/tests/addi.c +++ b/tests/addi.c @@ -4,7 +4,7 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_addi(j, JIT_R0, JIT_R0, 69); jit_retr(j, JIT_R0); diff --git a/tests/addr.c b/tests/addr.c index 8894cc5dc..a54f75661 100644 --- a/tests/addr.c +++ b/tests/addr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_addr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); diff --git a/tests/addx.c b/tests/addx.c index 6013e52c1..875e09f42 100644 --- a/tests/addx.c +++ b/tests/addx.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_movi(j, JIT_R2, 0); jit_addcr(j, JIT_R0, JIT_R0, JIT_R1); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0, 0) == 0); diff --git a/tests/andi.c b/tests/andi.c index a1d3203c9..2f84d767e 100644 --- a/tests/andi.c +++ b/tests/andi.c @@ -4,7 +4,7 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_andi(j, JIT_R0, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t) = ret; + jit_word_t (*f)(jit_word_t) = ret; ASSERT(f(0x7fffffff) == 1); ASSERT(f(0x80000000) == 0); diff --git a/tests/andr.c b/tests/andr.c index 62cc61e8a..2e09527b8 100644 --- a/tests/andr.c +++ b/tests/andr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_andr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 1); ASSERT(f(1, 0x7fffffff) == 1); diff --git a/tests/beqi.c b/tests/beqi.c index 994147306..857d927a5 100644 --- a/tests/beqi.c +++ b/tests/beqi.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_beqi(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 0); diff --git a/tests/beqr.c b/tests/beqr.c index 2bdeb24a9..e8bacd017 100644 --- a/tests/beqr.c +++ b/tests/beqr.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_beqr(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/beqr_d.c b/tests/beqr_d.c index 628e80ce3..1b7f88b25 100644 --- a/tests/beqr_d.c +++ b/tests/beqr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/beqr_f.c b/tests/beqr_f.c index dca60fa98..85b464f8f 100644 --- a/tests/beqr_f.c +++ b/tests/beqr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bgei.c b/tests/bgei.c index 7a847e699..939e1a02f 100644 --- a/tests/bgei.c +++ b/tests/bgei.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bgei(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 1); diff --git a/tests/bgei_u.c b/tests/bgei_u.c index 6847613c5..b5253e931 100644 --- a/tests/bgei_u.c +++ b/tests/bgei_u.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bgei_u(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 1); diff --git a/tests/bger.c b/tests/bger.c index 68df65bdf..d59e4f456 100644 --- a/tests/bger.c +++ b/tests/bger.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bger(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bger_d.c b/tests/bger_d.c index ab1190ea7..281803dc6 100644 --- a/tests/bger_d.c +++ b/tests/bger_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bger_f.c b/tests/bger_f.c index 07cf7f075..d9c556c23 100644 --- a/tests/bger_f.c +++ b/tests/bger_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bger_u.c b/tests/bger_u.c index 806953c60..13c6a1dc4 100644 --- a/tests/bger_u.c +++ b/tests/bger_u.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bger_u(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bgti.c b/tests/bgti.c index e6e6c05db..36df65930 100644 --- a/tests/bgti.c +++ b/tests/bgti.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bgti(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/bgti_u.c b/tests/bgti_u.c index f604fed36..c5be4e3f3 100644 --- a/tests/bgti_u.c +++ b/tests/bgti_u.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bgti_u(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/bgtr.c b/tests/bgtr.c index de31bf876..222816a26 100644 --- a/tests/bgtr.c +++ b/tests/bgtr.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bgtr(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bgtr_d.c b/tests/bgtr_d.c index 1cc8dd5eb..f2892ab83 100644 --- a/tests/bgtr_d.c +++ b/tests/bgtr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bgtr_f.c b/tests/bgtr_f.c index 37d65f2b8..4ac08a344 100644 --- a/tests/bgtr_f.c +++ b/tests/bgtr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bgtr_u.c b/tests/bgtr_u.c index 31202c455..23ade0931 100644 --- a/tests/bgtr_u.c +++ b/tests/bgtr_u.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bgtr_u(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/blei.c b/tests/blei.c index c9317eab8..4303cae13 100644 --- a/tests/blei.c +++ b/tests/blei.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_blei(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 0); diff --git a/tests/blei_u.c b/tests/blei_u.c index 614ddf0be..23c02729d 100644 --- a/tests/blei_u.c +++ b/tests/blei_u.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_blei_u(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 0); diff --git a/tests/bler.c b/tests/bler.c index ba580b032..0d3f160d9 100644 --- a/tests/bler.c +++ b/tests/bler.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bler(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bler_d.c b/tests/bler_d.c index f11b92356..7d5253160 100644 --- a/tests/bler_d.c +++ b/tests/bler_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bler_f.c b/tests/bler_f.c index 9c0a7f710..5d57bc11d 100644 --- a/tests/bler_f.c +++ b/tests/bler_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bler_u.c b/tests/bler_u.c index 036bb6420..a4caf5b31 100644 --- a/tests/bler_u.c +++ b/tests/bler_u.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bler_u(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bltgtr_d.c b/tests/bltgtr_d.c index 6d433e47b..21fa5467e 100644 --- a/tests/bltgtr_d.c +++ b/tests/bltgtr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bltgtr_f.c b/tests/bltgtr_f.c index 711e51647..872fbb3c3 100644 --- a/tests/bltgtr_f.c +++ b/tests/bltgtr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/blti.c b/tests/blti.c index a16ac0220..a011f5a6c 100644 --- a/tests/blti.c +++ b/tests/blti.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_blti(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 0); diff --git a/tests/blti_u.c b/tests/blti_u.c index 1a93f1d1e..b4afe71f5 100644 --- a/tests/blti_u.c +++ b/tests/blti_u.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_blti_u(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 0); diff --git a/tests/bltr.c b/tests/bltr.c index 7802fa82e..d9d252007 100644 --- a/tests/bltr.c +++ b/tests/bltr.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bltr(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bltr_d.c b/tests/bltr_d.c index 11930eee2..a1b60a314 100644 --- a/tests/bltr_d.c +++ b/tests/bltr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bltr_f.c b/tests/bltr_f.c index 4bb3ac48a..adbafec37 100644 --- a/tests/bltr_f.c +++ b/tests/bltr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bltr_u.c b/tests/bltr_u.c index c73949f6a..4ec33c26b 100644 --- a/tests/bltr_u.c +++ b/tests/bltr_u.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bltr_u(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bmci.c b/tests/bmci.c index 8846c9462..55cd4a33a 100644 --- a/tests/bmci.c +++ b/tests/bmci.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bmci(j, JIT_R0, 1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 1); ASSERT(f(1) == 0); diff --git a/tests/bmcr.c b/tests/bmcr.c index ba8b246c0..00dad50d2 100644 --- a/tests/bmcr.c +++ b/tests/bmcr.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bmcr(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bmsi.c b/tests/bmsi.c index 538575f8b..a51616427 100644 --- a/tests/bmsi.c +++ b/tests/bmsi.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bmsi(j, JIT_R0, 1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/bmsr.c b/tests/bmsr.c index 3ac320ff9..79a9d235f 100644 --- a/tests/bmsr.c +++ b/tests/bmsr.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bmsr(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bnei.c b/tests/bnei.c index f1ac741c8..3b064820b 100644 --- a/tests/bnei.c +++ b/tests/bnei.c @@ -4,14 +4,14 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bnei(j, JIT_R0, 0); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/bner.c b/tests/bner.c index 1f8f05dbe..2e1321682 100644 --- a/tests/bner.c +++ b/tests/bner.c @@ -4,15 +4,15 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bner(j, JIT_R0, JIT_R1); jit_reti(j, 0); jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bner_d.c b/tests/bner_d.c index afe1a363f..3f29d460b 100644 --- a/tests/bner_d.c +++ b/tests/bner_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bner_f.c b/tests/bner_f.c index bc5782439..e43ddf9e8 100644 --- a/tests/bner_f.c +++ b/tests/bner_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/boaddi.c b/tests/boaddi.c index 3ee3bef28..6dcc4ea5e 100644 --- a/tests/boaddi.c +++ b/tests/boaddi.c @@ -1,12 +1,12 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_boaddi(j, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -14,7 +14,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == 0); ASSERT(f(0) == 1); diff --git a/tests/boaddi_u.c b/tests/boaddi_u.c index c55c1f80b..364c71c96 100644 --- a/tests/boaddi_u.c +++ b/tests/boaddi_u.c @@ -1,12 +1,12 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_boaddi_u(j, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -14,7 +14,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == overflowed); ASSERT(f(0) == 1); diff --git a/tests/boaddr.c b/tests/boaddr.c index 4c86c320d..c07417c20 100644 --- a/tests/boaddr.c +++ b/tests/boaddr.c @@ -1,13 +1,13 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_boaddr(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 2); diff --git a/tests/boaddr_u.c b/tests/boaddr_u.c index 9c610f54b..4835857b7 100644 --- a/tests/boaddr_u.c +++ b/tests/boaddr_u.c @@ -1,13 +1,13 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_boaddr_u(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 2); diff --git a/tests/bordr_d.c b/tests/bordr_d.c index 6e220d931..9a611db0a 100644 --- a/tests/bordr_d.c +++ b/tests/bordr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bordr_f.c b/tests/bordr_f.c index 29bf8d4af..fcfac6e86 100644 --- a/tests/bordr_f.c +++ b/tests/bordr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bosubi.c b/tests/bosubi.c index ccf358175..41e624517 100644 --- a/tests/bosubi.c +++ b/tests/bosubi.c @@ -1,12 +1,12 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bosubi(j, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -14,7 +14,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == -2); ASSERT(f(0) == -1); diff --git a/tests/bosubi_u.c b/tests/bosubi_u.c index 4b36b9086..b494a7d92 100644 --- a/tests/bosubi_u.c +++ b/tests/bosubi_u.c @@ -1,12 +1,12 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bosubi_u(j, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -14,7 +14,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == -2); ASSERT(f(0) == overflowed); diff --git a/tests/bosubr.c b/tests/bosubr.c index f77d9bac9..17da71f83 100644 --- a/tests/bosubr.c +++ b/tests/bosubr.c @@ -1,13 +1,13 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bosubr(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == -1); diff --git a/tests/bosubr_u.c b/tests/bosubr_u.c index 2e9562c4e..a3d8ae355 100644 --- a/tests/bosubr_u.c +++ b/tests/bosubr_u.c @@ -1,13 +1,13 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bosubr_u(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_movi(j, JIT_R0, overflowed); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 0); diff --git a/tests/bswapr_ui.c b/tests/bswapr_ui.c index 2046d7f21..653eb2d42 100644 --- a/tests/bswapr_ui.c +++ b/tests/bswapr_ui.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_bswapr_ui(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(0x12345678) == 0x78563412); diff --git a/tests/bswapr_ul.c b/tests/bswapr_ul.c index 1b712dbe9..106a94cef 100644 --- a/tests/bswapr_ul.c +++ b/tests/bswapr_ul.c @@ -5,12 +5,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_bswapr_ul(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(0x12345678) == 0x7856341200000000); diff --git a/tests/bswapr_us.c b/tests/bswapr_us.c index 44302bc02..fd0d439f6 100644 --- a/tests/bswapr_us.c +++ b/tests/bswapr_us.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_bswapr_us(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(0x12345678) == 0x7856); diff --git a/tests/buneqr_d.c b/tests/buneqr_d.c index b24bb2b89..eead53ef3 100644 --- a/tests/buneqr_d.c +++ b/tests/buneqr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/buneqr_f.c b/tests/buneqr_f.c index 2c88bf043..b64874209 100644 --- a/tests/buneqr_f.c +++ b/tests/buneqr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bunger_d.c b/tests/bunger_d.c index 21f851ff6..e949c9719 100644 --- a/tests/bunger_d.c +++ b/tests/bunger_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bunger_f.c b/tests/bunger_f.c index 3ea27d408..4fc598393 100644 --- a/tests/bunger_f.c +++ b/tests/bunger_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 0); diff --git a/tests/bungtr_d.c b/tests/bungtr_d.c index 1af89877d..f00c1ea3d 100644 --- a/tests/bungtr_d.c +++ b/tests/bungtr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bungtr_f.c b/tests/bungtr_f.c index f60337766..722779c0f 100644 --- a/tests/bungtr_f.c +++ b/tests/bungtr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bunler_d.c b/tests/bunler_d.c index d16a0dc97..d3cec1842 100644 --- a/tests/bunler_d.c +++ b/tests/bunler_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bunler_f.c b/tests/bunler_f.c index 56680bab4..fa3b0ef99 100644 --- a/tests/bunler_f.c +++ b/tests/bunler_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 1); ASSERT(f(0, 1) == 1); diff --git a/tests/bunltr_d.c b/tests/bunltr_d.c index 30b157698..e6adf6d6c 100644 --- a/tests/bunltr_d.c +++ b/tests/bunltr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bunltr_f.c b/tests/bunltr_f.c index 97c89a08c..4d6048eae 100644 --- a/tests/bunltr_f.c +++ b/tests/bunltr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 1); diff --git a/tests/bunordr_d.c b/tests/bunordr_d.c index 3c124f964..f9d074b06 100644 --- a/tests/bunordr_d.c +++ b/tests/bunordr_d.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(double, double) = jit_end(j, NULL); + jit_word_t (*f)(double, double) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bunordr_f.c b/tests/bunordr_f.c index a1bd0a41c..5dffc6920 100644 --- a/tests/bunordr_f.c +++ b/tests/bunordr_f.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_patch_here(j, r); jit_reti(j, 1); - intmax_t (*f)(float, float) = jit_end(j, NULL); + jit_word_t (*f)(float, float) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == 0); diff --git a/tests/bxaddi.c b/tests/bxaddi.c index 43894a294..30ea9430b 100644 --- a/tests/bxaddi.c +++ b/tests/bxaddi.c @@ -1,19 +1,19 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bxaddi(j, JIT_R0, 1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == 0); ASSERT(f(0) == 1); diff --git a/tests/bxaddi_u.c b/tests/bxaddi_u.c index c67d40d1d..702f135a3 100644 --- a/tests/bxaddi_u.c +++ b/tests/bxaddi_u.c @@ -1,19 +1,19 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bxaddi_u(j, JIT_R0, 1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == overflowed); ASSERT(f(0) == 1); diff --git a/tests/bxaddr.c b/tests/bxaddr.c index 85af51d49..84b3639f0 100644 --- a/tests/bxaddr.c +++ b/tests/bxaddr.c @@ -1,20 +1,20 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bxaddr(j, JIT_R0, JIT_R1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 2); diff --git a/tests/bxaddr_u.c b/tests/bxaddr_u.c index 517b03fa1..e30ca2aa9 100644 --- a/tests/bxaddr_u.c +++ b/tests/bxaddr_u.c @@ -1,20 +1,20 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bxaddr_u(j, JIT_R0, JIT_R1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 2); diff --git a/tests/bxsubi.c b/tests/bxsubi.c index f6b66f8eb..23174d7a1 100644 --- a/tests/bxsubi.c +++ b/tests/bxsubi.c @@ -1,19 +1,19 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bxsubi(j, JIT_R0, 1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == -2); ASSERT(f(0) == -1); diff --git a/tests/bxsubi_u.c b/tests/bxsubi_u.c index 95a78df67..9c50858ef 100644 --- a/tests/bxsubi_u.c +++ b/tests/bxsubi_u.c @@ -1,19 +1,19 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_reloc_t r = jit_bxsubi_u(j, JIT_R0, 1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(-1) == -2); ASSERT(f(0) == overflowed); diff --git a/tests/bxsubr.c b/tests/bxsubr.c index 9f9b79cad..5ac2a7007 100644 --- a/tests/bxsubr.c +++ b/tests/bxsubr.c @@ -1,20 +1,20 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bxsubr(j, JIT_R0, JIT_R1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(0, 1) == -1); diff --git a/tests/bxsubr_u.c b/tests/bxsubr_u.c index 0d505b0cf..6ac20dbbf 100644 --- a/tests/bxsubr_u.c +++ b/tests/bxsubr_u.c @@ -1,20 +1,20 @@ #include "test.h" -static const intmax_t overflowed = 0xcabba9e5; +static const jit_word_t overflowed = 0xcabba9e5; static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_reloc_t r = jit_bxsubr_u(j, JIT_R0, JIT_R1); jit_movi(j, JIT_R0, overflowed); jit_patch_here(j, r); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t, intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t, jit_word_t) = jit_end(j, NULL); ASSERT(f(0, 0) == 0); ASSERT(f(1, 1) == 0); diff --git a/tests/comr.c b/tests/comr.c index 4b0151a5d..bbdc287a1 100644 --- a/tests/comr.c +++ b/tests/comr.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_comr(j, JIT_R0, JIT_R0); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); #if __WORDSIZE == 32 ASSERT(f(0) == 0xffffffff); diff --git a/tests/divr.c b/tests/divr.c index 4ca4904ef..b83382c4f 100644 --- a/tests/divr.c +++ b/tests/divr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_divr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0x7fffffff); ASSERT(f(1, 0x7fffffff) == 0); diff --git a/tests/divr_u.c b/tests/divr_u.c index c51bbc786..37ea02260 100644 --- a/tests/divr_u.c +++ b/tests/divr_u.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_divr_u(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0x7fffffff); ASSERT(f(1, 0x7fffffff) == 0); diff --git a/tests/extr_c.c b/tests/extr_c.c index 834777d69..06ea12a08 100644 --- a/tests/extr_c.c +++ b/tests/extr_c.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_c(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/extr_d.c b/tests/extr_d.c index 40d20e6d1..14c327258 100644 --- a/tests/extr_d.c +++ b/tests/extr_d.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_extr_d(j, JIT_F0, JIT_R0); jit_retr_d(j, JIT_F0); - double (*f)(intmax_t) = jit_end(j, NULL); + double (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0.0); ASSERT(f(1) == 1.0); diff --git a/tests/extr_f.c b/tests/extr_f.c index e84458c16..75d74a25d 100644 --- a/tests/extr_f.c +++ b/tests/extr_f.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_extr_f(j, JIT_F0, JIT_R0); jit_retr_f(j, JIT_F0); - float (*f)(intmax_t) = jit_end(j, NULL); + float (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0.0f); ASSERT(f(1) == 1.0f); diff --git a/tests/extr_i.c b/tests/extr_i.c index 1a80b5e38..6f7a9bb3f 100644 --- a/tests/extr_i.c +++ b/tests/extr_i.c @@ -5,12 +5,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_i(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/extr_s.c b/tests/extr_s.c index e4d1f1eb1..a111937e6 100644 --- a/tests/extr_s.c +++ b/tests/extr_s.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_s(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/extr_uc.c b/tests/extr_uc.c index d9890c788..4ebae5413 100644 --- a/tests/extr_uc.c +++ b/tests/extr_uc.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_uc(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/extr_ui.c b/tests/extr_ui.c index 6aa6024bb..70d7f3bb0 100644 --- a/tests/extr_ui.c +++ b/tests/extr_ui.c @@ -5,12 +5,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_ui(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/extr_us.c b/tests/extr_us.c index c10567b4f..7ea001fc2 100644 --- a/tests/extr_us.c +++ b/tests/extr_us.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_extr_us(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0); ASSERT(f(1) == 1); diff --git a/tests/ldi_c.c b/tests/ldi_c.c index e08231596..a825ab85c 100644 --- a/tests/ldi_c.c +++ b/tests/ldi_c.c @@ -10,7 +10,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_c(j, JIT_R0, &data[0]); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == -1); } diff --git a/tests/ldi_i.c b/tests/ldi_i.c index 7270cbcf0..6bb7a5997 100644 --- a/tests/ldi_i.c +++ b/tests/ldi_i.c @@ -10,7 +10,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_i(j, JIT_R0, &data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == -1); } diff --git a/tests/ldi_l.c b/tests/ldi_l.c index 299987049..f18ba202e 100644 --- a/tests/ldi_l.c +++ b/tests/ldi_l.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_l(j, JIT_R0, &data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == -1); #endif diff --git a/tests/ldi_s.c b/tests/ldi_s.c index 5713370fa..b7d2ff213 100644 --- a/tests/ldi_s.c +++ b/tests/ldi_s.c @@ -10,7 +10,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_s(j, JIT_R0, &data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == -1); } diff --git a/tests/ldi_uc.c b/tests/ldi_uc.c index a99af0eda..68b082c2e 100644 --- a/tests/ldi_uc.c +++ b/tests/ldi_uc.c @@ -10,7 +10,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_uc(j, JIT_R0, data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == 0xff); } diff --git a/tests/ldi_ui.c b/tests/ldi_ui.c index c0458a7cb..2f7dc5fc1 100644 --- a/tests/ldi_ui.c +++ b/tests/ldi_ui.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_ui(j, JIT_R0, data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == data[0]); #endif diff --git a/tests/ldi_us.c b/tests/ldi_us.c index 3c9ca5122..adaf1ee3c 100644 --- a/tests/ldi_us.c +++ b/tests/ldi_us.c @@ -10,7 +10,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldi_us(j, JIT_R0, data); jit_retr(j, JIT_R0); - uintmax_t (*f)(void) = jit_end(j, NULL); + jit_uword_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == data[0]); } diff --git a/tests/ldr_c.c b/tests/ldr_c.c index 0d50d4d59..ac851dbdd 100644 --- a/tests/ldr_c.c +++ b/tests/ldr_c.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_c(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == -1); ASSERT(f(&data[1]) == 0); diff --git a/tests/ldr_i.c b/tests/ldr_i.c index ed8784a40..5f6de9912 100644 --- a/tests/ldr_i.c +++ b/tests/ldr_i.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_i(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == -1); ASSERT(f(&data[1]) == 0); diff --git a/tests/ldr_l.c b/tests/ldr_l.c index d71f3e47e..76b6d7f57 100644 --- a/tests/ldr_l.c +++ b/tests/ldr_l.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_l(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == -1); ASSERT(f(&data[1]) == 0); diff --git a/tests/ldr_s.c b/tests/ldr_s.c index af83dc7e6..61daa721b 100644 --- a/tests/ldr_s.c +++ b/tests/ldr_s.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_s(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == -1); ASSERT(f(&data[1]) == 0); diff --git a/tests/ldr_uc.c b/tests/ldr_uc.c index 54a207531..049630bf4 100644 --- a/tests/ldr_uc.c +++ b/tests/ldr_uc.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_uc(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == 0xff); ASSERT(f(&data[1]) == 0); diff --git a/tests/ldr_ui.c b/tests/ldr_ui.c index 1867812b4..4d29a74c8 100644 --- a/tests/ldr_ui.c +++ b/tests/ldr_ui.c @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_ui(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == data[0]); ASSERT(f(&data[1]) == data[1]); diff --git a/tests/ldr_us.c b/tests/ldr_us.c index 5387882a6..464108008 100644 --- a/tests/ldr_us.c +++ b/tests/ldr_us.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldr_us(j, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*) = jit_end(j, NULL); + jit_uword_t (*f)(void*) = jit_end(j, NULL); ASSERT(f(&data[0]) == data[0]); ASSERT(f(&data[1]) == data[1]); diff --git a/tests/ldxi_c.c b/tests/ldxi_c.c index 58d1de9d4..82242af43 100644 --- a/tests/ldxi_c.c +++ b/tests/ldxi_c.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_c(j, JIT_R0, JIT_R0, (uintptr_t)&data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == -1); ASSERT(f(1) == 0); diff --git a/tests/ldxi_d.c b/tests/ldxi_d.c index c74992069..db5af67bc 100644 --- a/tests/ldxi_d.c +++ b/tests/ldxi_d.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_d(j, JIT_F0, JIT_R0, (uintptr_t)data); jit_retr_d(j, JIT_F0); - double (*f)(uintmax_t) = jit_end(j, NULL); + double (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == data[0]); ASSERT(f(8) == data[1]); diff --git a/tests/ldxi_f.c b/tests/ldxi_f.c index 33206debb..0e91f74b9 100644 --- a/tests/ldxi_f.c +++ b/tests/ldxi_f.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_f(j, JIT_F0, JIT_R0, (uintptr_t)data); jit_retr_f(j, JIT_F0); - float (*f)(uintmax_t) = jit_end(j, NULL); + float (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == data[0]); ASSERT(f(4) == data[1]); diff --git a/tests/ldxi_i.c b/tests/ldxi_i.c index f51bb5cfd..d6d2def08 100644 --- a/tests/ldxi_i.c +++ b/tests/ldxi_i.c @@ -11,7 +11,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_ldxi_i(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == -1); ASSERT(f(4) == 0); diff --git a/tests/ldxi_l.c b/tests/ldxi_l.c index 9bdc6559c..a90653cb7 100644 --- a/tests/ldxi_l.c +++ b/tests/ldxi_l.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_l(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == -1); ASSERT(f(8) == 0); diff --git a/tests/ldxi_s.c b/tests/ldxi_s.c index 4c75cc2b1..698bcdba2 100644 --- a/tests/ldxi_s.c +++ b/tests/ldxi_s.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_s(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == -1); ASSERT(f(2) == 0); diff --git a/tests/ldxi_uc.c b/tests/ldxi_uc.c index ebe91b46a..35ddf2454 100644 --- a/tests/ldxi_uc.c +++ b/tests/ldxi_uc.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_uc(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == 0xff); ASSERT(f(1) == 0); diff --git a/tests/ldxi_ui.c b/tests/ldxi_ui.c index ad1599f65..d6693feec 100644 --- a/tests/ldxi_ui.c +++ b/tests/ldxi_ui.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_ui(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == data[0]); ASSERT(f(4) == data[1]); diff --git a/tests/ldxi_us.c b/tests/ldxi_us.c index a50e4edc1..edc71906b 100644 --- a/tests/ldxi_us.c +++ b/tests/ldxi_us.c @@ -6,12 +6,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ldxi_us(j, JIT_R0, JIT_R0, (uintptr_t)data); jit_retr(j, JIT_R0); - uintmax_t (*f)(uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(jit_uword_t) = jit_end(j, NULL); ASSERT(f(0) == data[0]); ASSERT(f(2) == data[1]); diff --git a/tests/ldxr_c.c b/tests/ldxr_c.c index dd3df16ff..c770e7eab 100644 --- a/tests/ldxr_c.c +++ b/tests/ldxr_c.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_c(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == -1); ASSERT(f(data, 1) == 0); diff --git a/tests/ldxr_d.c b/tests/ldxr_d.c index 28543b7c6..7267245ea 100644 --- a/tests/ldxr_d.c +++ b/tests/ldxr_d.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_d(j, JIT_F0, JIT_R0, JIT_R1); jit_retr_d(j, JIT_F0); - double (*f)(void*, uintmax_t) = jit_end(j, NULL); + double (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == data[0]); ASSERT(f(data, 8) == data[1]); diff --git a/tests/ldxr_f.c b/tests/ldxr_f.c index a87f15acd..88aabc67f 100644 --- a/tests/ldxr_f.c +++ b/tests/ldxr_f.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_f(j, JIT_F0, JIT_R0, JIT_R1); jit_retr_f(j, JIT_F0); - float (*f)(void*, uintmax_t) = jit_end(j, NULL); + float (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == data[0]); ASSERT(f(data, 4) == data[1]); diff --git a/tests/ldxr_i.c b/tests/ldxr_i.c index 65ed0395b..774c682d1 100644 --- a/tests/ldxr_i.c +++ b/tests/ldxr_i.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_i(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == -1); ASSERT(f(data, 4) == 0); diff --git a/tests/ldxr_l.c b/tests/ldxr_l.c index d8afce547..14786aadd 100644 --- a/tests/ldxr_l.c +++ b/tests/ldxr_l.c @@ -8,12 +8,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_l(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == -1); ASSERT(f(data, 8) == 0); diff --git a/tests/ldxr_s.c b/tests/ldxr_s.c index 7f0724c27..ca93140ab 100644 --- a/tests/ldxr_s.c +++ b/tests/ldxr_s.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_s(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == -1); ASSERT(f(data, 2) == 0); diff --git a/tests/ldxr_uc.c b/tests/ldxr_uc.c index d6dcaf979..70bcf13a9 100644 --- a/tests/ldxr_uc.c +++ b/tests/ldxr_uc.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_uc(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == 0xff); ASSERT(f(data, 1) == 0); diff --git a/tests/ldxr_ui.c b/tests/ldxr_ui.c index 4e2d773be..773fccda1 100644 --- a/tests/ldxr_ui.c +++ b/tests/ldxr_ui.c @@ -8,12 +8,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_ui(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == data[0]); ASSERT(f(data, 4) == data[1]); diff --git a/tests/ldxr_us.c b/tests/ldxr_us.c index 78d38f5ef..32ce9233e 100644 --- a/tests/ldxr_us.c +++ b/tests/ldxr_us.c @@ -7,12 +7,12 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_ldxr_us(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); - uintmax_t (*f)(void*, uintmax_t) = jit_end(j, NULL); + jit_uword_t (*f)(void*, jit_uword_t) = jit_end(j, NULL); ASSERT(f(data, 0) == data[0]); ASSERT(f(data, 2) == data[1]); diff --git a/tests/lshi.c b/tests/lshi.c index 183aed9ff..8c25e40b0 100644 --- a/tests/lshi.c +++ b/tests/lshi.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_lshi(j, JIT_R0, JIT_R0, 31); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); #if __WORDSIZE == 32 ASSERT(f(-0x7f) == 0x80000000); diff --git a/tests/lshr.c b/tests/lshr.c index 5f3d5b96e..3861adb46 100644 --- a/tests/lshr.c +++ b/tests/lshr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_lshr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7f, 1) == 0xfe); ASSERT(f(0x7fff, 2) == 0x1fffc); diff --git a/tests/mulr.c b/tests/mulr.c index 943b31e01..7f39d3d6d 100644 --- a/tests/mulr.c +++ b/tests/mulr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_mulr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0x7fffffff); ASSERT(f(1, 0x7fffffff) == 0x7fffffff); diff --git a/tests/negr.c b/tests/negr.c index 974d3f0e9..cf9c84d69 100644 --- a/tests/negr.c +++ b/tests/negr.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_negr(j, JIT_R0, JIT_R0); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(0) == 0); #if __WORDSIZE == 32 diff --git a/tests/nop.c b/tests/nop.c index 16c5c8a7e..e2975c5d2 100644 --- a/tests/nop.c +++ b/tests/nop.c @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) ASSERT(end - start == total); jit_reti(j, 42); - intmax_t (*f)(void) = jit_end(j, NULL); + jit_word_t (*f)(void) = jit_end(j, NULL); ASSERT(f() == 42); } diff --git a/tests/ori.c b/tests/ori.c index ad555769d..25a528e23 100644 --- a/tests/ori.c +++ b/tests/ori.c @@ -4,7 +4,7 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_ori(j, JIT_R0, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t) = ret; + jit_word_t (*f)(jit_word_t) = ret; ASSERT(f(0x7fffffff) == 0x7fffffff); ASSERT(f(0x80000000) == 0x80000001); diff --git a/tests/orr.c b/tests/orr.c index 10b7c3d17..c7bf31375 100644 --- a/tests/orr.c +++ b/tests/orr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_orr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0x7fffffff); ASSERT(f(1, 0x7fffffff) == 0x7fffffff); diff --git a/tests/pushpop.c b/tests/pushpop.c index d2a4ab7bb..de010c812 100644 --- a/tests/pushpop.c +++ b/tests/pushpop.c @@ -8,7 +8,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); for (int i=0; i<6; i++) jit_pushr(j, gpr[i]); @@ -28,7 +28,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); ASSERT(f(42) == 42); } diff --git a/tests/qdivr.c b/tests/qdivr.c index b4dd8f637..9e1b8da04 100644 --- a/tests/qdivr.c +++ b/tests/qdivr.c @@ -25,8 +25,8 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_operand_t args[] = { jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R1), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_V0) }; + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_V0) }; jit_load_args(j, 4, args); jit_qdivr(j, JIT_V1, JIT_V2, JIT_R2, JIT_V0); @@ -42,11 +42,11 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - void (*f)(intmax_t*, intmax_t*, intmax_t, intmax_t) = ret; + void (*f)(jit_word_t*, jit_word_t*, jit_word_t, jit_word_t) = ret; #define QDIV(a, b, c, d) \ do { \ - intmax_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ + jit_word_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ } while (0) QDIV(10, 3, 3, 1); diff --git a/tests/qdivr_u.c b/tests/qdivr_u.c index 30849bd54..276219971 100644 --- a/tests/qdivr_u.c +++ b/tests/qdivr_u.c @@ -26,8 +26,8 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_operand_t args[] = { jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R1), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_V0) }; + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_V0) }; jit_load_args(j, 4, args); jit_qdivr_u(j, JIT_V1, JIT_V2, JIT_R2, JIT_V0); @@ -43,11 +43,10 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - void (*f)(intmax_t*, intmax_t*, intmax_t, intmax_t) = ret; - + void (*f)(jit_word_t*, jit_word_t*, jit_word_t, jit_word_t) = ret; #define QDIV(a, b, c, d) \ do { \ - intmax_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ + jit_word_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ } while (0) QDIV(-1, -2, 1, 1); diff --git a/tests/qmulr.c b/tests/qmulr.c index 9d0b2324e..eed0d58fd 100644 --- a/tests/qmulr.c +++ b/tests/qmulr.c @@ -26,8 +26,8 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_operand_t args[] = { jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R1), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_V0) }; + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_V0) }; jit_load_args(j, 4, args); jit_qmulr(j, JIT_V1, JIT_V2, JIT_R2, JIT_V0); @@ -43,11 +43,11 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - void (*f)(intmax_t*, intmax_t*, intmax_t, intmax_t) = ret; + void (*f)(jit_word_t*, jit_word_t*, jit_word_t, jit_word_t) = ret; #define QMUL(a, b, c, d) \ do { \ - intmax_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ + jit_word_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ } while (0) QMUL(-2, -1, 2, 0); diff --git a/tests/qmulr_u.c b/tests/qmulr_u.c index 741ea8175..ff3c92655 100644 --- a/tests/qmulr_u.c +++ b/tests/qmulr_u.c @@ -26,8 +26,8 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) jit_operand_t args[] = { jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R1), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_V0) }; + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_V0) }; jit_load_args(j, 4, args); jit_qmulr_u(j, JIT_V1, JIT_V2, JIT_R2, JIT_V0); @@ -43,11 +43,11 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - void (*f)(intmax_t*, intmax_t*, intmax_t, intmax_t) = ret; + void (*f)(jit_word_t*, jit_word_t*, jit_word_t, jit_word_t) = ret; #define UQMUL(a, b, c, d) \ do { \ - intmax_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ + jit_word_t C = 0, D = 0; f(&C, &D, a, b); ASSERT(C == c); ASSERT(D == d); \ } while (0) #if __WORDSIZE == 32 diff --git a/tests/remr.c b/tests/remr.c index 3c61384b6..74c85e14e 100644 --- a/tests/remr.c +++ b/tests/remr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_remr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0); ASSERT(f(1, 0x7fffffff) == 1); diff --git a/tests/remr_u.c b/tests/remr_u.c index 01113dbef..10a59522a 100644 --- a/tests/remr_u.c +++ b/tests/remr_u.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_remr_u(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0); ASSERT(f(1, 0x7fffffff) == 1); diff --git a/tests/rshi.c b/tests/rshi.c index 1f1ed6d94..ba20db6a6 100644 --- a/tests/rshi.c +++ b/tests/rshi.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_rshi(j, JIT_R0, JIT_R0, 31); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); #if __WORDSIZE == 32 ASSERT(f(0x80000000) == -1); diff --git a/tests/rshi_u.c b/tests/rshi_u.c index e78a205b8..c0e3d7193 100644 --- a/tests/rshi_u.c +++ b/tests/rshi_u.c @@ -4,12 +4,12 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_rshi_u(j, JIT_R0, JIT_R0, 31); jit_retr(j, JIT_R0); - intmax_t (*f)(intmax_t) = jit_end(j, NULL); + jit_word_t (*f)(jit_word_t) = jit_end(j, NULL); #if __WORDSIZE == 32 ASSERT(f(0x80000000) == 1); diff --git a/tests/rshr.c b/tests/rshr.c index 1a32bfd03..c168b9513 100644 --- a/tests/rshr.c +++ b/tests/rshr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_rshr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0xfe, 1) == 0x7f); ASSERT(f(0x1fffc, 2) == 0x7fff); diff --git a/tests/rshr_u.c b/tests/rshr_u.c index 644e71728..0ff9c2878 100644 --- a/tests/rshr_u.c +++ b/tests/rshr_u.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_rshr_u(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0xfe, 1) == 0x7f); ASSERT(f(0x1fffc, 2) == 0x7fff); diff --git a/tests/stxi_c.c b/tests/stxi_c.c index c38e5292e..78982044f 100644 --- a/tests/stxi_c.c +++ b/tests/stxi_c.c @@ -6,13 +6,13 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT8, JIT_R1)); jit_stxi_c(j, (uintptr_t)data, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(intmax_t, int8_t) = jit_end(j, NULL); + void (*f)(jit_word_t, int8_t) = jit_end(j, NULL); ASSERT(data[0] == 0x12); ASSERT(data[1] == 0x00); diff --git a/tests/stxi_d.c b/tests/stxi_d.c index cf68704cc..a63c335d8 100644 --- a/tests/stxi_d.c +++ b/tests/stxi_d.c @@ -6,13 +6,13 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_fpr (JIT_OPERAND_ABI_DOUBLE, JIT_F0)); jit_stxi_d(j, (uintptr_t)data, JIT_R2, JIT_F0); jit_ret(j); - void (*f)(intmax_t, double) = jit_end(j, NULL); + void (*f)(jit_word_t, double) = jit_end(j, NULL); ASSERT(data[0] == -1.0); ASSERT(data[1] == 0.0); diff --git a/tests/stxi_f.c b/tests/stxi_f.c index cec7fba69..5a93679ff 100644 --- a/tests/stxi_f.c +++ b/tests/stxi_f.c @@ -6,13 +6,13 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_fpr (JIT_OPERAND_ABI_FLOAT, JIT_F0)); jit_stxi_f(j, (uintptr_t)data, JIT_R2, JIT_F0); jit_ret(j); - void (*f)(intmax_t, float) = jit_end(j, NULL); + void (*f)(jit_word_t, float) = jit_end(j, NULL); ASSERT(data[0] == -1.0f); ASSERT(data[1] == 0.0f); diff --git a/tests/stxi_i.c b/tests/stxi_i.c index d0aef1116..e320c9201 100644 --- a/tests/stxi_i.c +++ b/tests/stxi_i.c @@ -6,13 +6,13 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT32, JIT_R1)); jit_stxi_i(j, (uintptr_t)data, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(intmax_t, int32_t) = jit_end(j, NULL); + void (*f)(jit_word_t, int32_t) = jit_end(j, NULL); ASSERT(data[0] == 0x12121212); ASSERT(data[1] == 0x00); diff --git a/tests/stxi_l.c b/tests/stxi_l.c index f731ee49b..b5f5d8c5b 100644 --- a/tests/stxi_l.c +++ b/tests/stxi_l.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT64, JIT_R1)); jit_stxi_l(j, (uintptr_t)data, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(intmax_t, int64_t) = jit_end(j, NULL); + void (*f)(jit_word_t, int64_t) = jit_end(j, NULL); ASSERT(data[0] == 0x1212121212121212); ASSERT(data[1] == 0x00); diff --git a/tests/stxi_s.c b/tests/stxi_s.c index 4deb826e6..7bc8fa2cc 100644 --- a/tests/stxi_s.c +++ b/tests/stxi_s.c @@ -6,13 +6,13 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT16, JIT_R1)); jit_stxi_s(j, (uintptr_t)data, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(intmax_t, int16_t) = jit_end(j, NULL); + void (*f)(jit_word_t, int16_t) = jit_end(j, NULL); ASSERT(data[0] == 0x1212); ASSERT(data[1] == 0); diff --git a/tests/stxr_c.c b/tests/stxr_c.c index bcebb3530..c88d8cd6f 100644 --- a/tests/stxr_c.c +++ b/tests/stxr_c.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT8, JIT_R1)); jit_stxr_c(j, JIT_R0, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(void*, intmax_t, int8_t) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, int8_t) = jit_end(j, NULL); ASSERT(data[0] == 0x12); ASSERT(data[1] == 0x00); diff --git a/tests/stxr_d.c b/tests/stxr_d.c index ba4988a8d..f3fb9334d 100644 --- a/tests/stxr_d.c +++ b/tests/stxr_d.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_fpr (JIT_OPERAND_ABI_DOUBLE, JIT_F0)); jit_stxr_d(j, JIT_R0, JIT_R2, JIT_F0); jit_ret(j); - void (*f)(void*, intmax_t, double) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, double) = jit_end(j, NULL); ASSERT(data[0] == -1.0); ASSERT(data[1] == 0.0); diff --git a/tests/stxr_f.c b/tests/stxr_f.c index 30c1e92de..43aeaa9bd 100644 --- a/tests/stxr_f.c +++ b/tests/stxr_f.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_fpr (JIT_OPERAND_ABI_FLOAT, JIT_F0)); jit_stxr_f(j, JIT_R0, JIT_R2, JIT_F0); jit_ret(j); - void (*f)(void*, intmax_t, float) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, float) = jit_end(j, NULL); ASSERT(data[0] == -1.0f); ASSERT(data[1] == 0.0f); diff --git a/tests/stxr_i.c b/tests/stxr_i.c index 247cab215..376354fca 100644 --- a/tests/stxr_i.c +++ b/tests/stxr_i.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT32, JIT_R1)); jit_stxr_i(j, JIT_R0, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(void*, intmax_t, int32_t) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, int32_t) = jit_end(j, NULL); ASSERT(data[0] == 0x12121212); ASSERT(data[1] == 0x00); diff --git a/tests/stxr_l.c b/tests/stxr_l.c index e680238c5..bc0ab9641 100644 --- a/tests/stxr_l.c +++ b/tests/stxr_l.c @@ -8,13 +8,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) #if __WORDSIZE > 32 jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT64, JIT_R1)); jit_stxr_l(j, JIT_R0, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(void*, intmax_t, int64_t) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, int64_t) = jit_end(j, NULL); ASSERT(data[0] == 0x1212121212121212); ASSERT(data[1] == 0x00); diff --git a/tests/stxr_s.c b/tests/stxr_s.c index 02d848382..2cee20194 100644 --- a/tests/stxr_s.c +++ b/tests/stxr_s.c @@ -7,13 +7,13 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); jit_load_args_3(j, jit_operand_gpr (JIT_OPERAND_ABI_POINTER, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R2), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R2), jit_operand_gpr (JIT_OPERAND_ABI_INT16, JIT_R1)); jit_stxr_s(j, JIT_R0, JIT_R2, JIT_R1); jit_ret(j); - void (*f)(void*, intmax_t, int16_t) = jit_end(j, NULL); + void (*f)(void*, jit_word_t, int16_t) = jit_end(j, NULL); ASSERT(data[0] == 0x1212); ASSERT(data[1] == 0); diff --git a/tests/subr.c b/tests/subr.c index 0ed2e320b..92b528fee 100644 --- a/tests/subr.c +++ b/tests/subr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_subr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); diff --git a/tests/subx.c b/tests/subx.c index 91f1f9565..cd1bb5b9c 100644 --- a/tests/subx.c +++ b/tests/subx.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_movi(j, JIT_R2, 0); jit_subcr(j, JIT_R0, JIT_R0, JIT_R1); @@ -15,7 +15,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0, 0) == 0); diff --git a/tests/xori.c b/tests/xori.c index 5884025d6..1071a4cd9 100644 --- a/tests/xori.c +++ b/tests/xori.c @@ -4,7 +4,7 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0)); + jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0)); jit_xori(j, JIT_R0, JIT_R0, 1); jit_retr(j, JIT_R0); @@ -12,7 +12,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t) = ret; + jit_word_t (*f)(jit_word_t) = ret; ASSERT(f(0x7fffffff) == 0x7ffffffe); ASSERT(f(0x80000000) == 0x80000001); diff --git a/tests/xorr.c b/tests/xorr.c index c24946638..a37a57004 100644 --- a/tests/xorr.c +++ b/tests/xorr.c @@ -4,8 +4,8 @@ static void run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) { jit_begin(j, arena_base, arena_size); - jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R0), - jit_operand_gpr (JIT_OPERAND_ABI_INTMAX, JIT_R1)); + jit_load_args_2(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0), + jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R1)); jit_xorr(j, JIT_R0, JIT_R0, JIT_R1); jit_retr(j, JIT_R0); @@ -13,7 +13,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size) size_t size = 0; void* ret = jit_end(j, &size); - intmax_t (*f)(intmax_t, intmax_t) = ret; + jit_word_t (*f)(jit_word_t, jit_word_t) = ret; ASSERT(f(0x7fffffff, 1) == 0x7ffffffe); ASSERT(f(1, 0x7fffffff) == 0x7ffffffe);