[LoongArch64] coreclr-vm directory

docs/design/coreclr/botr/clr-abi.md

@@ -26,6 +26,8 @@ Arm corporation ABI documentation (for ARM32 and ARM64) is [here](https://develo
 
 The Linux System V x86_64 ABI is documented in [System V Application Binary Interface / AMD64 Architecture Processor Supplement](https://github.com/hjl-tools/x86-psABI/wiki/x86-64-psABI-1.0.pdf), with document source material [here](https://gitlab.com/x86-psABIs/x86-64-ABI).
 
+The LoongArch64 ABI documentation is [here](https://github.com/loongson/LoongArch-Documentation/blob/main/docs/LoongArch-ELF-ABI-EN.adoc)
+
 # General Unwind/Frame Layout
 
 For all non-x86 platforms, all methods must have unwind information so the garbage collector (GC) can unwind them (unlike native code in which a leaf method may be omitted).

src/coreclr/ToolBox/superpmi/mcs/verbildump.cpp

@@ -90,7 +90,12 @@ void DumpSigToConsoleBare(MethodContext* mc, CORINFO_SIG_INFO* pSig)
     for (int i = 0; i < (int)pSig->numArgs; i++)
     {
         DWORDLONG          dl;
+#if defined(TARGET_LOONGARCH64)
+        int                  flags;
+        CorInfoTypeWithMod type = mc->repGetArgType(pSig, currentItem, (CORINFO_CLASS_HANDLE*)&dl, &flags, &exceptionCode);
+#else
         CorInfoTypeWithMod type = mc->repGetArgType(pSig, currentItem, (CORINFO_CLASS_HANDLE*)&dl, &exceptionCode);
+#endif
         CorInfoType        cit  = strip(type);
         if (cit == CORINFO_TYPE_CLASS)
             dl = CastHandle(mc->repGetArgClass(pSig, currentItem, &exceptionCode));

src/coreclr/ToolBox/superpmi/superpmi-shared/agnostic.h

@@ -529,6 +529,7 @@ struct Agnostic_GetArgType_Value
     DWORDLONG vcTypeRet;
     DWORD     result;
     DWORD     exceptionCode;
+    int       flags;//Now only LoongArch64 used.
 };
 
 // Agnostic_ConfigIntInfo combines as a single key the name

src/coreclr/ToolBox/superpmi/superpmi-shared/callutils.cpp

@@ -282,7 +282,12 @@ const char* CallUtils::GetMethodFullName(MethodContext* mc, CORINFO_METHOD_HANDL
         // Tweaked to use EE types instead of JIT-specific types
         CORINFO_CLASS_HANDLE typeHandle;
         DWORD                exception;
+#if defined(TARGET_LOONGARCH64)
+        int                  flags;
+        CorInfoType          type = strip(mc->repGetArgType(&sig, argList, &typeHandle, &flags, &exception));
+#else
         CorInfoType          type = strip(mc->repGetArgType(&sig, argList, &typeHandle, &exception));
+#endif
 
         length += strlen(TypeUtils::GetCorInfoTypeName(type));
         argList = mc->repGetArgNext(argList);
@@ -339,7 +344,12 @@ const char* CallUtils::GetMethodFullName(MethodContext* mc, CORINFO_METHOD_HANDL
         // Tweaked to use EE types instead of JIT-specific types
         CORINFO_CLASS_HANDLE typeHandle;
         DWORD                exception;
+#if defined(TARGET_LOONGARCH64)
+        int                  flags;
+        CorInfoType          type = strip(mc->repGetArgType(&sig, argList, &typeHandle, &flags, &exception));
+#else
         CorInfoType          type = strip(mc->repGetArgType(&sig, argList, &typeHandle, &exception));
+#endif
         strcat_s(retName, length, TypeUtils::GetCorInfoTypeName(type));
 
         argList = mc->repGetArgNext(argList);

src/coreclr/ToolBox/superpmi/superpmi-shared/lwmlist.h

@@ -51,6 +51,7 @@ LWM(GetAddrOfCaptureThreadGlobal, DWORD, DLDL)
 LWM(GetArgClass, Agnostic_GetArgClass_Key, Agnostic_GetArgClass_Value)
 LWM(GetArgNext, DWORDLONG, DWORDLONG)
 LWM(GetArgType, Agnostic_GetArgType_Key, Agnostic_GetArgType_Value)
+LWM(GetFieldTypeByHnd, DWORDLONG, DWORD)
 LWM(GetArrayInitializationData, DLD, DWORDLONG)
 LWM(GetArrayRank, DWORDLONG, DWORD)
 LWM(GetArrayIntrinsicID, DWORDLONG, DWORD)

src/coreclr/ToolBox/superpmi/superpmi-shared/methodcontext.cpp

@@ -2669,6 +2669,45 @@ void MethodContext::recGetArgType(CORINFO_SIG_INFO*       sig,
     GetArgType->Add(key, value);
     DEBUG_REC(dmpGetArgType(key, value));
 }
+
+void MethodContext::recGetArgType(CORINFO_SIG_INFO*       sig,
+                                  CORINFO_ARG_LIST_HANDLE args,
+                                  CORINFO_CLASS_HANDLE*   vcTypeRet,
+                                  CorInfoTypeWithMod      result,
+                                  int                     flags,
+                                  DWORD                   exceptionCode)
+{
+    if (GetArgType == nullptr)
+        GetArgType = new LightWeightMap<Agnostic_GetArgType_Key, Agnostic_GetArgType_Value>();
+
+    Agnostic_GetArgType_Key key;
+    ZeroMemory(&key, sizeof(key)); // Zero key including any struct padding
+
+    // Only setting values for CORINFO_SIG_INFO things the EE seems to pay attention to... this is necessary since some of the values
+    // are unset and fail our precise comparisons ...
+    // TODO: verify that the above comment is still true (that some of the fields of incoming argument `sig` contain garbage), or
+    // can we store the whole thing and use StoreAgnostic_CORINFO_SIG_INFO()?
+
+    key.flags           = (DWORD)sig->flags;
+    key.numArgs         = (DWORD)sig->numArgs;
+
+    SpmiRecordsHelper::StoreAgnostic_CORINFO_SIG_INST_HandleArray(sig->sigInst.classInstCount, sig->sigInst.classInst, SigInstHandleMap, &key.sigInst_classInstCount, &key.sigInst_classInst_Index);
+    SpmiRecordsHelper::StoreAgnostic_CORINFO_SIG_INST_HandleArray(sig->sigInst.methInstCount, sig->sigInst.methInst, SigInstHandleMap, &key.sigInst_methInstCount, &key.sigInst_methInst_Index);
+
+    key.methodSignature = CastPointer(sig->methodSignature);
+    key.scope           = CastHandle(sig->scope);
+    key.args            = CastHandle(args);
+
+    Agnostic_GetArgType_Value value;
+    value.vcTypeRet     = CastHandle(*vcTypeRet);
+    value.result        = (DWORD)result;
+    value.flags = flags;
+    value.exceptionCode = (DWORD)exceptionCode;
+
+    GetArgType->Add(key, value);
+    DEBUG_REC(dmpGetArgType(key, value));
+}
+
 void MethodContext::dmpGetArgType(const Agnostic_GetArgType_Key& key, const Agnostic_GetArgType_Value& value)
 {
     printf("GetArgType key flg-%08X na-%u %s %s msig-%016llX scp-%016llX arg-%016llX",
@@ -2678,9 +2717,42 @@ void MethodContext::dmpGetArgType(const Agnostic_GetArgType_Key& key, const Agno
         key.methodSignature, key.scope, key.args);
     printf(", value result(cit)-%u(%s) vcType-%016llX excp-%08X", value.result, toString((CorInfoTypeWithMod)value.result), value.vcTypeRet, value.exceptionCode);
 }
+
+CorInfoTypeWithMod MethodContext::repGetArgType(CORINFO_SIG_INFO*       sig,
+                                                CORINFO_ARG_LIST_HANDLE args,
+                                                CORINFO_CLASS_HANDLE*   vcTypeRet,
+                                                DWORD*                  exceptionCode)
+{
+    AssertMapExists(GetArgType, ": key %016llX %016llX", CastHandle(sig->scope), CastHandle(args));
+
+    Agnostic_GetArgType_Key key;
+    ZeroMemory(&key, sizeof(key)); // Zero key including any struct padding
+    key.flags                  = (DWORD)sig->flags;
+    key.numArgs                = (DWORD)sig->numArgs;
+    key.sigInst_classInstCount = (DWORD)sig->sigInst.classInstCount;
+    key.sigInst_methInstCount  = (DWORD)sig->sigInst.methInstCount;
+    key.methodSignature        = CastPointer(sig->methodSignature);
+    key.scope                  = CastHandle(sig->scope);
+    key.args                   = CastHandle(args);
+
+    key.sigInst_classInst_Index = SpmiRecordsHelper::ContainsHandleMap(sig->sigInst.classInstCount, sig->sigInst.classInst, SigInstHandleMap);
+    key.sigInst_methInst_Index  = SpmiRecordsHelper::ContainsHandleMap(sig->sigInst.methInstCount, sig->sigInst.methInst, SigInstHandleMap);
+
+    AssertKeyExists(GetArgType, key, ": key %016llX %016llX", key.scope, key.args);
+
+    Agnostic_GetArgType_Value value = GetArgType->Get(key);
+    DEBUG_REP(dmpGetArgType(key, value));
+
+    *vcTypeRet              = (CORINFO_CLASS_HANDLE)value.vcTypeRet;
+    CorInfoTypeWithMod temp = (CorInfoTypeWithMod)value.result;
+    *exceptionCode          = (DWORD)value.exceptionCode;
+    return temp;
+}
+
 CorInfoTypeWithMod MethodContext::repGetArgType(CORINFO_SIG_INFO*       sig,
                                                 CORINFO_ARG_LIST_HANDLE args,
                                                 CORINFO_CLASS_HANDLE*   vcTypeRet,
+                                                int*                    flags,
                                                 DWORD*                  exceptionCode)
 {
     AssertMapExists(GetArgType, ": key %016llX %016llX", CastHandle(sig->scope), CastHandle(args));
@@ -2701,6 +2773,8 @@ CorInfoTypeWithMod MethodContext::repGetArgType(CORINFO_SIG_INFO*       sig,
     AssertKeyExists(GetArgType, key, ": key %016llX %016llX", key.scope, key.args);
 
     Agnostic_GetArgType_Value value = GetArgType->Get(key);
+    if (flags)
+        *flags                      = value.flags;
     DEBUG_REP(dmpGetArgType(key, value));
 
     *vcTypeRet              = (CORINFO_CLASS_HANDLE)value.vcTypeRet;
@@ -2709,6 +2783,27 @@ CorInfoTypeWithMod MethodContext::repGetArgType(CORINFO_SIG_INFO*       sig,
     return temp;
 }
 
+void MethodContext::recGetFieldTypeByHnd(CORINFO_CLASS_HANDLE cls, DWORD value)
+{
+    if (GetFieldTypeByHnd == nullptr)
+        GetFieldTypeByHnd = new LightWeightMap<DWORDLONG, DWORD>();
+
+    DWORDLONG key = (DWORDLONG)cls;
+
+    GetFieldTypeByHnd->Add((DWORDLONG)cls, value);
+    //DEBUG_REC(dmpGetArgType(key, value));
+}
+
+void MethodContext::dmpGetFieldTypeByHnd(DWORDLONG key, DWORD value)
+{
+    printf("GetFieldTypeByHnd key %016llX value-%08X", key, value);
+}
+
+DWORD MethodContext::repGetFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+    return GetFieldTypeByHnd->Get((DWORDLONG)cls);
+}
+
 void MethodContext::recGetArgNext(CORINFO_ARG_LIST_HANDLE args, CORINFO_ARG_LIST_HANDLE result)
 {
     if (GetArgNext == nullptr)

src/coreclr/ToolBox/superpmi/superpmi-shared/methodcontext.h

@@ -363,11 +363,26 @@ class MethodContext
                        CORINFO_CLASS_HANDLE*   vcTypeRet,
                        CorInfoTypeWithMod      result,
                        DWORD                   exception);
+    void recGetArgType(CORINFO_SIG_INFO*       sig,
+                       CORINFO_ARG_LIST_HANDLE args,
+                       CORINFO_CLASS_HANDLE*   vcTypeRet,
+                       CorInfoTypeWithMod      result,
+                       int flags,
+                       DWORD                   exception);
     void dmpGetArgType(const Agnostic_GetArgType_Key& key, const Agnostic_GetArgType_Value& value);
     CorInfoTypeWithMod repGetArgType(CORINFO_SIG_INFO*       sig,
                                      CORINFO_ARG_LIST_HANDLE args,
                                      CORINFO_CLASS_HANDLE*   vcTypeRet,
                                      DWORD*                  exception);
+    CorInfoTypeWithMod repGetArgType(CORINFO_SIG_INFO*       sig,
+                                     CORINFO_ARG_LIST_HANDLE args,
+                                     CORINFO_CLASS_HANDLE*   vcTypeRet,
+                                     int *flags,
+                                     DWORD*                  exception);
+
+    void recGetFieldTypeByHnd(CORINFO_CLASS_HANDLE cls, DWORD value);
+    void dmpGetFieldTypeByHnd(DWORDLONG key, DWORD value);
+    DWORD repGetFieldTypeByHnd(CORINFO_CLASS_HANDLE cls);
 
     void recGetArgNext(CORINFO_ARG_LIST_HANDLE args, CORINFO_ARG_LIST_HANDLE result);
     void dmpGetArgNext(DWORDLONG key, DWORDLONG value);
@@ -1097,6 +1112,7 @@ enum mcPackets
     Packet_GetAssemblyName = 191,
     Packet_IsIntrinsic = 192,
     Packet_UpdateEntryPointForTailCall = 193,
+    Packet_GetFieldTypeByHnd = 194,
 };
 
 void SetDebugDumpVariables();

src/coreclr/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp

@@ -1203,12 +1203,59 @@ CorInfoTypeWithMod interceptor_ICJI::getArgType(CORINFO_SIG_INFO*       sig,
     },
     [&](DWORD exceptionCode)
     {
+
         this->mc->recGetArgType(sig, args, vcTypeRet, temp, exceptionCode);
     });
 
     return temp;
 }
 
+CorInfoTypeWithMod interceptor_ICJI::getArgType2(CORINFO_SIG_INFO*       sig,      /* IN */
+                                                CORINFO_ARG_LIST_HANDLE args,     /* IN */
+                                                CORINFO_CLASS_HANDLE*   vcTypeRet, /* OUT */
+                                                int*                    flags      /* OUT */
+                                                )
+{
+    CorInfoTypeWithMod      temp      = (CorInfoTypeWithMod)CORINFO_TYPE_UNDEF;
+
+    RunWithErrorExceptionCodeCaptureAndContinue(
+    [&]()
+    {
+        mc->cr->AddCall("getArgType2");
+        temp =
+            original_ICorJitInfo->getArgType2(sig, args, vcTypeRet, flags);
+
+#ifdef fatMC
+        CORINFO_CLASS_HANDLE temp3 = getArgClass(sig, args);
+#endif
+    },
+    [&](DWORD exceptionCode)
+    {
+
+        this->mc->recGetArgType(sig, args, vcTypeRet, temp, flags ? *flags : 0, exceptionCode);
+    });
+
+    return temp;
+}
+
+uint32_t interceptor_ICJI::getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+
+    uint32_t temp = 0;
+    RunWithErrorExceptionCodeCaptureAndContinue(
+    [&]()
+    {
+        mc->cr->AddCall("getFieldTypeByHnd");
+        temp = original_ICorJitInfo->getFieldTypeByHnd(cls);
+    },
+    [&](DWORD exceptionCode)
+    {
+        this->mc->recGetFieldTypeByHnd(cls, temp);
+    });
+
+    return temp;
+}
+
 // If the Arg is a CORINFO_TYPE_CLASS fetch the class handle associated with it
 CORINFO_CLASS_HANDLE interceptor_ICJI::getArgClass(CORINFO_SIG_INFO*       sig, /* IN */
                                                    CORINFO_ARG_LIST_HANDLE args /* IN */

src/coreclr/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp

@@ -814,6 +814,23 @@ CorInfoTypeWithMod interceptor_ICJI::getArgType(
     return original_ICorJitInfo->getArgType(sig, args, vcTypeRet);
 }
 
+CorInfoTypeWithMod interceptor_ICJI::getArgType2(
+          CORINFO_SIG_INFO* sig,
+          CORINFO_ARG_LIST_HANDLE args,
+          CORINFO_CLASS_HANDLE* vcTypeRet,
+          int* flags)
+{
+    mcs->AddCall("getArgType2");
+    return original_ICorJitInfo->getArgType2(sig, args, vcTypeRet, flags);
+}
+
+uint32_t interceptor_ICJI::getFieldTypeByHnd(
+          CORINFO_CLASS_HANDLE cls)
+{
+    mcs->AddCall("getFieldTypeByHnd");
+    return original_ICorJitInfo->getFieldTypeByHnd(cls);
+}
+
 CORINFO_CLASS_HANDLE interceptor_ICJI::getArgClass(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args)

src/coreclr/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp

@@ -713,6 +713,21 @@ CorInfoTypeWithMod interceptor_ICJI::getArgType(
     return original_ICorJitInfo->getArgType(sig, args, vcTypeRet);
 }
 
+CorInfoTypeWithMod interceptor_ICJI::getArgType2(
+          CORINFO_SIG_INFO* sig,
+          CORINFO_ARG_LIST_HANDLE args,
+          CORINFO_CLASS_HANDLE* vcTypeRet,
+          int* flags)
+{
+    return original_ICorJitInfo->getArgType2(sig, args, vcTypeRet, flags);
+}
+
+uint32_t interceptor_ICJI::getFieldTypeByHnd(
+          CORINFO_CLASS_HANDLE cls)
+{
+    return original_ICorJitInfo->getFieldTypeByHnd(cls);
+}
+
 CORINFO_CLASS_HANDLE interceptor_ICJI::getArgClass(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args)

src/coreclr/ToolBox/superpmi/superpmi/icorjitinfo.cpp

@@ -1060,6 +1060,26 @@ CorInfoTypeWithMod MyICJI::getArgType(CORINFO_SIG_INFO*       sig,      /* IN */
     return value;
 }
 
+CorInfoTypeWithMod MyICJI::getArgType2(CORINFO_SIG_INFO*       sig,      /* IN */
+                                      CORINFO_ARG_LIST_HANDLE args,     /* IN */
+                                      CORINFO_CLASS_HANDLE*   vcTypeRet,/* OUT */
+                                      int*                    flags     /* OUT */
+                                      )
+{
+    DWORD exceptionCode = 0;
+    jitInstance->mc->cr->AddCall("getArgType2");
+    CorInfoTypeWithMod value = jitInstance->mc->repGetArgType(sig, args, vcTypeRet, flags, &exceptionCode);
+    if (exceptionCode != 0)
+        ThrowException(exceptionCode);
+    return value;
+}
+
+uint32_t MyICJI::getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+    jitInstance->mc->cr->AddCall("getFieldTypeByHnd");
+    return jitInstance->mc->repGetFieldTypeByHnd(cls);
+}
+
 // If the Arg is a CORINFO_TYPE_CLASS fetch the class handle associated with it
 CORINFO_CLASS_HANDLE MyICJI::getArgClass(CORINFO_SIG_INFO*       sig, /* IN */
                                          CORINFO_ARG_LIST_HANDLE args /* IN */

src/coreclr/inc/corinfo.h

@@ -2714,6 +2714,13 @@ class ICorStaticInfo
             CORINFO_CLASS_HANDLE       *vcTypeRet       /* OUT */
             ) = 0;
 
+    virtual CorInfoTypeWithMod getArgType2 (
+            CORINFO_SIG_INFO*           sig,            /* IN */
+            CORINFO_ARG_LIST_HANDLE     args,           /* IN */
+            CORINFO_CLASS_HANDLE       *vcTypeRet,      /* OUT */
+            int *flags = NULL
+            ) = 0;
+
     // If the Arg is a CORINFO_TYPE_CLASS fetch the class handle associated with it
     virtual CORINFO_CLASS_HANDLE getArgClass (
             CORINFO_SIG_INFO*           sig,            /* IN */
@@ -2848,6 +2855,7 @@ class ICorStaticInfo
         /* OUT */   SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR* structPassInRegDescPtr
         ) = 0;
 
+    virtual uint32_t getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls) = 0;
 };
 
 /*****************************************************************************

src/coreclr/inc/icorjitinfoimpl_generated.h

@@ -419,6 +419,15 @@ CorInfoTypeWithMod getArgType(
           CORINFO_ARG_LIST_HANDLE args,
           CORINFO_CLASS_HANDLE* vcTypeRet) override;
 
+CorInfoTypeWithMod getArgType2(
+          CORINFO_SIG_INFO* sig,
+          CORINFO_ARG_LIST_HANDLE args,
+          CORINFO_CLASS_HANDLE* vcTypeRet,
+          int* flags) override;
+
+uint32_t getFieldTypeByHnd(
+          CORINFO_CLASS_HANDLE cls) override;
+
 CORINFO_CLASS_HANDLE getArgClass(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args) override;