X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightning%2Flib%2Fjit_ppc-cpu.c;h=f84998bfd88f537e4301b62bfb5b18430407b498;hb=ba86ff938a6b17c171dd68ebdf897ca3e30550f8;hp=67874c604f59f1e069a50f2a4842529cd3541835;hpb=02a5662c31c401081716623cc80bb1c4ab1dbb19;p=pcsx_rearmed.git diff --git a/deps/lightning/lib/jit_ppc-cpu.c b/deps/lightning/lib/jit_ppc-cpu.c index 67874c60..f84998bf 100644 --- a/deps/lightning/lib/jit_ppc-cpu.c +++ b/deps/lightning/lib/jit_ppc-cpu.c @@ -61,14 +61,20 @@ # define _FP_REGNO 31 # if __WORDSIZE == 32 # define ldr(r0,r1) ldr_i(r0,r1) +# define ldi(r0,i0) ldi_i(r0,i0) # define ldxi(r0,r1,i0) ldxi_i(r0,r1,i0) # define ldxr(r0,r1,r2) ldxr_i(r0,r1,r2) +# define str(r0,r1) str_i(r0,r1) +# define sti(i0,r0) sti_i(i0,r0) # define stxi(i0,r0,r1) stxi_i(i0,r0,r1) # define stxr(r0,r1,r2) stxr_i(r0,r1,r2) # else # define ldr(r0,r1) ldr_l(r0,r1) +# define ldi(r0,i0) ldi_l(r0,i0) # define ldxi(r0,r1,i0) ldxi_l(r0,r1,i0) # define ldxr(r0,r1,r2) ldxr_l(r0,r1,r2) +# define str(r0,r1) str_l(r0,r1) +# define sti(i0,r0) sti_l(i0,r0) # define stxi(i0,r0,r1) stxi_l(i0,r0,r1) # define stxr(r0,r1,r2) stxr_l(r0,r1,r2) # endif @@ -295,7 +301,7 @@ static void _FXS(jit_state_t*,int,int,int,int,int,int,int); # define LWZX(d,a,b) FX(31,d,a,b,23) # define LD(d,a,s) FDs(58,d,a,s) # define LDX(d,a,b) FX(31,d,a,b,21) -# define MCRF(d,s) FXL(19,d<<2,(s)<<2,0) +# define MCRF(d,s) FXL(19,((d)<<2),((s)<<2),0) # if DEBUG /* In case instruction is emulated, check the kernel can handle it. Will only generate it if DEBUG is enabled. @@ -327,31 +333,31 @@ instruction will cause the system illegal instruction error handler to be invoked """ */ -# define MCRXR(d) FX(31,d<<2,0,0,512) +# define MCRXR(d) FX(31,((d)<<2),0,0,512) # else # define MCRXR(cr) _MCRXR(_jit,cr); static void _MCRXR(jit_state_t*, jit_int32_t); # endif # define MFCR(d) FX(31,d,0,0,19) # define MFMSR(d) FX(31,d,0,0,83) -# define MFSPR(d,s) FXFX(31,d,s<<5,339) +# define MFSPR(d,s) FXFX(31,d,((s)<<5),339) # define MFXER(d) MFSPR(d,1) # define MFLR(d) MFSPR(d,8) # define MFCTR(d) MFSPR(d,9) # define MFSR(d,s) FX(31,d,s,0,595) # define MFSRIN(d,b) FX(31,d,0,b,659) -# define MFTB(d,x,y) FXFX(31,d,(x)|((y)<<5),371) +# define MFTB(d,x,y) FXFX(31,d,((x)|((y)<<5)),371) # define MFTBL(d) MFTB(d,8,12) # define MFTBU(d) MFTB(d,8,13) -# define MTCRF(c,s) FXFX(31,s,c<<1,144) +# define MTCRF(c,s) FXFX(31,s,((c)<<1),144) # define MTCR(s) MTCRF(0xff,s) # define MTMSR(s) FX(31,s,0,0,146) -# define MTSPR(d,s) FXFX(31,d,s<<5,467) +# define MTSPR(d,s) FXFX(31,d,((s)<<5),467) # define MTXER(d) MTSPR(d,1) # define MTLR(d) MTSPR(d,8) # define MTCTR(d) MTSPR(d,9) -# define MTSR(r,s) FX(31,s<<1,r,0,210) -# define MTSRIN(r,b) FX(31,r<<1,0,b,242) +# define MTSR(r,s) FX(31,((s)<<1),r,0,210) +# define MTSRIN(r,b) FX(31,((r)<<1),0,b,242) # define MULLI(d,a,s) FDs(07,d,a,s) # define MULHW(d,a,b) FXO(31,d,a,b,0,75) # define MULHW_(d,a,b) FXO_(31,d,a,b,0,75) @@ -386,22 +392,23 @@ static void _MCRXR(jit_state_t*, jit_int32_t); # define ORI(d,a,u) FDu(24,a,d,u) # define NOP() ORI(0,0,0) # define ORIS(d,a,u) FDu(25,a,d,u) +# define POPCNTB(a,s) FX(31,s,a,0,122) # define RFI() FXL(19,0,0,50) # define RLWIMI(d,s,h,b,e) FM(20,s,d,h,b,e,0) # define RLWIMI_(d,s,h,b,e) FM(20,s,d,h,b,e,1) -# define INSLWI(a,s,n,b) RLWIMI(a,s,32-b,b,b+n-1) -# define INSRWI(a,s,n,b) RLWIMI(a,s,32-(b+n),b,(b+n)-1) +# define INSLWI(a,s,n,b) RLWIMI(a,s,(32-(b)),b,(((b)+(n))-1)) +# define INSRWI(a,s,n,b) RLWIMI(a,s,(32-((b)+(n))),b,(((b)+(n))-1)) # define RLWINM(a,s,h,b,e) FM(21,s,a,h,b,e,0) # define RLWINM_(a,s,h,b,e) FM(21,s,a,h,b,e,1) -# define EXTLWI(a,s,n,b) RLWINM(a,s,b,0,n-1) -# define EXTRWI(a,s,n,b) RLWINM(a,s,b+n,32-n,31) +# define EXTLWI(a,s,n,b) RLWINM(a,s,b,0,((n)-1)) +# define EXTRWI(a,s,n,b) RLWINM(a,s,((b)+(n)),(32-(n)),31) # define ROTLWI(a,s,n) RLWINM(a,s,n,0,31) -# define ROTRWI(a,s,n) RLWINM(a,s,32-n,0,31) -# define SLWI(a,s,n) RLWINM(a,s,n,0,31-n) -# define SRWI(a,s,n) RLWINM(a,s,32-n,n,31) +# define ROTRWI(a,s,n) RLWINM(a,s,(32-(n)),0,31) +# define SLWI(a,s,n) RLWINM(a,s,n,0,(31-(n))) +# define SRWI(a,s,n) RLWINM(a,s,(32-(n)),n,31) # define CLRLWI(a,s,n) RLWINM(a,s,0,n,31) -# define CLRRWI(a,s,n) RLWINM(a,s,0,0,31-n) -# define CLRLSWI(a,s,b,n) RLWINM(a,s,n,b-n,31-n) +# define CLRRWI(a,s,n) RLWINM(a,s,0,0,(31-(n))) +# define CLRLSWI(a,s,b,n) RLWINM(a,s,n,((b)-(n)),(31-(n))) # define RLWNM(a,s,b,m,e) FM(23,s,a,b,m,e,0) # define RLWNM_(a,s,b,m,e) FM(23,s,a,b,m,e,1) # define ROTLW(a,s,b) RLWNM(a,s,b,0,31) @@ -415,33 +422,34 @@ static void _MCRXR(jit_state_t*, jit_int32_t); # define SRW(a,s,b) FX(31,s,a,b,536) # define SRW_(a,s,b) FX_(31,s,a,b,536) # if __WORDSIZE == 64 -# define RLDICL(a,s,h,b) FMD(30,s,a,h&~32,b,0,h>>5) -# define RLDICL_(a,s,h,b) FMD_(30,s,a,h&~32,b,0,h>>5) -# define EXTRDI(x,y,n,b) RLDICL(x,y,(b+n),(64-n)) -# define SRDI(x,y,n) RLDICL(x,y,(64-n),n) +# define RLDICL(a,s,h,b) FMD(30,s,a,((h)&~32),b,0,((h)>>5)) +# define RLDICL_(a,s,h,b) FMD_(30,s,a,((h)&~32),b,0,((h)>>5)) +# define EXTRDI(x,y,n,b) RLDICL(x,y,((b)+(n)),(64-(n))) +# define SRDI(x,y,n) RLDICL(x,y,(64-(n)),n) # define CLRLDI(x,y,n) RLDICL(x,y,0,n) -# define RLDICR(a,s,h,e) FMD(30,s,a,h&~32,e,1,h>>5) -# define RLDICR_(a,s,h,e) FMD_(30,s,a,h&~32,e,1,h>>5) -# define EXTRLI(x,y,n,b) RLDICR(x,y,b,(n-1)) -# define SLDI(x,y,n) RLDICR(x,y,n,(63-n)) -# define CLRRDI(x,y,n) RLDICR(x,y,0,(63-n)) -# define RLDIC(a,s,h,b) FMD(30,s,a,h&~32,b,2,h>>5) -# define RLDIC_(a,s,h,b) FMD_(30,s,a,h&~32,b,2,h>>5) -# define CLRLSLDI(x,y,b,n) RLDIC(x,y,n,(b-n)) +# define RLDICR(a,s,h,e) FMD(30,s,a,((h)&~32),e,1,((h)>>5)) +# define RLDICR_(a,s,h,e) FMD_(30,s,a,((h)&~32),e,1,((h)>>5)) +# define EXTLDI(x,y,n,b) RLDICR(x,y,b,((n)-1)) +# define SLDI(x,y,n) RLDICR(x,y,n,(63-(n))) +# define CLRRDI(x,y,n) RLDICR(x,y,0,(63-(n))) +# define RLDIC(a,s,h,b) FMD(30,s,a,((h)&~32),b,2,((h)>>5)) +# define RLDIC_(a,s,h,b) FMD_(30,s,a,((h)&~32),b,2,((h)>>5)) +# define CLRLSLDI(x,y,b,n) RLDIC(x,y,n,((b)-(n))) # define RLDCL(a,s,h,b) FMDS(30,s,a,h,b,8) # define RLDCL_(a,s,h,b) FMDS_(30,s,a,h,b,8) # define ROTLD(x,y,z) RLDCL(x,y,z,0) # define RLDCR(a,s,b,e) FMDS(30,s,a,b,e,0) # define RLDCR_(a,s,b,e) FMDS_(30,s,a,b,e,0) -# define RLDIMI(a,s,h,b) FMD(30,s,a,h&~32,b,3,h>>5) -# define RLDIMI_(a,s,h,b) FMD_(30,s,a,h&~32,b,3,h>>5) -# define INSRDI(x,y,n,b) RLDIMI(x,y,(64-(b+n)),b) +# define RLDIMI(a,s,h,b) FMD(30,s,a,((h)&~32),b,3,((h)>>5)) +# define RLDIMI_(a,s,h,b) FMD_(30,s,a,((h)&~32),b,3,((h)>>5)) +# define INSLDI(x,y,n,b) RLDIMI(x,y,(64-(b)),(((b)+(n))-1)) +# define INSRDI(x,y,n,b) RLDIMI(x,y,(64-((b)+(n))),b) # define SLD(a,s,b) FX(31,s,a,b,27) # define SLD_(a,s,b) FX_(31,s,a,b,27) # define SRD(a,s,b) FX(31,s,a,b,539) # define SRD_(a,s,b) FX_(31,s,a,b,539) -# define SRADI(a,s,h) FXS(31,s,a,h&~32,413,h>>5) -# define SRADI_(a,s,h) FXS_(31,s,a,h&~32,413,h>>5) +# define SRADI(a,s,h) FXS(31,s,a,((h)&~32),413,((h)>>5)) +# define SRADI_(a,s,h) FXS_(31,s,a,((h)&~32),413,((h)>>5)) # define SRAD(a,s,b) FX(31,s,a,b,794) # define SRAD_(a,s,b) FX_(31,s,a,b,794) # endif @@ -466,7 +474,7 @@ static void _MCRXR(jit_state_t*, jit_int32_t); # define STWX(s,a,b) FX(31,s,a,b,151) # define STD(s,a,d) FDs(62,s,a,d) # define STDX(s,a,b) FX(31,s,a,b,149) -# define STDU(s,a,d) FDs(62,s,a,d|1) +# define STDU(s,a,d) FDs(62,s,a,((d)|1)) # define STDUX(s,a,b) FX(31,s,a,b,181) # define SUBF(d,a,b) FXO(31,d,a,b,0,40) # define SUBF_(d,a,b) FXO_(31,d,a,b,0,40) @@ -476,15 +484,15 @@ static void _MCRXR(jit_state_t*, jit_int32_t); # define SUB_(d,a,b) SUBF_(d,b,a) # define SUBO(d,a,b) SUBFO(d,b,a) # define SUBO_(d,a,b) SUBFO_(d,b,a) -# define SUBI(d,a,s) ADDI(d,a,-s) -# define SUBIS(d,a,s) ADDIS(d,a,-s) +# define SUBI(d,a,s) ADDI(d,a,-(s)) +# define SUBIS(d,a,s) ADDIS(d,a,-(s)) # define SUBFC(d,a,b) FXO(31,d,a,b,0,8) # define SUBFC_(d,a,b) FXO_(31,d,a,b,0,8) # define SUBFCO(d,a,b) FXO(31,d,a,b,1,8) # define SUBFCO_(d,a,b) FXO_(31,d,a,b,1,8) # define SUBC(d,a,b) SUBFC(d,b,a) -# define SUBIC(d,a,s) ADDIC(d,a,-s) -# define SUBIC_(d,a,s) ADDIC_(d,a,-s) +# define SUBIC(d,a,s) ADDIC(d,a,-(s)) +# define SUBIC_(d,a,s) ADDIC_(d,a,-(s)) # define SUBFE(d,a,b) FXO(31,d,a,b,0,136) # define SUBFE_(d,a,b) FXO_(31,d,a,b,0,136) # define SUBFEO(d,a,b) FXO(31,d,a,b,1,136) @@ -533,8 +541,6 @@ static void _casx(jit_state_t *_jit,jit_int32_t,jit_int32_t, #define casi(r0, i0, r1, r2) casx(r0, _NOREG, r1, r2, i0) # define negr(r0,r1) NEG(r0,r1) # define comr(r0,r1) NOT(r0,r1) -# define bitswap(r0, r1) _bitswap(_jit, r0, r1) -static void _bitswap(jit_state_t*, jit_int32_t, jit_int32_t); # define clor(r0, r1) _clor(_jit, r0, r1) static void _clor(jit_state_t*, jit_int32_t, jit_int32_t); # if __WORDSIZE == 32 @@ -546,6 +552,14 @@ static void _clor(jit_state_t*, jit_int32_t, jit_int32_t); static void _ctor(jit_state_t*, jit_int32_t, jit_int32_t); # define ctzr(r0, r1) _ctzr(_jit, r0, r1) static void _ctzr(jit_state_t*, jit_int32_t, jit_int32_t); +# define popcntr(r0, r1) _popcntr(_jit, r0, r1) +static void _popcntr(jit_state_t*, jit_int32_t, jit_int32_t); +# define extr(r0,r1,i0,i1) _extr(_jit,r0,r1,i0,i1) +static void _extr(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t,jit_word_t); +# define extr_u(r0,r1,i0,i1) _extr_u(_jit,r0,r1,i0,i1) +static void _extr_u(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t,jit_word_t); +# define depr(r0,r1,i0,i1) _depr(_jit,r0,r1,i0,i1) +static void _depr(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t,jit_word_t); # define extr_c(r0,r1) EXTSB(r0,r1) # define extr_uc(r0,r1) ANDI_(r0,r1,0xff) # define extr_s(r0,r1) EXTSH(r0,r1) @@ -586,16 +600,20 @@ static void _rsbi(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); # if __WORDSIZE == 32 # define mulr(r0,r1,r2) MULLW(r0,r1,r2) # define mullr(r0,r1,r2) MULLW(r0,r1,r2) -# define mulhr(r0,r1,r2) MULHW(r0,r1,r2) -# define mulhr_u(r0,r1,r2) MULHWU(r0,r1,r2) +# define hmulr(r0,r1,r2) MULHW(r0,r1,r2) +# define hmulr_u(r0,r1,r2) MULHWU(r0,r1,r2) # else # define mulr(r0,r1,r2) MULLD(r0,r1,r2) # define mullr(r0,r1,r2) MULLD(r0,r1,r2) -# define mulhr(r0,r1,r2) MULHD(r0,r1,r2) -# define mulhr_u(r0,r1,r2) MULHDU(r0,r1,r2) +# define hmulr(r0,r1,r2) MULHD(r0,r1,r2) +# define hmulr_u(r0,r1,r2) MULHDU(r0,r1,r2) # endif # define muli(r0,r1,i0) _muli(_jit,r0,r1,i0) static void _muli(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); +# define hmuli(r0,r1,i0) _hmuli(_jit,r0,r1,i0) +static void _hmuli(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); +# define hmuli_u(r0,r1,i0) _hmuli_u(_jit,r0,r1,i0) +static void _hmuli_u(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); # define qmulr(r0,r1,r2,r3) iqmulr(r0,r1,r2,r3,1) # define qmulr_u(r0,r1,r2,r3) iqmulr(r0,r1,r2,r3,0) # define iqmulr(r0,r1,r2,r3,cc) _iqmulr(_jit,r0,r1,r2,r3,cc) @@ -652,8 +670,18 @@ static void _xori(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); # else # define lshr(r0,r1,r2) SLD(r0,r1,r2) # endif +#define qlshr(r0,r1,r2,r3) xlshr(1,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 lshi(r0,r1,i0) _lshi(_jit,r0,r1,i0) static void _lshi(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); +# define qlshi(r0, r1, r2, i0) xlshi(1, 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 qlshr_u(r0, r1, r2, r3) xlshr(0, r0, r1, r2, r3) +# define qlshi_u(r0, r1, r2, i0) xlshi(0, r0, r1, r2, i0) # if __WORDSIZE == 32 # define rshr(r0,r1,r2) SRAW(r0,r1,r2) # else @@ -668,6 +696,27 @@ static void _rshi(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); # endif # 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 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); +# if __WORDSIZE == 32 +# define lrotr(r0,r1,r2) ROTLW(r0,r1,r2) +# else +# define lrotr(r0,r1,r2) ROTLD(r0,r1,r2) +# endif +# define lroti(r0,r1,i0) _lroti(_jit,r0,r1,i0) +static void _lroti(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); +# define rrotr(r0,r1,r2) _rrotr(_jit,r0,r1,r2) +static void _rrotr(jit_state_t*,jit_int32_t,jit_int32_t,jit_int32_t); +# define rroti(r0,r1,i0) _rroti(_jit,r0,r1,i0) +static void _rroti(jit_state_t*,jit_int32_t,jit_int32_t,jit_word_t); # define ltr(r0,r1,r2) _ltr(_jit,r0,r1,r2) static void _ltr(jit_state_t*,jit_int32_t,jit_int32_t,jit_int32_t); # define lti(r0,r1,i0) _lti(_jit,r0,r1,i0) @@ -1220,92 +1269,107 @@ _casx(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_unget_reg(r1_reg); } -/* http://graphics.stanford.edu/~seander/bithacks.html#ReverseParallel */ -/* -unsigned int v; // 32-bit word to reverse bit order - -// swap odd and even bits -v = ((v >> 1) & 0x55555555) | ((v & 0x55555555) << 1); -// swap consecutive pairs -v = ((v >> 2) & 0x33333333) | ((v & 0x33333333) << 2); -// swap nibbles ... -v = ((v >> 4) & 0x0F0F0F0F) | ((v & 0x0F0F0F0F) << 4); -// swap bytes -v = ((v >> 8) & 0x00FF00FF) | ((v & 0x00FF00FF) << 8); -// swap 2-byte long pairs -v = ( v >> 16 ) | ( v << 16); - */ static void -_bitswap(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +_clor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +{ + comr(r0, r1); + clzr(r0, r0); +} + +static void +_ctor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +{ + comr(r0, r1); + ctzr(r0, r0); +} + +static void +_ctzr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) { - jit_int32_t t0, t1, t2, t3, t4; - movr(r0, r1); + jit_int32_t t0, t1; t0 = jit_get_reg(jit_class_gpr); t1 = jit_get_reg(jit_class_gpr); - t2 = jit_get_reg(jit_class_gpr); - movi(rn(t0), __WORDSIZE == 32 ? 0x55555555L : 0x5555555555555555L); - rshi_u(rn(t1), r0, 1); /* t1 = v >> 1 */ - andr(rn(t1), rn(t1), rn(t0)); /* t1 &= t0 */ - andr(rn(t2), r0, rn(t0)); /* t2 = v & t0*/ - lshi(rn(t2), rn(t2), 1); /* t2 <<= 1 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ - movi(rn(t0), __WORDSIZE == 32 ? 0x33333333L : 0x3333333333333333L); - rshi_u(rn(t1), r0, 2); /* t1 = v >> 2 */ - andr(rn(t1), rn(t1), rn(t0)); /* t1 &= t0 */ - andr(rn(t2), r0, rn(t0)); /* t2 = v & t0*/ - lshi(rn(t2), rn(t2), 2); /* t2 <<= 2 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ - movi(rn(t0), __WORDSIZE == 32 ? 0x0f0f0f0fL : 0x0f0f0f0f0f0f0f0fL); - rshi_u(rn(t1), r0, 4); /* t1 = v >> 4 */ - andr(rn(t1), rn(t1), rn(t0)); /* t1 &= t0 */ - andr(rn(t2), r0, rn(t0)); /* t2 = v & t0*/ - lshi(rn(t2), rn(t2), 4); /* t2 <<= 4 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ - movi(rn(t0), __WORDSIZE == 32 ? 0x00ff00ffL : 0x00ff00ff00ff00ffL); - rshi_u(rn(t1), r0, 8); /* t1 = v >> 8 */ - andr(rn(t1), rn(t1), rn(t0)); /* t1 &= t0 */ - andr(rn(t2), r0, rn(t0)); /* t2 = v & t0*/ - lshi(rn(t2), rn(t2), 8); /* t2 <<= 8 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ -# if __WORDSIZE == 32 - rshi_u(rn(t1), r0, 16); /* t1 = v >> 16 */ - lshi(rn(t2), r0, 16); /* t2 = v << 16 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ -# else - movi(rn(t0), 0x0000ffff0000ffffL); - rshi_u(rn(t1), r0, 16); /* t1 = v >> 16 */ - andr(rn(t1), rn(t1), rn(t0)); /* t1 &= t0 */ - andr(rn(t2), r0, rn(t0)); /* t2 = v & t0*/ - lshi(rn(t2), rn(t2), 16); /* t2 <<= 16 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ - rshi_u(rn(t1), r0, 32); /* t1 = v >> 32 */ - lshi(rn(t2), r0, 32); /* t2 = v << 32 */ - orr(r0, rn(t1), rn(t2)); /* v = t1 | t2 */ -# endif - jit_unget_reg(t2); - jit_unget_reg(t1); + negr(rn(t0), r1); + andr(rn(t0), rn(t0), r1); + clzr(r0, rn(t0)); + xori(rn(t1), r0, __WORDSIZE - 1); + movnr(r0, rn(t1), rn(t0)); jit_unget_reg(t0); + jit_unget_reg(t1); } static void -_clor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +_popcntr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) { - comr(r0, r1); - clzr(r0, r0); + jit_int32_t reg; + reg = jit_get_reg(jit_class_gpr); + POPCNTB(r0, r1); +#if __WORDSIZE == 32 + movi(rn(reg), 0x01010101); +#else + movi(rn(reg), 0x0101010101010101); +#endif + mullr(r0, r0, rn(reg)); + rshi_u(r0, r0, __WORDSIZE - 8); + jit_unget_reg(reg); } static void -_ctor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +_extr(jit_state_t *_jit, + jit_int32_t r0, jit_int32_t r1, jit_word_t i0 ,jit_word_t i1) { - bitswap(r0, r1); - clor(r0, r0); + assert(i0 >= 0 && i1 >= 1 && i0 + i1 <= __WORDSIZE); + if ( i1 == __WORDSIZE) + movr(r0, r1); + else { +# if __BYTE_ORDER == __BIG_ENDIAN + i0 = __WORDSIZE - (i0 + i1); +# endif + if (__WORDSIZE - (i0 + i1)) { + lshi(r0, r1, __WORDSIZE - (i0 + i1)); + rshi(r0, r0, __WORDSIZE - i1); + } + else + rshi(r0, r1, __WORDSIZE - i1); + } } static void -_ctzr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) +_extr_u(jit_state_t *_jit, + jit_int32_t r0, jit_int32_t r1, jit_word_t i0 ,jit_word_t i1) { - bitswap(r0, r1); - clzr(r0, r0); + assert(i0 >= 0 && i1 >= 1 && i0 + i1 <= __WORDSIZE); + if (i1 == __WORDSIZE) + movr(r0, r1); + else { +# if __BYTE_ORDER == __BIG_ENDIAN + i0 = __WORDSIZE - (i0 + i1); +# endif +# if __WORDSIZE == 32 + RLWINM(r0, r1, (32 - i0) & 0x1f, 32 - i1, 31); +# else + RLDICL(r0, r1, (64 - i0) & 0x3f, 64 - i1); +# endif + } +} + +static void +_depr(jit_state_t *_jit, + jit_int32_t r0, jit_int32_t r1, jit_word_t i0 ,jit_word_t i1) +{ + assert(i0 >= 0 && i1 >= 1 && i0 + i1 <= __WORDSIZE); + if (i1 == __WORDSIZE) + movr(r0, r1); + else { +# if __BYTE_ORDER == __BIG_ENDIAN + i0 = __WORDSIZE - (i0 + i1); +# endif +#if __WORDSIZE == 32 + RLWIMI(r0, r1, i0, 32 - (i0 + i1), 31 - i0); +#else + RLDIMI(r0, r1, i0, 64 - (i0 + i1)); +#endif + } } static void @@ -1475,6 +1539,9 @@ static void _muli(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) { jit_int32_t reg; + /* NOTE verified and overflow is correctly computed. + * No need to check for __WORDSIZE == 32. + * Documented as a 32 bit instruction. */ if (can_sign_extend_short_p(i0)) MULLI(r0, r1, i0); else { @@ -1485,6 +1552,26 @@ _muli(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) } } +static void +_hmuli(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) +{ + jit_int32_t reg; + reg = jit_get_reg(jit_class_gpr); + movi(rn(reg), i0); + hmulr(r0, r1, rn(reg)); + jit_unget_reg(reg); +} + +static void +_hmuli_u(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) +{ + jit_int32_t reg; + reg = jit_get_reg(jit_class_gpr); + movi(rn(reg), i0); + hmulr_u(r0, r1, rn(reg)); + jit_unget_reg(reg); +} + static void _iqmulr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2, jit_int32_t r3, jit_bool_t sign) @@ -1497,9 +1584,9 @@ _iqmulr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, else mullr(r0, r2, r3); if (sign) - mulhr(r1, r2, r3); + hmulr(r1, r2, r3); else - mulhr_u(r1, r2, r3); + hmulr_u(r1, r2, r3); if (r0 == r2 || r0 == r3) { movr(r0, rn(reg)); jit_unget_reg(reg); @@ -1710,6 +1797,81 @@ _lshi(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_int32_t t0, s0, t2, s2, t3, s3; + jit_word_t over, zero, done, done_over; + 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; + rsbi(t0, t3, __WORDSIZE); + lshr(r0, t2, t3); + if (sign) + rshr(r1, t2, t0); + else + rshr_u(r1, t2, t0); + zero = beqi(_jit->pc.w, t3, 0); + over = beqi(_jit->pc.w, t3, __WORDSIZE); + done = fallback_jmpi(_jit->pc.w); + patch_at(over, _jit->pc.w); + /* overflow */ + movi(r0, 0); + done_over = fallback_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(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 _rshi(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) { @@ -1738,6 +1900,131 @@ _rshi_u(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t 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_int32_t t0, s0, t2, s2, t3, s3; + jit_word_t over, zero, done, done_over; + 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; + rsbi(t0, t3, __WORDSIZE); + if (sign) + rshr(r0, t2, t3); + else + rshr_u(r0, t2, t3); + lshr(r1, t2, t0); + 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(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 +_lroti(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) +{ + if (i0 == 0) + movr(r0, r1); + else { +# if __WORDSIZE == 32 + ROTLWI(r0, r1, i0); +# else + RLDICL(r0, r1, i0, 0); +# endif + } +} + +static void +_rrotr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2) +{ + jit_int32_t reg; + if (r0 != r1 && r0 != r2) { + rsbi(r0, r2, __WORDSIZE); + lrotr(r0, r1, r0); + } + else { + reg = jit_get_reg(jit_class_gpr); + rsbi(rn(reg), r2, __WORDSIZE); + lrotr(r0, r1, rn(reg)); + jit_unget_reg(reg); + } +} + +static void +_rroti(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) +{ + if (i0 == 0) + movr(r0, r1); + else { +# if __WORDSIZE == 32 + ROTRWI(r0, r1, i0); +# else + RLDICL(r0, r1, 64 - i0, 0); +# endif + } +} + static void _ltr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2) { @@ -2860,9 +3147,9 @@ _ldi_i(jit_state_t *_jit, jit_int32_t r0, jit_word_t i0) jit_bool_t inv; jit_int32_t reg; jit_word_t lo, hi; - if (can_sign_extend_short_p(i0)) + if (can_sign_extend_short_p(i0) && !(i0 & 3)) LWA(r0, _R0_REGNO, i0); - else if (can_sign_extend_int_p(i0)) { + else if (can_sign_extend_int_p(i0) && !(i0 & 3)) { hi = (jit_int16_t)((i0 >> 16) + ((jit_uint16_t)i0 >> 15)); lo = (jit_int16_t)(i0 - (hi << 16)); reg = jit_get_reg(jit_class_gpr); @@ -2904,7 +3191,7 @@ _ldxi_i(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) jit_int32_t reg; if (i0 == 0) ldr_i(r0, r1); - else if (can_sign_extend_short_p(i0)) { + else if (can_sign_extend_short_p(i0) && !(i0 & 3)) { if (r1 == _R0_REGNO) { reg = jit_get_reg(jit_class_gpr); movr(rn(reg), r1); @@ -2996,9 +3283,9 @@ _ldi_l(jit_state_t *_jit, jit_int32_t r0, jit_word_t i0) jit_bool_t inv; jit_int32_t reg; jit_word_t lo, hi; - if (can_sign_extend_short_p(i0)) + if (can_sign_extend_short_p(i0) && !(i0 & 3)) LD(r0, _R0_REGNO, i0); - else if (can_sign_extend_int_p(i0)) { + else if (can_sign_extend_int_p(i0) && !(i0 & 3)) { hi = (jit_int16_t)((i0 >> 16) + ((jit_uint16_t)i0 >> 15)); lo = (jit_int16_t)(i0 - (hi << 16)); reg = jit_get_reg(jit_class_gpr); @@ -3040,7 +3327,7 @@ _ldxi_l(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0) jit_int32_t reg; if (i0 == 0) ldr_l(r0, r1); - else if (can_sign_extend_short_p(i0)) { + else if (can_sign_extend_short_p(i0) && !(i0 & 3)) { if (r1 == _R0_REGNO) { reg = jit_get_reg(jit_class_gpr); movr(rn(reg), r1); @@ -3270,9 +3557,9 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0) jit_bool_t inv; jit_int32_t reg; jit_word_t lo, hi; - if (can_sign_extend_short_p(i0)) + if (can_sign_extend_short_p(i0) && !(i0 & 3)) STD(r0, _R0_REGNO, i0); - else if (can_sign_extend_int_p(i0)) { + else if (can_sign_extend_int_p(i0) && !(i0 & 3)) { hi = (jit_int16_t)((i0 >> 16) + ((jit_uint16_t)i0 >> 15)); lo = (jit_int16_t)(i0 - (hi << 16)); reg = jit_get_reg(jit_class_gpr); @@ -3314,7 +3601,7 @@ _stxi_l(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1) jit_int32_t reg; if (i0 == 0) str_l(r0, r1); - else if (can_sign_extend_short_p(i0)) { + else if (can_sign_extend_short_p(i0) && !(i0 & 3)) { if (r0 == _R0_REGNO) { reg = jit_get_reg(jit_class_gpr); movr(rn(reg), i0); @@ -3465,20 +3752,15 @@ _calli_p(jit_state_t *_jit, jit_word_t i0 return (w); } -/* order is not guaranteed to be sequential */ -static jit_int32_t save[] = { - _R14, _R15, _R16, _R17, _R18, _R19, _R20, _R21, _R22, - _R23, _R24, _R25, _R26, _R27, _R28, _R29, _R30, _R31, -}; - static void _prolog(jit_state_t *_jit, jit_node_t *node) { - unsigned long regno; + jit_int32_t regno; jit_word_t offset; if (_jitc->function->define_frame || _jitc->function->assume_frame) { jit_int32_t frame = -_jitc->function->frame; + jit_check_frame(); assert(_jitc->function->self.aoff >= frame); if (_jitc->function->assume_frame) return; @@ -3492,36 +3774,66 @@ _prolog(jit_state_t *_jit, jit_node_t *node) _jitc->function->self.size - _jitc->function->self.aoff) + 15) & -16; - /* return address */ - MFLR(_R0_REGNO); + if (_jitc->function->need_frame) + _jitc->function->need_stack = _jitc->function->need_return = 1; + + if (!_jitc->function->need_stack) { + for (regno = 0; regno < jit_size(iregs); regno++) { + if (jit_regset_tstbit(&_jitc->function->regset, iregs[regno])) { + _jitc->function->need_stack = + _jitc->function->need_return = 1; + break; + } + } + if (!_jitc->function->need_stack) { + for (offset = 0; offset < jit_size(fregs); offset++) { + if (jit_regset_tstbit(&_jitc->function->regset, fregs[offset])) { + _jitc->function->need_stack = + _jitc->function->need_return = 1; + break; + } + } + } + } /* params >= %r31+params_offset+(8*sizeof(jit_word_t)) * alloca < %r31-80 */ + /* return address */ + if (_jitc->function->need_return) { + MFLR(_R0_REGNO); #if _CALL_SYSV - stxi(sizeof(jit_word_t), _SP_REGNO, _R0_REGNO); + stxi(sizeof(jit_word_t), _SP_REGNO, _R0_REGNO); #else - stxi(sizeof(void*) * 2, _SP_REGNO, _R0_REGNO); + stxi(sizeof(void*) * 2, _SP_REGNO, _R0_REGNO); #endif - offset = -gpr_save_area; - for (regno = 0; regno < jit_size(save); regno++, offset += sizeof(void*)) { - if (jit_regset_tstbit(&_jitc->function->regset, save[regno])) - stxi(offset, _SP_REGNO, rn(save[regno])); - } - for (offset = 0; offset < 8; offset++) { - if (jit_regset_tstbit(&_jitc->function->regset, _F14 + offset)) - stxi_d(-(gpr_save_area + 8 + offset * 8), - _SP_REGNO, rn(_F14 + offset)); } - stxi(-(sizeof(void*)), _SP_REGNO, _FP_REGNO); + if (_jitc->function->need_stack) { + offset = -gpr_save_area; + for (regno = 0; regno < jit_size(iregs); + regno++, offset += sizeof(void*)) { + if (jit_regset_tstbit(&_jitc->function->regset, iregs[regno])) + stxi(offset, _SP_REGNO, rn(iregs[regno])); + } + for (offset = 0; offset < jit_size(fregs); offset++) { + if (jit_regset_tstbit(&_jitc->function->regset, fregs[offset])) + stxi_d(-(gpr_save_area + 8 + offset * 8), + _SP_REGNO, rn(fregs[offset])); + } + } - movr(_FP_REGNO, _SP_REGNO); + if (_jitc->function->need_frame) { + stxi(-(sizeof(void*)), _SP_REGNO, _FP_REGNO); + movr(_FP_REGNO, _SP_REGNO); + } + if (_jitc->function->need_stack) { #if __WORDSIZE == 32 - STWU(_SP_REGNO, _SP_REGNO, -_jitc->function->stack); + STWU(_SP_REGNO, _SP_REGNO, -_jitc->function->stack); #else - STDU(_SP_REGNO, _SP_REGNO, -_jitc->function->stack); + STDU(_SP_REGNO, _SP_REGNO, -_jitc->function->stack); #endif + } if (_jitc->function->allocar) { regno = jit_get_reg(jit_class_gpr); @@ -3552,33 +3864,44 @@ _prolog(jit_state_t *_jit, jit_node_t *node) static void _epilog(jit_state_t *_jit, jit_node_t *node) { - unsigned long regno; + jit_int32_t regno; jit_word_t offset; if (_jitc->function->assume_frame) return; - if (_jitc->function->allocar) - ldr(_SP_REGNO, _SP_REGNO); - else - addi(_SP_REGNO, _SP_REGNO, _jitc->function->stack); + if (_jitc->function->need_stack) { + if (_jitc->function->allocar) + ldr(_SP_REGNO, _SP_REGNO); + else + addi(_SP_REGNO, _SP_REGNO, _jitc->function->stack); + } + + if (_jitc->function->need_return) { #if _CALL_SYSV - ldxi(_R0_REGNO, _SP_REGNO, sizeof(jit_word_t)); + ldxi(_R0_REGNO, _SP_REGNO, sizeof(jit_word_t)); #else - ldxi(_R0_REGNO, _SP_REGNO, sizeof(void*) * 2); + ldxi(_R0_REGNO, _SP_REGNO, sizeof(void*) * 2); #endif - offset = -gpr_save_area; - for (regno = 0; regno < jit_size(save); regno++, offset += sizeof(void*)) { - if (jit_regset_tstbit(&_jitc->function->regset, save[regno])) - ldxi(rn(save[regno]), _SP_REGNO, offset); } - for (offset = 0; offset < 8; offset++) { - if (jit_regset_tstbit(&_jitc->function->regset, _F14 + offset)) - ldxi_d(rn(_F14 + offset), _SP_REGNO, - -(gpr_save_area + 8 + offset * 8)); + + if (_jitc->function->need_stack) { + offset = -gpr_save_area; + for (regno = 0; regno < jit_size(iregs); + regno++, offset += sizeof(void*)) { + if (jit_regset_tstbit(&_jitc->function->regset, iregs[regno])) + ldxi(rn(iregs[regno]), _SP_REGNO, offset); + } + for (offset = 0; offset < 8; offset++) { + if (jit_regset_tstbit(&_jitc->function->regset, fregs[offset])) + ldxi_d(rn(fregs[offset]), _SP_REGNO, + -(gpr_save_area + 8 + offset * 8)); + } } - MTLR(_R0_REGNO); - ldxi(_FP_REGNO, _SP_REGNO, -(sizeof(void*))); + if (_jitc->function->need_return) + MTLR(_R0_REGNO); + if (_jitc->function->need_frame) + ldxi(_FP_REGNO, _SP_REGNO, -(sizeof(void*))); BLR(); }