Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ef2b28d

Browse files
FeiPengIntelFeiPengIntel
committed
get rid of TYP_CHAR
1 parent 07d8a29 commit ef2b28d

22 files changed

+97
-121
lines changed

‎src/jit/assertionprop.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTreePtr op1,
12711271
case TYP_UBYTE:
12721272
case TYP_SHORT:
12731273
case TYP_USHORT:
1274-
case TYP_CHAR:
12751274
#ifdef _TARGET_64BIT_
12761275
case TYP_UINT:
12771276
case TYP_INT:
@@ -2236,7 +2235,6 @@ AssertionIndex Compiler::optAssertionIsSubrange(GenTreePtr tree, var_types toTyp
22362235
case TYP_UBYTE:
22372236
case TYP_SHORT:
22382237
case TYP_USHORT:
2239-
case TYP_CHAR:
22402238
if ((curAssertion->op2.u2.loBound < AssertionDsc::GetLowerBoundForIntegralType(toType)) ||
22412239
(curAssertion->op2.u2.hiBound > AssertionDsc::GetUpperBoundForIntegralType(toType)))
22422240
{

‎src/jit/codegenarm64.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3749,7 +3749,7 @@ void CodeGen::genSIMDIntrinsic(GenTreeSIMD* simdNode)
37493749
// NYI for unsupported base types
37503750
if (simdNode->gtSIMDBaseType != TYP_INT && simdNode->gtSIMDBaseType != TYP_LONG &&
37513751
simdNode->gtSIMDBaseType != TYP_FLOAT && simdNode->gtSIMDBaseType != TYP_DOUBLE &&
3752-
simdNode->gtSIMDBaseType != TYP_CHAR && simdNode->gtSIMDBaseType != TYP_UBYTE &&
3752+
simdNode->gtSIMDBaseType != TYP_USHORT && simdNode->gtSIMDBaseType != TYP_UBYTE &&
37533753
simdNode->gtSIMDBaseType != TYP_SHORT && simdNode->gtSIMDBaseType != TYP_BYTE &&
37543754
simdNode->gtSIMDBaseType != TYP_UINT && simdNode->gtSIMDBaseType != TYP_ULONG)
37553755
{
@@ -3859,7 +3859,7 @@ insOpts CodeGen::genGetSimdInsOpt(bool is16B, var_types elementType)
38593859
case TYP_INT:
38603860
result = is16B ? INS_OPTS_4S : INS_OPTS_2S;
38613861
break;
3862-
case TYP_CHAR:
3862+
case TYP_USHORT:
38633863
case TYP_SHORT:
38643864
result = is16B ? INS_OPTS_8H : INS_OPTS_4H;
38653865
break;
@@ -4329,7 +4329,7 @@ void CodeGen::genSIMDIntrinsicNarrow(GenTreeSIMD* simdNode)
43294329
opt = INS_OPTS_4H;
43304330
opt2 = INS_OPTS_8H;
43314331
break;
4332-
case TYP_CHAR:
4332+
case TYP_USHORT:
43334333
case TYP_SHORT:
43344334
opt = INS_OPTS_8B;
43354335
opt2 = INS_OPTS_16B;

‎src/jit/codegenlegacy.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3999,7 +3999,7 @@ emitJumpKind CodeGen::genCondSetFlags(GenTreePtr cond)
39993999
if (iVal & 0xffffff00)
40004000
goto NO_TEST_FOR_AND;
40014001
break;
4002-
case TYP_CHAR:
4002+
case TYP_USHORT:
40034003
case TYP_SHORT:
40044004
if (iVal & 0xffff0000)
40054005
goto NO_TEST_FOR_AND;
@@ -4317,7 +4317,7 @@ emitJumpKind CodeGen::genCondSetFlags(GenTreePtr cond)
43174317
if (ival != (signed short)ival)
43184318
smallOk = false;
43194319
break;
4320-
case TYP_CHAR:
4320+
case TYP_USHORT:
43214321
if (ival != (unsigned short)ival)
43224322
smallOk = false;
43234323
break;
@@ -6724,7 +6724,7 @@ void CodeGen::genCodeForTreeSmpBinArithLogOp(GenTreePtr tree, regMaskTP destReg,
67246724
andMask = 0x000000FF;
67256725
break;
67266726
case TYP_SHORT:
6727-
case TYP_CHAR:
6727+
case TYP_USHORT:
67286728
andMask = 0x0000FFFF;
67296729
break;
67306730
default:
@@ -6743,7 +6743,7 @@ void CodeGen::genCodeForTreeSmpBinArithLogOp(GenTreePtr tree, regMaskTP destReg,
67436743
else // varTypeIsShort(typ)
67446744
{
67456745
assert(varTypeIsShort(typ));
6746-
op1->gtType = TYP_CHAR;
6746+
op1->gtType = TYP_USHORT;
67476747
}
67486748

67496749
/* Generate the first operand into a scratch register */
@@ -10846,7 +10846,7 @@ void CodeGen::genCodeForNumericCast(GenTreePtr tree, regMaskTP destReg, regMaskT
1084610846
case TYP_BOOL:
1084710847
case TYP_BYTE:
1084810848
case TYP_SHORT:
10849-
case TYP_CHAR:
10849+
case TYP_USHORT:
1085010850
case TYP_UBYTE:
1085110851
break;
1085210852

@@ -10992,7 +10992,7 @@ void CodeGen::genCodeForNumericCast(GenTreePtr tree, regMaskTP destReg, regMaskT
1099210992
unsv = true;
1099310993
typeMask = ssize_t((int)0xFFFFFF00L);
1099410994
break;
10995-
case TYP_CHAR:
10995+
case TYP_USHORT:
1099610996
unsv = true;
1099710997
typeMask = ssize_t((int)0xFFFF0000L);
1099810998
break;
@@ -11771,7 +11771,7 @@ void CodeGen::genCodeForTreeSmpOpAsg(GenTreePtr tree)
1177111771
case TYP_SHORT:
1177211772
mask = 0x0000FFFF;
1177311773
break;
11774-
case TYP_CHAR:
11774+
case TYP_USHORT:
1177511775
mask = 0x0000FFFF;
1177611776
break;
1177711777
default:
@@ -14673,7 +14673,7 @@ void CodeGen::genCodeForTreeLng(GenTreePtr tree, regMaskTP needReg, regMaskTP av
1467314673
{
1467414674
case TYP_BOOL:
1467514675
case TYP_BYTE:
14676-
case TYP_CHAR:
14676+
case TYP_USHORT:
1467714677
case TYP_SHORT:
1467814678
case TYP_INT:
1467914679
case TYP_UBYTE:
@@ -15733,7 +15733,7 @@ size_t CodeGen::genPushArgList(GenTreeCall* call)
1573315733
case TYP_BOOL:
1573415734
case TYP_BYTE:
1573515735
case TYP_SHORT:
15736-
case TYP_CHAR:
15736+
case TYP_USHORT:
1573715737
case TYP_UBYTE:
1573815738

1573915739
/* Don't want to push a small value, make it a full word */

‎src/jit/codegenxarch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6584,7 +6584,7 @@ void CodeGen::genIntToIntCast(GenTreePtr treeNode)
65846584
typeMax = SHRT_MAX;
65856585
break;
65866586

6587-
case TYP_CHAR:
6587+
case TYP_USHORT:
65886588
typeMask = ssize_t((int)0xFFFF0000L);
65896589
break;
65906590

‎src/jit/compiler.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5977,7 +5977,6 @@ class Compiler
59775977
return INT_MIN;
59785978
case TYP_BOOL:
59795979
case TYP_UBYTE:
5980-
case TYP_CHAR:
59815980
case TYP_USHORT:
59825981
case TYP_UINT:
59835982
return 0;
@@ -5999,7 +5998,6 @@ class Compiler
59995998
return INT_MAX;
60005999
case TYP_UBYTE:
60016000
return UCHAR_MAX;
6002-
case TYP_CHAR:
60036001
case TYP_USHORT:
60046002
return USHRT_MAX;
60056003
case TYP_UINT:
@@ -7452,8 +7450,6 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
74527450
return SIMDDoubleHandle;
74537451
case TYP_INT:
74547452
return SIMDIntHandle;
7455-
case TYP_CHAR:
7456-
return SIMDUShortHandle;
74577453
case TYP_USHORT:
74587454
return SIMDUShortHandle;
74597455
case TYP_UBYTE:

‎src/jit/compiler.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ inline bool genTypeCanRepresentValue(var_types type, TValue value)
538538
case TYP_BYTE:
539539
return FitsIn<INT8>(value);
540540
case TYP_USHORT:
541-
case TYP_CHAR:
542541
return FitsIn<UINT16>(value);
543542
case TYP_SHORT:
544543
return FitsIn<INT16>(value);
@@ -626,7 +625,7 @@ inline var_types genUnsignedType(var_types type)
626625
type = TYP_UBYTE;
627626
break;
628627
case TYP_SHORT:
629-
type = TYP_CHAR;
628+
type = TYP_USHORT;
630629
break;
631630
case TYP_INT:
632631
type = TYP_UINT;

‎src/jit/ee_il_dll.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ inline var_types JITtype2varType(CorInfoType type)
138138
TYP_UNDEF, // CORINFO_TYPE_UNDEF = 0x0,
139139
TYP_VOID, // CORINFO_TYPE_VOID = 0x1,
140140
TYP_BOOL, // CORINFO_TYPE_BOOL = 0x2,
141-
TYP_CHAR, // CORINFO_TYPE_CHAR = 0x3,
141+
TYP_USHORT, // CORINFO_TYPE_CHAR = 0x3,
142142
TYP_BYTE, // CORINFO_TYPE_BYTE = 0x4,
143143
TYP_UBYTE, // CORINFO_TYPE_UBYTE = 0x5,
144144
TYP_SHORT, // CORINFO_TYPE_SHORT = 0x6,
145-
TYP_CHAR, // CORINFO_TYPE_USHORT = 0x7,
145+
TYP_USHORT, // CORINFO_TYPE_USHORT = 0x7,
146146
TYP_INT, // CORINFO_TYPE_INT = 0x8,
147147
TYP_INT, // CORINFO_TYPE_UINT = 0x9,
148148
TYP_LONG, // CORINFO_TYPE_LONG = 0xa,

‎src/jit/gentree.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13767,7 +13767,7 @@ GenTreePtr Compiler::gtFoldExprConst(GenTreePtr tree)
1376713767
i1 = itemp;
1376813768
goto CNS_INT;
1376913769

13770-
case TYP_CHAR:
13770+
case TYP_USHORT:
1377113771
itemp = INT32(UINT16(i1));
1377213772
if (tree->gtOverflow())
1377313773
{
@@ -13892,7 +13892,7 @@ GenTreePtr Compiler::gtFoldExprConst(GenTreePtr tree)
1389213892
i1 = INT32(INT16(lval1));
1389313893
goto CHECK_INT_OVERFLOW;
1389413894

13895-
case TYP_CHAR:
13895+
case TYP_USHORT:
1389613896
i1 = INT32(UINT16(lval1));
1389713897
goto CHECK_UINT_OVERFLOW;
1389813898

@@ -14036,7 +14036,7 @@ GenTreePtr Compiler::gtFoldExprConst(GenTreePtr tree)
1403614036
i1 = INT32(INT16(d1));
1403714037
goto CNS_INT;
1403814038

14039-
case TYP_CHAR:
14039+
case TYP_USHORT:
1404014040
i1 = INT32(UINT16(d1));
1404114041
goto CNS_INT;
1404214042

‎src/jit/hwintrinsiccodegenxarch.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ void CodeGen::genSSE2Intrinsic(GenTreeHWIntrinsic* node)
149149
case TYP_UBYTE:
150150
ins = INS_paddb;
151151
break;
152-
case TYP_CHAR:
153152
case TYP_SHORT:
154153
case TYP_USHORT:
155154
ins = INS_paddw;
@@ -206,7 +205,7 @@ void CodeGen::genSSE42Intrinsic(GenTreeHWIntrinsic* node)
206205
inst_RV_RV(INS_mov, targetReg, op1Reg, targetType, emitTypeSize(targetType));
207206
}
208207

209-
if (baseType == TYP_UBYTE || baseType == TYP_CHAR) // baseType is the type of the second argument
208+
if (baseType == TYP_UBYTE || baseType == TYP_USHORT) // baseType is the type of the second argument
210209
{
211210
assert(targetType == TYP_INT);
212211
inst_RV_RV(INS_crc32, targetReg, op2Reg, baseType, emitTypeSize(baseType));
@@ -307,7 +306,6 @@ void CodeGen::genAVX2Intrinsic(GenTreeHWIntrinsic* node)
307306
case TYP_UBYTE:
308307
ins = INS_paddb;
309308
break;
310-
case TYP_CHAR:
311309
case TYP_SHORT:
312310
case TYP_USHORT:
313311
ins = INS_paddw;

‎src/jit/hwintrinsicxarch.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ CORINFO_CLASS_HANDLE Compiler::gtGetStructHandleForHWSIMD(var_types simdType, va
264264
return Vector128DoubleHandle;
265265
case TYP_INT:
266266
return Vector128IntHandle;
267-
case TYP_CHAR:
268267
case TYP_USHORT:
269268
return Vector128UShortHandle;
270269
case TYP_UBYTE:
@@ -293,7 +292,6 @@ CORINFO_CLASS_HANDLE Compiler::gtGetStructHandleForHWSIMD(var_types simdType, va
293292
return Vector256DoubleHandle;
294293
case TYP_INT:
295294
return Vector256IntHandle;
296-
case TYP_CHAR:
297295
case TYP_USHORT:
298296
return Vector256UShortHandle;
299297
case TYP_UBYTE:

0 commit comments

Comments
 (0)