[LoongArch64] Fix the compiling errors for aligned and definiations. (#84971)

shushanhf · web-flow · commit 44ea019bbbaa · 2023-04-18T07:08:22.000-07:00
diff --git a/src/coreclr/debug/di/loongarch64/cordbregisterset.cpp b/src/coreclr/debug/di/loongarch64/cordbregisterset.cpp
@@ -282,14 +282,14 @@ void CordbRegisterSet::InternalCopyRDToContext(DT_CONTEXT *pInputContext)
             *pDest++ = *pSrc++;
         }
 
-        pInputContext->TP = m_rd->TP;
-        pInputContext->RA = m_rd->RA;
+        pInputContext->Tp = m_rd->TP;
+        pInputContext->Ra = m_rd->RA;
     }
 
     if ((pInputContext->ContextFlags & DT_CONTEXT_CONTROL) == DT_CONTEXT_CONTROL)
     {
-        pInputContext->SP = m_rd->SP;
-        pInputContext->PC = m_rd->PC;
-        pInputContext->FP = m_rd->FP;
+        pInputContext->Sp = m_rd->SP;
+        pInputContext->Pc = m_rd->PC;
+        pInputContext->Fp = m_rd->FP;
     }
 }
diff --git a/src/coreclr/debug/inc/dbgtargetcontext.h b/src/coreclr/debug/inc/dbgtargetcontext.h
@@ -487,7 +487,7 @@ static_assert(sizeof(DT_CONTEXT) == sizeof(T_CONTEXT), "DT_CONTEXT size must equ
 #define DT_LOONGARCH64_MAX_BREAKPOINTS     8
 #define DT_LOONGARCH64_MAX_WATCHPOINTS     2
 
-typedef DECLSPEC_ALIGN(16) struct {
+typedef struct DECLSPEC_ALIGN(16) {
     //
     // Control flags.
     //
@@ -498,9 +498,9 @@ typedef DECLSPEC_ALIGN(16) struct {
     // Integer registers
     //
     DWORD64 R0;
-    DWORD64 RA;
-    DWORD64 TP;
-    DWORD64 SP;
+    DWORD64 Ra;
+    DWORD64 Tp;
+    DWORD64 Sp;
     DWORD64 A0;
     DWORD64 A1;
     DWORD64 A2;
@@ -519,7 +519,7 @@ typedef DECLSPEC_ALIGN(16) struct {
     DWORD64 T7;
     DWORD64 T8;
     DWORD64 X0;
-    DWORD64 FP;
+    DWORD64 Fp;
     DWORD64 S0;
     DWORD64 S1;
     DWORD64 S2;
@@ -529,12 +529,13 @@ typedef DECLSPEC_ALIGN(16) struct {
     DWORD64 S6;
     DWORD64 S7;
     DWORD64 S8;
-    DWORD64 PC;
+    DWORD64 Pc;
 
     //
     // Floating Point Registers
     //
     ULONGLONG F[32];
+    DWORD Fcsr;
 } DT_CONTEXT;
 
 static_assert(sizeof(DT_CONTEXT) == sizeof(T_CONTEXT), "DT_CONTEXT size must equal the T_CONTEXT size");
diff --git a/src/coreclr/debug/inc/loongarch64/primitives.h b/src/coreclr/debug/inc/loongarch64/primitives.h
@@ -85,31 +85,31 @@ constexpr CorDebugRegister g_JITToCorDbgReg[] =
 inline void CORDbgSetIP(DT_CONTEXT *context, LPVOID ip) {
     LIMITED_METHOD_CONTRACT;
 
-    context->PC = (DWORD64)ip;
+    context->Pc = (DWORD64)ip;
 }
 
 inline LPVOID CORDbgGetSP(const DT_CONTEXT * context) {
     LIMITED_METHOD_CONTRACT;
 
-    return (LPVOID)(size_t)(context->SP);
+    return (LPVOID)(size_t)(context->Sp);
 }
 
 inline void CORDbgSetSP(DT_CONTEXT *context, LPVOID esp) {
     LIMITED_METHOD_CONTRACT;
 
-    context->SP = (DWORD64)esp;
+    context->Sp = (DWORD64)esp;
 }
 
 inline LPVOID CORDbgGetFP(const DT_CONTEXT * context) {
     LIMITED_METHOD_CONTRACT;
 
-    return (LPVOID)(size_t)(context->FP);
+    return (LPVOID)(size_t)(context->Fp);
 }
 
 inline void CORDbgSetFP(DT_CONTEXT *context, LPVOID fp) {
     LIMITED_METHOD_CONTRACT;
 
-    context->FP = (DWORD64)fp;
+    context->Fp = (DWORD64)fp;
 }
 
 
@@ -119,9 +119,9 @@ inline BOOL CompareControlRegisters(const DT_CONTEXT * pCtx1, const DT_CONTEXT *
 
     // TODO-LoongArch64: Sort out frame registers
 
-    if ((pCtx1->PC == pCtx2->PC) &&
-        (pCtx1->SP == pCtx2->SP) &&
-        (pCtx1->FP == pCtx2->FP))
+    if ((pCtx1->Pc == pCtx2->Pc) &&
+        (pCtx1->Sp == pCtx2->Sp) &&
+        (pCtx1->Fp == pCtx2->Fp))
     {
         return TRUE;
     }
@@ -166,7 +166,7 @@ inline LPVOID CORDbgGetIP(DT_CONTEXT *context)
 {
     LIMITED_METHOD_CONTRACT;
 
-    return (LPVOID)(size_t)(context->PC);
+    return (LPVOID)(size_t)(context->Pc);
 }
 
 inline void CORDbgSetInstructionExImpl(CORDB_ADDRESS_TYPE* address,
diff --git a/src/coreclr/debug/shared/loongarch64/primitives.cpp b/src/coreclr/debug/shared/loongarch64/primitives.cpp
@@ -29,37 +29,38 @@ void CORDbgCopyThreadContext(DT_CONTEXT* pDst, const DT_CONTEXT* pSrc)
     {
         LOG((LF_CORDB, LL_INFO1000000,
              "CP::CTC: RA: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",
-             pDst->RA, pSrc->RA, DT_CONTEXT_CONTROL));
-        pDst->RA = pSrc->RA;
+             pDst->Ra, pSrc->Ra, DT_CONTEXT_CONTROL));
+        pDst->Ra = pSrc->Ra;
 
         LOG((LF_CORDB, LL_INFO1000000,
              "CP::CTC: SP: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",
-             pDst->SP, pSrc->SP, DT_CONTEXT_CONTROL));
-        pDst->SP = pSrc->SP;
+             pDst->Sp, pSrc->Sp, DT_CONTEXT_CONTROL));
+        pDst->Sp = pSrc->Sp;
 
         LOG((LF_CORDB, LL_INFO1000000,
              "CP::CTC: FP: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",
-             pDst->FP, pSrc->FP, DT_CONTEXT_CONTROL));
-        pDst->FP = pSrc->FP;
+             pDst->Fp, pSrc->Fp, DT_CONTEXT_CONTROL));
+        pDst->Fp = pSrc->Fp;
 
         LOG((LF_CORDB, LL_INFO1000000,
              "CP::CTC: PC: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",
-             pDst->PC, pSrc->PC, DT_CONTEXT_CONTROL));
-        pDst->PC = pSrc->PC;
+             pDst->Pc, pSrc->Pc, DT_CONTEXT_CONTROL));
+        pDst->Pc = pSrc->Pc;
     }
 
     if ((dstFlags & srcFlags & DT_CONTEXT_INTEGER) == DT_CONTEXT_INTEGER)
     {
-        CopyContextChunk(&pDst->A0, &pSrc->A0, &pDst->FP,
+        CopyContextChunk(&pDst->A0, &pSrc->A0, &pDst->Fp,
                          DT_CONTEXT_INTEGER);
-        CopyContextChunk(&pDst->S0, &pSrc->S0, &pDst->PC,
+        CopyContextChunk(&pDst->S0, &pSrc->S0, &pDst->Pc,
                          DT_CONTEXT_INTEGER);
     }
 
     if ((dstFlags & srcFlags & DT_CONTEXT_FLOATING_POINT) == DT_CONTEXT_FLOATING_POINT)
     {
         CopyContextChunk(&pDst->F[0], &pSrc->F[0], &pDst->F[32],
                          DT_CONTEXT_FLOATING_POINT);
+        pDst->Fcsr = pSrc->Fcsr;
     }
 }
 
@@ -76,13 +77,13 @@ void SetDebuggerREGDISPLAYFromREGDISPLAY(DebuggerREGDISPLAY* pDRD, REGDISPLAY* p
     if ((flags & DT_CONTEXT_CONTROL) == DT_CONTEXT_CONTROL)
     {
         pDRD->FP = (SIZE_T)CORDbgGetFP(pContext);
-        pDRD->PC = (SIZE_T)pContext->PC;
-        pDRD->RA = (SIZE_T)pContext->RA;
+        pDRD->PC = (SIZE_T)pContext->Pc;
+        pDRD->RA = (SIZE_T)pContext->Ra;
     }
 
     if ((flags & DT_CONTEXT_INTEGER) == DT_CONTEXT_INTEGER)
     {
-        pDRD->TP = pContext->TP;
+        pDRD->TP = pContext->Tp;
         memcpy(&pDRD->A0, &pContext->A0, sizeof(pDRD->A0)*(21 - 4 + 1));
         memcpy(&pDRD->S0, &pContext->S0, sizeof(pDRD->S0)* 9);
     }

Original file line number	Diff line number	Diff line change
`@@ -282,14 +282,14 @@ void CordbRegisterSet::InternalCopyRDToContext(DT_CONTEXT *pInputContext)`
`282`	`282`	`pDest++ = pSrc++;`
`283`	`283`	`}`
`284`	`284`
`285`		`- pInputContext->TP = m_rd->TP;`
`286`		`- pInputContext->RA = m_rd->RA;`
	`285`	`+ pInputContext->Tp = m_rd->TP;`
	`286`	`+ pInputContext->Ra = m_rd->RA;`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`if ((pInputContext->ContextFlags & DT_CONTEXT_CONTROL) == DT_CONTEXT_CONTROL)`
`290`	`290`	`{`
`291`		`- pInputContext->SP = m_rd->SP;`
`292`		`- pInputContext->PC = m_rd->PC;`
`293`		`- pInputContext->FP = m_rd->FP;`
	`291`	`+ pInputContext->Sp = m_rd->SP;`
	`292`	`+ pInputContext->Pc = m_rd->PC;`
	`293`	`+ pInputContext->Fp = m_rd->FP;`
`294`	`294`	`}`
`295`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,31 +85,31 @@ constexpr CorDebugRegister g_JITToCorDbgReg[] =`
`85`	`85`	`inline void CORDbgSetIP(DT_CONTEXT *context, LPVOID ip) {`
`86`	`86`	`LIMITED_METHOD_CONTRACT;`
`87`	`87`
`88`		`- context->PC = (DWORD64)ip;`
	`88`	`+ context->Pc = (DWORD64)ip;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`inline LPVOID CORDbgGetSP(const DT_CONTEXT * context) {`
`92`	`92`	`LIMITED_METHOD_CONTRACT;`
`93`	`93`
`94`		`- return (LPVOID)(size_t)(context->SP);`
	`94`	`+ return (LPVOID)(size_t)(context->Sp);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`inline void CORDbgSetSP(DT_CONTEXT *context, LPVOID esp) {`
`98`	`98`	`LIMITED_METHOD_CONTRACT;`
`99`	`99`
`100`		`- context->SP = (DWORD64)esp;`
	`100`	`+ context->Sp = (DWORD64)esp;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`inline LPVOID CORDbgGetFP(const DT_CONTEXT * context) {`
`104`	`104`	`LIMITED_METHOD_CONTRACT;`
`105`	`105`
`106`		`- return (LPVOID)(size_t)(context->FP);`
	`106`	`+ return (LPVOID)(size_t)(context->Fp);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`inline void CORDbgSetFP(DT_CONTEXT *context, LPVOID fp) {`
`110`	`110`	`LIMITED_METHOD_CONTRACT;`
`111`	`111`
`112`		`- context->FP = (DWORD64)fp;`
	`112`	`+ context->Fp = (DWORD64)fp;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`
`@@ -119,9 +119,9 @@ inline BOOL CompareControlRegisters(const DT_CONTEXT * pCtx1, const DT_CONTEXT *`
`119`	`119`
`120`	`120`	`// TODO-LoongArch64: Sort out frame registers`
`121`	`121`
`122`		`- if ((pCtx1->PC == pCtx2->PC) &&`
`123`		`- (pCtx1->SP == pCtx2->SP) &&`
`124`		`- (pCtx1->FP == pCtx2->FP))`
	`122`	`+ if ((pCtx1->Pc == pCtx2->Pc) &&`
	`123`	`+ (pCtx1->Sp == pCtx2->Sp) &&`
	`124`	`+ (pCtx1->Fp == pCtx2->Fp))`
`125`	`125`	`{`
`126`	`126`	`return TRUE;`
`127`	`127`	`}`
`@@ -166,7 +166,7 @@ inline LPVOID CORDbgGetIP(DT_CONTEXT *context)`
`166`	`166`	`{`
`167`	`167`	`LIMITED_METHOD_CONTRACT;`
`168`	`168`
`169`		`- return (LPVOID)(size_t)(context->PC);`
	`169`	`+ return (LPVOID)(size_t)(context->Pc);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`inline void CORDbgSetInstructionExImpl(CORDB_ADDRESS_TYPE* address,`
Original file line number	Diff line number	Diff line change
`@@ -29,37 +29,38 @@ void CORDbgCopyThreadContext(DT_CONTEXT* pDst, const DT_CONTEXT* pSrc)`
`29`	`29`	`{`
`30`	`30`	`LOG((LF_CORDB, LL_INFO1000000,`
`31`	`31`	`"CP::CTC: RA: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",`
`32`		`- pDst->RA, pSrc->RA, DT_CONTEXT_CONTROL));`
`33`		`- pDst->RA = pSrc->RA;`
	`32`	`+ pDst->Ra, pSrc->Ra, DT_CONTEXT_CONTROL));`
	`33`	`+ pDst->Ra = pSrc->Ra;`
`34`	`34`
`35`	`35`	`LOG((LF_CORDB, LL_INFO1000000,`
`36`	`36`	`"CP::CTC: SP: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",`
`37`		`- pDst->SP, pSrc->SP, DT_CONTEXT_CONTROL));`
`38`		`- pDst->SP = pSrc->SP;`
	`37`	`+ pDst->Sp, pSrc->Sp, DT_CONTEXT_CONTROL));`
	`38`	`+ pDst->Sp = pSrc->Sp;`
`39`	`39`
`40`	`40`	`LOG((LF_CORDB, LL_INFO1000000,`
`41`	`41`	`"CP::CTC: FP: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",`
`42`		`- pDst->FP, pSrc->FP, DT_CONTEXT_CONTROL));`
`43`		`- pDst->FP = pSrc->FP;`
	`42`	`+ pDst->Fp, pSrc->Fp, DT_CONTEXT_CONTROL));`
	`43`	`+ pDst->Fp = pSrc->Fp;`
`44`	`44`
`45`	`45`	`LOG((LF_CORDB, LL_INFO1000000,`
`46`	`46`	`"CP::CTC: PC: pDst=0x%lx, pSrc=0x%lx, Flags=0x%x\n",`
`47`		`- pDst->PC, pSrc->PC, DT_CONTEXT_CONTROL));`
`48`		`- pDst->PC = pSrc->PC;`
	`47`	`+ pDst->Pc, pSrc->Pc, DT_CONTEXT_CONTROL));`
	`48`	`+ pDst->Pc = pSrc->Pc;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if ((dstFlags & srcFlags & DT_CONTEXT_INTEGER) == DT_CONTEXT_INTEGER)`
`52`	`52`	`{`
`53`		`- CopyContextChunk(&pDst->A0, &pSrc->A0, &pDst->FP,`
	`53`	`+ CopyContextChunk(&pDst->A0, &pSrc->A0, &pDst->Fp,`
`54`	`54`	`DT_CONTEXT_INTEGER);`
`55`		`- CopyContextChunk(&pDst->S0, &pSrc->S0, &pDst->PC,`
	`55`	`+ CopyContextChunk(&pDst->S0, &pSrc->S0, &pDst->Pc,`
`56`	`56`	`DT_CONTEXT_INTEGER);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ((dstFlags & srcFlags & DT_CONTEXT_FLOATING_POINT) == DT_CONTEXT_FLOATING_POINT)`
`60`	`60`	`{`
`61`	`61`	`CopyContextChunk(&pDst->F[0], &pSrc->F[0], &pDst->F[32],`
`62`	`62`	`DT_CONTEXT_FLOATING_POINT);`
	`63`	`+ pDst->Fcsr = pSrc->Fcsr;`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
`@@ -76,13 +77,13 @@ void SetDebuggerREGDISPLAYFromREGDISPLAY(DebuggerREGDISPLAY* pDRD, REGDISPLAY* p`
`76`	`77`	`if ((flags & DT_CONTEXT_CONTROL) == DT_CONTEXT_CONTROL)`
`77`	`78`	`{`
`78`	`79`	`pDRD->FP = (SIZE_T)CORDbgGetFP(pContext);`
`79`		`- pDRD->PC = (SIZE_T)pContext->PC;`
`80`		`- pDRD->RA = (SIZE_T)pContext->RA;`
	`80`	`+ pDRD->PC = (SIZE_T)pContext->Pc;`
	`81`	`+ pDRD->RA = (SIZE_T)pContext->Ra;`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`if ((flags & DT_CONTEXT_INTEGER) == DT_CONTEXT_INTEGER)`
`84`	`85`	`{`
`85`		`- pDRD->TP = pContext->TP;`
	`86`	`+ pDRD->TP = pContext->Tp;`
`86`	`87`	`memcpy(&pDRD->A0, &pContext->A0, sizeof(pDRD->A0)*(21 - 4 + 1));`
`87`	`88`	`memcpy(&pDRD->S0, &pContext->S0, sizeof(pDRD->S0)* 9);`
`88`	`89`	`}`