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

diff --git a/lib/jit_arm-cpu.c b/lib/jit_arm-cpu.c
index 552bce3..aabccef 100644
--- a/lib/jit_arm-cpu.c
+++ b/lib/jit_arm-cpu.c

@@ -31,7 +31,7 @@

# define jit_thumb_p() jit_cpu.thumb

# define jit_no_set_flags() _jitc->no_set_flags

# define jit_armv5_p() (jit_cpu.version >= 5)

-# define jit_armv5e_p() (jit_cpu.version >= 5 && jit_cpu.extend)

+# define jit_armv5e_p() (jit_cpu.version > 5 || (jit_cpu.version == 5 && jit_cpu.extend))

# define jit_armv6_p() (jit_cpu.version >= 6)

# define jit_armv7r_p() 0

# define stack_framesize 48

@@ -709,9 +709,9 @@ static void _torl(jit_state_t*,int,int,int) maybe_unused;

# define LDRD(rt,rn,rm) CC_LDRD(ARM_CC_AL,rt,rn,rm)

# define T2_LDRDI(rt,rt2,rn,im) torrri8(THUMB2_LDRDI|ARM_P,rn,rt,rt2,im)

# define CC_LDRDN(cc,rt,rn,rm) corrr(cc,ARM_LDRD,rn,rt,rm)

-# define LDRDN(rd,rn,rm) CC_LDRDN(ARM_CC_AL,rn,rt,rm)

+# define LDRDN(rd,rn,rm) CC_LDRDN(ARM_CC_AL,rt,rn,rm)

# define CC_LDRDI(cc,rt,rn,im) corri8(cc,ARM_LDRDI|ARM_P,rn,rt,im)

-# define LDRDI(rt,rn,im) CC_LDRDI(ARM_CC_AL,rn,rt,im)

+# define LDRDI(rt,rn,im) CC_LDRDI(ARM_CC_AL,rt,rn,im)

# define CC_LDRDIN(cc,rt,rn,im) corri8(cc,ARM_LDRDI,rn,rt,im)

# define LDRDIN(rt,rn,im) CC_LDRDIN(ARM_CC_AL,rt,rn,im)

# define T2_LDRDIN(rt,rt2,rn,im) torrri8(THUMB2_LDRDI,rn,rt,rt2,im)

@@ -758,7 +758,7 @@ static void _torl(jit_state_t*,int,int,int) maybe_unused;

# define CC_STRIN(cc,rt,rn,im) corri(cc,ARM_STRI,rn,rt,im)

# define STRIN(rt,rn,im) CC_STRIN(ARM_CC_AL,rt,rn,im)

# define T2_STRIN(rt,rn,im) torri8(THUMB2_STRI,rn,rt,im)

-# define CC_STRD(cc,rt,rn,rm) corrr(cc,ARM_STRD|ARM_P,rt,rn,rm)

+# define CC_STRD(cc,rt,rn,rm) corrr(cc,ARM_STRD|ARM_P,rn,rt,rm)

# define STRD(rt,rn,rm) CC_STRD(ARM_CC_AL,rt,rn,rm)

# define CC_STRDN(cc,rt,rn,rm) corrr(cc,ARM_STRD,rn,rt,rm)

# define STRDN(rt,rn,rm) CC_STRDN(ARM_CC_AL,rt,rn,rm)

diff --git a/lib/jit_arm-swf.c b/lib/jit_arm-swf.c
index 8afd9e5..d4774e9 100644
--- a/lib/jit_arm-swf.c
+++ b/lib/jit_arm-swf.c

@@ -1870,7 +1870,7 @@ _swf_movr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

}

}

else if (jit_fpr_p(r0)) {

- if (!jit_thumb_p() && jit_armv5e_p())

+ if (!jit_thumb_p() && jit_armv5e_p() && !(r1 & 1))

STRDIN(r1, _FP_REGNO, swf_off(r0) + 8);

else {

swf_strin(r1, _FP_REGNO, swf_off(r0) + 8);

@@ -1967,9 +1967,9 @@ _swf_absr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

if (jit_fpr_p(r1)) {

if (jit_fpr_p(r0) && !jit_thumb_p() && jit_armv5e_p() &&

r0 != r1 && (reg = jit_get_reg_pair()) != JIT_NOREG) {

- LDRDIN(rn(reg), _FP_REGNO, swf_off(r1) + 4);

- swf_bici(rn(reg), rn(reg), 0x80000000);

- STRDIN(rn(reg), _FP_REGNO, swf_off(r0) + 4);

+ LDRDIN(rn(reg), _FP_REGNO, swf_off(r1) + 8);

+ swf_bici(rn(reg) + 1, rn(reg) + 1, 0x80000000);

+ STRDIN(rn(reg), _FP_REGNO, swf_off(r0) + 8);

jit_unget_reg_pair(reg);

}

else {

@@ -2039,9 +2039,9 @@ _swf_negr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

if (jit_fpr_p(r1)) {

if (jit_fpr_p(r0) && !jit_thumb_p() && jit_armv5e_p() &&

r0 != r1 && (reg = jit_get_reg_pair()) != JIT_NOREG) {

- LDRDIN(rn(reg), _FP_REGNO, swf_off(r1) + 4);

- EORI(rn(reg), rn(reg), encode_arm_immediate(0x80000000));

- STRDIN(rn(reg), _FP_REGNO, swf_off(r0) + 4);

+ LDRDIN(rn(reg), _FP_REGNO, swf_off(r1) + 8);

+ EORI(rn(reg) + 1, rn(reg) + 1, encode_arm_immediate(0x80000000));

+ STRDIN(rn(reg), _FP_REGNO, swf_off(r0) + 8);

jit_unget_reg_pair(reg);

}

else {

@@ -2197,7 +2197,7 @@ _swf_ldr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

jit_unget_reg(reg);

}

}

- else if (!jit_thumb_p() && jit_armv5e_p())

+ else if (!jit_thumb_p() && jit_armv5e_p() && !(r0 & 1))

LDRDI(r0, r1, 0);

else {

ldxi_i(r0, r1, 0);

@@ -2241,7 +2241,7 @@ _swf_ldi_d(jit_state_t *_jit, jit_int32_t r0, jit_word_t i0)

swf_strin(rn(rg0), _FP_REGNO, swf_off(r0) + 4);

jit_unget_reg(rg0);

}

- else if (!jit_thumb_p() && jit_armv5e_p())

+ else if (!jit_thumb_p() && jit_armv5e_p() && !(r0 & 1))

LDRDI(r0, rn(rg1), 0);

else {

ldxi_i(r0, rn(rg1), 0);

@@ -2289,7 +2289,7 @@ _swf_ldxr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2)

}

}

else {

- if (!jit_thumb_p() && jit_armv5e_p())

+ if (!jit_thumb_p() && jit_armv5e_p() && !(r0 & 1))

LDRD(r0, r1, r2);

else {

rg1 = jit_get_reg(jit_class_gpr);

@@ -2360,9 +2360,11 @@ _swf_ldxi_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)

}

}

else {

- if (!jit_thumb_p() && jit_armv5e_p() && i0 >= 0 && i0 <= 255)

+ if (!jit_thumb_p() && jit_armv5e_p() &&

+ i0 >= 0 && i0 <= 255 && !(r0 & 1))

LDRDI(r0, r1, i0);

- else if (!jit_thumb_p() && jit_armv5e_p() && i0 < 0 && i0 >= -255)

+ else if (!jit_thumb_p() && jit_armv5e_p() &&

+ i0 < 0 && i0 >= -255 && !(r0 & 1))

LDRDIN(r0, r1, -i0);

else if (i0 >= 0 && i0 + 4 <= 4095) {

ldxi_i(r0, r1, i0);

@@ -2417,7 +2419,7 @@ _swf_str_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)

}

}

else {

- if (!jit_thumb_p() && jit_armv5e_p())

+ if (!jit_thumb_p() && jit_armv5e_p() && !(r1 & 1))

STRDI(r1, r0, 0);

else {

stxi_i(0, r0, r1);

@@ -2469,7 +2471,7 @@ _swf_sti_d(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0)

else {

rg1 = jit_get_reg(jit_class_gpr);

movi(rn(rg1), i0);

- if (!jit_thumb_p() && jit_armv5e_p())

+ if (!jit_thumb_p() && jit_armv5e_p() && !(r0 & 1))

STRDI(r0, rn(rg1), 0);

else {

stxi_i(0, rn(rg1), r0);

@@ -2517,7 +2519,7 @@ _swf_stxr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2)

}

}

else {

- if (!jit_thumb_p() && jit_armv5e_p())

+ if (!jit_thumb_p() && jit_armv5e_p() && !(r2 & 1))

STRD(r0, r1, r2);

else {

rg1 = jit_get_reg(jit_class_gpr);

@@ -2556,6 +2558,7 @@ _swf_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)

STRDI(rn(rg0), r0, i0);

else

STRDIN(rn(rg0), r0, -i0);

+ jit_unget_reg_pair(rg0);

}

else if (i0 >= 0 && i0 + 4 <= 4095) {

rg0 = jit_get_reg(jit_class_gpr);

@@ -2587,9 +2590,11 @@ _swf_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)

}

}

else {

- if (!jit_thumb_p() && jit_armv5e_p() && i0 >= 0 && i0 <= 255)

+ if (!jit_thumb_p() && jit_armv5e_p() &&

+ i0 >= 0 && i0 <= 255 && !(r1 & 1))

STRDI(r1, r0, i0);

- else if (!jit_thumb_p() && jit_armv5e_p() && i0 < 0 && i0 >= -255)

+ else if (!jit_thumb_p() && jit_armv5e_p() &&

+ i0 < 0 && i0 >= -255 && !(r1 & 1))

STRDIN(r1, r0, -i0);

else if (i0 >= 0 && i0 + 4 <= 4095) {

stxi_i(i0, r0, r1);

diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c
index 6f9227d..51c6784 100644
--- a/lib/jit_disasm.c
+++ b/lib/jit_disasm.c

@@ -84,12 +84,6 @@ jit_init_debug(const char *progname)

disasm_info.mach = bfd_mach_i386_i386;

# endif

# endif

-# if defined(__arm__)

- /* FIXME add mapping for prolog switching to arm and possible jump

- * before first prolog also in arm mode */

- if (jit_cpu.thumb)

- disasm_info.disassembler_options = "force-thumb";

-# endif

# if defined(__powerpc__)

disasm_info.arch = bfd_arch_powerpc;

disasm_info.mach = bfd_mach_ppc64;

@@ -204,8 +198,15 @@ void

_jit_disassemble(jit_state_t *_jit)

{

#if DISASSEMBLER

- if (disasm_bfd)

+ if (disasm_bfd) {

+# if defined(__arm__)

+ /* FIXME add mapping for prolog switching to arm and possible jump

+ * before first prolog also in arm mode */

+ disasm_info.disassembler_options = jit_cpu.thumb ? "force-thumb" : "";

+# endif

+

disassemble(_jit->code.ptr, _jit->pc.uc - _jit->code.ptr);

+ }

#endif

}

@@ -326,8 +327,7 @@ _disassemble(jit_state_t *_jit, jit_pointer_t code, jit_int32_t length)

again:

if (data_info) {

while (_jitc->data_info.ptr[data_offset].code < pc) {

- data_offset += 2;

- if (data_offset >= _jitc->data_info.length) {

+ if (++data_offset >= _jitc->data_info.length) {

data_info = 0;

goto again;

}