[WIP] JIT

src/coreclr/vm/callingconvention.h

@@ -96,7 +96,7 @@ struct ArgLocDesc
 #if defined(TARGET_ARM64)
         m_hfaFieldSize = 0;
 #endif // defined(TARGET_ARM64)
-#if defined(TARGET_LOONGARCH64)
+#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
         m_structFields = STRUCT_NO_FLOAT_FIELD;
 #endif
 #if defined(UNIX_AMD64_ABI)
@@ -965,6 +965,7 @@ class ArgIteratorTemplate : public ARGITERATOR_BASE
 
 #ifdef TARGET_RISCV64
     int             m_idxGenReg;        // Next general register to be assigned a value
+    int             m_idxStack;         // Next stack slot to be assigned a value
     int             m_idxFPReg;         // Next FP register to be assigned a value
 #endif
 
@@ -1218,7 +1219,6 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset()
 #elif defined(TARGET_RISCV64)
         m_idxGenReg = numRegistersUsed;
         m_ofsStack = 0;
-
         m_idxFPReg = 0;
 #else
         PORTABILITY_ASSERT("ArgIteratorTemplate::GetNextOffset");
@@ -1960,7 +1960,7 @@ void ArgIteratorTemplate<ARGITERATOR_BASE>::ComputeReturnFlags()
         break;
 
     case ELEMENT_TYPE_R4:
-#if defined(TARGET_LOONGARCH64)
+#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
         flags |= STRUCT_FLOAT_FIELD_ONLY_ONE << RETURN_FP_SIZE_SHIFT;
 #else
 #ifndef ARM_SOFTFP
@@ -1970,7 +1970,7 @@ void ArgIteratorTemplate<ARGITERATOR_BASE>::ComputeReturnFlags()
         break;
 
     case ELEMENT_TYPE_R8:
-#if defined(TARGET_LOONGARCH64)
+#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
         flags |= (STRUCT_FLOAT_FIELD_ONLY_ONE | STRUCT_FIRST_FIELD_SIZE_IS8) << RETURN_FP_SIZE_SHIFT;
 #else
 #ifndef ARM_SOFTFP

src/coreclr/vm/frames.h

@@ -1907,7 +1907,7 @@ class UnmanagedToManagedFrame : public Frame
     TADDR           m_ReturnAddress;
     TADDR           m_x8; // ret buff arg
     ArgumentRegisters m_argumentRegisters;
-#elif defined (TARGET_LOONGARCH64)
+#elif defined (TARGET_LOONGARCH64) || defined (TARGET_RISCV64)
     TADDR           m_fp;
     TADDR           m_ReturnAddress;
     ArgumentRegisters m_argumentRegisters;

src/coreclr/vm/riscv64/cgencpu.h

@@ -96,6 +96,7 @@ struct CalleeSavedRegisters {
     INT64 sp; // stack pointer
     INT64 fp; // frame pointer
     INT64 s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
+    INT64 tp, gp;
 };
 
 //--------------------------------------------------------------------

src/coreclr/vm/riscv64/virtualcallstubcpu.hpp

@@ -10,7 +10,7 @@
 #define RESOLVE_STUB_FIRST_DWORD 0x0
 #define VTABLECALL_STUB_FIRST_DWORD 0x0
 
-#define LOOKUP_STUB_FIRST_DWORD 0x00000097
+#define LOOKUP_STUB_FIRST_DWORD 0x00000f97
 
 #define USES_LOOKUP_STUBS   1
 
@@ -36,18 +36,18 @@ struct LookupHolder
 
     void  Initialize(LookupHolder* pLookupHolderRX, PCODE resolveWorkerTarget, size_t dispatchToken)
     {
-        // auipc ra, 0
+        // auipc t6, 0
         // ld    t2, (12 + 12)(ra)
-        // ld    ra, (4 + 12)(ra)
-        // jalr  x0, ra, 0
+        // ld    t6, (4 + 12)(ra)
+        // jalr  x0, t6, 0
         //
         // _resolveWorkerTarget
         // _token
 
-        _stub._entryPoint[0] = LOOKUP_STUB_FIRST_DWORD; //auipc ra, 12  //0x00000097
-        _stub._entryPoint[1] = 0x0180b383; //ld   t2, 24(ra)
-        _stub._entryPoint[2] = 0x0100b083; //ld   ra, 16(ra)
-        _stub._entryPoint[3] = 0x00008067; //jalr r0, ra, 0
+        _stub._entryPoint[0] = LOOKUP_STUB_FIRST_DWORD; //auipc ra, 0  //0x00000097
+        _stub._entryPoint[1] = 0x018fb383; //ld   t2, 24(ra)
+        _stub._entryPoint[2] = 0x010fbf83; //ld   ra, 16(ra)
+        _stub._entryPoint[3] = 0x000f8067; //jalr r0, ra, 0
 
         _stub._resolveWorkerTarget = resolveWorkerTarget;
         _stub._token               = dispatchToken;