Import ZAPD XML

Z64Utils/Common/Filters.cs

@@ -14,6 +14,7 @@ public static class Filters
         public const string N64 = "N64 Rom (*.n64; *.z64)|*.n64;*.z64";
         public const string BIN = "Bin Files (*.bin)|*.bin";
         public const string JSON = "JSON Files (*.json)|*.json";
+        public const string XML = "XML Files (*.xml)|*.xml";
         public const string C = "C Files (*.c)|*.c";
     }
 }

Z64Utils/F3DZEX/Command/CmdEncoding.cs

@@ -70,7 +70,28 @@ public static byte[] EncodeCmds(List<CmdInfo> dlist)
                 return ms.GetBuffer().Take((int)ms.Length).ToArray();
             }
         }
+        public static int GetDListSize(byte[] ucode, int off = 0)
+        {
+            int length = 0;
+            using (MemoryStream ms = new MemoryStream(ucode))
+            {
+                ms.Position = off;
+                while (ms.Position < ms.Length)
+                {
+                    length += 1;
+                    CmdID id = (CmdID)ms.ReadByte();
+
+                    if (!DEC_TABLE.ContainsKey(id))
+                        throw new InvalidF3DZEXOpCodeException($"Invalid OpCode : {id:X}");
 
+                    ms.Seek(7, SeekOrigin.Current);
+
+                    if (id == CmdID.G_ENDDL)
+                        break;
+                }
+            }
+            return length * 8;
+        }
 
         public static readonly Dictionary<CmdID, Func<BitReader, CmdInfo>> DEC_TABLE = new Dictionary<CmdID, Func<BitReader, CmdInfo>>()
         {

Z64Utils/Forms/ObjectAnalyzerForm.cs

@@ -139,14 +139,19 @@ private void UpdateMap()
             for (int i = 0; i < _obj.Entries.Count; i++)
             {
                 var entry = _obj.Entries[i];
+                string type;
+                if (entry.GetEntryType() == Z64Object.EntryType.Unimplemented)
+                    type = "XXX " + ((Z64Object.UnimplementedHolder)entry).Description;
+                else
+                    type = entry.GetEntryType().ToString();
                 string addrStr = $"{new SegmentedAddress(_segment, _obj.OffsetOf(entry)).VAddr:X8}";
-                string entryStr = $"{addrStr}{entry.Name}{entry.GetEntryType()}".ToLower();
+                string entryStr = $"{addrStr}{entry.Name}{type}".ToLower();
 
                 if (entryStr.Contains(compare))
                 {
                     var item = listView_map.Items.Add(addrStr);
                     item.SubItems.Add(entry.Name);
-                    item.SubItems.Add(entry.GetEntryType().ToString());
+                    item.SubItems.Add(type);
                     item.Tag = i;
                 }
             }
@@ -346,6 +351,13 @@ private void listView_map_SelectedIndexChanged(object sender, EventArgs e)
                         SelectTabPage(tabPage_unknow);
                         break;
                     }
+                case Z64Object.EntryType.Unimplemented:
+                    {
+                        string description = ((Z64Object.UnimplementedHolder)holder).Description;
+                        // todo show description
+                        SelectTabPage(tabPage_unknow);
+                        break;
+                    }
                 default: SelectTabPage(tabPage_empty); break;
             }
 
@@ -540,6 +552,7 @@ private void exportCToolStripMenuItem_Click(object sender, EventArgs e)
                                 break;
                             }
                         case Z64Object.EntryType.Unknown:
+                        case Z64Object.EntryType.Unimplemented:
                             {
                                 sw.WriteLine($"u8 {entry.Name}[] = \r\n{{");
 
@@ -620,6 +633,49 @@ private void exportCToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
 
+        private void importXMLZAPDToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            openFileDialog1.FileName = "";
+            openFileDialog1.Filter = $"{Filters.XML}|{Filters.ALL}";
+            if (openFileDialog1.ShowDialog() == DialogResult.OK)
+            {
+                string xml = File.ReadAllText(openFileDialog1.FileName);
+                StringWriter warnings = new StringWriter();
+                Z64Object newObj = null;
+
+                try
+                {
+                    // todo allow the user to provide fileName somehow
+                    newObj = Z64Object.FromXmlZAPD(xml, _data, warnings);
+                }
+                catch (FileFormatException ex)
+                {
+                    warnings.WriteLine();
+                    warnings.WriteLine("The XML is not a ZAPD-compatible XML file:");
+                    warnings.WriteLine(ex.Message);
+                }
+                catch (NotImplementedException ex)
+                {
+                    warnings.WriteLine();
+                    warnings.WriteLine("The XML uses features that aren't implemented yet:");
+                    warnings.WriteLine(ex.Message);
+                }
+
+                string warningsStr = warnings.ToString();
+                if (warningsStr.Length != 0)
+                {
+                    TextForm form = new TextForm(SystemIcons.Warning, "Warning", warningsStr);
+                    form.ShowDialog();
+                }
+
+                if (newObj != null)
+                {
+                    _obj = newObj;
+                    UpdateMap();
+                }
+            }
+        }
+
         private void textBox_filter_TextChanged(object sender, EventArgs e)
         {
             UpdateMap();