Skip to content

Commit 2441dd1

Browse files
committed
Comment out Util.UnsafeSpanFromPointer<T>
see 245f0e2
1 parent 0a958c8 commit 2441dd1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.GameVerification.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ private bool GetNcchNormalKeysFunc(IntPtr primary_key_y, byte secondary_key_x_sl
385385
}
386386

387387
var programId = BinaryPrimitives.ReadUInt64LittleEndian(
388-
Util.UnsafeSpanFromPointer<byte>(ptr: optional_program_id, count: 8));
388+
Util.UnsafeSpanFromPointer(ptr: optional_program_id, length: 8));
389389

390390
FirmwareID seeddbFWID = new("3DS", "seeddb");
391391
using BinaryReader seeddb = new(GetFirmware(seeddbFWID));

src/BizHawk.Common/Util.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,17 +293,19 @@ public static unsafe Span<byte> UnsafeSpanFromPointer(IntPtr ptr, int length)
293293
return new(pointer: ptr.ToPointer(), length: length);
294294
}
295295

296+
#if false // unused
296297
/// <summary>
297298
/// creates span over <paramref name="count"/><c> * sizeof(</c><typeparamref name="T"/><c>)</c> octets
298299
/// starting at <paramref name="ptr"/>
299300
/// </summary>
300-
/// <remarks>uses native endianness</remarks>
301+
/// <remarks>uses native endianness and <paramref name="ptr"/> must be aligned (else UB)</remarks>
301302
[MethodImpl(MethodImplOptions.AggressiveInlining)]
302-
public static unsafe Span<T> UnsafeSpanFromPointer<T>(IntPtr ptr, int count)
303+
public static unsafe Span<T> UnsafeSpanFromPointerAligned<T>(IntPtr ptr, int count)
303304
where T : unmanaged
304305
{
305306
return new(pointer: ptr.ToPointer(), length: count * sizeof(T));
306307
}
308+
#endif
307309

308310
public static void WriteByteBuffer(this BinaryWriter bw, byte[]? data)
309311
{

0 commit comments

Comments
 (0)