[LoongArch64] JIT/EE interface for getting ABI-info

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

@@ -528,6 +528,9 @@ struct Agnostic_GetArgType_Value
 {
     DWORDLONG vcTypeRet;
     DWORD     result;
+#if defined(TARGET_LOONGARCH64)
+        int       flags;
+#endif
     DWORD     exceptionCode;
 };
 

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

@@ -2638,6 +2638,9 @@ void MethodContext::recGetArgType(CORINFO_SIG_INFO*       sig,
                                   CORINFO_ARG_LIST_HANDLE args,
                                   CORINFO_CLASS_HANDLE*   vcTypeRet,
                                   CorInfoTypeWithMod      result,
+#if defined(TARGET_LOONGARCH64)
+                                    int flags,
+#endif
                                   DWORD                   exceptionCode)
 {
     if (GetArgType == nullptr)
@@ -2664,6 +2667,9 @@ void MethodContext::recGetArgType(CORINFO_SIG_INFO*       sig,
     Agnostic_GetArgType_Value value;
     value.vcTypeRet     = CastHandle(*vcTypeRet);
     value.result        = (DWORD)result;
+#if defined(TARGET_LOONGARCH64)
+    value.flags = flags;
+#endif
     value.exceptionCode = (DWORD)exceptionCode;
 
     GetArgType->Add(key, value);
@@ -2681,6 +2687,9 @@ void MethodContext::dmpGetArgType(const Agnostic_GetArgType_Key& key, const Agno
 CorInfoTypeWithMod MethodContext::repGetArgType(CORINFO_SIG_INFO*       sig,
                                                 CORINFO_ARG_LIST_HANDLE args,
                                                 CORINFO_CLASS_HANDLE*   vcTypeRet,
+#if defined(TARGET_LOONGARCH64)
+                                                int *flags,
+#endif
                                                 DWORD*                  exceptionCode)
 {
     AssertMapExists(GetArgType, ": key %016llX %016llX", CastHandle(sig->scope), CastHandle(args));
@@ -2701,6 +2710,10 @@ 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 defined(TARGET_LOONGARCH64)
+    if (flags)
+        *flags                      = value.flags;
+#endif
     DEBUG_REP(dmpGetArgType(key, value));
 
     *vcTypeRet              = (CORINFO_CLASS_HANDLE)value.vcTypeRet;
@@ -2709,6 +2722,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 %08X value-%X", 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

@@ -362,13 +362,23 @@ class MethodContext
                        CORINFO_ARG_LIST_HANDLE args,
                        CORINFO_CLASS_HANDLE*   vcTypeRet,
                        CorInfoTypeWithMod      result,
+#if defined(TARGET_LOONGARCH64)
+                       int flags,
+#endif
                        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,
+#if defined(TARGET_LOONGARCH64)
+                                     int *flags,
+#endif
                                      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);
     CORINFO_ARG_LIST_HANDLE repGetArgNext(CORINFO_ARG_LIST_HANDLE args);
@@ -1097,6 +1107,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

@@ -1186,6 +1186,9 @@ CORINFO_ARG_LIST_HANDLE interceptor_ICJI::getArgNext(CORINFO_ARG_LIST_HANDLE arg
 CorInfoTypeWithMod interceptor_ICJI::getArgType(CORINFO_SIG_INFO*       sig,      /* IN */
                                                 CORINFO_ARG_LIST_HANDLE args,     /* IN */
                                                 CORINFO_CLASS_HANDLE*   vcTypeRet /* OUT */
+#if defined(TARGET_LOONGARCH64)
+                                    ,int *flags
+#endif
                                                 )
 {
     CorInfoTypeWithMod      temp      = (CorInfoTypeWithMod)CORINFO_TYPE_UNDEF;
@@ -1195,15 +1198,42 @@ CorInfoTypeWithMod interceptor_ICJI::getArgType(CORINFO_SIG_INFO*       sig,
     {
         mc->cr->AddCall("getArgType");
         temp =
+#if defined(TARGET_LOONGARCH64)
+            original_ICorJitInfo->getArgType(sig, args, vcTypeRet, flags);
+#else
             original_ICorJitInfo->getArgType(sig, args, vcTypeRet);
+#endif
 
 #ifdef fatMC
         CORINFO_CLASS_HANDLE temp3 = getArgClass(sig, args);
 #endif
     },
     [&](DWORD exceptionCode)
     {
+
+#if defined(TARGET_LOONGARCH64)
+        this->mc->recGetArgType(sig, args, vcTypeRet, temp, flags ? *flags : 0, exceptionCode);
+#else
         this->mc->recGetArgType(sig, args, vcTypeRet, temp, exceptionCode);
+#endif
+    });
+
+    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;

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

@@ -808,10 +808,24 @@ CORINFO_ARG_LIST_HANDLE interceptor_ICJI::getArgNext(
 CorInfoTypeWithMod interceptor_ICJI::getArgType(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args,
-          CORINFO_CLASS_HANDLE* vcTypeRet)
+          CORINFO_CLASS_HANDLE* vcTypeRet
+#if defined(TARGET_LOONGARCH64)
+         ,int *flags
+#endif
+                                                )
 {
     mcs->AddCall("getArgType");
+#if defined(TARGET_LOONGARCH64)
+    return original_ICorJitInfo->getArgType(sig, args, vcTypeRet, flags);
+#else
     return original_ICorJitInfo->getArgType(sig, args, vcTypeRet);
+#endif
+}
+
+uint32_t interceptor_ICJI::getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+    mcs->AddCall("getFieldTypeByHnd");
+    return original_ICorJitInfo->getFieldTypeByHnd(cls);
 }
 
 CORINFO_CLASS_HANDLE interceptor_ICJI::getArgClass(

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

@@ -708,9 +708,23 @@ CORINFO_ARG_LIST_HANDLE interceptor_ICJI::getArgNext(
 CorInfoTypeWithMod interceptor_ICJI::getArgType(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args,
-          CORINFO_CLASS_HANDLE* vcTypeRet)
+          CORINFO_CLASS_HANDLE* vcTypeRet
+#if defined(TARGET_LOONGARCH64)
+          ,int *flags
+#endif
+                                                )
 {
+
+#if defined(TARGET_LOONGARCH64)
+    return original_ICorJitInfo->getArgType(sig, args, vcTypeRet, flags);
+#else
     return original_ICorJitInfo->getArgType(sig, args, vcTypeRet);
+#endif
+}
+
+uint32_t interceptor_ICJI::getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+    return original_ICorJitInfo->getFieldTypeByHnd(cls);
 }
 
 CORINFO_CLASS_HANDLE interceptor_ICJI::getArgClass(

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

@@ -1050,16 +1050,29 @@ CORINFO_ARG_LIST_HANDLE MyICJI::getArgNext(CORINFO_ARG_LIST_HANDLE args /* IN */
 CorInfoTypeWithMod MyICJI::getArgType(CORINFO_SIG_INFO*       sig,      /* IN */
                                       CORINFO_ARG_LIST_HANDLE args,     /* IN */
                                       CORINFO_CLASS_HANDLE*   vcTypeRet /* OUT */
+#if defined(TARGET_LOONGARCH64)
+                                    ,int *flags
+#endif
                                       )
 {
     DWORD exceptionCode = 0;
     jitInstance->mc->cr->AddCall("getArgType");
+#if defined(TARGET_LOONGARCH64)
+    CorInfoTypeWithMod value = jitInstance->mc->repGetArgType(sig, args, vcTypeRet, flags, &exceptionCode);
+#else
     CorInfoTypeWithMod value = jitInstance->mc->repGetArgType(sig, args, vcTypeRet, &exceptionCode);
+#endif
     if (exceptionCode != 0)
         ThrowException(exceptionCode);
     return value;
 }
 
+uint32_t MyICJI::getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls)
+{
+    jitInstance->mc->cr->AddCall("getFieldTypeByHnd");
+    return 0;//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/icorjitinfoimpl_generated.h

@@ -417,7 +417,13 @@ CORINFO_ARG_LIST_HANDLE getArgNext(
 CorInfoTypeWithMod getArgType(
           CORINFO_SIG_INFO* sig,
           CORINFO_ARG_LIST_HANDLE args,
-          CORINFO_CLASS_HANDLE* vcTypeRet) override;
+          CORINFO_CLASS_HANDLE* vcTypeRet
+#if defined(TARGET_LOONGARCH64)
+          ,int *flags = NULL
+#endif
+) override;
+
+    uint32_t getFieldTypeByHnd(CORINFO_CLASS_HANDLE cls) override;
 
 CORINFO_CLASS_HANDLE getArgClass(
           CORINFO_SIG_INFO* sig,