From 24950994ef6f0e642d67e99d304a0b5c90232d05 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Fri, 26 Apr 2019 16:13:29 +0200
Subject: [PATCH] Simplify 64/32 concerns in x86-cpu.c

* lightening/x86-cpu.c (il): Take a uint64_t.  It's only called this
  way.
(imovi): Remove some x64_32 conditions; they seem bogus.
---
 lightening/x86-cpu.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lightening/x86-cpu.c b/lightening/x86-cpu.c
index 7144dff6c..b32c8502c 100644
--- a/lightening/x86-cpu.c
+++ b/lightening/x86-cpu.c
@@ -161,9 +161,9 @@ ii(jit_state_t *_jit, uint32_t i)
 }
 
 static inline void
-il(jit_state_t *_jit, unsigned long l)
+iw(jit_state_t *_jit, jit_word_t l)
 {
-#if __X64 && !__X64_32
+#if __X64
   emit_u64(_jit, l);
 #else
   ii(_jit, l);
@@ -410,19 +410,15 @@ static void
 imovi(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 {
 #if __X64
-#  if !__X64_32
   if (fits_uint32_p(i0)) {
-#  endif
     rex(_jit, 0, 0, _NOREG, _NOREG, r0);
     ic(_jit, 0xb8 | r7(r0));
     ii(_jit, i0);
-#  if !__X64_32
   } else {
     rex(_jit, 0, 1, _NOREG, _NOREG, r0);
     ic(_jit, 0xb8 | r7(r0));
-    il(_jit, i0);
+    iw(_jit, i0);
   }
-#  endif
 #else
   ic(_jit, 0xb8 | r7(r0));
   ii(_jit, i0);