Skip to content

[release/6.0-rc1] X86 Debug Stack offsets are encoded divided by 4 #58094

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

Merged
merged 1 commit into from
Aug 26, 2021
Merged

[release/6.0-rc1] X86 Debug Stack offsets are encoded divided by 4 #58094

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
2 changes: 1 addition & 1 deletion src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ private void PublishCode()
_methodCodeNode.InitializeEHInfo(ehInfo);

_methodCodeNode.InitializeDebugLocInfos(_debugLocInfos);
_methodCodeNode.InitializeDebugVarInfos(_debugVarInfos);
_methodCodeNode.InitializeDebugVarInfos(_debugVarInfos, _compilation.TypeSystemContext.Target);
#if READYTORUN
_methodCodeNode.InitializeInliningInfo(_inlinedMethods.ToArray());

Expand Down
26 changes: 21 additions & 5 deletions ...ls/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DebugInfoTableNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;

using Internal.JitInterface;
Expand Down Expand Up @@ -149,11 +150,13 @@ public static byte[] CreateBoundsBlobForMethod(OffsetMapping[] offsetMapping)
return writer.ToArray();
}

public static byte[] CreateVarBlobForMethod(NativeVarInfo[] varInfos)
public static byte[] CreateVarBlobForMethod(NativeVarInfo[] varInfos, TargetDetails target)
{
if (varInfos == null || varInfos.Length == 0)
return null;

bool isX86 = target.Architecture == TargetArchitecture.X86;

NibbleWriter writer = new NibbleWriter();
writer.WriteUInt((uint)varInfos.Length);

Expand All @@ -177,7 +180,7 @@ public static byte[] CreateVarBlobForMethod(NativeVarInfo[] varInfos)
case VarLocType.VLT_STK:
case VarLocType.VLT_STK_BYREF:
writer.WriteUInt((uint)nativeVarInfo.varLoc.B);
writer.WriteInt(nativeVarInfo.varLoc.C);
WriteEncodedStackOffset(writer, nativeVarInfo.varLoc.C, assume4ByteAligned : isX86);
break;
case VarLocType.VLT_REG_REG:
writer.WriteUInt((uint)nativeVarInfo.varLoc.B);
Expand All @@ -186,16 +189,16 @@ public static byte[] CreateVarBlobForMethod(NativeVarInfo[] varInfos)
case VarLocType.VLT_REG_STK:
writer.WriteUInt((uint)nativeVarInfo.varLoc.B);
writer.WriteUInt((uint)nativeVarInfo.varLoc.C);
writer.WriteInt(nativeVarInfo.varLoc.D);
WriteEncodedStackOffset(writer, nativeVarInfo.varLoc.D, assume4ByteAligned : isX86);
break;
case VarLocType.VLT_STK_REG:
writer.WriteInt(nativeVarInfo.varLoc.B);
WriteEncodedStackOffset(writer, nativeVarInfo.varLoc.B, assume4ByteAligned : isX86);
writer.WriteUInt((uint)nativeVarInfo.varLoc.C);
writer.WriteUInt((uint)nativeVarInfo.varLoc.D);
break;
case VarLocType.VLT_STK2:
writer.WriteUInt((uint)nativeVarInfo.varLoc.B);
writer.WriteInt(nativeVarInfo.varLoc.C);
WriteEncodedStackOffset(writer, nativeVarInfo.varLoc.C, assume4ByteAligned : isX86);
break;
case VarLocType.VLT_FPSTK:
writer.WriteUInt((uint)nativeVarInfo.varLoc.B);
Expand All @@ -206,6 +209,19 @@ public static byte[] CreateVarBlobForMethod(NativeVarInfo[] varInfos)
default:
throw new BadImageFormatException("Unexpected var loc type");
}

static void WriteEncodedStackOffset(NibbleWriter _writer, int offset, bool assume4ByteAligned)
{
if (assume4ByteAligned)
{
Debug.Assert(offset % 4 == 0);
_writer.WriteInt(offset / 4);
}
else
{
_writer.WriteInt(offset);
}
}
}

return writer.ToArray();
Expand Down
4 changes: 2 additions & 2 deletions ...ools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@ public void InitializeDebugLocInfos(OffsetMapping[] debugLocInfos)
_debugLocInfos = DebugInfoTableNode.CreateBoundsBlobForMethod(debugLocInfos);
}

public void InitializeDebugVarInfos(NativeVarInfo[] debugVarInfos)
public void InitializeDebugVarInfos(NativeVarInfo[] debugVarInfos, TargetDetails target)
{
Debug.Assert(_debugVarInfos == null);
// Process the debug info from JIT format to R2R format immediately as it is large
// and not used in the rest of the process except to emit.
_debugVarInfos = DebugInfoTableNode.CreateVarBlobForMethod(debugVarInfos);
_debugVarInfos = DebugInfoTableNode.CreateVarBlobForMethod(debugVarInfos, target);
}

public void InitializeDebugEHClauseInfos(DebugEHClauseInfo[] debugEHClauseInfos)
Expand Down