Skip to content

Commit 5d7b287

Browse files
t-mustafint-mustafin
committed
Fix mess with precode macro definitions
1 parent ba7c671 commit 5d7b287

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎src/coreclr/vm/amd64/cgencpu.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ EXTERN_C void FastCallFinalizeWorker(Object *obj, PCODE funcPtr);
5151
// Also in CorCompile.h, FnTableAccess.h
5252
#define USE_INDIRECT_CODEHEADER // use CodeHeader, RealCodeHeader construct
5353

54-
#define HAS_NDIRECT_IMPORT_PRECODE 1
55-
#define HAS_FIXUP_PRECODE 1
54+
#define HAS_NDIRECT_IMPORT_PRECODE
55+
#define HAS_FIXUP_PRECODE
5656

5757
// ThisPtrRetBufPrecode one is necessary for closed delegates over static methods with return buffer
58-
#define HAS_THISPTR_RETBUF_PRECODE 1
58+
#define HAS_THISPTR_RETBUF_PRECODE
5959

6060
#define CODE_SIZE_ALIGN 16 // must alloc code blocks on 8-byte boundaries; for perf reasons we use 16 byte boundaries
6161
#define CACHE_LINE_SIZE 64 // Current AMD64 processors have 64-byte cache lines as per AMD64 optimization manual
@@ -66,8 +66,8 @@ EXTERN_C void FastCallFinalizeWorker(Object *obj, PCODE funcPtr);
6666
#define ENREGISTERED_RETURNTYPE_INTEGER_MAXSIZE 16 // bytes
6767
#define ENREGISTERED_PARAMTYPE_MAXSIZE 16 // bytes
6868
#define ENREGISTERED_RETURNTYPE_MAXSIZE 16 // bytes
69-
#define CALLDESCR_ARGREGS 1 // CallDescrWorker has ArgumentRegister parameter
70-
#define CALLDESCR_FPARGREGS 1 // CallDescrWorker has FloatArgumentRegisters parameter
69+
#define CALLDESCR_ARGREGS // CallDescrWorker has ArgumentRegister parameter
70+
#define CALLDESCR_FPARGREGS // CallDescrWorker has FloatArgumentRegisters parameter
7171
#else
7272
#define ENREGISTERED_RETURNTYPE_INTEGER_MAXSIZE 8 // bytes
7373
#define ENREGISTERED_PARAMTYPE_MAXSIZE 8 // bytes

‎src/coreclr/vm/arm/cgencpu.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,20 @@ EXTERN_C void checkStack(void);
5858
#define JUMP_ALLOCATE_SIZE 8 // # bytes to allocate for a jump instruction
5959
#define BACK_TO_BACK_JUMP_ALLOCATE_SIZE 8 // # bytes to allocate for a back to back jump instruction
6060

61-
#define HAS_COMPACT_ENTRYPOINTS 1
61+
#define HAS_COMPACT_ENTRYPOINTS
6262

63-
#define HAS_NDIRECT_IMPORT_PRECODE 1
63+
#define HAS_NDIRECT_IMPORT_PRECODE
6464

6565
#define USE_INDIRECT_CODEHEADER
6666

6767

6868
EXTERN_C void getFPReturn(int fpSize, INT64 *pRetVal);
6969
EXTERN_C void setFPReturn(int fpSize, INT64 retVal);
7070

71-
#define HAS_FIXUP_PRECODE 1
71+
#define HAS_FIXUP_PRECODE
7272

7373
// ThisPtrRetBufPrecode one is necessary for closed delegates over static methods with return buffer
74-
#define HAS_THISPTR_RETBUF_PRECODE 1
74+
#define HAS_THISPTR_RETBUF_PRECODE
7575

7676
#define CODE_SIZE_ALIGN 4
7777
#define CACHE_LINE_SIZE 32 // As per Intel Optimization Manual the cache line size is 32 bytes
@@ -80,8 +80,8 @@ EXTERN_C void setFPReturn(int fpSize, INT64 retVal);
8080
#define ENREGISTERED_RETURNTYPE_MAXSIZE 32 // bytes (maximum HFA size is 4 doubles)
8181
#define ENREGISTERED_RETURNTYPE_INTEGER_MAXSIZE 4 // bytes
8282

83-
#define CALLDESCR_ARGREGS 1 // CallDescrWorker has ArgumentRegister parameter
84-
#define CALLDESCR_FPARGREGS 1 // CallDescrWorker has FloatArgumentRegisters parameter
83+
#define CALLDESCR_ARGREGS // CallDescrWorker has ArgumentRegister parameter
84+
#define CALLDESCR_FPARGREGS // CallDescrWorker has FloatArgumentRegisters parameter
8585

8686
// Given a return address retrieved during stackwalk,
8787
// this is the offset by which it should be decremented to arrive at the callsite.

‎src/coreclr/vm/arm64/cgencpu.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ extern PCODE GetPreStubEntryPoint();
3636
#define JUMP_ALLOCATE_SIZE 16 // # bytes to allocate for a jump instruction
3737
#define BACK_TO_BACK_JUMP_ALLOCATE_SIZE 16 // # bytes to allocate for a back to back jump instruction
3838

39-
#define HAS_NDIRECT_IMPORT_PRECODE 1
39+
#define HAS_NDIRECT_IMPORT_PRECODE
4040

4141
#define USE_INDIRECT_CODEHEADER
4242

43-
#define HAS_FIXUP_PRECODE 1
43+
#define HAS_FIXUP_PRECODE
4444

4545
// ThisPtrRetBufPrecode one is necessary for closed delegates over static methods with return buffer
46-
#define HAS_THISPTR_RETBUF_PRECODE 1
46+
#define HAS_THISPTR_RETBUF_PRECODE
4747

4848
#define CODE_SIZE_ALIGN 8
4949
#define CACHE_LINE_SIZE 64
@@ -53,9 +53,9 @@ extern PCODE GetPreStubEntryPoint();
5353
#define ENREGISTERED_RETURNTYPE_INTEGER_MAXSIZE 16 // bytes (two int registers: x0 and x1)
5454
#define ENREGISTERED_PARAMTYPE_MAXSIZE 16 // bytes (max value type size that can be passed by value)
5555

56-
#define CALLDESCR_ARGREGS 1 // CallDescrWorker has ArgumentRegister parameter
57-
#define CALLDESCR_FPARGREGS 1 // CallDescrWorker has FloatArgumentRegisters parameter
58-
#define CALLDESCR_RETBUFFARGREG 1 // CallDescrWorker has RetBuffArg parameter that's separate from arg regs
56+
#define CALLDESCR_ARGREGS // CallDescrWorker has ArgumentRegister parameter
57+
#define CALLDESCR_FPARGREGS // CallDescrWorker has FloatArgumentRegisters parameter
58+
#define CALLDESCR_RETBUFFARGREG // CallDescrWorker has RetBuffArg parameter that's separate from arg regs
5959

6060
#define FLOAT_REGISTER_SIZE 16 // each register in FloatArgumentRegisters is 16 bytes.
6161

‎src/coreclr/vm/i386/cgencpu.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ EXTERN_C void SinglecastDelegateInvokeStub();
7575
#define USE_INDIRECT_CODEHEADER
7676
#endif // FEATURE_EH_FUNCLETS
7777

78-
#define HAS_COMPACT_ENTRYPOINTS 1
78+
#define HAS_COMPACT_ENTRYPOINTS
7979

8080
// Needed for PInvoke inlining in ngened images
81-
#define HAS_NDIRECT_IMPORT_PRECODE 1
81+
#define HAS_NDIRECT_IMPORT_PRECODE
8282

83-
#define HAS_FIXUP_PRECODE 1
83+
#define HAS_FIXUP_PRECODE
8484

8585
// ThisPtrRetBufPrecode one is necessary for closed delegates over static methods with return buffer
86-
#define HAS_THISPTR_RETBUF_PRECODE 1
86+
#define HAS_THISPTR_RETBUF_PRECODE
8787

8888
#define CODE_SIZE_ALIGN 4
8989
#define CACHE_LINE_SIZE 32 // As per Intel Optimization Manual the cache line size is 32 bytes

‎src/coreclr/vm/loongarch64/cgencpu.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ extern PCODE GetPreStubEntryPoint();
3434
#define JUMP_ALLOCATE_SIZE 40 // # bytes to allocate for a jump instruction
3535
#define BACK_TO_BACK_JUMP_ALLOCATE_SIZE 40 // # bytes to allocate for a back to back jump instruction
3636

37-
#define HAS_NDIRECT_IMPORT_PRECODE 1
37+
#define HAS_NDIRECT_IMPORT_PRECODE
3838

3939
#define USE_INDIRECT_CODEHEADER
4040

41-
#define HAS_FIXUP_PRECODE 1
42-
#define HAS_FIXUP_PRECODE_CHUNKS 1
41+
#define HAS_FIXUP_PRECODE
42+
#define HAS_FIXUP_PRECODE_CHUNKS
4343

4444
// ThisPtrRetBufPrecode one is necessary for closed delegates over static methods with return buffer
45-
#define HAS_THISPTR_RETBUF_PRECODE 1
45+
#define HAS_THISPTR_RETBUF_PRECODE
4646

4747
#define CODE_SIZE_ALIGN 8
4848
#define CACHE_LINE_SIZE 64
@@ -52,8 +52,8 @@ extern PCODE GetPreStubEntryPoint();
5252
#define ENREGISTERED_RETURNTYPE_INTEGER_MAXSIZE 16 // bytes (two int registers: v0 and v1)
5353
#define ENREGISTERED_PARAMTYPE_MAXSIZE 16 // bytes (max value type size that can be passed by value)
5454

55-
#define CALLDESCR_ARGREGS 1 // CallDescrWorker has ArgumentRegister parameter
56-
#define CALLDESCR_FPARGREGS 1 // CallDescrWorker has FloatArgumentRegisters parameter
55+
#define CALLDESCR_ARGREGS // CallDescrWorker has ArgumentRegister parameter
56+
#define CALLDESCR_FPARGREGS // CallDescrWorker has FloatArgumentRegisters parameter
5757

5858
#define FLOAT_REGISTER_SIZE 16 // each register in FloatArgumentRegisters is 16 bytes. Loongarch size is ??
5959

0 commit comments

Comments
 (0)