Skip to content

Commit 9df2042

Browse files
authored
[cDAC] Rename datadescriptor.h -> datadescriptor.inc (#118067)
* rename datadescriptor.h -> datadescriptor.inc
1 parent ffe8967 commit 9df2042

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/coreclr/debug/runtimeinfo/contractpointerdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extern const uintptr_t contractDescriptorPointerData[];
1818
const uintptr_t contractDescriptorPointerData[] = {
1919
(uintptr_t)0, // placeholder
2020
#define CDAC_GLOBAL_POINTER(name,value) (uintptr_t)(value),
21-
#include "datadescriptor.h"
21+
#include "datadescriptor.inc"
2222
};
2323

2424
}

src/coreclr/debug/runtimeinfo/datadescriptor.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ struct CDacStringPoolSizes
8989
#define CDAC_GLOBAL_POINTER(name,value) DECL_LEN(MAKE_GLOBALLEN_NAME(name), sizeof(#name))
9090
#define CDAC_GLOBAL(name,tyname,value) DECL_LEN(MAKE_GLOBALLEN_NAME(name), sizeof(#name)) \
9191
DECL_LEN(MAKE_GLOBALTYPELEN_NAME(name), sizeof(#tyname))
92-
#include "datadescriptor.h"
92+
#include "datadescriptor.inc"
9393
char cdac_string_pool_trailing_nil;
9494
#undef DECL_LEN
9595
};
@@ -107,7 +107,7 @@ enum
107107
CDacBlobTypesCount =
108108
#define CDAC_TYPES_BEGIN() 0
109109
#define CDAC_TYPE_BEGIN(name) + 1
110-
#include "datadescriptor.h"
110+
#include "datadescriptor.inc"
111111
};
112112

113113
// count the field pool size.
@@ -118,7 +118,7 @@ enum
118118
#define CDAC_TYPES_BEGIN() 1
119119
#define CDAC_TYPE_FIELD(tyname,membertyname,membername,offset) + 1
120120
#define CDAC_TYPE_END(name) + 1
121-
#include "datadescriptor.h"
121+
#include "datadescriptor.inc"
122122
};
123123

124124
// count the literal globals
@@ -127,7 +127,7 @@ enum
127127
CDacBlobGlobalLiteralsCount =
128128
#define CDAC_GLOBALS_BEGIN() 0
129129
#define CDAC_GLOBAL(name,tyname,value) + 1
130-
#include "datadescriptor.h"
130+
#include "datadescriptor.inc"
131131
};
132132

133133
// count the aux vector globals
@@ -136,7 +136,7 @@ enum
136136
CDacBlobGlobalPointersCount =
137137
#define CDAC_GLOBALS_BEGIN() 0
138138
#define CDAC_GLOBAL_POINTER(name,value) + 1
139-
#include "datadescriptor.h"
139+
#include "datadescriptor.inc"
140140
};
141141

142142
// count the global strings
@@ -145,7 +145,7 @@ enum
145145
CDacBlobGlobalStringsCount =
146146
#define CDAC_GLOBALS_BEGIN() 0
147147
#define CDAC_GLOBAL_STRING(name,value) + 1
148-
#include "datadescriptor.h"
148+
#include "datadescriptor.inc"
149149
};
150150

151151

@@ -175,7 +175,7 @@ struct CDacFieldsPoolSizes
175175
#define CDAC_TYPE_FIELD(tyname,membertyname,membername,offset) DECL_LEN(CONCAT4(cdac_fields_pool_member__, tyname, __, membername))
176176
#define CDAC_TYPE_END(name) DECL_LEN(CONCAT4(cdac_fields_pool_member__, tyname, _, endmarker)) \
177177
} MAKE_TYPEFIELDS_TYNAME(name);
178-
#include "datadescriptor.h"
178+
#include "datadescriptor.inc"
179179
#undef DECL_LEN
180180
};
181181

@@ -197,7 +197,7 @@ struct CDacGlobalPointerIndex
197197
#define DECL_LEN(membername) char membername;
198198
#define CDAC_GLOBALS_BEGIN() DECL_LEN(cdac_global_pointer_index_start_placeholder__)
199199
#define CDAC_GLOBAL_POINTER(name,value) DECL_LEN(CONCAT(cdac_global_pointer_index__, name))
200-
#include "datadescriptor.h"
200+
#include "datadescriptor.inc"
201201
#undef DECL_LEN
202202
};
203203

@@ -295,7 +295,7 @@ struct MagicAndBlob BlobDataDescriptor = {
295295
#define CDAC_TYPE_INDETERMINATE(name) /*.Size = */ 0,
296296
#define CDAC_TYPE_SIZE(size) /* .Size = */ size,
297297
#define CDAC_TYPE_END(name) },
298-
#include "datadescriptor.h"
298+
#include "datadescriptor.inc"
299299
},
300300

301301
/* .FieldsPool = */ {
@@ -306,22 +306,22 @@ struct MagicAndBlob BlobDataDescriptor = {
306306
/* .FieldOffset = */ offset, \
307307
},
308308
#define CDAC_TYPE_END(name) { 0, },
309-
#include "datadescriptor.h"
309+
#include "datadescriptor.inc"
310310
},
311311

312312
/* .GlobalLiteralValues = */ {
313313
#define CDAC_GLOBAL(name,tyname,value) { /*.Name = */ GET_GLOBAL_NAME(name), /* .TypeName = */ GET_GLOBALTYPE_NAME(name), /* .Value = */ value },
314-
#include "datadescriptor.h"
314+
#include "datadescriptor.inc"
315315
},
316316

317317
/* .GlobalPointerValues = */ {
318318
#define CDAC_GLOBAL_POINTER(name,value) { /* .Name = */ GET_GLOBAL_NAME(name), /* .PointerDataIndex = */ GET_GLOBAL_POINTER_INDEX(name) },
319-
#include "datadescriptor.h"
319+
#include "datadescriptor.inc"
320320
},
321321

322322
/* .GlobalStringValues = */ {
323323
#define CDAC_GLOBAL_STRING(name,value) { /* .Name = */ GET_GLOBAL_NAME(name), /* .Value = */ GET_GLOBALSTRING_VALUE(name) },
324-
#include "datadescriptor.h"
324+
#include "datadescriptor.inc"
325325
},
326326

327327
/* .NamesPool = */ ("\0" // starts with a nul
@@ -331,7 +331,7 @@ struct MagicAndBlob BlobDataDescriptor = {
331331
#define CDAC_GLOBAL_STRING(name,value) #name "\0" STRINGIFY(value) "\0"
332332
#define CDAC_GLOBAL_POINTER(name,value) #name "\0"
333333
#define CDAC_GLOBAL(name,tyname,value) #name "\0" #tyname "\0"
334-
#include "datadescriptor.h"
334+
#include "datadescriptor.inc"
335335
),
336336

337337
/* .EndMagic = */ { 0x01, 0x02, 0x03, 0x04 },

0 commit comments

Comments
 (0)