lightning.git - Portable just-in-time compiler library

diff --git a/lib/jit_mips-cpu.c b/lib/jit_mips-cpu.c
index 57b0c88..0625589 100644
--- a/lib/jit_mips-cpu.c
+++ b/lib/jit_mips-cpu.c

@@ -607,23 +607,12 @@ static void _stxr_l(jit_state_t*,jit_int32_t,jit_int32_t,jit_int32_t);

# define stxi_l(i0,r0,r1) _stxi_l(_jit,i0,r0,r1)

static void _stxi_l(jit_state_t*,jit_word_t,jit_int32_t,jit_int32_t);

# endif

-# if __BYTE_ORDER == __LITTLE_ENDIAN

-# define htonr_us(r0,r1) _htonr_us(_jit,r0,r1)

-static void _htonr_us(jit_state_t*,jit_int32_t,jit_int32_t);

-# define htonr_ui(r0,r1) _htonr_ui(_jit,r0,r1)

-static void _htonr_ui(jit_state_t*,jit_int32_t,jit_int32_t);

-# if __WORDSIZE == 64

-# define htonr_ul(r0,r1) _htonr_ul(_jit,r0,r1)

-static void _htonr_ul(jit_state_t*,jit_int32_t,jit_int32_t);

-# endif

-# else

-# define htonr_us(r0,r1) extr_us(r0,r1)

-# if __WORDSIZE == 32

-# define htonr_ui(r0,r1) movr(r0,r1)

-# else

-# define htonr_ui(r0,r1) extr_ui(r0,r1)

-# define htonr_ul(r0,r1) movr(r0,r1)

-# endif

+# define bswapr_us(r0,r1) _bswapr_us(_jit,r0,r1)

+static void _bswapr_us(jit_state_t*,jit_int32_t,jit_int32_t);

+# define bswapr_ui(r0,r1) _bswapr_ui(_jit,r0,r1)

+static void _bswapr_ui(jit_state_t*,jit_int32_t,jit_int32_t);

+# if __WORDSIZE == 64

+# define bswapr_ul(r0,r1) generic_bswapr_ul(_jit,r0,r1)

# endif

# define extr_c(r0,r1) _extr_c(_jit,r0,r1)

static void _extr_c(jit_state_t*,jit_int32_t,jit_int32_t);

@@ -1765,33 +1754,20 @@ _stxi_l(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)

}

#endif

-# if __BYTE_ORDER == __LITTLE_ENDIAN

static void

-_htonr_us(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

+_bswapr_us(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

{

- jit_int32_t t0;

-

if (jit_mips2_p()) {

extr_us(r0, r1);

WSBH(r0, r0);

} else {

- t0 = jit_get_reg(jit_class_gpr);

- rshi(rn(t0), r1, 8);

- andi(r0, r1, 0xff);

- andi(rn(t0), rn(t0), 0xff);

- lshi(r0, r0, 8);

- orr(r0, r0, rn(t0));

- jit_unget_reg(t0);

+ generic_bswapr_us(_jit, r0, r1);

}

}

static void

-_htonr_ui(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

+_bswapr_ui(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

{

- jit_int32_t t0;

- jit_int32_t t1;

- jit_int32_t t2;

-

if (jit_mips2_p()) {

if (__WORDSIZE == 64) {

SLL(r0, r1, 0);

@@ -1803,45 +1779,11 @@ _htonr_ui(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

ROTR(r0, r0, 16);

}

} else {

- t0 = jit_get_reg(jit_class_gpr);

- t1 = jit_get_reg(jit_class_gpr);

- t2 = jit_get_reg(jit_class_gpr);

-

- rshi(rn(t0), r1, 24);

- rshi(rn(t1), r1, 16);

- rshi(rn(t2), r1, 8);

- andi(rn(t0), rn(t0), 0xff);

- andi(rn(t1), rn(t1), 0xff);

- andi(rn(t2), rn(t2), 0xff);

- andi(r0, r1, 0xff);

- lshi(r0, r0, 24);

- lshi(rn(t1), rn(t1), 8);

- orr(r0, r0, rn(t0));

- lshi(rn(t2), rn(t2), 16);

- orr(r0, r0, rn(t1));

- orr(r0, r0, rn(t2));

-

- jit_unget_reg(t2);

- jit_unget_reg(t1);

- jit_unget_reg(t0);

+ generic_bswapr_ui(_jit, r0, r1);

}

}

static void

-_htonr_ul(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

-{

- jit_int32_t reg;

- reg = jit_get_reg(jit_class_gpr);

- rshi_u(rn(reg), r1, 32);

- htonr_ui(r0, r1);

- htonr_ui(rn(reg), rn(reg));

- lshi(r0, r0, 32);

- orr(r0, r0, rn(reg));

- jit_unget_reg(reg);

-}

-# endif

-

-static void

_extr_c(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

{

if (jit_mips2_p())