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

diff --git a/lib/jit_arm-swf.c b/lib/jit_arm-swf.c
index 1315693..89aefed 100644
--- a/lib/jit_arm-swf.c
+++ b/lib/jit_arm-swf.c

@@ -175,7 +175,7 @@ static void _swf_negr_d(jit_state_t*,jit_int32_t,jit_int32_t);

# define swf_ger_d(r0,r1,r2) swf_idd(__aeabi_dcmpge,r0,r1,r2)

# define swf_gei_d(r0,r1,i0) swf_idd_(__aeabi_dcmpge,r0,r1,i0)

# define swf_gtr_f(r0,r1,r2) swf_iff(__aeabi_fcmpgt,r0,r1,r2)

-# define swf_gti_f(r0,r1,i0) swf_iff(__aeabi_fcmpgt,r0,r1,i0)

+# define swf_gti_f(r0,r1,i0) swf_iff_(__aeabi_fcmpgt,r0,r1,i0)

# define swf_gtr_d(r0,r1,r2) swf_idd(__aeabi_dcmpgt,r0,r1,r2)

# define swf_gti_d(r0,r1,i0) swf_idd_(__aeabi_dcmpgt,r0,r1,i0)

# define swf_ner_f(r0,r1,r2) _swf_ner_f(_jit,r0,r1,r2)

@@ -688,7 +688,7 @@ _swf_iunff(jit_state_t *_jit, int (*i0)(float, float),

movr(_R1_REGNO, r2);

swf_call(__aeabi_fcmpun, fcmpun, _R2_REGNO);

if (jit_thumb_p()) {

- T1_CMPI(_R0, 0);

+ T1_CMPI(_R0_REGNO, 0);

IT(ARM_CC_NE);

if (r0 < 8)

T1_MOVI(r0, 1);

@@ -698,7 +698,7 @@ _swf_iunff(jit_state_t *_jit, int (*i0)(float, float),

T2_CC_B(ARM_CC_NE, 0);

}

else {

- CMPI(_R0, 0);

+ CMPI(_R0_REGNO, 0);

CC_MOVI(ARM_CC_NE, r0, 1);

instr = _jit->pc.w;

CC_B(ARM_CC_NE, 0);

@@ -749,7 +749,7 @@ _swf_iundd(jit_state_t *_jit, int (*i0)(double, double),

}

swf_call_with_get_reg(__aeabi_dcmpun, dcmpun);

if (jit_thumb_p()) {

- T1_CMPI(_R0, 0);

+ T1_CMPI(_R0_REGNO, 0);

IT(ARM_CC_NE);

if (r0 < 8)

T1_MOVI(r0, 1);

@@ -759,7 +759,7 @@ _swf_iundd(jit_state_t *_jit, int (*i0)(double, double),

T2_CC_B(ARM_CC_NE, 0);

}

else {

- CMPI(_R0, 0);

+ CMPI(_R0_REGNO, 0);

CC_MOVI(ARM_CC_NE, r0, 1);

instr = _jit->pc.w;

CC_B(ARM_CC_NE, 0);

@@ -812,7 +812,7 @@ _swf_iunff_(jit_state_t *_jit, int (*i0)(float, float),

movi(_R1_REGNO, data.i);

swf_call(__aeabi_fcmpun, fcmpun, _R2_REGNO);

if (jit_thumb_p()) {

- T1_CMPI(_R0, 0);

+ T1_CMPI(__R0_REGNO, 0);

IT(ARM_CC_NE);

if (r0 < 8)

T1_MOVI(r0, 1);

@@ -822,7 +822,7 @@ _swf_iunff_(jit_state_t *_jit, int (*i0)(float, float),

T2_CC_B(ARM_CC_NE, 0);

}

else {

- CMPI(_R0, 0);

+ CMPI(__R0_REGNO, 0);

CC_MOVI(ARM_CC_NE, r0, 1);

instr = _jit->pc.w;

CC_B(ARM_CC_NE, 0);

@@ -865,7 +865,7 @@ _swf_iundd_(jit_state_t *_jit, int (*i0)(double, double),

movi(_R3_REGNO, data.i[1]);

swf_call_with_get_reg(__aeabi_dcmpun, dcmpun);

if (jit_thumb_p()) {

- T1_CMPI(_R0, 0);

+ T1_CMPI(__R0_REGNO, 0);

IT(ARM_CC_NE);

if (r0 < 8)

T1_MOVI(r0, 1);

@@ -875,7 +875,7 @@ _swf_iundd_(jit_state_t *_jit, int (*i0)(double, double),

T2_CC_B(ARM_CC_NE, 0);

}

else {

- CMPI(_R0, 0);

+ CMPI(__R0_REGNO, 0);

CC_MOVI(ARM_CC_NE, r0, 1);

instr = _jit->pc.w;

CC_B(ARM_CC_NE, 0);

diff --git a/lib/jit_x86-sse.c b/lib/jit_x86-sse.c
index d67ab9d..afc7c9a 100644
--- a/lib/jit_x86-sse.c
+++ b/lib/jit_x86-sse.c

@@ -191,7 +191,7 @@ static void _sse_ungei_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

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

# define sse_ungti_f(r0, r1, i0) _sse_ungti_f(_jit, r0, r1, i0)

static void _sse_ungti_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

-# define sse_ungtr_f(r0, r1, r2) ssecmpf(X86_CC_NAE, r0, r2, r1)

+# define sse_ungtr_f(r0, r1, r2) ssecmpf(X86_CC_NAE, r0, r1, r2)

# define sse_ltgti_f(r0, r1, i0) _sse_ltgti_f(_jit, r0, r1, i0)

static void _sse_ltgti_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

# define sse_ltgtr_f(r0, r1, r2) _sse_ltgtr_f(_jit, r0, r1, r2)

@@ -323,7 +323,7 @@ static void _sse_uneqi_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

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

# define sse_ungei_d(r0, r1, i0) _sse_ungei_d(_jit, r0, r1, i0)

static void _sse_ungei_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

-# define sse_ungtr_d(r0, r1, r2) ssecmpd(X86_CC_NAE, r0, r2, r1)

+# define sse_ungtr_d(r0, r1, r2) ssecmpd(X86_CC_NAE, r0, r1, r2)

# define sse_ungti_d(r0, r1, i0) _sse_ungti_d(_jit, r0, r1, i0)

static void _sse_ungti_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

# define sse_ltgtr_d(r0, r1, r2) _sse_ltgtr_d(_jit, r0, r1, r2)

diff --git a/lib/jit_x86-x87.c b/lib/jit_x86-x87.c
index 579c661..7df1154 100644
--- a/lib/jit_x86-x87.c
+++ b/lib/jit_x86-x87.c

@@ -166,7 +166,7 @@ static void _x87_unlti_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

# define x87_unler_f(r0, r1, r2) x87cmp(X86_CC_NA, r0, r1, r2)

# define x87_unlei_f(r0, r1, i0) _x87_unlei_f(_jit, r0, r1, i0)

static void _x87_unlei_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

-# define x87_uneqr_f(r0, r1, r2) x87cmp2(X86_CC_E, r0, r1, r1)

+# define x87_uneqr_f(r0, r1, r2) x87cmp2(X86_CC_E, r0, r1, r2)

# define x87_uneqi_f(r0, r1, i0) _x87_uneqi_f(_jit, r0, r1, i0)

static void _x87_uneqi_f(jit_state_t*,jit_int32_t,jit_int32_t,jit_float32_t*);

# define x87_unger_f(r0, r1, r2) x87cmp(X86_CC_NA, r0, r2, r1)

@@ -210,7 +210,7 @@ static void _x87_unlti_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

# define x87_unler_d(r0, r1, r2) x87cmp(X86_CC_NA, r0, r1, r2)

# define x87_unlei_d(r0, r1, i0) _x87_unlei_d(_jit, r0, r1, i0)

static void _x87_unlei_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

-# define x87_uneqr_d(r0, r1, r2) x87cmp2(X86_CC_E, r0, r1, r1)

+# define x87_uneqr_d(r0, r1, r2) x87cmp2(X86_CC_E, r0, r1, r2)

# define x87_uneqi_d(r0, r1, i0) _x87_uneqi_d(_jit, r0, r1, i0)

static void _x87_uneqi_d(jit_state_t*,jit_int32_t,jit_int32_t,jit_float64_t*);

# define x87_unger_d(r0, r1, r2) x87cmp(X86_CC_NA, r0, r2, r1)

diff --git a/lib/jit_x86.c b/lib/jit_x86.c
index 7104edb..6b14808 100644
--- a/lib/jit_x86.c
+++ b/lib/jit_x86.c

@@ -480,11 +480,7 @@ _jit_arg_d(jit_state_t *_jit)

#endif

{

offset = _jit->function->self.size;

-#if __WORDSIZE == 32

- _jit->function->self.size += sizeof(jit_float32_t);

-#else

_jit->function->self.size += sizeof(jit_float64_t);

-#endif

}

return (jit_new_node_w(jit_code_arg_d, offset));

}