Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jkotas wants to merge 1 commit into from
Closed

Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information" #89994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 11 additions & 104 deletions src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

return UnwindHelpers::StepFrame(
pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

uint8_t unwindBlockFlags = *p++;

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
{
// Reverse PInvoke transition should be on the main function body only
assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

uint8_t unwindBlockFlags = *p++;

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
{
// Reverse PInvoke transition should be on the main function body only
assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

// VirtualUnwind can't unwind epilogues.
return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
ASSERT(pNativeMethodInfo != NULL);

uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
bool savedFpLr = false;
bool establishedFp = false;

for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
{
uint32_t instr = *pInstr;

if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
{
// SP/FP-relative store of pair of registers
savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
}
else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
{
establishedFp = true;
}
else
{
// JIT generates other patterns into the prolog that we currently don't
// recognize (saving unpaired register, stack pointer adjustments). We
// don't need to recognize these patterns unless a compact unwinding code
// is generated for them in ILC.
// https://github.com/dotnet/runtime/issues/76371
return -1;
}
}

return savedFpLr && establishedFp ? 0 : 1;

#else

return -1;

#endif
return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

uint8_t unwindBlockFlags = *p++;

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

// Check whether this is a funclet
if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
return false;

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
return true;
}

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
// If we are inside a prolog without a saved frame then we cannot safely unwind.
//
// Some known frame layouts use compact unwind encoding which cannot handle unwinding
// inside prolog or epilog, so don't even try that. These known sequences must be
// recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
// through to the platform unwinder which should have DWARF information about the
// frame.
if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
{
return false;
}
#endif

ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

// Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
PTR_UInt8 p = methodInfo.pLSDA;

uint8_t unwindBlockFlags = *p++;

if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
p += sizeof(uint32_t);

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
return NULL;

Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

bool IsUnwindable(PTR_VOID pvAddress);

int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down
88 changes: 12 additions & 76 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
private HashSet<int> _offsetToCfiStart = new HashSet<int>();
// Code offsets that ends a frame
private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
// Code offsets to compact unwind encoding
private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
// Used to assert whether frames are not overlapped.
private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
}

[DllImport(NativeObjectWriterFileName)]
private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
public void EmitCFICompactUnwindEncoding(uint encoding)
{
Debug.Assert(_frameOpened);
EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
}

[DllImport(NativeObjectWriterFileName)]
private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
}
}

// This represents the following DWARF code:
// DW_CFA_advance_loc: 4
// DW_CFA_def_cfa_offset: +16
// DW_CFA_offset: W29 -16
// DW_CFA_offset: W30 -8
// DW_CFA_advance_loc: 4
// DW_CFA_def_cfa_register: W29
// which is generated for the following frame prolog/epilog:
// stp fp, lr, [sp, #-10]!
// mov fp, sp
// ...
// ldp fp, lr, [sp], #0x10
// ret
private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
{
0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
};

private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
{
if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
{
if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
{
// Frame-based encoding, no saved registers
encoding = 0x04000000;
return true;
}
}
encoding = 0;
return false;
}

public void BuildCFIMap(NodeFactory factory, ObjectNode node)
{
_offsetToCfis.Clear();
_offsetToCfiStart.Clear();
_offsetToCfiEnd.Clear();
_offsetToCfiLsdaBlobName.Clear();
_offsetToCfiCompactEncoding.Clear();
_frameOpened = false;

INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
int end = frameInfo.EndOffset;
int len = frameInfo.BlobData.Length;
byte[] blob = frameInfo.BlobData;
bool emitDwarf = true;

ObjectNodeSection lsdaSection = LsdaSection;
if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
EmitSymbolDef(blobSymbolName);

if (_targetPlatform.IsOSXLike &&
TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
{
_offsetToCfiCompactEncoding[start] = compactEncoding;
emitDwarf = false;
}

FrameInfoFlags flags = frameInfo.Flags;
flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
_byteInterruptionOffsets[start] = true;
_byteInterruptionOffsets[end] = true;
_offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

if (emitDwarf)
for (int j = 0; j < len; j += CfiCodeSize)
{
for (int j = 0; j < len; j += CfiCodeSize)
// The first byte of CFI_CODE is offset from the range the frame covers.
// Compute code offset from the root method.
int codeOffset = blob[j] + start;
List<byte[]> cfis;
if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
{
// The first byte of CFI_CODE is offset from the range the frame covers.
// Compute code offset from the root method.
int codeOffset = blob[j] + start;
List<byte[]> cfis;
if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
{
cfis = new List<byte[]>();
_offsetToCfis.Add(codeOffset, cfis);
_byteInterruptionOffsets[codeOffset] = true;
}
byte[] cfi = new byte[CfiCodeSize];
Array.Copy(blob, j, cfi, 0, CfiCodeSize);
cfis.Add(cfi);
cfis = new List<byte[]>();
_offsetToCfis.Add(codeOffset, cfis);
_byteInterruptionOffsets[codeOffset] = true;
}
byte[] cfi = new byte[CfiCodeSize];
Array.Copy(blob, j, cfi, 0, CfiCodeSize);
cfis.Add(cfi);
}
}

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
// prefix to `_fram`.
"_fram"u8.CopyTo(blobSymbolName);
EmitSymbolDef(blobSymbolName);

if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
{
EmitCFICompactUnwindEncoding(compactEncoding);
}
}
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"#89994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkotas
wants to merge
1
commit into

from

 Closed


Revert "[NativeAOT] macOS/iOS: Emit simple compact unwinding information"
#89994
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


115 changes: 11 additions & 104 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ bool UnixNativeCodeManager::VirtualUnwind(MethodInfo* pMethodInfo, REGDISPLAY* p
{
 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;

 return UnwindHelpers::StepFrame(
 pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
 return UnwindHelpers::StepFrame(pRegisterSet, pNativeMethodInfo->start_ip, pNativeMethodInfo->format, pNativeMethodInfo->unwind_info);
}

bool UnixNativeCodeManager::FindMethodInfo(PTR_VOID ControlPC,
Expand DownExpand Up@@ -259,14 +258,14 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -321,14 +320,14 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 {
 // Reverse PInvoke transition should be on the main function body only
 assert(pNativeMethodInfo->pMainLSDA == pNativeMethodInfo->pLSDA);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand DownExpand Up@@ -378,81 +377,7 @@ bool UnixNativeCodeManager::IsUnwindable(PTR_VOID pvAddress)
#endif

 // VirtualUnwind can't unwind epilogues.
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0 && IsInProlog(pMethodInfo, pvAddress) != 1;
}

// checks for known prolog instructions generated by ILC and returns
// 1 - in prolog
// 0 - not in prolog,
// -1 - unknown.
int UnixNativeCodeManager::IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress)
{
#if defined(TARGET_ARM64)

// post/pre


// stp with signed offset
// x010 1001 00xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS1 0x29000000
#define STP_MASK1 0x7FC00000

// stp with pre/post/no offset
// x010 100x x0xx xxxx xxxx xxxx xxxx xxxx
#define STP_BITS2 0x28000000
#define STP_MASK2 0x7E400000

// add fp, sp, x
// mov fp, sp
// 1001 0001 0xxx xxxx xxxx xx11 1111 1101
#define ADD_FP_SP_BITS 0x910003FD
#define ADD_FP_SP_MASK 0xFF8003FF

#define STP_RT2_RT_MASK 0x7C1F
#define STP_RT2_RT_FP_LR 0x781D
#define STP_RN_MASK 0x3E0
#define STP_RN_SP 0x3E0
#define STP_RN_FP 0x3A0

 UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
 ASSERT(pNativeMethodInfo != NULL);

 uint32_t* start = (uint32_t*)pNativeMethodInfo->pMethodStartAddress;
 bool savedFpLr = false;
 bool establishedFp = false;

 for (uint32_t* pInstr = (uint32_t*)start; pInstr < pvAddress && !(savedFpLr && establishedFp); pInstr++)
 {
 uint32_t instr = *pInstr;

 if (((instr & STP_MASK1) == STP_BITS1 || (instr & STP_MASK2) == STP_BITS2) &&
 ((instr & STP_RN_MASK) == STP_RN_SP || (instr & STP_RN_MASK) == STP_RN_FP))
 {
 // SP/FP-relative store of pair of registers
 savedFpLr |= (instr & STP_RT2_RT_MASK) == STP_RT2_RT_FP_LR;
 }
 else if ((instr & ADD_FP_SP_MASK) == ADD_FP_SP_BITS)
 {
 establishedFp = true;
 }
 else
 {
 // JIT generates other patterns into the prolog that we currently don't
 // recognize (saving unpaired register, stack pointer adjustments). We
 // don't need to recognize these patterns unless a compact unwinding code
 // is generated for them in ILC.
 // https://github.com/dotnet/runtime/issues/76371
 return -1;
 }
 }

 return savedFpLr && establishedFp ? 0 : 1;

#else

 return -1;

#endif
 return TrailingEpilogueInstructionsCount(pMethodInfo, pvAddress) == 0;
}

// when stopped in an epilogue, returns the count of remaining stack-consuming instructions
Expand DownExpand Up@@ -757,6 +682,9 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 // Check whether this is a funclet
 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 return false;
Expand All@@ -766,9 +694,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
 return false;

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
 p += sizeof(int32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_EHINFO) != 0)
 p += sizeof(int32_t);

Expand All@@ -793,20 +718,6 @@ bool UnixNativeCodeManager::GetReturnAddressHijackInfo(MethodInfo * pMethodIn
 return true;
 }

#if defined(TARGET_APPLE) && defined(TARGET_ARM64)
 // If we are inside a prolog without a saved frame then we cannot safely unwind.
 //
 // Some known frame layouts use compact unwind encoding which cannot handle unwinding
 // inside prolog or epilog, so don't even try that. These known sequences must be
 // recognized by IsInProlog. Any other instruction sequence, known or unknown, falls
 // through to the platform unwinder which should have DWARF information about the
 // frame.
 if (IsInProlog(pMethodInfo, (PTR_VOID)pRegisterSet->IP) == 1)
 {
 return false;
 }
#endif

 ASSERT(IsUnwindable((PTR_VOID)pRegisterSet->IP));

 // Unwind the current method context to the caller's context to get its stack pointer
Expand DownExpand Up@@ -1008,10 +919,6 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
 PTR_UInt8 p = methodInfo.pLSDA;

 uint8_t unwindBlockFlags = *p++;

 if ((unwindBlockFlags & UBF_FUNC_KIND_MASK) != UBF_FUNC_KIND_ROOT)
 p += sizeof(uint32_t);

 if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)
 return NULL;

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ class UnixNativeCodeManager : public ICodeManager

 bool IsUnwindable(PTR_VOID pvAddress);

 int IsInProlog(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 int TrailingEpilogueInstructionsCount(MethodInfo * pMethodInfo, PTR_VOID pvAddress);

 bool GetReturnAddressHijackInfo(MethodInfo * pMethodInfo,
Expand Down

88 changes: 12 additions & 76 deletions
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,6 @@ public class ObjectWriter : IDisposable, ITypesDebugInfoWriter
 private HashSet<int> _offsetToCfiStart = new HashSet<int>();
 // Code offsets that ends a frame
 private HashSet<int> _offsetToCfiEnd = new HashSet<int>();
 // Code offsets to compact unwind encoding
 private Dictionary<int, uint> _offsetToCfiCompactEncoding = new Dictionary<int, uint>();
 // Used to assert whether frames are not overlapped.
 private bool _frameOpened;

Expand DownExpand Up@@ -250,14 +248,6 @@ public void EmitCFICode(int nativeOffset, byte[] blob)
 EmitCFICode(_nativeObjectWriter, nativeOffset, blob);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitCFICompactUnwindEncoding(IntPtr objWriter, uint encoding);
 public void EmitCFICompactUnwindEncoding(uint encoding)
 {
 Debug.Assert(_frameOpened);
 EmitCFICompactUnwindEncoding(_nativeObjectWriter, encoding);
 }

 [DllImport(NativeObjectWriterFileName)]
 private static extern void EmitDebugFileInfo(IntPtr objWriter, int fileId, string fileName);
 public void EmitDebugFileInfo(int fileId, string fileName)
Expand DownExpand Up@@ -584,49 +574,12 @@ public void PublishUnwindInfo(ObjectNode node)
 }
 }

 // This represents the following DWARF code:
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_offset: +16
 // DW_CFA_offset: W29 -16
 // DW_CFA_offset: W30 -8
 // DW_CFA_advance_loc: 4
 // DW_CFA_def_cfa_register: W29
 // which is generated for the following frame prolog/epilog:
 // stp fp, lr, [sp, #-10]!
 // mov fp, sp
 // ...
 // ldp fp, lr, [sp], #0x10
 // ret
 private static ReadOnlySpan<byte> DwarfArm64EmptyFrame => new byte[]
 {
 0x04, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x04, 0x02, 0x1E, 0x00, 0x08, 0x00, 0x00, 0x00,
 0x08, 0x01, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00
 };

 private bool TryGetCompactUnwindEncoding(byte[] blob, out uint encoding)
 {
 if (_targetPlatform.Architecture == TargetArchitecture.ARM64)
 {
 if (blob.AsSpan().SequenceEqual(DwarfArm64EmptyFrame))
 {
 // Frame-based encoding, no saved registers
 encoding = 0x04000000;
 return true;
 }
 }
 encoding = 0;
 return false;
 }

 public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 {
 _offsetToCfis.Clear();
 _offsetToCfiStart.Clear();
 _offsetToCfiEnd.Clear();
 _offsetToCfiLsdaBlobName.Clear();
 _offsetToCfiCompactEncoding.Clear();
 _frameOpened = false;

 INodeWithCodeInfo nodeWithCodeInfo = node as INodeWithCodeInfo;
Expand DownExpand Up@@ -656,7 +609,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 int end = frameInfo.EndOffset;
 int len = frameInfo.BlobData.Length;
 byte[] blob = frameInfo.BlobData;
 bool emitDwarf = true;

 ObjectNodeSection lsdaSection = LsdaSection;
 if (ShouldShareSymbol(node))
Expand All@@ -669,13 +621,6 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 byte[] blobSymbolName = _sb.ToUtf8String().UnderlyingArray;
 EmitSymbolDef(blobSymbolName);

 if (_targetPlatform.IsOSXLike &&
 TryGetCompactUnwindEncoding(blob, out uint compactEncoding))
 {
 _offsetToCfiCompactEncoding[start] = compactEncoding;
 emitDwarf = false;
 }

 FrameInfoFlags flags = frameInfo.Flags;
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;
Expand DownExpand Up@@ -717,25 +662,21 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 _byteInterruptionOffsets[start] = true;
 _byteInterruptionOffsets[end] = true;
 _offsetToCfiLsdaBlobName.Add(start, blobSymbolName);

 if (emitDwarf)
 for (int j = 0; j < len; j += CfiCodeSize)
 {
 for (int j = 0; j < len; j += CfiCodeSize)
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 // The first byte of CFI_CODE is offset from the range the frame covers.
 // Compute code offset from the root method.
 int codeOffset = blob[j] + start;
 List<byte[]> cfis;
 if (!_offsetToCfis.TryGetValue(codeOffset, out cfis))
 {
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 cfis = new List<byte[]>();
 _offsetToCfis.Add(codeOffset, cfis);
 _byteInterruptionOffsets[codeOffset] = true;
 }
 byte[] cfi = new byte[CfiCodeSize];
 Array.Copy(blob, j, cfi, 0, CfiCodeSize);
 cfis.Add(cfi);
 }
 }

Expand DownExpand Up@@ -785,11 +726,6 @@ public void EmitCFICodes(int offset)
 // prefix to `_fram`.
 "_fram"u8.CopyTo(blobSymbolName);
 EmitSymbolDef(blobSymbolName);

 if (_offsetToCfiCompactEncoding.TryGetValue(offset, out uint compactEncoding))
 {
 EmitCFICompactUnwindEncoding(compactEncoding);
 }
 }
 }

Expand Down