Refactored function generation

Author: mappzor

src/Zydis.Generator.Core/CodeGeneration/CodeWriter.cs

@@ -0,0 +1,72 @@
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+
+namespace Zydis.Generator.Core.CodeGeneration;
+
+public sealed class CodeWriter
+{
+    private const int IndentSize = 4;
+
+    private readonly TextWriter _writer;
+    private string _indent;
+
+    public CodeWriter(TextWriter writer)
+    {
+        _writer = writer;
+        _indent = "";
+    }
+
+    public CodeWriter BeginBlock(bool indent = true)
+    {
+        _writer.Write(_indent);
+        _writer.WriteLine('{');
+        if (indent)
+        {
+            BeginIndent();
+        }
+        return this;
+    }
+
+    public CodeWriter EndBlock(bool semicolon = false, bool indent = true)
+    {
+        if (indent)
+        {
+            EndIndent();
+        }
+        _writer.Write(_indent);
+        _writer.WriteLine(semicolon ? "};" : "}");
+        return this;
+    }
+
+    public CodeWriter BeginIndent()
+    {
+        _indent = new string(' ', _indent.Length + IndentSize);
+        return this;
+    }
+
+    public CodeWriter EndIndent()
+    {
+        _indent = new string(' ', _indent.Length - IndentSize);
+        return this;
+    }
+
+    public CodeWriter Newline()
+    {
+        _writer.WriteLine();
+        return this;
+    }
+
+    public CodeWriter WriteLine(string text)
+    {
+        _writer.Write(_indent);
+        _writer.WriteLine(text);
+        return this;
+    }
+
+    public CodeWriter WriteLine([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, params object?[] arg)
+    {
+        _writer.Write(_indent);
+        _writer.WriteLine(format, arg);
+        return this;
+    }
+}

src/Zydis.Generator.Core/Definitions/Builder/RelativeInfoRegistry.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using Zydis.Generator.Core.CodeGeneration;
+
 namespace Zydis.Generator.Core.Definitions.Builder;
 
 internal sealed class RelativeInfoRegistry
@@ -12,9 +14,16 @@ internal sealed class RelativeInfoRegistry
 
     internal sealed class RelInfo : IEquatable<RelInfo>
     {
+        [Emittable(0)]
         public int[,] Size { get; private set; }
+
+        [Emittable(1, "accepts_scaling_hints")]
         public SizeHint SizeHint { get; init; }
+
+        [Emittable(2)]
         public bool AcceptsBranchHints { get; init; }
+
+        [Emittable(3)]
         public bool AcceptsBound { get; private set; }
 
         public RelInfo(EncodableDefinition definition)

src/Zydis.Generator.Core/Definitions/Emitters/ConditionCodeEmitter.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
+using Zydis.Generator.Core.CodeGeneration;
 using Zydis.Generator.Core.Definitions.Builder;
 
 namespace Zydis.Generator.Core.Definitions.Emitters;
@@ -13,24 +14,30 @@ public static async Task EmitAsync(StreamWriter writer, ConditionCodeRegistry re
         ArgumentNullException.ThrowIfNull(writer);
         ArgumentNullException.ThrowIfNull(registry);
 
-        // TODO: Add something to handle indentation automatically
-        writer.WriteLine("ZyanBool ZydisGetCcInfo(ZydisMnemonic mnemonic, ZydisSourceConditionCode *scc)");
-        writer.WriteLine("{");
-        writer.WriteLine("    switch (mnemonic)");
-        writer.WriteLine("    {");
+        var codeWriter = new CodeWriter(writer);
+        codeWriter
+            .WriteLine("ZyanBool ZydisGetCcInfo(ZydisMnemonic mnemonic, ZydisSourceConditionCode *scc)")
+            .BeginBlock()
+            .WriteLine("switch (mnemonic)")
+            .BeginBlock(false);
         foreach (var info in registry.ConditionCodeInfos)
         {
             foreach (var mnemonic in info.Mnemonics)
             {
-                writer.WriteLine("    case ZYDIS_MNEMONIC_{0}:", mnemonic.ToUpperInvariant());
+                codeWriter.WriteLine("case ZYDIS_MNEMONIC_{0}:", mnemonic.ToUpperInvariant());
             }
-            writer.WriteLine("        *scc = {0};", info.Scc);
-            writer.WriteLine("        return ZYAN_TRUE;");
+            codeWriter
+                .BeginIndent()
+                .WriteLine("*scc = {0};", info.Scc)
+                .WriteLine("return ZYAN_TRUE;")
+                .EndIndent();
         }
-        writer.WriteLine("    default:");
-        writer.WriteLine("        *scc = ZYDIS_SCC_NONE;");
-        writer.WriteLine("        return ZYAN_FALSE;");
-        writer.WriteLine("    }");
-        writer.WriteLine("}");
+        codeWriter
+            .WriteLine("default:")
+            .BeginIndent()
+            .WriteLine("*scc = ZYDIS_SCC_NONE;")
+            .WriteLine("return ZYAN_FALSE;")
+            .EndBlock()
+            .EndBlock();
     }
 }

src/Zydis.Generator.Core/Definitions/Emitters/RelativeInfoEmitter.cs

@@ -5,6 +5,9 @@
 using Zydis.Generator.Core.CodeGeneration;
 using Zydis.Generator.Core.Definitions.Builder;
 
+using static Zydis.Generator.Core.CodeGeneration.ObjectDeclaration;
+using static Zydis.Generator.Core.Definitions.Builder.RelativeInfoRegistry;
+
 namespace Zydis.Generator.Core.Definitions.Emitters;
 
 internal sealed class RelativeInfoEmitter
@@ -14,44 +17,55 @@ public static async Task EmitAsync(StreamWriter writer, RelativeInfoRegistry reg
         ArgumentNullException.ThrowIfNull(writer);
         ArgumentNullException.ThrowIfNull(registry);
 
-        // TODO: Add something to handle indentation automatically
-        writer.WriteLine("const ZydisEncoderRelInfo *ZydisGetRelInfo(ZydisMnemonic mnemonic)");
-        writer.WriteLine("{");
-        writer.WriteLine("    static const ZydisEncoderRelInfo info_lookup[{0}] =", registry.Infos.Count);
-        writer.WriteLine("    {");
+        var codeWriter = new CodeWriter(writer);
+        codeWriter
+            .WriteLine("const ZydisEncoderRelInfo *ZydisGetRelInfo(ZydisMnemonic mnemonic)")
+            .BeginBlock()
+            .WriteLine("static const ZydisEncoderRelInfo info_lookup[{0}] =", registry.Infos.Count)
+            .BeginBlock();
+        var relInfoDeclaration = new ObjectDeclaration<RelInfo>(InitializerType.Positional);
+        var sizeArrayDeclaration = new ArrayObjectDeclaration(3);
 
         foreach (var info in registry.Infos)
         {
-            var lookup = "";
+            var relInfoEntry = new ObjectWriter(relInfoDeclaration, null);
+            var sizeEntry = new ObjectWriter(sizeArrayDeclaration, null);
             for (var i = 0; i < info.Size.GetLength(0); ++i)
             {
-                lookup += $"{{ {info.Size[i, 0]}, {info.Size[i, 1]}, {info.Size[i, 2]} }}, ";
+                sizeEntry.WriteIntegerArray(i, info.Size[i, 0], info.Size[i, 1], info.Size[i, 2]);
             }
-            writer.Write("        {{ {{ {0} }}, ZYDIS_SIZE_HINT_{1}, ", lookup[..^2], info.SizeHint.ToZydisString());
-            WriterExtensions.WriteBool(writer, info.AcceptsBranchHints);
-            writer.Write(", ");
-            WriterExtensions.WriteBool(writer, info.AcceptsBound);
-            writer.WriteLine(" },");
+            relInfoEntry
+                .WriteObject("size", sizeEntry)
+                .WriteExpression("accepts_scaling_hints", "ZYDIS_SIZE_HINT_{0}", info.SizeHint.ToZydisString())
+                .WriteBool("accepts_branch_hints", info.AcceptsBranchHints)
+                .WriteBool("accepts_bound", info.AcceptsBound);
+            codeWriter.WriteLine("{0},", relInfoEntry.GetExpression());
         }
 
-        writer.WriteLine("    };");
-        writer.WriteLine("");
-        writer.WriteLine("    switch (mnemonic)");
-        writer.WriteLine("    {");
+        codeWriter
+            .EndBlock(true)
+            .Newline()
+            .WriteLine("switch (mnemonic)")
+            .BeginBlock(false);
 
         var info_index = 0;
         foreach (var mnemonics in registry.Mnemonics)
         {
             foreach (var mnemonic in mnemonics)
             {
-                writer.WriteLine("    case ZYDIS_MNEMONIC_{0}:", mnemonic.ToUpperInvariant());
+                codeWriter.WriteLine("case ZYDIS_MNEMONIC_{0}:", mnemonic.ToUpperInvariant());
             }
-            writer.WriteLine("        return &info_lookup[{0}];", info_index++);
+            codeWriter
+                .BeginIndent()
+                .WriteLine("return &info_lookup[{0}];", info_index++)
+                .EndIndent();
         }
 
-        writer.WriteLine("    default:");
-        writer.WriteLine("        return ZYAN_NULL;");
-        writer.WriteLine("    }");
-        writer.WriteLine("}");
+        codeWriter
+            .WriteLine("default:")
+            .BeginIndent()
+            .WriteLine("return ZYAN_NULL;")
+            .EndBlock()
+            .EndBlock();
     }
 }