Merge pull request #6328 from ramarag/arm64debugger

Implementing Arm64 Debugger Requirements

Author: ramarag

functions.cmake

@@ -47,10 +47,10 @@ endfunction(convert_to_absolute_path)
 #Preprocess exports definition file
 function(preprocess_def_file inputFilename outputFilename)
   get_compile_definitions(PREPROCESS_DEFINITIONS)
-
+  get_include_directories(ASM_INCLUDE_DIRECTORIES)
   add_custom_command(
     OUTPUT ${outputFilename}
-    COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TC ${PREPROCESS_DEFINITIONS}  /Fi${outputFilename}  ${inputFilename}
+    COMMAND ${CMAKE_CXX_COMPILER} ${ASM_INCLUDE_DIRECTORIES} /P /EP /TC ${PREPROCESS_DEFINITIONS}  /Fi${outputFilename}  ${inputFilename}
     DEPENDS ${inputFilename}
     COMMENT "Preprocessing ${inputFilename}"
   )
@@ -185,4 +185,4 @@ function(_install)
     if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
       install(${ARGV})
     endif()
-endfunction()
+endfunction()

src/debug/daccess/dacdbiimpl.cpp

@@ -5238,6 +5238,11 @@ void DacDbiInterfaceImpl::Hijack(
     ctx.R1 = (DWORD)espRecord;
     ctx.R2 = (DWORD)reason;
     ctx.R3 = (DWORD)pData;
+#elif defined(_TARGET_ARM64_)
+    ctx.X0 = (DWORD64)espContext;
+    ctx.X1 = (DWORD64)espRecord;
+    ctx.X2 = (DWORD64)reason;
+    ctx.X3 = (DWORD64)pData;
 #else
     PORTABILITY_ASSERT("CordbThread::HijackForUnhandledException is not implemented on this platform.");
 #endif

src/debug/di/CMakeLists.txt

@@ -34,11 +34,30 @@ if(WIN32)
     #use static crt
     add_definitions(-MT) 
 
+    if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64)
+        set(CORDBDI_SOURCES_ASM_FILE ${ARCH_SOURCES_DIR}/floatconversion.asm)
+    endif()
     if (CLR_CMAKE_TARGET_ARCH_AMD64)
         set(CORDBDI_SOURCES
           ${CORDBDI_SOURCES}
-          ${ARCH_SOURCES_DIR}/floatconversion.asm
+          ${CORDBDI_SOURCES_ASM_FILE}
         )
+    elseif (CLR_CMAKE_TARGET_ARCH_ARM64 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
+        convert_to_absolute_path(CORDBDI_SOURCES_ASM_FILE ${CORDBDI_SOURCES_ASM_FILE})
+        get_compile_definitions(ASM_DEFINITIONS)
+        set(ASM_OPTIONS /c /Zi /W3 /errorReport:prompt)
+        # asm files require preprocessing using cl.exe on arm64
+        get_filename_component(name ${CORDBDI_SOURCES_ASM_FILE} NAME_WE)
+        set(ASM_PREPROCESSED_FILE ${CMAKE_CURRENT_BINARY_DIR}/${name}.asm)
+        preprocess_def_file(${CORDBDI_SOURCES_ASM_FILE} ${ASM_PREPROCESSED_FILE})
+        set(CORDBDI_SOURCES_WKS_PREPROCESSED_ASM  ${ASM_PREPROCESSED_FILE})
+
+        set_property(SOURCE ${CORDBDI_SOURCES_WKS_PREPROCESSED_ASM} PROPERTY COMPILE_DEFINITIONS ${ASM_DEFINITIONS})
+        set_property(SOURCE ${CORDBDI_SOURCES_WKS_PREPROCESSED_ASM} PROPERTY COMPILE_DEFINITIONS ${ASM_OPTIONS})
+        set(CORDBDI_SOURCES
+              ${CORDBDI_SOURCES}
+              ${CORDBDI_SOURCES_WKS_PREPROCESSED_ASM}
+            )
     endif()
 elseif(CLR_CMAKE_PLATFORM_UNIX)
     add_compile_options(-fPIC)
@@ -54,4 +73,5 @@ endif(WIN32)
 
 add_precompiled_header(stdafx.h stdafx.cpp CORDBDI_SOURCES)
 
+
 add_library_clr(cordbdi STATIC ${CORDBDI_SOURCES})

src/debug/di/DI.props

@@ -76,7 +76,11 @@
     <CppCompile Include="@(SourcesPublish)" />
     <CppCompile Include="@(SourcesShim)" />
     <CppCompile Include="@(SourcesRightside)" />
-    <AssembleAmd64 Condition="'$(BuildArchitecture)' == 'amd64'" Include="..\amd64\floatconversion.asm" />
+    <AssembleAmd64 Condition="'$(BuildArchitecture)' == 'amd64' and '$(CrossTargetArchitecture)' != 'arm64'" Include="..\amd64\floatconversion.asm" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(BuildArchitecture)' == 'arm64'">
+    <PreprocessAssembleArm Include="..\arm64\floatconversion.asm" />
+    <AssembleArm64  Include="$(IntermediateOutputDirectory)\floatconversion.i" />
   </ItemGroup>
   <!--Import the targets-->
 </Project>

src/debug/di/arm64/cordbregisterset.cpp

@@ -65,8 +65,8 @@ HRESULT CordbRegisterSet::GetRegisters(ULONG64 mask, ULONG32 regCount,
 
     // @ARM64TODO: floating point support
 
-    for (int i = REGISTER_ARM64_X0;
-         i <= REGISTER_ARM64_PC && iRegister < regCount;
+    for (int i = REGISTER_ARM64_PC;
+         i <= REGISTER_ARM64_LR && iRegister < regCount;
          i++)
     {
         if (mask &  SETBITULONG64(i))

src/debug/di/arm64/floatconversion.asm

@@ -0,0 +1,22 @@
+; Licensed to the .NET Foundation under one or more agreements.
+; The .NET Foundation licenses this file to you under the MIT license.
+; See the LICENSE file in the project root for more information.
+
+;; ==++==
+;;
+
+;;
+;; ==--==
+#include "ksarm64.h"
+
+;; Arguments
+;;     input: (in X0) the _NEON128 value to be converted to a double
+;;     output: the double corresponding to the _NEON128 input value
+
+    LEAF_ENTRY FPFillR8
+        LDR  Q0, [X0]
+        ret     lr
+    LEAF_END
+
+;; Must be at very end of file
+    END

src/debug/di/module.cpp

@@ -4114,9 +4114,9 @@ HRESULT CordbNativeCode::GetReturnValueLiveOffset(ULONG32 ILoffset, ULONG32 buff
 int CordbNativeCode::GetCallInstructionLength(BYTE *ip, ULONG32 count)
 {
 #if defined(DBG_TARGET_ARM)
-    return E_NOTIMPL;
+    return MAX_INSTRUCTION_LENGTH;
 #elif defined(DBG_TARGET_ARM64)
-    return E_NOTIMPL;
+    return MAX_INSTRUCTION_LENGTH;
 #elif defined(DBG_TARGET_X86)
     if (count < 2)
         return -1;

src/debug/di/rspriv.h

@@ -6097,7 +6097,7 @@ class CordbThread : public CordbBase, public ICorDebugThread,
     // Converts the values in the floating point register area of the context to real number values.
     void Get32bitFPRegisters(CONTEXT * pContext);
 
-#elif defined(DBG_TARGET_AMD64)
+#elif defined(DBG_TARGET_AMD64) ||  defined(DBG_TARGET_ARM64)
     // Converts the values in the floating point register area of the context to real number values.
     void Get64bitFPRegisters(FPRegister64 * rgContextFPRegisters, int start, int nRegisters);
 #endif // DBG_TARGET_X86

src/debug/di/rsthread.cpp

@@ -1432,8 +1432,20 @@ HRESULT CordbThread::FindFrame(ICorDebugFrame ** ppFrame, FramePointer fp)
     return E_FAIL;
 }
 
+
 #if !defined(DBG_TARGET_ARM) // @ARMTODO
 
+#if defined(CROSS_COMPILE) && defined(_TARGET_ARM64_)
+extern "C" double FPFillR8(void* pFillSlot)
+{
+    _ASSERTE(!"nyi for platform");
+    return 0;
+}
+#elif defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) 
+extern "C" double FPFillR8(void* pFillSlot);
+#endif
+
+
 #if defined(_TARGET_X86_)
 
 // CordbThread::Get32bitFPRegisters
@@ -1496,8 +1508,7 @@ void CordbThread::Get32bitFPRegisters(CONTEXT * pContext)
     m_floatStackTop = floatStackTop;
 } // CordbThread::Get32bitFPRegisters
 
-#elif defined(_TARGET_AMD64_)
-extern "C" double FPFillR8(void* pFillSlot);
+#elif defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
 
 // CordbThread::Get64bitFPRegisters
 // Converts the values in the floating point register area of the context to real number values. See
@@ -1525,7 +1536,6 @@ void CordbThread::Get64bitFPRegisters(FPRegister64 * rgContextFPRegisters, int s
     }
 } // CordbThread::Get64bitFPRegisters
 
-
 #endif // _TARGET_X86_
 
 // CordbThread::LoadFloatState
@@ -1556,6 +1566,10 @@ void CordbThread::LoadFloatState()
 #elif defined(_TARGET_AMD64_)
     // we have no fixed-value registers, so we begin with the first one and initialize all 16
     Get64bitFPRegisters((FPRegister64*) &(tempContext.Xmm0), 0, 16);
+#elif defined(_TARGET_ARM64_)
+    Get64bitFPRegisters((FPRegister64*) &(tempContext.V), 0, 32);
+#else 
+    _ASSERTE(!"nyi for platform");
 #endif // !_TARGET_X86_
 
     m_fFloatStateValid = true;
@@ -6991,6 +7005,8 @@ HRESULT CordbNativeFrame::GetLocalRegisterValue(CorDebugRegister reg,
     if ((reg >= REGISTER_X86_FPSTACK_0) && (reg <= REGISTER_X86_FPSTACK_7))
 #elif defined(DBG_TARGET_AMD64)
     if ((reg >= REGISTER_AMD64_XMM0) && (reg <= REGISTER_AMD64_XMM15))
+#elif defined(DBG_TARGET_ARM64)
+    if ((reg >= REGISTER_ARM64_V0) && (reg <= REGISTER_ARM64_V31))
 #endif
     {
         return GetLocalFloatingPointValue(reg, pType, ppValue);
@@ -7239,6 +7255,11 @@ HRESULT CordbNativeFrame::GetLocalFloatingPointValue(DWORD index,
           (index <= REGISTER_AMD64_XMM15)))
         return E_INVALIDARG;
     index -= REGISTER_AMD64_XMM0;
+#elif defined(DBG_TARGET_ARM64)
+    if (!((index >= REGISTER_ARM64_V0) &&
+        (index <= REGISTER_ARM64_V31)))
+        return E_INVALIDARG;
+    index -= REGISTER_ARM64_V0;
 #else
     if (!((index >= REGISTER_X86_FPSTACK_0) &&
           (index <= REGISTER_X86_FPSTACK_7)))
@@ -8941,20 +8962,25 @@ HRESULT CordbJITILFrame::GetReturnValueForILOffsetImpl(ULONG32 ILoffset, ICorDeb
 
 HRESULT CordbJITILFrame::GetReturnValueForType(CordbType *pType, ICorDebugValue **ppReturnValue)
 {
-#if defined(DBG_TARGET_ARM) || defined(DBG_TARGET_ARM64)
+#if defined(DBG_TARGET_ARM) 
     return E_NOTIMPL;
 #else
 
+
 #if defined(DBG_TARGET_X86)
     const CorDebugRegister floatRegister = REGISTER_X86_FPSTACK_0;
 #elif defined(DBG_TARGET_AMD64)
     const CorDebugRegister floatRegister = REGISTER_AMD64_XMM0;
+#elif  defined(DBG_TARGET_ARM64)
+    const CorDebugRegister floatRegister = REGISTER_ARM64_V0;
 #endif
 
 #if defined(DBG_TARGET_X86)
     const CorDebugRegister ptrRegister = REGISTER_X86_EAX;
 #elif defined(DBG_TARGET_AMD64)
     const CorDebugRegister ptrRegister = REGISTER_AMD64_RAX;
+#elif  defined(DBG_TARGET_ARM64)
+    const CorDebugRegister ptrRegister = REGISTER_ARM64_X0;
 #endif
 
     CorElementType corReturnType = pType->GetElementType();

src/debug/di/shimstackwalk.cpp

@@ -1097,7 +1097,7 @@ void ShimStackWalk::AppendChain(ChainInfo * pChainInfo, StackWalkInfo * pStackWa
             // We need to send an extra enter-managed chain.
             _ASSERTE(pChainInfo->m_fLeafNativeContextIsValid);
             BYTE * sp = reinterpret_cast<BYTE *>(CORDbgGetSP(&(pChainInfo->m_leafNativeContext)));
-#ifndef _TARGET_ARM_
+#if !defined(_TARGET_ARM_) &&  !defined(_TARGET_ARM64_)
             // Dev11 324806: on ARM we use the caller's SP for a frame's ending delimiter so we cannot
             // subtract 4 bytes from the chain's ending delimiter else the frame might never be in range.
             // TODO: revisit overlapping ranges on ARM, it would be nice to make it consistent with the other architectures.