diff --git a/src/BizHawk.Common/Util.cs b/src/BizHawk.Common/Util.cs index e707815b08..9347e4b588 100644 --- a/src/BizHawk.Common/Util.cs +++ b/src/BizHawk.Common/Util.cs @@ -12,7 +12,7 @@ using BizHawk.Common.StringExtensions; namespace BizHawk.Common { - public static unsafe class Util + public static class Util { [Conditional("DEBUG")] public static void BreakDebuggerIfAttached() @@ -147,26 +147,6 @@ namespace BizHawk.Common return ms.ToArray(); } - public static int Memcmp(void* a, void* b, int len) - { - var ba = (byte*) a; - var bb = (byte*) b; - for (var i = 0; i != len; i++) - { - var _a = ba[i]; - var _b = bb[i]; - var c = _a - _b; - if (c != 0) return c; - } - return 0; - } - - public static void Memset(void* ptr, int val, int len) - { - var bptr = (byte*) ptr; - for (var i = 0; i != len; i++) bptr[i] = (byte) val; - } - public static byte[]? ReadByteBuffer(this BinaryReader br, bool returnNull) { var len = br.ReadInt32(); @@ -308,7 +288,7 @@ namespace BizHawk.Common /// creates span over octets starting at [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span UnsafeSpanFromPointer(IntPtr ptr, int length) + public static unsafe Span UnsafeSpanFromPointer(IntPtr ptr, int length) { return new(pointer: ptr.ToPointer(), length: length); } @@ -319,7 +299,7 @@ namespace BizHawk.Common /// /// uses native endianness [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Span UnsafeSpanFromPointer(IntPtr ptr, int count) + public static unsafe Span UnsafeSpanFromPointer(IntPtr ptr, int count) where T : unmanaged { return new(pointer: ptr.ToPointer(), length: count * sizeof(T));