Build infra changes to enable building a more universal cross target jit builds

eng/Signing.props

@@ -47,7 +47,7 @@
       <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.DependencyAnalysisFramework.dll" />
       <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.ReadyToRun.dll" />
       <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.TypeSystem.ReadyToRun.dll" />
-      <ItemsToSign Include="$(CoreCLRCrossgen2Dir)jitinterface.dll" />
+      <ItemsToSign Include="$(CoreCLRCrossgen2Dir)jitinterface_$(TargetArchitecture).dll" />
 
       <ItemsToSign Include="$(CoreCLRCrossgen2Dir)clrjit_win_x86_$(TargetArchitecture).dll" />
       <ItemsToSign Include="$(CoreCLRCrossgen2Dir)clrjit_win_arm_$(TargetArchitecture).dll" />

src/coreclr/crosscomponents.cmake

@@ -7,7 +7,7 @@ endif(CLR_CMAKE_HOST_ARCH_AMD64 AND (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARG
 if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
     set (CLR_CROSS_COMPONENTS_LIST
         clrjit
-        jitinterface
+        jitinterface_${ARCH_HOST_NAME}
     )
 
     if(CLR_CMAKE_HOST_LINUX OR NOT FEATURE_CROSSBITNESS)

src/coreclr/src/jit/codegen.h

@@ -1393,8 +1393,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
                        emitAttr    size,
                        insFlags    flags = INS_FLAGS_DONT_CARE);
 
-    void inst_IV(instruction ins, int val);
-    void inst_IV_handle(instruction ins, int val);
+    void inst_IV(instruction ins, cnsval_ssize_t val);
+    void inst_IV_handle(instruction ins, cnsval_ssize_t val);
 
     void inst_RV_IV(
         instruction ins, regNumber reg, target_ssize_t val, emitAttr size, insFlags flags = INS_FLAGS_DONT_CARE);

src/coreclr/src/jit/codegenxarch.cpp

@@ -7519,11 +7519,11 @@ void CodeGen::genPutArgStkFieldList(GenTreePutArgStk* putArgStk)
                         case GT_CNS_INT:
                             if (fieldNode->IsIconHandle())
                             {
-                                inst_IV_handle(INS_push, (target_ssize_t)fieldNode->AsIntCon()->gtIconVal);
+                                inst_IV_handle(INS_push, fieldNode->AsIntCon()->gtIconVal);
                             }
                             else
                             {
-                                inst_IV(INS_push, (target_ssize_t)fieldNode->AsIntCon()->gtIconVal);
+                                inst_IV(INS_push, fieldNode->AsIntCon()->gtIconVal);
                             }
                             break;
                         default:
@@ -7618,11 +7618,11 @@ void CodeGen::genPutArgStk(GenTreePutArgStk* putArgStk)
     {
         if (data->IsIconHandle())
         {
-            inst_IV_handle(INS_push, (target_ssize_t)data->AsIntCon()->gtIconVal);
+            inst_IV_handle(INS_push, data->AsIntCon()->gtIconVal);
         }
         else
         {
-            inst_IV(INS_push, (target_ssize_t)data->AsIntCon()->gtIconVal);
+            inst_IV(INS_push, data->AsIntCon()->gtIconVal);
         }
         AddStackLevel(argSize);
     }
@@ -8493,12 +8493,11 @@ void CodeGen::genProfilingEnterCallback(regNumber initReg, bool* pInitRegZeroed)
     // Push the profilerHandle
     if (compiler->compProfilerMethHndIndirected)
     {
-        GetEmitter()->emitIns_AR_R(INS_push, EA_PTR_DSP_RELOC, REG_NA, REG_NA,
-                                   (target_ssize_t)(size_t)compiler->compProfilerMethHnd);
+        GetEmitter()->emitIns_AR_R(INS_push, EA_PTR_DSP_RELOC, REG_NA, REG_NA, (ssize_t)compiler->compProfilerMethHnd);
     }
     else
     {
-        inst_IV(INS_push, (target_ssize_t)(size_t)compiler->compProfilerMethHnd);
+        inst_IV(INS_push, (size_t)compiler->compProfilerMethHnd);
     }
 
     //
@@ -8579,12 +8578,11 @@ void CodeGen::genProfilingLeaveCallback(unsigned helper)
 
     if (compiler->compProfilerMethHndIndirected)
     {
-        GetEmitter()->emitIns_AR_R(INS_push, EA_PTR_DSP_RELOC, REG_NA, REG_NA,
-                                   (target_ssize_t)(ssize_t)compiler->compProfilerMethHnd);
+        GetEmitter()->emitIns_AR_R(INS_push, EA_PTR_DSP_RELOC, REG_NA, REG_NA, (ssize_t)compiler->compProfilerMethHnd);
     }
     else
     {
-        inst_IV(INS_push, (target_size_t)(size_t)compiler->compProfilerMethHnd);
+        inst_IV(INS_push, (size_t)compiler->compProfilerMethHnd);
     }
     genSinglePush();
 

src/coreclr/src/jit/emit.cpp

@@ -6422,7 +6422,7 @@ unsigned char emitter::emitOutputLong(BYTE* dst, ssize_t val)
 
 unsigned char emitter::emitOutputSizeT(BYTE* dst, ssize_t val)
 {
-#if !TARGET_64BIT
+#if !defined(TARGET_64BIT)
     MISALIGNED_WR_I4(dst, (int)val);
 #else
     MISALIGNED_WR_ST(dst, val);
@@ -7028,7 +7028,7 @@ void emitter::emitNxtIG(bool extend)
  *  emitGetInsSC: Get the instruction's constant value.
  */
 
-target_ssize_t emitter::emitGetInsSC(instrDesc* id)
+cnsval_ssize_t emitter::emitGetInsSC(instrDesc* id)
 {
 #ifdef TARGET_ARM // should it be TARGET_ARMARCH? Why do we need this? Note that on ARM64 we store scaled immediates
                   // for some formats

src/coreclr/src/jit/emit.h

@@ -1370,7 +1370,7 @@ class emitter
 
     struct instrDescCns : instrDesc // large const
     {
-        target_ssize_t idcCnsVal;
+        cnsval_ssize_t idcCnsVal;
     };
 
     struct instrDescDsp : instrDesc // large displacement
@@ -1466,7 +1466,7 @@ class emitter
 
 #endif // TARGET_XARCH
 
-    target_ssize_t emitGetInsSC(instrDesc* id);
+    cnsval_ssize_t emitGetInsSC(instrDesc* id);
     unsigned emitInsCount;
 
 /************************************************************************/
@@ -1911,7 +1911,7 @@ class emitter
         return (instrDescCns*)emitAllocAnyInstr(sizeof(instrDescCns), attr);
     }
 
-    instrDescCns* emitAllocInstrCns(emitAttr attr, target_size_t cns)
+    instrDescCns* emitAllocInstrCns(emitAttr attr, cnsval_size_t cns)
     {
         instrDescCns* result = emitAllocInstrCns(attr);
         result->idSetIsLargeCns();
@@ -1965,8 +1965,8 @@ class emitter
 
     instrDesc* emitNewInstrSmall(emitAttr attr);
     instrDesc* emitNewInstr(emitAttr attr = EA_4BYTE);
-    instrDesc* emitNewInstrSC(emitAttr attr, target_ssize_t cns);
-    instrDesc* emitNewInstrCns(emitAttr attr, target_ssize_t cns);
+    instrDesc* emitNewInstrSC(emitAttr attr, cnsval_ssize_t cns);
+    instrDesc* emitNewInstrCns(emitAttr attr, cnsval_ssize_t cns);
     instrDesc* emitNewInstrDsp(emitAttr attr, target_ssize_t dsp);
     instrDesc* emitNewInstrCnsDsp(emitAttr attr, target_ssize_t cns, int dsp);
 #ifdef TARGET_ARM
@@ -2513,7 +2513,7 @@ inline emitter::instrDesc* emitter::emitNewInstrDsp(emitAttr attr, target_ssize_
  *  Note that this very similar to emitter::emitNewInstrSC(), except it never
  *  allocates a small descriptor.
  */
-inline emitter::instrDesc* emitter::emitNewInstrCns(emitAttr attr, target_ssize_t cns)
+inline emitter::instrDesc* emitter::emitNewInstrCns(emitAttr attr, cnsval_ssize_t cns)
 {
     if (instrDesc::fitsInSmallCns(cns))
     {
@@ -2572,7 +2572,7 @@ inline size_t emitter::emitGetInstrDescSize(const instrDesc* id)
  *  emitNewInstrCns() always allocates at least sizeof(instrDesc)).
  */
 
-inline emitter::instrDesc* emitter::emitNewInstrSC(emitAttr attr, target_ssize_t cns)
+inline emitter::instrDesc* emitter::emitNewInstrSC(emitAttr attr, cnsval_ssize_t cns)
 {
     if (instrDesc::fitsInSmallCns(cns))
     {

src/coreclr/src/jit/emitxarch.cpp

@@ -3924,7 +3924,7 @@ void emitter::emitIns_R_I(instruction ins, emitAttr attr, regNumber reg, ssize_t
         sz += emitGetRexPrefixSize(ins);
     }
 
-    id = emitNewInstrSC(attr, (target_ssize_t)val);
+    id = emitNewInstrSC(attr, val);
     id->idIns(ins);
     id->idInsFmt(fmt);
     id->idReg1(reg);
@@ -3945,7 +3945,7 @@ void emitter::emitIns_R_I(instruction ins, emitAttr attr, regNumber reg, ssize_t
  *  Add an instruction referencing an integer constant.
  */
 
-void emitter::emitIns_I(instruction ins, emitAttr attr, int val)
+void emitter::emitIns_I(instruction ins, emitAttr attr, cnsval_ssize_t val)
 {
     UNATIVE_OFFSET sz;
     instrDesc*     id;
@@ -5349,7 +5349,7 @@ void emitter::emitIns_R_AI(instruction ins, emitAttr attr, regNumber ireg, ssize
     emitCurIGsize += sz;
 }
 
-void emitter::emitIns_AR_R(instruction ins, emitAttr attr, regNumber reg, regNumber base, int disp)
+void emitter::emitIns_AR_R(instruction ins, emitAttr attr, regNumber reg, regNumber base, cnsval_ssize_t disp)
 {
     emitIns_ARX_R(ins, attr, reg, base, REG_NA, 1, disp);
 }
@@ -5587,7 +5587,7 @@ void emitter::emitIns_R_ARX(
 }
 
 void emitter::emitIns_ARX_R(
-    instruction ins, emitAttr attr, regNumber reg, regNumber base, regNumber index, unsigned scale, int disp)
+    instruction ins, emitAttr attr, regNumber reg, regNumber base, regNumber index, unsigned scale, cnsval_ssize_t disp)
 {
     UNATIVE_OFFSET sz;
     instrDesc*     id = emitNewInstrAmd(attr, disp);

src/coreclr/src/jit/emitxarch.h

@@ -299,7 +299,7 @@ void emitInsRMW(instruction inst, emitAttr attr, GenTreeStoreInd* storeInd);
 
 void emitIns_Nop(unsigned size);
 
-void emitIns_I(instruction ins, emitAttr attr, int val);
+void emitIns_I(instruction ins, emitAttr attr, cnsval_ssize_t val);
 
 void emitIns_R(instruction ins, emitAttr attr, regNumber reg);
 
@@ -409,7 +409,7 @@ void emitIns_R_AR(instruction ins, emitAttr attr, regNumber reg, regNumber base,
 
 void emitIns_R_AI(instruction ins, emitAttr attr, regNumber ireg, ssize_t disp);
 
-void emitIns_AR_R(instruction ins, emitAttr attr, regNumber reg, regNumber base, int disp);
+void emitIns_AR_R(instruction ins, emitAttr attr, regNumber reg, regNumber base, cnsval_ssize_t disp);
 
 void emitIns_AI_R(instruction ins, emitAttr attr, regNumber ireg, ssize_t disp);
 
@@ -425,7 +425,7 @@ void emitIns_R_ARX(
     instruction ins, emitAttr attr, regNumber reg, regNumber base, regNumber index, unsigned scale, int disp);
 
 void emitIns_ARX_R(
-    instruction ins, emitAttr attr, regNumber reg, regNumber base, regNumber index, unsigned scale, int disp);
+    instruction ins, emitAttr attr, regNumber reg, regNumber base, regNumber index, unsigned scale, cnsval_ssize_t disp);
 
 void emitIns_I_AX(instruction ins, emitAttr attr, int val, regNumber reg, unsigned mul, int disp);
 

src/coreclr/src/jit/gentree.cpp

@@ -3310,14 +3310,14 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
                     costSz = 8;
                     costEx = 2;
                 }
-                else if (codeGen->validImmForInstr(INS_add, (target_ssize_t)conVal))
+                else if (codeGen->validImmForInstr(INS_add, conVal))
                 {
                     // Typically included with parent oper
                     costSz = 2;
                     costEx = 1;
                 }
-                else if (codeGen->validImmForInstr(INS_mov, (target_ssize_t)conVal) &&
-                         codeGen->validImmForInstr(INS_mvn, (target_ssize_t)conVal))
+                else if (codeGen->validImmForInstr(INS_mov, conVal) &&
+                         codeGen->validImmForInstr(INS_mvn, conVal))
                 {
                     // Uses mov or mvn
                     costSz = 4;

src/coreclr/src/jit/instr.cpp

@@ -454,7 +454,7 @@ void CodeGen::inst_RV_RV_RV(instruction ins,
  *  Generate a "op icon" instruction.
  */
 
-void CodeGen::inst_IV(instruction ins, int val)
+void CodeGen::inst_IV(instruction ins, cnsval_ssize_t val)
 {
     GetEmitter()->emitIns_I(ins, EA_PTRSIZE, val);
 }
@@ -465,7 +465,7 @@ void CodeGen::inst_IV(instruction ins, int val)
  *  by 'flags'
  */
 
-void CodeGen::inst_IV_handle(instruction ins, int val)
+void CodeGen::inst_IV_handle(instruction ins, cnsval_ssize_t val)
 {
     GetEmitter()->emitIns_I(ins, EA_HANDLE_CNS_RELOC, val);
 }
@@ -631,9 +631,9 @@ void CodeGen::inst_TT(instruction ins, GenTree* tree, unsigned offs, int shfv, e
             assert(offs == 0);
             assert(!shfv);
             if (tree->IsIconHandle())
-                inst_IV_handle(ins, (target_ssize_t)tree->AsIntCon()->gtIconVal);
+                inst_IV_handle(ins, tree->AsIntCon()->gtIconVal);
             else
-                inst_IV(ins, (target_ssize_t)tree->AsIntCon()->gtIconVal);
+                inst_IV(ins, tree->AsIntCon()->gtIconVal);
             break;
 #endif
 

src/coreclr/src/jit/target.h

@@ -2013,6 +2013,15 @@ typedef int          target_ssize_t;
 C_ASSERT(sizeof(target_size_t) == TARGET_POINTER_SIZE);
 C_ASSERT(sizeof(target_ssize_t) == TARGET_POINTER_SIZE);
 
+#if defined(TARGET_X86)
+typedef ssize_t cnsval_ssize_t;
+typedef size_t cnsval_size_t;
+#else
+typedef target_ssize_t cnsval_ssize_t;
+typedef target_size_t cnsval_size_t;
+#endif
+
+
 /*****************************************************************************/
 #endif // TARGET_H_
 /*****************************************************************************/

src/coreclr/src/tools/Common/JitInterface/CorInfoImpl.cs

@@ -49,7 +49,7 @@ private enum ImageFileMachine
 #if SUPPORT_JIT
         private const string JitSupportLibrary = "*";
 #else
-        private const string JitSupportLibrary = "jitinterface";
+        internal const string JitSupportLibrary = "jitinterface";
 #endif
 
         private IntPtr _jit;
@@ -209,11 +209,11 @@ private void CompileMethodInternal(IMethodNode methodCodeNodeNeedingCode, Method
 #endif
             }
 
-            PublishCode();
+            PublishCode(codeSize);
             PublishROData();
         }
 
-        private void PublishCode()
+        private void PublishCode(uint codeSize)
         {
             var relocs = _codeRelocs.ToArray();
             Array.Sort(relocs, (x, y) => (x.Offset - y.Offset));
@@ -224,7 +224,10 @@ private void PublishCode()
 
             alignment = Math.Max(alignment, _codeAlignment);
 
-            var objectData = new ObjectNode.ObjectData(_code,
+            byte[] actualCodeBytes = _code;
+            Array.Resize(ref actualCodeBytes, (int)codeSize);
+
+            var objectData = new ObjectNode.ObjectData(actualCodeBytes,
                                                        relocs,
                                                        alignment,
                                                        new ISymbolDefinitionNode[] { _methodCodeNode });
@@ -397,12 +400,19 @@ private void CompileMethodCleanup()
         private const int handleMultipler = 8;
         private const int handleBase = 0x420000;
 
+#if DEBUG
+        private static readonly IntPtr s_handleHighBitSet = (sizeof(IntPtr) == 4) ? new IntPtr(0x40000000) : new IntPtr(0x4000000000000000);
+#endif
+
         private IntPtr ObjectToHandle(Object obj)
         {
             IntPtr handle;
             if (!_objectToHandle.TryGetValue(obj, out handle))
             {
                 handle = (IntPtr)(handleMultipler * _handleToObject.Count + handleBase);
+#if DEBUG
+                handle = new IntPtr((long)s_handleHighBitSet | (long)handle);
+#endif
                 _handleToObject.Add(obj);
                 _objectToHandle.Add(obj, handle);
             }
@@ -411,6 +421,9 @@ private IntPtr ObjectToHandle(Object obj)
 
         private Object HandleToObject(IntPtr handle)
         {
+#if DEBUG
+            handle = new IntPtr(~(long)s_handleHighBitSet & (long) handle);
+#endif
             int index = ((int)handle - handleBase) / handleMultipler;
             return _handleToObject[index];
         }

src/coreclr/src/tools/Common/JitInterface/JitConfigProvider.cs

@@ -57,6 +57,10 @@ public static void Initialize(
                         libHandle = NativeLibrary.Load("clrjit_" + GetTargetSpec(target), assembly, searchPath);
                     }
                 }
+                if (libName == CorInfoImpl.JitSupportLibrary)
+                {
+                    libHandle = NativeLibrary.Load("jitinterface_" + RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant(), assembly, searchPath);
+                }
                 return libHandle;
             });
 #else

src/coreclr/src/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TransitionBlock.cs

@@ -366,6 +366,8 @@ public override int OffsetFromGCRefMapPos(int pos)
                 }
             }
 
+            public override bool IsArgPassedByRef(TypeHandle th) => false;
+
             /// <summary>
             /// x86 is special as always
             /// DESKTOP BEHAVIOR            ret += this.HasThis() ? ArgumentRegisters.GetOffsetOfEdx() : ArgumentRegisters.GetOffsetOfEcx();