[Guile-commits] 01/02: Fix some compiler warnings on 64-bit builds

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit d0aca1635ecb9cc4ce15c072a454293f9b542ca2
Author: Andy Wingo <address@hidden>
Date:   Sat Aug 3 12:44:11 2019 +0200

    Fix some compiler warnings on 64-bit builds
---
 libguile/jit.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/libguile/jit.c b/libguile/jit.c
index b80d9a1..082eb3e 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -252,7 +252,7 @@ SCM_UNUSED static const jit_gpr_t T4_OR_SP = JIT_R0;
 
 /* Sometimes you want to call out the fact that T0 and T1 are preserved
    across calls.  In that case, use these.  */
-static const jit_gpr_t T0_PRESERVED = JIT_V1;
+SCM_UNUSED static const jit_gpr_t T0_PRESERVED = JIT_V1;
 static const jit_gpr_t T1_PRESERVED = JIT_V2;
 
 static const uint32_t SP_IN_REGISTER = 0x1;
@@ -269,12 +269,6 @@ static const uint8_t OP_ATTR_ENTRY = 0x2;
 #define BIGENDIAN 0
 #endif
 
-#if BIGENDIAN
-static const uint32_t uint32_offset_low_byte = 3;
-#else
-static const uint32_t uint32_offset_low_byte = 0;
-#endif
-
 #if SCM_SIZEOF_UINTPTR_T == 4
 static const uint32_t log2_sizeof_uintptr_t = 2;
 #elif SCM_SIZEOF_UINTPTR_T == 8
@@ -510,7 +504,6 @@ emit_##stem (scm_jit_state *j,                              
            \
 
 DEFINE_CLOBBER_RECORDING_EMITTER_R(ldr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_P(ldi, gpr)
-DEFINE_CLOBBER_RECORDING_EMITTER_R(movr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R(comr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R_R(ldxr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R_I(addi, gpr)
@@ -535,6 +528,7 @@ DEFINE_CLOBBER_RECORDING_EMITTER_R_I(lshi, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R_R(lshr, gpr)
 
 #if SIZEOF_UINTPTR_T < 8
+DEFINE_CLOBBER_RECORDING_EMITTER_R(movr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R(negr, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R_I(addci, gpr)
 DEFINE_CLOBBER_RECORDING_EMITTER_R_R(addcr, gpr)
@@ -757,16 +751,6 @@ emit_get_callee_vcode (scm_jit_state *j, jit_gpr_t dst)
 }
 
 static void
-emit_get_vcode_low_byte (scm_jit_state *j, jit_gpr_t dst, jit_gpr_t addr)
-{
-  if (uint32_offset_low_byte == 0)
-    jit_ldr_uc (j->jit, dst, addr);
-  else
-    jit_ldxi_uc (j->jit, dst, addr, uint32_offset_low_byte);
-  record_gpr_clobber (j, dst);
-}
-
-static void
 emit_get_ip_relative_addr (scm_jit_state *j, jit_gpr_t dst, jit_gpr_t ip,
                            uint32_t offset)
 {