add instruction labels to output

Author: xMiraiChan

AstralUdonViewer.cs

@@ -1,10 +1,11 @@
 using MelonLoader;
 using System;
 using System.IO;
+using System.Linq;
 using UnityEngine.SceneManagement;
 using VRC.Udon;
 
-[assembly: MelonInfo(typeof(Astrum.AstralUdonViewer), nameof(Astrum.AstralUdonViewer), "0.2.1", downloadLink: "github.com/Astrum-Project/" + nameof(Astrum.AstralUdonViewer))]
+[assembly: MelonInfo(typeof(Astrum.AstralUdonViewer), nameof(Astrum.AstralUdonViewer), "0.3.0", downloadLink: "github.com/Astrum-Project/" + nameof(Astrum.AstralUdonViewer))]
 [assembly: MelonColor(ConsoleColor.DarkMagenta)]
 
 namespace Astrum
@@ -36,21 +37,26 @@ public static System.Collections.IEnumerator DissassembleAll()
                 yield return null;
 
             // todo: change this to All
-            // todo: dedup
-            UdonBehaviour[] behaviours = UnityEngine.Object.FindObjectsOfType<UdonBehaviour>();
-            
+            UdonBehaviour[] behaviours = UnityEngine.Object.FindObjectsOfType<UdonBehaviour>()
+                .GroupBy(x => x.Pointer)
+                .Select(x => x.FirstOrDefault())
+                .ToArray();
+
+            if (behaviours.Length == 0) yield break;
+
             AstralCore.Logger.Notif($"[UdonViewer] Disassembling {behaviours.Length} UdonBehaviours");
 
             foreach (UdonBehaviour behaviour in behaviours)
             {
-                if (behaviour._program is null) continue;
+                if (behaviour?._program is null) continue;
 
                 AstralCore.Logger.Trace($"Disassembling {behaviour.name}");
-                MelonCoroutines.Start(Disassembler.DisassembleProgram($"{path}/{RemoveInvalid(behaviour.name)}.uasm", behaviour._program));
+                MelonCoroutines.Start(Disassembler.DisassembleProgram($"{path}/{RemoveInvalid(behaviour.name)}.uasm", behaviour));
 
                 yield return null;
             }
 
+            // this is a lie! it just started the last behaviour, not finished at all
             AstralCore.Logger.Notif("[UdonViewer] Finished!");
         }
 

AstralUdonViewer.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3F023BCB-4CB9-4631-A790-D49C4E910007}</ProjectGuid>
+    <ProjectGuid>{494A3959-C330-41C6-8142-C7E8951AE991}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Astrum</RootNamespace>

Disassembler.cs

@@ -1,8 +1,10 @@
 // This is a modified version of `VRC.Udon.Compiler.dll`
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using VRC.Udon;
 using VRC.Udon.Common.Interfaces;
 using VRC.Udon.VM.Common;
 
@@ -12,15 +14,33 @@ partial class AstralUdonViewer
     {
         public static class Disassembler
         {
-            public static System.Collections.IEnumerator DisassembleProgram(string path, IUdonProgram program)
+            public static System.Collections.IEnumerator DisassembleProgram(string path, UdonBehaviour udonBehaviour)
             {
-                string[] lines = new string[program.ByteCode.Length];
+                IUdonProgram program = udonBehaviour._program;
+                var events = udonBehaviour._eventTable;
+
+                var label = GetNextFunction(udonBehaviour, null);
+
+                List<string> lines = new List<string>(program.ByteCode.Length / 4);
                 for (uint i = 0; i < program.ByteCode.Length;)
                 {
-                    lines[i] = DisassembleInstruction(program, ref i);
+                    if (i == label.Item2)
+                    {
+                        lines.Add($"{label.Item1}:");
+                        
+                        string c = DisassembleInstruction(program, ref i);
+                        lines.Add(c);
+                        
+                        label = GetNextFunction(udonBehaviour, i);
+                    } else
+                    {
+                        string c = DisassembleInstruction(program, ref i);
+                        lines.Add(c);
+                    }
+
                     yield return null;
                 }
-                File.WriteAllLines(path, lines.Where(x => !string.IsNullOrEmpty(x)));
+                File.WriteAllLines(path, lines.ToArray().Where(x => !string.IsNullOrEmpty(x)));
             }
 
             public static string DisassembleInstruction(IUdonProgram program, ref uint offset)
@@ -47,6 +67,27 @@ public static string DisassembleInstruction(IUdonProgram program, ref uint offse
                 else return $"0x{(offset += 4) - 4:X}: INVALID (0x{opCode:X})";
             }
 
+            private static (string, uint) GetNextFunction(UdonBehaviour ub, uint? cur)
+            {
+                uint delta = unchecked((uint)-1);
+                string key = null;
+                foreach (var kvp in ub._eventTable) {
+                    if ((kvp.Value?.Count ?? 0) == 0) continue;
+
+                    uint val = kvp.Value[0];
+
+                    if (cur != null && val <= (uint)cur) continue;
+
+                    if (val < delta) {
+                        delta = val;
+                        key = kvp.Key;
+
+                    }
+                }
+
+                return (key, delta);
+            }
+
             private static string SimpleInstruction(ref uint offset, string name)
                 => string.Format("0x{0:X8}: {1}", (offset += 4) - 4, name);
             private static string DirectInstruction(ref uint offset, string name, IUdonProgram program)