alpha: Implement q{l,r}sh{r,i}{,_u} - lightning.git - Portable just-in-time compiler library

diff --git a/lib/jit_alpha-cpu.c b/lib/jit_alpha-cpu.c
index 227851d..fc10c10 100644
--- a/lib/jit_alpha-cpu.c
+++ b/lib/jit_alpha-cpu.c

@@ -409,6 +409,26 @@ static void _rshi(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t);

# define rshr_u(r0,r1,r2) SRL(r1,r2,r0)

# define rshi_u(r0,r1,i0) _rshi_u(_jit,r0,r1,i0)

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

+# define qlshr(r0,r1,r2,r3) xlshr(1,r0,r1,r2,r3)

+# define qlshr_u(r0, r1, r2, r3) xlshr(0, r0, r1, r2, r3)

+# define xlshr(s,r0,r1,r2,r3) _xlshr(_jit,s,r0,r1,r2,r3)

+static void

+_xlshr(jit_state_t*,jit_bool_t,jit_int32_t,jit_int32_t,jit_int32_t,jit_int32_t);

+# define qlshi(r0, r1, r2, i0) xlshi(1, r0, r1, r2, i0)

+# define qlshi_u(r0, r1, r2, i0) xlshi(0, r0, r1, r2, i0)

+# define xlshi(s, r0, r1, r2, i0) _xlshi(_jit, s, r0, r1, r2, i0)

+static void

+_xlshi(jit_state_t*,jit_bool_t,jit_int32_t,jit_int32_t,jit_int32_t,jit_word_t);

+# define qrshr(r0, r1, r2, r3) xrshr(1, r0, r1, r2, r3)

+# define qrshr_u(r0, r1, r2, r3) xrshr(0, r0, r1, r2, r3)

+# define xrshr(s, r0, r1, r2, r3) _xrshr(_jit, s, r0, r1, r2, r3)

+static void

+_xrshr(jit_state_t*,jit_bool_t,jit_int32_t,jit_int32_t,jit_int32_t,jit_int32_t);

+# define qrshi(r0, r1, r2, i0) xrshi(1, r0, r1, r2, i0)

+# define qrshi_u(r0, r1, r2, i0) xrshi(0, r0, r1, r2, i0)

+# define xrshi(s, r0, r1, r2, i0) _xrshi(_jit, s, r0, r1, r2, i0)

+static void

+_xrshi(jit_state_t*,jit_bool_t,jit_int32_t,jit_int32_t,jit_int32_t,jit_word_t);

# define andr(r0,r1,r2) AND(r1,r2,r0)

# define andi(r0,r1,i0) _andi(_jit,r0,r1,i0)

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

@@ -1312,6 +1332,208 @@ _rshi_u(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)

}

static void

+_xlshr(jit_state_t *_jit, jit_bool_t sign,

+ jit_int32_t r0, jit_int32_t r1, jit_int32_t r2, jit_int32_t r3)

+{

+ jit_bool_t branch;

+ jit_word_t over, zero, done, done_over;

+ jit_int32_t t0, s0, t1, s1, t2, s2, t3, s3;

+ s0 = jit_get_reg(jit_class_gpr);

+ t0 = rn(s0);

+ if (r0 == r2 || r1 == r2) {

+ s2 = jit_get_reg(jit_class_gpr);

+ t2 = rn(s2);

+ movr(t2, r2);

+ }

+ else

+ t2 = r2;

+ if (r0 == r3 || r1 == r3) {

+ s3 = jit_get_reg(jit_class_gpr);

+ t3 = rn(s3);

+ movr(t3, r3);

+ }

+ else

+ t3 = r3;

+ if ((s1 = jit_get_reg(jit_class_gpr|jit_class_nospill|jit_class_chk))) {

+ t1 = rn(s1);

+ branch = 0;

+ }

+ else

+ branch = 1;

+ rsbi(t0, t3, __WORDSIZE);

+ lshr(r0, t2, t3);

+ if (sign)

+ rshr(r1, t2, t0);

+ else

+ rshr_u(r1, t2, t0);

+ if (branch) {

+ zero = beqi(_jit->pc.w, t3, 0);

+ over = beqi(_jit->pc.w, t3, __WORDSIZE);

+ done = jmpi(_jit->pc.w);

+ patch_at(over, _jit->pc.w);

+ /* overflow */

+ movi(r0, 0);

+ done_over = jmpi(_jit->pc.w);

+ /* zero */

+ patch_at(zero, _jit->pc.w);

+ if (sign)

+ rshi(r1, t2, __WORDSIZE - 1);

+ else

+ movi(r1, 0);

+ patch_at(done, _jit->pc.w);

+ patch_at(done_over, _jit->pc.w);

+ }

+ else {

+ if (sign)

+ rshi(t0, t2, __WORDSIZE - 1);

+ else

+ movi(t0, 0);

+ /* zero? */

+ movzr(r1, t0, t3);

+ /* Branchless but 4 bytes longer than branching fallback */

+ if (sign)

+ movi(t0, 0);

+ /* overflow? */

+ eqi(t1, t3, __WORDSIZE);

+ movnr(r0, t0, t1);

+ jit_unget_reg(s1);

+ }

+ jit_unget_reg(s0);

+ if (t2 != r2)

+ jit_unget_reg(s2);

+ if (t3 != r3)

+ jit_unget_reg(s3);

+}

+

+static void

+_xlshi(jit_state_t *_jit, jit_bool_t sign,

+ jit_int32_t r0, jit_int32_t r1, jit_int32_t r2, jit_word_t i0)

+{

+ if (i0 == 0) {

+ movr(r0, r2);

+ if (sign)

+ rshi(r1, r2, __WORDSIZE - 1);

+ else

+ movi(r1, 0);

+ }

+ else if (i0 == __WORDSIZE) {

+ movr(r1, r2);

+ movi(r0, 0);

+ }

+ else {

+ assert((jit_uword_t)i0 <= __WORDSIZE);

+ if (sign)

+ rshi(r1, r2, __WORDSIZE - i0);

+ else

+ rshi_u(r1, r2, __WORDSIZE - i0);

+ lshi(r0, r2, i0);

+ }

+}

+

+static void

+_xrshr(jit_state_t *_jit, jit_bool_t sign,

+ jit_int32_t r0, jit_int32_t r1, jit_int32_t r2, jit_int32_t r3)

+{

+ jit_bool_t branch;

+ jit_word_t over, zero, done, done_over;

+ jit_int32_t t0, s0, t1, s1, t2, s2, t3, s3;

+ s0 = jit_get_reg(jit_class_gpr);

+ t0 = rn(s0);

+ if (r0 == r2 || r1 == r2) {

+ s2 = jit_get_reg(jit_class_gpr);

+ t2 = rn(s2);

+ movr(t2, r2);

+ }

+ else

+ t2 = r2;

+ if (r0 == r3 || r1 == r3) {

+ s3 = jit_get_reg(jit_class_gpr);

+ t3 = rn(s3);

+ movr(t3, r3);

+ }

+ else

+ t3 = r3;

+ if ((s1 = jit_get_reg(jit_class_gpr|jit_class_nospill|jit_class_chk))) {

+ t1 = rn(s1);

+ branch = 0;

+ }

+ else

+ branch = 1;

+ rsbi(t0, t3, __WORDSIZE);

+ if (sign)

+ rshr(r0, t2, t3);

+ else

+ rshr_u(r0, t2, t3);

+ lshr(r1, t2, t0);

+ if (branch) {

+ zero = beqi(_jit->pc.w, t3, 0);

+ over = beqi(_jit->pc.w, t3, __WORDSIZE);

+ done = jmpi(_jit->pc.w);

+ patch_at(over, _jit->pc.w);

+ /* underflow */

+ if (sign)

+ rshi(r0, t2, __WORDSIZE - 1);

+ else

+ movi(r0, 0);

+ done_over = jmpi(_jit->pc.w);

+ /* zero */

+ patch_at(zero, _jit->pc.w);

+ if (sign)

+ rshi(r1, t2, __WORDSIZE - 1);

+ else

+ movi(r1, 0);

+ patch_at(done, _jit->pc.w);

+ patch_at(done_over, _jit->pc.w);

+ jit_unget_reg(s1);

+ }

+ else {

+ /* zero? */

+ if (sign)

+ rshi(t0, t2, __WORDSIZE - 1);

+ else

+ movi(t0, 0);

+ movzr(r1, t0, t3);

+ /* underflow? */

+ eqi(t1, t3, __WORDSIZE);

+ movnr(r0, t0, t1);

+ jit_unget_reg(s1);

+ }

+ jit_unget_reg(s0);

+ if (t2 != r2)

+ jit_unget_reg(s2);

+ if (t3 != r3)

+ jit_unget_reg(s3);

+}

+

+static void

+_xrshi(jit_state_t *_jit, jit_bool_t sign,

+ jit_int32_t r0, jit_int32_t r1, jit_int32_t r2, jit_word_t i0)

+{

+ if (i0 == 0) {

+ movr(r0, r2);

+ if (sign)

+ rshi(r1, r2, __WORDSIZE - 1);

+ else

+ movi(r1, 0);

+ }

+ else if (i0 == __WORDSIZE) {

+ movr(r1, r2);

+ if (sign)

+ rshi(r0, r2, __WORDSIZE - 1);

+ else

+ movi(r0, 0);

+ }

+ else {

+ assert((jit_uword_t)i0 <= __WORDSIZE);

+ lshi(r1, r2, __WORDSIZE - i0);

+ if (sign)

+ rshi(r0, r2, i0);

+ else

+ rshi_u(r0, r2, i0);

+ }

+}

+

+static void

_andi(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)

{

union {

diff --git a/lib/jit_alpha-sz.c b/lib/jit_alpha-sz.c
index fba733b..8b62186 100644
--- a/lib/jit_alpha-sz.c
+++ b/lib/jit_alpha-sz.c

@@ -189,7 +189,7 @@

8, /* bgtr_u */

12, /* bgti_u */

8, /* bner */

- 36, /* bnei */

+ 40, /* bnei */

8, /* bmsr */

8, /* bmsi */

8, /* bmcr */

@@ -455,7 +455,44 @@

12, /* lroti */

20, /* rrotr */

12, /* rroti */

- 8, /* ext */

- 36, /* ext_u */

- 72, /* dep */

+ 8, /* extr */

+ 36, /* extr_u */

+ 72, /* depr */

+ 24, /* depi */

+ 4, /* negi */

+ 4, /* comi */

+ 4, /* exti_c */

+ 4, /* exti_uc */

+ 4, /* exti_s */

+ 16, /* exti_us */

+ 28, /* exti_i */

+ 16, /* exti_ui */

+ 4, /* bswapi_us */

+ 16, /* bswapi_ui */

+ 32, /* bswapi_ul */

+ 16, /* htoni_us */

+ 16, /* htoni_ui */

+ 32, /* htoni_ul */

+ 0, /* negi_f */

+ 0, /* absi_f */

+ 0, /* sqrti_f */

+ 0, /* negi_d */

+ 0, /* absi_d */

+ 0, /* sqrti_d */

+ 4, /* cloi */

+ 4, /* clzi */

+ 4, /* ctoi */

+ 4, /* ctzi */

+ 32, /* rbiti */

+ 4, /* popcnti */

+ 4, /* exti */

+ 4, /* exti_u */

+ 44, /* qlshr */

+ 8, /* qlshi */

+ 40, /* qlshr_u */

+ 8, /* qlshi_u */

+ 40, /* qrshr */

+ 8, /* qrshi */

+ 40, /* qrshr_u */

+ 8, /* qrshi_u */

#endif /* __WORDSIZE */

diff --git a/lib/jit_alpha.c b/lib/jit_alpha.c
index 904ea75..d6f5e5c 100644
--- a/lib/jit_alpha.c
+++ b/lib/jit_alpha.c

@@ -1031,10 +1031,18 @@ _emit_code(jit_state_t *_jit)

case_rrw(rem, _u);

case_rrr(lsh,);

case_rrw(lsh,);

+ case_rrrr(qlsh,);

+ case_rrrw(qlsh,);

+ case_rrrr(qlsh, _u);

+ case_rrrw(qlsh, _u);

case_rrr(rsh,);

case_rrw(rsh,);

case_rrr(rsh, _u);

case_rrw(rsh, _u);

+ case_rrrr(qrsh,);

+ case_rrrw(qrsh,);

+ case_rrrr(qrsh, _u);

+ case_rrrw(qrsh, _u);

#define lrotr(r0,r1,r2) fallback_lrotr(r0,r1,r2)

#define lroti(r0,r1,i0) fallback_lroti(r0,r1,i0)

#define rrotr(r0,r1,r2) fallback_rrotr(r0,r1,r2)