Skip to content

Always marshal native variable-length strings #183

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
andrew-boyarshin merged 1 commit into from
Mar 3, 2021
Merged

Always marshal native variable-length strings #183

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
96 changes: 46 additions & 50 deletions SharpGen/Generator/Marshallers/StringMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,67 +141,63 @@ MemberAccessExpressionSyntax PtrToString(NameSyntax implName) =>

if (csElement.IsArray) // Fixed-length character array
{
if (!csElement.IsWideChar || !singleStackFrame)
{
const string ptrName = "__ptr";
if (csElement.IsWideChar && singleStackFrame)
return null;

return FixedStatement(
VariableDeclaration(
VoidPtrType,
SingletonSeparatedList(
VariableDeclarator(ptrName)
.WithInitializer(
EqualsValueClause(
PrefixUnaryExpression(
SyntaxKind.AddressOfExpression,
GetMarshalStorageLocation(csElement)
)
const string ptrName = "__ptr";

return FixedStatement(
VariableDeclaration(
VoidPtrType,
SingletonSeparatedList(
VariableDeclarator(ptrName)
.WithInitializer(
EqualsValueClause(
PrefixUnaryExpression(
SyntaxKind.AddressOfExpression,
GetMarshalStorageLocation(csElement)
)
)
)
),
ExpressionStatement(
AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
IdentifierName(csElement.Name),
InvocationExpression(
PtrToString(GlobalNamespace.GetTypeNameSyntax(WellKnownName.StringHelpers)),
ArgumentList(
SeparatedList(
new[]
{
Argument(CastExpression(IntPtrType, IdentifierName(ptrName))),
Argument(
LiteralExpression(
SyntaxKind.NumericLiteralExpression,
Literal(csElement.ArrayDimensionValue - 1)
)
)
)
),
ExpressionStatement(
AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
IdentifierName(csElement.Name),
InvocationExpression(
PtrToString(GlobalNamespace.GetTypeNameSyntax(WellKnownName.StringHelpers)),
ArgumentList(
SeparatedList(
new[]
{
Argument(CastExpression(IntPtrType, IdentifierName(ptrName))),
Argument(
LiteralExpression(
SyntaxKind.NumericLiteralExpression,
Literal(csElement.ArrayDimensionValue - 1)
)
}
)
)
}
)
)
)
)
);
}
return null;
}

if (!csElement.IsWideChar || !singleStackFrame) // Variable-length string represented as a pointer.
{
return ExpressionStatement(
AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
IdentifierName(csElement.Name),
InvocationExpression(
PtrToString(GlobalNamespaceProvider.GetTypeNameSyntax(BuiltinType.Marshal)),
ArgumentList(SingletonSeparatedList(Argument(GetMarshalStorageLocation(csElement))))
)
)
);
}
return null;

// Variable-length string represented as a pointer.
return ExpressionStatement(
AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
IdentifierName(csElement.Name),
InvocationExpression(
PtrToString(GlobalNamespaceProvider.GetTypeNameSyntax(BuiltinType.Marshal)),
ArgumentList(SingletonSeparatedList(Argument(GetMarshalStorageLocation(csElement))))
)
)
);
}

public IEnumerable<StatementSyntax> GenerateNativeToManagedExtendedProlog(CsMarshalCallableBase csElement) =>
Expand Down