Skip to content

Add a generate-native-bitfield-attribute switch #442

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
Apr 9, 2023
Merged

Add a generate-native-bitfield-attribute switch #442

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
21 changes: 21 additions & 0 deletions sources/ClangSharp.PInvokeGenerator/Abstractions/BitfieldDesc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Collections.Generic;

namespace ClangSharp.Abstractions;

public struct BitfieldDesc
{
public Type TypeBacking { get; set; }

public List<BitfieldRegion> Regions { get; set; }
}

public struct BitfieldRegion
{
public string Name { get; set; }

public long Offset { get; set; }

public long Length { get; set; }
}
33 changes: 27 additions & 6 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,8 +1753,8 @@ private void VisitRecordDecl(RecordDecl recordDecl)
_testOutputBuilder.WriteBlockEnd();
}

var bitfieldTypes = GetBitfieldCount(recordDecl);
var bitfieldIndex = (bitfieldTypes.Length == 1) ? -1 : 0;
var bitfieldDescs = GetBitfieldDescs(recordDecl);
var bitfieldIndex = (bitfieldDescs.Length == 1) ? -1 : 0;

var bitfieldPreviousSize = 0L;
var bitfieldRemainingBits = 0L;
Expand All @@ -1763,7 +1763,7 @@ private void VisitRecordDecl(RecordDecl recordDecl)
{
if (fieldDecl.IsBitField)
{
VisitBitfieldDecl(fieldDecl, bitfieldTypes, recordDecl, contextName: "", ref bitfieldIndex, ref bitfieldPreviousSize, ref bitfieldRemainingBits);
VisitBitfieldDecl(fieldDecl, bitfieldDescs, recordDecl, contextName: "", ref bitfieldIndex, ref bitfieldPreviousSize, ref bitfieldRemainingBits);
}
else
{
Expand Down Expand Up @@ -2351,7 +2351,7 @@ void OutputVtblHelperMethods(CXXRecordDecl rootCxxRecordDecl, CXXRecordDecl cxxR
}
}

void VisitBitfieldDecl(FieldDecl fieldDecl, Type[] types, RecordDecl recordDecl, string contextName, ref int index, ref long previousSize, ref long remainingBits)
void VisitBitfieldDecl(FieldDecl fieldDecl, BitfieldDesc[] bitfieldDescs, RecordDecl recordDecl, string contextName, ref int index, ref long previousSize, ref long remainingBits)
{
Debug.Assert(fieldDecl.IsBitField);

Expand Down Expand Up @@ -2384,7 +2384,8 @@ void VisitBitfieldDecl(FieldDecl fieldDecl, Type[] types, RecordDecl recordDecl,
remainingBits = currentSize * 8;
previousSize = 0;

typeBacking = (index > 0) ? types[index - 1] : types[0];
var bitfieldDesc = (index > 0) ? bitfieldDescs[index - 1] : bitfieldDescs[0];
typeBacking = bitfieldDesc.TypeBacking;
typeNameBacking = GetRemappedTypeName(fieldDecl, context: null, typeBacking, out _);

if (parent == recordDecl)
Expand All @@ -2396,6 +2397,26 @@ void VisitBitfieldDecl(FieldDecl fieldDecl, Type[] types, RecordDecl recordDecl,
Offset = parent.IsUnion ? 0 : null,
NeedsNewKeyword = false,
Location = fieldDecl.Location,
WriteCustomAttrs = static context => {
(var bitfieldDesc, var generator) = ((BitfieldDesc, PInvokeGenerator))context;

if (!generator.Config.GenerateNativeBitfieldAttribute)
{
return;
}

var outputBuilder = generator._outputBuilder;
Debug.Assert(outputBuilder is not null);

foreach (var bitfieldRegion in bitfieldDesc.Regions)
{
outputBuilder.WriteCustomAttribute($"NativeBitfield(\"{bitfieldRegion.Name}\", offset: {bitfieldRegion.Offset}, length: {bitfieldRegion.Length})");
}

var namespaceName = generator.GetNamespace("NativeBitfieldAttribute");
generator.AddUsingDirective(outputBuilder, namespaceName);
},
CustomAttrGeneratorData = (bitfieldDesc, this),
};
_outputBuilder.BeginField(in fieldDesc);
_outputBuilder.WriteRegularField(typeNameBacking, bitfieldName);
Expand All @@ -2416,7 +2437,7 @@ void VisitBitfieldDecl(FieldDecl fieldDecl, Type[] types, RecordDecl recordDecl,
bitfieldName += index.ToString();
}

typeBacking = (index > 0) ? types[index - 1] : types[0];
typeBacking = (index > 0) ? bitfieldDescs[index - 1].TypeBacking : bitfieldDescs[0].TypeBacking;
typeNameBacking = GetRemappedTypeName(fieldDecl, context: null, typeBacking, out _);
}

Expand Down
Loading