|
From: <sv...@va...> - 2005-09-16 08:55:55
|
Author: cerion
Date: 2005-09-16 09:55:50 +0100 (Fri, 16 Sep 2005)
New Revision: 1403
Log:
spacing and var name chages only
- 'saturated' op names get a preceding Q instead of a trailing S
Modified:
trunk/priv/host-ppc32/hdefs.c
trunk/priv/host-ppc32/hdefs.h
trunk/priv/host-ppc32/isel.c
Modified: trunk/priv/host-ppc32/hdefs.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/host-ppc32/hdefs.c 2005-09-16 07:54:40 UTC (rev 1402)
+++ trunk/priv/host-ppc32/hdefs.c 2005-09-16 08:55:50 UTC (rev 1403)
@@ -645,13 +645,13 @@
case Pav_UNPCKLPIX: return "vupklpx";
=20
/* Integer binary */
- case Pav_ADDUM: return "vaddu_m"; // b,h,w
- case Pav_ADDUS: return "vaddu_s"; // b,h,w
- case Pav_ADDSS: return "vadds_s"; // b,h,w
+ case Pav_ADDU: return "vaddu_m"; // b,h,w
+ case Pav_QADDU: return "vaddu_s"; // b,h,w
+ case Pav_QADDS: return "vadds_s"; // b,h,w
=20
- case Pav_SUBUM: return "vsubu_m"; // b,h,w
- case Pav_SUBUS: return "vsubu_s"; // b,h,w
- case Pav_SUBSS: return "vsubs_s"; // b,h,w
+ case Pav_SUBU: return "vsubu_m"; // b,h,w
+ case Pav_QSUBU: return "vsubu_s"; // b,h,w
+ case Pav_QSUBS: return "vsubs_s"; // b,h,w
=20
case Pav_OMULU: return "vmulou"; // b,h
case Pav_OMULS: return "vmulos"; // b,h
@@ -679,17 +679,16 @@
case Pav_ROTL: return "vrl"; // b,h,w
=20
/* Pack */
- case Pav_PACKUUM: return "vpku_um"; // h,w
- case Pav_PACKUUS: return "vpku_us"; // h,w
- case Pav_PACKSUS: return "vpks_us"; // h,w
- case Pav_PACKSSS: return "vpks_ss"; // h,w
+ case Pav_PACKUU: return "vpku_um"; // h,w
+ case Pav_QPACKUU: return "vpku_us"; // h,w
+ case Pav_QPACKSU: return "vpks_us"; // h,w
+ case Pav_QPACKSS: return "vpks_ss"; // h,w
case Pav_PACKPXL: return "vpkpx";
=20
/* Merge */
case Pav_MRGHI: return "vmrgh"; // b,h,w
case Pav_MRGLO: return "vmrgl"; // b,h,w
=20
-
/* Floating Point Binary */
case Pav_ADDF: return "vaddfp";
case Pav_SUBF: return "vsubfp";
@@ -2894,13 +2893,13 @@
UInt opc2;
switch (i->Pin.AvBin8x16.op) {
=20
- case Pav_ADDUM: opc2 =3D 0; break; // vaddubm
- case Pav_ADDUS: opc2 =3D 512; break; // vaddubs
- case Pav_ADDSS: opc2 =3D 768; break; // vaddsbs
+ case Pav_ADDU: opc2 =3D 0; break; // vaddubm
+ case Pav_QADDU: opc2 =3D 512; break; // vaddubs
+ case Pav_QADDS: opc2 =3D 768; break; // vaddsbs
=20
- case Pav_SUBUM: opc2 =3D 1024; break; // vsububm
- case Pav_SUBUS: opc2 =3D 1536; break; // vsububs
- case Pav_SUBSS: opc2 =3D 1792; break; // vsubsbs
+ case Pav_SUBU: opc2 =3D 1024; break; // vsububm
+ case Pav_QSUBU: opc2 =3D 1536; break; // vsububs
+ case Pav_QSUBS: opc2 =3D 1792; break; // vsubsbs
=20
case Pav_AVGU: opc2 =3D 1026; break; // vavgub
case Pav_AVGS: opc2 =3D 1282; break; // vavgsb
@@ -2935,18 +2934,18 @@
UInt opc2;
switch (i->Pin.AvBin16x8.op) {
=20
- case Pav_ADDUM: opc2 =3D 64; break; // vadduhm
- case Pav_ADDUS: opc2 =3D 576; break; // vadduhs
- case Pav_ADDSS: opc2 =3D 832; break; // vaddshs
+ case Pav_ADDU: opc2 =3D 64; break; // vadduhm
+ case Pav_QADDU: opc2 =3D 576; break; // vadduhs
+ case Pav_QADDS: opc2 =3D 832; break; // vaddshs
=20
- case Pav_SUBUM: opc2 =3D 1088; break; // vsubuhm
- case Pav_SUBUS: opc2 =3D 1600; break; // vsubuhs
- case Pav_SUBSS: opc2 =3D 1856; break; // vsubshs
+ case Pav_SUBU: opc2 =3D 1088; break; // vsubuhm
+ case Pav_QSUBU: opc2 =3D 1600; break; // vsubuhs
+ case Pav_QSUBS: opc2 =3D 1856; break; // vsubshs
=20
- case Pav_OMULU: opc2 =3D 8; break; // vmuloub
- case Pav_OMULS: opc2 =3D 264; break; // vmulosb
- case Pav_EMULU: opc2 =3D 520; break; // vmuleub
- case Pav_EMULS: opc2 =3D 776; break; // vmulesb
+ case Pav_OMULU: opc2 =3D 8; break; // vmuloub
+ case Pav_OMULS: opc2 =3D 264; break; // vmulosb
+ case Pav_EMULU: opc2 =3D 520; break; // vmuleub
+ case Pav_EMULS: opc2 =3D 776; break; // vmulesb
=20
case Pav_AVGU: opc2 =3D 1090; break; // vavguh
case Pav_AVGS: opc2 =3D 1346; break; // vavgsh
@@ -2964,11 +2963,11 @@
case Pav_SAR: opc2 =3D 836; break; // vsrah
case Pav_ROTL: opc2 =3D 68; break; // vrlh
=20
- case Pav_PACKUUM: opc2 =3D 14; break; // vpkuhum
- case Pav_PACKUUS: opc2 =3D 142; break; // vpkuhus
- case Pav_PACKSUS: opc2 =3D 270; break; // vpkshus
- case Pav_PACKSSS: opc2 =3D 398; break; // vpkshss
- case Pav_PACKPXL: opc2 =3D 782; break; // vpkpx
+ case Pav_PACKUU: opc2 =3D 14; break; // vpkuhum
+ case Pav_QPACKUU: opc2 =3D 142; break; // vpkuhus
+ case Pav_QPACKSU: opc2 =3D 270; break; // vpkshus
+ case Pav_QPACKSS: opc2 =3D 398; break; // vpkshss
+ case Pav_PACKPXL: opc2 =3D 782; break; // vpkpx
=20
case Pav_MRGHI: opc2 =3D 76; break; // vmrghh
case Pav_MRGLO: opc2 =3D 332; break; // vmrglh
@@ -2987,13 +2986,13 @@
UInt opc2;
switch (i->Pin.AvBin32x4.op) {
=20
- case Pav_ADDUM: opc2 =3D 128; break; // vadduwm
- case Pav_ADDUS: opc2 =3D 640; break; // vadduws
- case Pav_ADDSS: opc2 =3D 896; break; // vaddsws
+ case Pav_ADDU: opc2 =3D 128; break; // vadduwm
+ case Pav_QADDU: opc2 =3D 640; break; // vadduws
+ case Pav_QADDS: opc2 =3D 896; break; // vaddsws
=20
- case Pav_SUBUM: opc2 =3D 1152; break; // vsubuwm
- case Pav_SUBUS: opc2 =3D 1664; break; // vsubuws
- case Pav_SUBSS: opc2 =3D 1920; break; // vsubsws
+ case Pav_SUBU: opc2 =3D 1152; break; // vsubuwm
+ case Pav_QSUBU: opc2 =3D 1664; break; // vsubuws
+ case Pav_QSUBS: opc2 =3D 1920; break; // vsubsws
=20
case Pav_OMULU: opc2 =3D 72; break; // vmulouh
case Pav_OMULS: opc2 =3D 328; break; // vmulosh
@@ -3018,10 +3017,10 @@
case Pav_SAR: opc2 =3D 900; break; // vsraw
case Pav_ROTL: opc2 =3D 132; break; // vrlw
=20
- case Pav_PACKUUM: opc2 =3D 78; break; // vpkuwum
- case Pav_PACKUUS: opc2 =3D 206; break; // vpkuwus
- case Pav_PACKSUS: opc2 =3D 334; break; // vpkswus
- case Pav_PACKSSS: opc2 =3D 462; break; // vpkswss
+ case Pav_PACKUU: opc2 =3D 78; break; // vpkuwum
+ case Pav_QPACKUU: opc2 =3D 206; break; // vpkuwus
+ case Pav_QPACKSU: opc2 =3D 334; break; // vpkswus
+ case Pav_QPACKSS: opc2 =3D 462; break; // vpkswss
=20
case Pav_MRGHI: opc2 =3D 140; break; // vmrghw
case Pav_MRGLO: opc2 =3D 396; break; // vmrglw
Modified: trunk/priv/host-ppc32/hdefs.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/host-ppc32/hdefs.h 2005-09-16 07:54:40 UTC (rev 1402)
+++ trunk/priv/host-ppc32/hdefs.h 2005-09-16 08:55:50 UTC (rev 1403)
@@ -378,9 +378,9 @@
/* Integer Binary */
Pav_AND, Pav_OR, Pav_XOR, /* Bitwise */
=20
- Pav_ADDUM, Pav_ADDUS,Pav_ADDSS,
+ Pav_ADDU, Pav_QADDU, Pav_QADDS,
=20
- Pav_SUBUM, Pav_SUBUS, Pav_SUBSS,
+ Pav_SUBU, Pav_QSUBU, Pav_QSUBS,
=20
Pav_OMULU, Pav_OMULS, Pav_EMULU, Pav_EMULS,
=20
@@ -395,7 +395,7 @@
Pav_SHL, Pav_SHR, Pav_SAR, Pav_ROTL,
=20
/* Pack */
- Pav_PACKUUM, Pav_PACKUUS, Pav_PACKSUS, Pav_PACKSSS,
+ Pav_PACKUU, Pav_QPACKUU, Pav_QPACKSU, Pav_QPACKSS,
Pav_PACKPXL,
=20
/* Merge */
Modified: trunk/priv/host-ppc32/isel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/host-ppc32/isel.c 2005-09-16 07:54:40 UTC (rev 1402)
+++ trunk/priv/host-ppc32/isel.c 2005-09-16 08:55:50 UTC (rev 1403)
@@ -781,9 +781,9 @@
addInstr(env, PPC32Instr_AvSplat(sz, v1, PPC32VI5s_Imm(-16))=
);
addInstr(env, PPC32Instr_AvSplat(sz, v2, PPC32VI5s_Imm(simm6=
-16)));
addInstr(env,
- (sz=3D=3D 8) ? PPC32Instr_AvBin8x16(Pav_SUBUM, dst, v2, v=
1) :
- (sz=3D=3D16) ? PPC32Instr_AvBin16x8(Pav_SUBUM, dst, v2, v=
1)
- : PPC32Instr_AvBin32x4(Pav_SUBUM, dst, v2, v1) )=
;
+ (sz=3D=3D 8) ? PPC32Instr_AvBin8x16(Pav_SUBU, dst, v2, v1=
) :
+ (sz=3D=3D16) ? PPC32Instr_AvBin16x8(Pav_SUBU, dst, v2, v1=
)
+ : PPC32Instr_AvBin32x4(Pav_SUBU, dst, v2, v1) );
return dst;
}
if (simm6 < -16) { /* -32:-17 inclusive */
@@ -792,9 +792,9 @@
addInstr(env, PPC32Instr_AvSplat(sz, v1, PPC32VI5s_Imm(-16))=
);
addInstr(env, PPC32Instr_AvSplat(sz, v2, PPC32VI5s_Imm(simm6=
+16)));
addInstr(env,
- (sz=3D=3D 8) ? PPC32Instr_AvBin8x16(Pav_ADDUM, dst, v2, v=
1) :
- (sz=3D=3D16) ? PPC32Instr_AvBin16x8(Pav_ADDUM, dst, v2, v=
1)
- : PPC32Instr_AvBin32x4(Pav_ADDUM, dst, v2, v1) )=
;
+ (sz=3D=3D 8) ? PPC32Instr_AvBin8x16(Pav_ADDU, dst, v2, v1=
) :
+ (sz=3D=3D16) ? PPC32Instr_AvBin16x8(Pav_ADDU, dst, v2, v1=
)
+ : PPC32Instr_AvBin32x4(Pav_ADDU, dst, v2, v1) );
return dst;
}
/* simplest form: -16:15 inclusive */
@@ -3294,12 +3294,12 @@
case Iop_Rotl8x16: op =3D Pav_ROTL; goto do_AvBin8x16;
case Iop_InterleaveHI8x16: op =3D Pav_MRGHI; goto do_AvBin8x16;
case Iop_InterleaveLO8x16: op =3D Pav_MRGLO; goto do_AvBin8x16;
- case Iop_Add8x16: op =3D Pav_ADDUM; goto do_AvBin8x16;
- case Iop_QAdd8Ux16: op =3D Pav_ADDUS; goto do_AvBin8x16;
- case Iop_QAdd8Sx16: op =3D Pav_ADDSS; goto do_AvBin8x16;
- case Iop_Sub8x16: op =3D Pav_SUBUM; goto do_AvBin8x16;
- case Iop_QSub8Ux16: op =3D Pav_SUBUS; goto do_AvBin8x16;
- case Iop_QSub8Sx16: op =3D Pav_SUBSS; goto do_AvBin8x16;
+ case Iop_Add8x16: op =3D Pav_ADDU; goto do_AvBin8x16;
+ case Iop_QAdd8Ux16: op =3D Pav_QADDU; goto do_AvBin8x16;
+ case Iop_QAdd8Sx16: op =3D Pav_QADDS; goto do_AvBin8x16;
+ case Iop_Sub8x16: op =3D Pav_SUBU; goto do_AvBin8x16;
+ case Iop_QSub8Ux16: op =3D Pav_QSUBU; goto do_AvBin8x16;
+ case Iop_QSub8Sx16: op =3D Pav_QSUBS; goto do_AvBin8x16;
case Iop_Avg8Ux16: op =3D Pav_AVGU; goto do_AvBin8x16;
case Iop_Avg8Sx16: op =3D Pav_AVGS; goto do_AvBin8x16;
case Iop_Max8Ux16: op =3D Pav_MAXU; goto do_AvBin8x16;
@@ -3321,17 +3321,17 @@
case Iop_Shr16x8: op =3D Pav_SHR; goto do_AvBin16x8;
case Iop_Sar16x8: op =3D Pav_SAR; goto do_AvBin16x8;
case Iop_Rotl16x8: op =3D Pav_ROTL; goto do_AvBin16x8;
- case Iop_Narrow16Ux8: op =3D Pav_PACKUUM; goto do_AvBin16x8;
- case Iop_QNarrow16Ux8: op =3D Pav_PACKUUS; goto do_AvBin16x8;
- case Iop_QNarrow16Sx8: op =3D Pav_PACKSSS; goto do_AvBin16x8;
+ case Iop_Narrow16Ux8: op =3D Pav_PACKUU; goto do_AvBin16x8;
+ case Iop_QNarrow16Ux8: op =3D Pav_QPACKUU; goto do_AvBin16x8;
+ case Iop_QNarrow16Sx8: op =3D Pav_QPACKSS; goto do_AvBin16x8;
case Iop_InterleaveHI16x8: op =3D Pav_MRGHI; goto do_AvBin16x8;
case Iop_InterleaveLO16x8: op =3D Pav_MRGLO; goto do_AvBin16x8;
- case Iop_Add16x8: op =3D Pav_ADDUM; goto do_AvBin16x8;
- case Iop_QAdd16Ux8: op =3D Pav_ADDUS; goto do_AvBin16x8;
- case Iop_QAdd16Sx8: op =3D Pav_ADDSS; goto do_AvBin16x8;
- case Iop_Sub16x8: op =3D Pav_SUBUM; goto do_AvBin16x8;
- case Iop_QSub16Ux8: op =3D Pav_SUBUS; goto do_AvBin16x8;
- case Iop_QSub16Sx8: op =3D Pav_SUBSS; goto do_AvBin16x8;
+ case Iop_Add16x8: op =3D Pav_ADDU; goto do_AvBin16x8;
+ case Iop_QAdd16Ux8: op =3D Pav_QADDU; goto do_AvBin16x8;
+ case Iop_QAdd16Sx8: op =3D Pav_QADDS; goto do_AvBin16x8;
+ case Iop_Sub16x8: op =3D Pav_SUBU; goto do_AvBin16x8;
+ case Iop_QSub16Ux8: op =3D Pav_QSUBU; goto do_AvBin16x8;
+ case Iop_QSub16Sx8: op =3D Pav_QSUBS; goto do_AvBin16x8;
case Iop_Avg16Ux8: op =3D Pav_AVGU; goto do_AvBin16x8;
case Iop_Avg16Sx8: op =3D Pav_AVGS; goto do_AvBin16x8;
case Iop_Max16Ux8: op =3D Pav_MAXU; goto do_AvBin16x8;
@@ -3357,17 +3357,17 @@
case Iop_Shr32x4: op =3D Pav_SHR; goto do_AvBin32x4;
case Iop_Sar32x4: op =3D Pav_SAR; goto do_AvBin32x4;
case Iop_Rotl32x4: op =3D Pav_ROTL; goto do_AvBin32x4;
- case Iop_Narrow32Ux4: op =3D Pav_PACKUUM; goto do_AvBin32x4;
- case Iop_QNarrow32Ux4: op =3D Pav_PACKUUS; goto do_AvBin32x4;
- case Iop_QNarrow32Sx4: op =3D Pav_PACKSSS; goto do_AvBin32x4;
+ case Iop_Narrow32Ux4: op =3D Pav_PACKUU; goto do_AvBin32x4;
+ case Iop_QNarrow32Ux4: op =3D Pav_QPACKUU; goto do_AvBin32x4;
+ case Iop_QNarrow32Sx4: op =3D Pav_QPACKSS; goto do_AvBin32x4;
case Iop_InterleaveHI32x4: op =3D Pav_MRGHI; goto do_AvBin32x4;
case Iop_InterleaveLO32x4: op =3D Pav_MRGLO; goto do_AvBin32x4;
- case Iop_Add32x4: op =3D Pav_ADDUM; goto do_AvBin32x4;
- case Iop_QAdd32Ux4: op =3D Pav_ADDUS; goto do_AvBin32x4;
- case Iop_QAdd32Sx4: op =3D Pav_ADDSS; goto do_AvBin32x4;
- case Iop_Sub32x4: op =3D Pav_SUBUM; goto do_AvBin32x4;
- case Iop_QSub32Ux4: op =3D Pav_SUBUS; goto do_AvBin32x4;
- case Iop_QSub32Sx4: op =3D Pav_SUBSS; goto do_AvBin32x4;
+ case Iop_Add32x4: op =3D Pav_ADDU; goto do_AvBin32x4;
+ case Iop_QAdd32Ux4: op =3D Pav_QADDU; goto do_AvBin32x4;
+ case Iop_QAdd32Sx4: op =3D Pav_QADDS; goto do_AvBin32x4;
+ case Iop_Sub32x4: op =3D Pav_SUBU; goto do_AvBin32x4;
+ case Iop_QSub32Ux4: op =3D Pav_QSUBU; goto do_AvBin32x4;
+ case Iop_QSub32Sx4: op =3D Pav_QSUBS; goto do_AvBin32x4;
case Iop_Avg32Ux4: op =3D Pav_AVGU; goto do_AvBin32x4;
case Iop_Avg32Sx4: op =3D Pav_AVGS; goto do_AvBin32x4;
case Iop_Max32Ux4: op =3D Pav_MAXU; goto do_AvBin32x4;
|