Manual fixups to the generated LLVMSharp code

Author: tannergooding

src/Generated.Custom.cs

@@ -13,6 +13,16 @@ public size_t(IntPtr Pointer)
         public IntPtr Pointer;
     }
 
+    public partial struct off_t
+    {
+        public off_t(int value)
+        {
+            this.Value = value;
+        }
+
+        public int Value;
+    }
+
     public static partial class LLVM
     {
         [DllImport(libraryPath, EntryPoint = "LLVMAddFunctionAttr2", CallingConvention = CallingConvention.Cdecl)]

src/Generated.cs

@@ -161,16 +161,6 @@ public partial struct LLVMOpaquePassManagerBuilder
     {
     }
 
-    public partial struct LLVMAttributeIndex
-    {
-        public LLVMAttributeIndex(uint value)
-        {
-            Value = value;
-        }
-
-        public uint Value;
-    }
-
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate void LLVMDiagnosticHandler(LLVMDiagnosticInfoRef param0, IntPtr param1);
 
@@ -841,7 +831,7 @@ public enum LLVMDiagnosticSeverity
         LLVMDSNote = 3,
     }
 
-    public enum (anonymous enum at E:\Users\tagoo\Repos\llvm\include/llvm-c/Core.h:342:1)
+    public enum LLVMAttributeIndex
     {
         LLVMAttributeReturnIndex = 0,
         LLVMAttributeFunctionIndex = -1,
@@ -1008,9 +998,6 @@ public static partial class LLVM
         [DllImport(libraryPath, EntryPoint = "LLVMWriteBitcodeToMemoryBuffer", CallingConvention = CallingConvention.Cdecl)]
         public static extern LLVMMemoryBufferRef WriteBitcodeToMemoryBuffer(LLVMModuleRef M);
 
-        [DllImport(libraryPath, EntryPoint = "LLVMInitializeCore", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void InitializeCore(LLVMPassRegistryRef R);
-
         [DllImport(libraryPath, EntryPoint = "LLVMShutdown", CallingConvention = CallingConvention.Cdecl)]
         public static extern void Shutdown();
 

src/LLVMSharp.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

src/StringMarshaler.cs

@@ -0,0 +1,70 @@
+namespace LLVMSharp
+{
+    using System;
+    using System.IO;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    internal class StringMarshaler : ICustomMarshaler
+    {
+        private static readonly StringMarshaler staticInstance = new StringMarshaler();
+
+        public static ICustomMarshaler GetInstance(string cookie)
+        {
+            return staticInstance;
+        }
+
+        public object MarshalNativeToManaged(IntPtr pNativeData)
+        {
+            // We don't know when the string is done, so we have to read byte-by-byte :(
+            // Start at 128 bytes capacity to avoid a crazy number of allocs...
+            var data = new MemoryStream(128);
+            var offset = 0;
+            while (true)
+            {
+                var b = Marshal.ReadByte(pNativeData, offset);
+                if (b == 0)
+                {
+                    break;
+                }
+
+                data.WriteByte(b);
+                offset++;
+            }
+
+            if (data.Length >= int.MaxValue)
+            {
+                throw new Exception("Crazy-long string!");
+            }
+
+            return Encoding.UTF8.GetString(data.GetBuffer(), 0, (int)data.Length);
+        }
+
+        public IntPtr MarshalManagedToNative(object managedObj)
+        {
+            var str = (string)managedObj;
+            var bytes = Encoding.UTF8.GetBytes(str);
+
+            var ptr = Marshal.AllocCoTaskMem(bytes.Length + 1);
+            Marshal.Copy(bytes, 0, ptr, bytes.Length); // utf-8 bytes
+            Marshal.WriteByte(ptr, bytes.Length, 0); // null terminator
+
+            return ptr;
+        }
+
+        public void CleanUpNativeData(IntPtr pNativeData)
+        {
+            // Nothing to do
+        }
+
+        public void CleanUpManagedData(object managedObj)
+        {
+            // Nothing to do
+        }
+
+        public int GetNativeDataSize()
+        {
+            return -1;
+        }
+    }
+}