-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement System.Runtime.InteropServices.CLong/CULong/NFloat (#46401)
* Implement managed side of CLong/CULong/NFloat. * Make CLong, CULong, and NFloat intrinsically handled correctly by the JIT. * Add framework tests for CLong, CULong, and NFloat. * Add interop test of CLong to validate calling convention semantics. * Update CULong.cs * Fix implicit conversions. * Fix overflow and equality test failures. * Fix formatting. * Fix formatting and add function header. * Add doc comments. * Don't throw on float out of range. Rename tests. * Rewrite EqualsTest implementations more straightforward. * Fix NFloat tests. * Use .Equals instead of == * Use ToString directly instead of hard coding the expected value. * Update the emitted assembly stub's thiscall retbuf support for x86 to account for the new native exchange types. * Add sizeof tests. * Add test with struct containing CLong. * Disable ThisCallTest on Mono due to #46820 * validate type name.
- Loading branch information
1 parent
689bcb2
commit 79e0e27
Showing
21 changed files
with
986 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/CLong.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Runtime.CompilerServices; | ||
|
|
||
| #pragma warning disable SA1121 // We use our own aliases since they differ per platform | ||
| #if TARGET_WINDOWS | ||
| using NativeType = System.Int32; | ||
| #else | ||
| using NativeType = System.IntPtr; | ||
| #endif | ||
|
|
||
| namespace System.Runtime.InteropServices | ||
| { | ||
| /// <summary> | ||
| /// <see cref="CLong"/> is an immutable value type that represents the <c>long</c> type in C and C++. | ||
| /// It is meant to be used as an exchange type at the managed/unmanaged boundary to accurately represent | ||
| /// in managed code unmanaged APIs that use the <c>long</c> type. | ||
| /// This type has 32-bits of storage on all Windows platforms and 32-bit Unix-based platforms. | ||
| /// It has 64-bits of storage on 64-bit Unix platforms. | ||
| /// </summary> | ||
| [CLSCompliant(false)] | ||
| [Intrinsic] | ||
| public readonly struct CLong : IEquatable<CLong> | ||
| { | ||
| private readonly NativeType _value; | ||
|
|
||
| /// <summary> | ||
| /// Constructs an instance from a 32-bit integer. | ||
| /// </summary> | ||
| /// <param name="value">The integer vaule.</param> | ||
| public CLong(int value) | ||
| { | ||
| _value = (NativeType)value; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Constructs an instance from a native sized integer. | ||
| /// </summary> | ||
| /// <param name="value">The integer vaule.</param> | ||
| /// <exception cref="OverflowException"><paramref name="value"/> is outside the range of the underlying storage type.</exception> | ||
| public CLong(nint value) | ||
| { | ||
| _value = checked((NativeType)value); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// The underlying integer value of this instance. | ||
| /// </summary> | ||
| public nint Value => _value; | ||
|
|
||
| /// <summary> | ||
| /// Returns a value indicating whether this instance is equal to a specified object. | ||
| /// </summary> | ||
| /// <param name="o">An object to compare with this instance.</param> | ||
| /// <returns><c>true</c> if <paramref name="o"/> is an instance of <see cref="CLong"/> and equals the value of this instance; otherwise, <c>false</c>.</returns> | ||
| public override bool Equals(object? o) => o is CLong other && Equals(other); | ||
|
|
||
| /// <summary> | ||
| /// Returns a value indicating whether this instance is equal to a specified <see cref="CLong"/> value. | ||
| /// </summary> | ||
| /// <param name="other">A <see cref="CLong"/> value to compare to this instance.</param> | ||
| /// <returns><c>true</c> if <paramref name="other"/> has the same value as this instance; otherwise, <c>false</c>.</returns> | ||
| public bool Equals(CLong other) => _value == other._value; | ||
|
|
||
| /// <summary> | ||
| /// Returns the hash code for this instance. | ||
| /// </summary> | ||
| /// <returns>A 32-bit signed integer hash code.</returns> | ||
| public override int GetHashCode() => _value.GetHashCode(); | ||
|
|
||
| /// <summary> | ||
| /// Converts the numeric value of this instance to its equivalent string representation. | ||
| /// </summary> | ||
| /// <returns>The string representation of the value of this instance, consisting of a negative sign if the value is negative, and a sequence of digits ranging from 0 to 9 with no leading zeroes.</returns> | ||
| public override string ToString() => _value.ToString(); | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/CULong.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Runtime.CompilerServices; | ||
|
|
||
| #pragma warning disable SA1121 // We use our own aliases since they differ per platform | ||
| #if TARGET_WINDOWS | ||
| using NativeType = System.UInt32; | ||
| #else | ||
| using NativeType = System.UIntPtr; | ||
| #endif | ||
|
|
||
| namespace System.Runtime.InteropServices | ||
| { | ||
| /// <summary> | ||
| /// <see cref="CULong"/> is an immutable value type that represents the <c>unsigned long</c> type in C and C++. | ||
| /// It is meant to be used as an exchange type at the managed/unmanaged boundary to accurately represent | ||
| /// in managed code unmanaged APIs that use the <c>unsigned long</c> type. | ||
| /// This type has 32-bits of storage on all Windows platforms and 32-bit Unix-based platforms. | ||
| /// It has 64-bits of storage on 64-bit Unix platforms. | ||
| /// </summary> | ||
| [CLSCompliant(false)] | ||
| [Intrinsic] | ||
| public readonly struct CULong : IEquatable<CULong> | ||
| { | ||
| private readonly NativeType _value; | ||
|
|
||
| /// <summary> | ||
| /// Constructs an instance from a 32-bit unsigned integer. | ||
| /// </summary> | ||
| /// <param name="value">The integer vaule.</param> | ||
| public CULong(uint value) | ||
| { | ||
| _value = (NativeType)value; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Constructs an instance from a native sized unsigned integer. | ||
| /// </summary> | ||
| /// <param name="value">The integer vaule.</param> | ||
| /// <exception cref="OverflowException"><paramref name="value"/> is outside the range of the underlying storage type.</exception> | ||
| public CULong(nuint value) | ||
| { | ||
| _value = checked((NativeType)value); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// The underlying integer value of this instance. | ||
| /// </summary> | ||
| public nuint Value => _value; | ||
|
|
||
| /// <summary> | ||
| /// Returns a value indicating whether this instance is equal to a specified object. | ||
| /// </summary> | ||
| /// <param name="o">An object to compare with this instance.</param> | ||
| /// <returns><c>true</c> if <paramref name="o"/> is an instance of <see cref="CULong"/> and equals the value of this instance; otherwise, <c>false</c>.</returns> | ||
| public override bool Equals(object? o) => o is CULong other && Equals(other); | ||
|
|
||
| /// <summary> | ||
| /// Returns a value indicating whether this instance is equal to a specified <see cref="CLong"/> value. | ||
| /// </summary> | ||
| /// <param name="other">A <see cref="CULong"/> value to compare to this instance.</param> | ||
| /// <returns><c>true</c> if <paramref name="other"/> has the same value as this instance; otherwise, <c>false</c>.</returns> | ||
| public bool Equals(CULong other) => _value == other._value; | ||
|
|
||
| /// <summary> | ||
| /// Returns the hash code for this instance. | ||
| /// </summary> | ||
| /// <returns>A 32-bit signed integer hash code.</returns> | ||
| public override int GetHashCode() => _value.GetHashCode(); | ||
|
|
||
| /// <summary> | ||
| /// Converts the numeric value of this instance to its equivalent string representation. | ||
| /// </summary> | ||
| /// <returns>The string representation of the value of this instance, consisting of a sequence of digits ranging from 0 to 9 with no leading zeroes.</returns> | ||
| public override string ToString() => _value.ToString(); | ||
| } | ||
| } |
Oops, something went wrong.