Skip to content

Commit f0edcd8

Browse files
jkotasjkotas
authored
Find & replace MS specific __int8/16/32/64 with standard C++ types (#102241)
1 parent 3b3a435 commit f0edcd8

File tree

119 files changed

+794
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+794
-805
lines changed

‎src/coreclr/debug/daccess/dacfn.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ DacReadAll(TADDR addr, PVOID buffer, ULONG32 size, bool throwEx)
154154
ULONG32 returned;
155155

156156
#if defined(DAC_MEASURE_PERF)
157-
unsigned __int64 nStart, nEnd;
157+
uint64_t nStart, nEnd;
158158
nStart = GetCycleCount();
159159
#endif // #if defined(DAC_MEASURE_PERF)
160160

‎src/coreclr/debug/daccess/dacimpl.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -3860,7 +3860,7 @@ HRESULT GetServerHeaps(CLRDATA_ADDRESS pGCHeaps[], ICorDebugDataTarget* pTarget)
38603860

38613861
#pragma warning( disable: 4035 ) /* Don't complain about lack of return value */
38623862

3863-
__inline unsigned __int64 GetCycleCount ()
3863+
__inline uint64_t GetCycleCount ()
38643864
{
38653865
__asm _emit 0x0F
38663866
__asm _emit 0x31 /* rdtsc */
@@ -3884,7 +3884,7 @@ __asm pop EDX
38843884

38853885
#define CCNT_OVERHEAD 0 // Don't know
38863886

3887-
__inline unsigned __int64 GetCycleCount()
3887+
__inline uint64_t GetCycleCount()
38883888
{
38893889
LIMITED_METHOD_CONTRACT;
38903890

@@ -3895,16 +3895,16 @@ __inline unsigned __int64 GetCycleCount()
38953895

38963896
#endif // #if defined(TARGET_X86)
38973897

3898-
extern unsigned __int64 g_nTotalTime;
3899-
extern unsigned __int64 g_nStackTotalTime;
3900-
extern unsigned __int64 g_nReadVirtualTotalTime;
3901-
extern unsigned __int64 g_nFindTotalTime;
3902-
extern unsigned __int64 g_nFindHashTotalTime;
3903-
extern unsigned __int64 g_nFindHits;
3904-
extern unsigned __int64 g_nFindCalls;
3905-
extern unsigned __int64 g_nFindFails;
3906-
extern unsigned __int64 g_nStackWalk;
3907-
extern unsigned __int64 g_nFindStackTotalTime;
3898+
extern uint64_t g_nTotalTime;
3899+
extern uint64_t g_nStackTotalTime;
3900+
extern uint64_t g_nReadVirtualTotalTime;
3901+
extern uint64_t g_nFindTotalTime;
3902+
extern uint64_t g_nFindHashTotalTime;
3903+
extern uint64_t g_nFindHits;
3904+
extern uint64_t g_nFindCalls;
3905+
extern uint64_t g_nFindFails;
3906+
extern uint64_t g_nStackWalk;
3907+
extern uint64_t g_nFindStackTotalTime;
39083908

39093909
#endif // #if defined(DAC_MEASURE_PERF)
39103910

‎src/coreclr/debug/daccess/enummem.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ extern HRESULT GetDacTableAddress(ICorDebugDataTarget* dataTarget, ULONG64 baseA
2929

3030
#if defined(DAC_MEASURE_PERF)
3131

32-
unsigned __int64 g_nTotalTime;
33-
unsigned __int64 g_nStackTotalTime;
34-
unsigned __int64 g_nReadVirtualTotalTime;
35-
unsigned __int64 g_nFindTotalTime;
36-
unsigned __int64 g_nFindHashTotalTime;
37-
unsigned __int64 g_nFindHits;
38-
unsigned __int64 g_nFindCalls;
39-
unsigned __int64 g_nFindFails;
40-
unsigned __int64 g_nStackWalk;
41-
unsigned __int64 g_nFindStackTotalTime;
32+
uint64_t g_nTotalTime;
33+
uint64_t g_nStackTotalTime;
34+
uint64_t g_nReadVirtualTotalTime;
35+
uint64_t g_nFindTotalTime;
36+
uint64_t g_nFindHashTotalTime;
37+
uint64_t g_nFindHits;
38+
uint64_t g_nFindCalls;
39+
uint64_t g_nFindFails;
40+
uint64_t g_nStackWalk;
41+
uint64_t g_nFindStackTotalTime;
4242

4343
#endif // #if defined(DAC_MEASURE_PERF)
4444

@@ -764,7 +764,7 @@ HRESULT ClrDataAccess::EnumMemWalkStackHelper(CLRDataEnumMemoryFlags flags,
764764

765765
#if defined(DAC_MEASURE_PERF)
766766
g_nStackWalk = 1;
767-
unsigned __int64 nStart= GetCycleCount();
767+
uint64_t nStart= GetCycleCount();
768768
#endif
769769

770770
HRESULT status = S_OK;
@@ -997,7 +997,7 @@ HRESULT ClrDataAccess::EnumMemWalkStackHelper(CLRDataEnumMemoryFlags flags,
997997
EX_END_CATCH(RethrowCancelExceptions)
998998

999999
#if defined(DAC_MEASURE_PERF)
1000-
unsigned __int64 nEnd = GetCycleCount();
1000+
uint64_t nEnd = GetCycleCount();
10011001
g_nStackTotalTime += nEnd - nStart;
10021002
g_nStackWalk = 0;
10031003
#endif // #if defined(DAC_MEASURE_PERF)
@@ -1961,8 +1961,8 @@ ClrDataAccess::EnumMemoryRegions(IN ICLRDataEnumMemoryRegionsCallback* callback,
19611961
g_nFindStackTotalTime = 0;
19621962

19631963
LARGE_INTEGER nClockFrequency;
1964-
unsigned __int64 nStart = 0;
1965-
unsigned __int64 nEnd = 0;
1964+
uint64_t nStart = 0;
1965+
uint64_t nEnd = 0;
19661966

19671967
QueryPerformanceFrequency(&nClockFrequency);
19681968

‎src/coreclr/gc/env/volatile.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,16 @@ T VolatileLoad(T const * pt)
161161
switch (sizeof(T))
162162
{
163163
case 1:
164-
*(unsigned __int8* )pv = __ldar8 ((unsigned __int8 volatile*)pt);
164+
*(uint8_t* )pv = __ldar8 ((uint8_t volatile*)pt);
165165
break;
166166
case 2:
167-
*(unsigned __int16*)pv = __ldar16((unsigned __int16 volatile*)pt);
167+
*(uint16_t*)pv = __ldar16((uint16_t volatile*)pt);
168168
break;
169169
case 4:
170-
*(unsigned __int32*)pv = __ldar32((unsigned __int32 volatile*)pt);
170+
*(uint32_t*)pv = __ldar32((uint32_t volatile*)pt);
171171
break;
172172
case 8:
173-
*(unsigned __int64*)pv = __ldar64((unsigned __int64 volatile*)pt);
173+
*(uint64_t*)pv = __ldar64((uint64_t volatile*)pt);
174174
break;
175175
default:
176176
val = *(T volatile const*)pt;
@@ -240,16 +240,16 @@ void VolatileStore(T* pt, T val)
240240
switch (sizeof(T))
241241
{
242242
case 1:
243-
__stlr8 ((unsigned __int8 volatile*)pt, *(unsigned __int8* )pv);
243+
__stlr8 ((uint8_t volatile*)pt, *(uint8_t* )pv);
244244
break;
245245
case 2:
246-
__stlr16((unsigned __int16 volatile*)pt, *(unsigned __int16*)pv);
246+
__stlr16((uint16_t volatile*)pt, *(uint16_t*)pv);
247247
break;
248248
case 4:
249-
__stlr32((unsigned __int32 volatile*)pt, *(unsigned __int32*)pv);
249+
__stlr32((uint32_t volatile*)pt, *(uint32_t*)pv);
250250
break;
251251
case 8:
252-
__stlr64((unsigned __int64 volatile*)pt, *(unsigned __int64*)pv);
252+
__stlr64((uint64_t volatile*)pt, *(uint64_t*)pv);
253253
break;
254254
default:
255255
__dmb(_ARM64_BARRIER_ISH);

‎src/coreclr/ilasm/asmparse.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ class AsmParse : public ErrorReporter
313313
friend char* skipBlanks(_In_ __nullterminated char*,unsigned*);
314314
friend char* nextBlank(_In_ __nullterminated char*);
315315
friend int ProcessEOF();
316-
friend unsigned __int8* skipType(unsigned __int8* ptr, BOOL fFixupType);
316+
friend uint8_t* skipType(uint8_t* ptr, BOOL fFixupType);
317317
friend void FixupConstraints();
318318

319319
Assembler* assem; // This does most of the semantic processing

‎src/coreclr/ilasm/asmparse.y

+34-34
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
CorTypeAttr exptAttr;
2828
CorManifestResourceFlags manresAttr;
2929
double* float64;
30-
__int64* int64;
31-
__int32 int32;
30+
int64_t* int64;
31+
int32_t int32;
3232
char* string;
3333
BinStr* binstr;
3434
Labels* labels;
@@ -263,11 +263,11 @@ int32 : INT32_V { $$ = $1; }
263263
;
264264

265265
int64 : INT64_V { $$ = $1; }
266-
| INT32_V { $$ = neg ? new __int64($1) : new __int64((unsigned)$1); }
266+
| INT32_V { $$ = neg ? new int64_t($1) : new int64_t((unsigned)$1); }
267267
;
268268

269269
float64 : FLOAT64 { $$ = $1; }
270-
| FLOAT32_ '(' int32 ')' { float f; *((__int32*) (&f)) = $3; $$ = new double(f); }
270+
| FLOAT32_ '(' int32 ')' { float f; *((int32_t*) (&f)) = $3; $$ = new double(f); }
271271
| FLOAT64_ '(' int64 ')' { $$ = (double*) $3; }
272272
;
273273

@@ -1068,71 +1068,71 @@ ddItem : CHAR_ '*' '(' compQstring ')' { PASM->EmitDataStr
10681068
} else PASM->report->error("Out of memory emitting data block %d bytes\n",
10691069
sizeof(double)*$5); }
10701070
| INT64_ '(' int64 ')' ddItemCount
1071-
{ __int64* p = new (nothrow) __int64[$5];
1071+
{ int64_t* p = new (nothrow) int64_t[$5];
10721072
if(p != NULL) {
10731073
for(int i=0; i<$5; i++) p[i] = *($3);
1074-
PASM->EmitData(p, sizeof(__int64)*$5); delete $3; delete [] p;
1074+
PASM->EmitData(p, sizeof(int64_t)*$5); delete $3; delete [] p;
10751075
} else PASM->report->error("Out of memory emitting data block %d bytes\n",
1076-
sizeof(__int64)*$5); }
1076+
sizeof(int64_t)*$5); }
10771077
| INT32_ '(' int32 ')' ddItemCount
1078-
{ __int32* p = new (nothrow) __int32[$5];
1078+
{ int32_t* p = new (nothrow) int32_t[$5];
10791079
if(p != NULL) {
10801080
for(int i=0; i<$5; i++) p[i] = $3;
1081-
PASM->EmitData(p, sizeof(__int32)*$5); delete [] p;
1081+
PASM->EmitData(p, sizeof(int32_t)*$5); delete [] p;
10821082
} else PASM->report->error("Out of memory emitting data block %d bytes\n",
1083-
sizeof(__int32)*$5); }
1083+
sizeof(int32_t)*$5); }
10841084
| INT16_ '(' int32 ')' ddItemCount
1085-
{ __int16 i = (__int16) $3; FAIL_UNLESS(i == $3, ("Value %d too big\n", $3));
1086-
__int16* p = new (nothrow) __int16[$5];
1085+
{ int16_t i = (int16_t) $3; FAIL_UNLESS(i == $3, ("Value %d too big\n", $3));
1086+
int16_t* p = new (nothrow) int16_t[$5];
10871087
if(p != NULL) {
10881088
for(int j=0; j<$5; j++) p[j] = i;
1089-
PASM->EmitData(p, sizeof(__int16)*$5); delete [] p;
1089+
PASM->EmitData(p, sizeof(int16_t)*$5); delete [] p;
10901090
} else PASM->report->error("Out of memory emitting data block %d bytes\n",
1091-
sizeof(__int16)*$5); }
1091+
sizeof(int16_t)*$5); }
10921092
| INT8_ '(' int32 ')' ddItemCount
1093-
{ __int8 i = (__int8) $3; FAIL_UNLESS(i == $3, ("Value %d too big\n", $3));
1094-
__int8* p = new (nothrow) __int8[$5];
1093+
{ int8_t i = (int8_t) $3; FAIL_UNLESS(i == $3, ("Value %d too big\n", $3));
1094+
int8_t* p = new (nothrow) int8_t[$5];
10951095
if(p != NULL) {
10961096
for(int j=0; j<$5; j++) p[j] = i;
1097-
PASM->EmitData(p, sizeof(__int8)*$5); delete [] p;
1097+
PASM->EmitData(p, sizeof(int8_t)*$5); delete [] p;
10981098
} else PASM->report->error("Out of memory emitting data block %d bytes\n",
1099-
sizeof(__int8)*$5); }
1099+
sizeof(int8_t)*$5); }
11001100
| FLOAT32_ ddItemCount { PASM->EmitData(NULL, sizeof(float)*$2); }
11011101
| FLOAT64_ ddItemCount { PASM->EmitData(NULL, sizeof(double)*$2); }
1102-
| INT64_ ddItemCount { PASM->EmitData(NULL, sizeof(__int64)*$2); }
1103-
| INT32_ ddItemCount { PASM->EmitData(NULL, sizeof(__int32)*$2); }
1104-
| INT16_ ddItemCount { PASM->EmitData(NULL, sizeof(__int16)*$2); }
1105-
| INT8_ ddItemCount { PASM->EmitData(NULL, sizeof(__int8)*$2); }
1102+
| INT64_ ddItemCount { PASM->EmitData(NULL, sizeof(int64_t)*$2); }
1103+
| INT32_ ddItemCount { PASM->EmitData(NULL, sizeof(int32_t)*$2); }
1104+
| INT16_ ddItemCount { PASM->EmitData(NULL, sizeof(int16_t)*$2); }
1105+
| INT8_ ddItemCount { PASM->EmitData(NULL, sizeof(int8_t)*$2); }
11061106
;
11071107

11081108
/* Default values declaration for fields, parameters and verbal form of CA blob description */
11091109
fieldSerInit : FLOAT32_ '(' float64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_R4);
11101110
float f = (float)(*$3);
1111-
$$->appendInt32(*((__int32*)&f)); delete $3; }
1111+
$$->appendInt32(*((int32_t*)&f)); delete $3; }
11121112
| FLOAT64_ '(' float64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_R8);
1113-
$$->appendInt64((__int64 *)$3); delete $3; }
1113+
$$->appendInt64((int64_t *)$3); delete $3; }
11141114
| FLOAT32_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_R4);
11151115
$$->appendInt32($3); }
11161116
| FLOAT64_ '(' int64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_R8);
1117-
$$->appendInt64((__int64 *)$3); delete $3; }
1117+
$$->appendInt64((int64_t *)$3); delete $3; }
11181118
| INT64_ '(' int64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_I8);
1119-
$$->appendInt64((__int64 *)$3); delete $3; }
1119+
$$->appendInt64((int64_t *)$3); delete $3; }
11201120
| INT32_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_I4);
11211121
$$->appendInt32($3); }
11221122
| INT16_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_I2);
11231123
$$->appendInt16($3); }
11241124
| INT8_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_I1);
11251125
$$->appendInt8($3); }
11261126
| UNSIGNED_ INT64_ '(' int64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U8);
1127-
$$->appendInt64((__int64 *)$4); delete $4; }
1127+
$$->appendInt64((int64_t *)$4); delete $4; }
11281128
| UNSIGNED_ INT32_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U4);
11291129
$$->appendInt32($4); }
11301130
| UNSIGNED_ INT16_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U2);
11311131
$$->appendInt16($4); }
11321132
| UNSIGNED_ INT8_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U1);
11331133
$$->appendInt8($4); }
11341134
| UINT64_ '(' int64 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U8);
1135-
$$->appendInt64((__int64 *)$3); delete $3; }
1135+
$$->appendInt64((int64_t *)$3); delete $3; }
11361136
| UINT32_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U4);
11371137
$$->appendInt32($3); }
11381138
| UINT16_ '(' int32 ')' { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_U2);
@@ -1154,8 +1154,8 @@ bytes : /* EMPTY */ { $$ = new BinStr()
11541154
| hexbytes { $$ = $1; }
11551155
;
11561156

1157-
hexbytes : HEXBYTE { __int8 i = (__int8) $1; $$ = new BinStr(); $$->appendInt8(i); }
1158-
| hexbytes HEXBYTE { __int8 i = (__int8) $2; $$ = $1; $$->appendInt8(i); }
1157+
hexbytes : HEXBYTE { int8_t i = (int8_t) $1; $$ = new BinStr(); $$->appendInt8(i); }
1158+
| hexbytes HEXBYTE { int8_t i = (int8_t) $2; $$ = $1; $$->appendInt8(i); }
11591159
;
11601160

11611161
/* Field/parameter initialization */
@@ -1257,21 +1257,21 @@ serInit : fieldSerInit { $$ = $1; }
12571257

12581258
f32seq : /* EMPTY */ { $$ = new BinStr(); }
12591259
| f32seq float64 { $$ = $1;
1260-
float f = (float) (*$2); $$->appendInt32(*((__int32*)&f)); delete $2; }
1260+
float f = (float) (*$2); $$->appendInt32(*((int32_t*)&f)); delete $2; }
12611261
| f32seq int32 { $$ = $1;
12621262
$$->appendInt32($2); }
12631263
;
12641264

12651265
f64seq : /* EMPTY */ { $$ = new BinStr(); }
12661266
| f64seq float64 { $$ = $1;
1267-
$$->appendInt64((__int64 *)$2); delete $2; }
1267+
$$->appendInt64((int64_t *)$2); delete $2; }
12681268
| f64seq int64 { $$ = $1;
1269-
$$->appendInt64((__int64 *)$2); delete $2; }
1269+
$$->appendInt64((int64_t *)$2); delete $2; }
12701270
;
12711271

12721272
i64seq : /* EMPTY */ { $$ = new BinStr(); }
12731273
| i64seq int64 { $$ = $1;
1274-
$$->appendInt64((__int64 *)$2); delete $2; }
1274+
$$->appendInt64((int64_t *)$2); delete $2; }
12751275
;
12761276

12771277
i32seq : /* EMPTY */ { $$ = new BinStr(); }

0 commit comments

Comments
 (0)