TAG205 2025/02/23

  Compiler
    ループ回数が未指定の場合に次の文字をスキップしてしまうバグを修正
    オリジナルは省略が元々できないのでDotNETのみの現象。

Author: kumatan

CHANGE.txt

@@ -1,4 +1,8 @@
 �X�V����
+TAG205 2025/02/23
+  Compiler
+    ���[�v�񐔂����w��̏ꍇ�Ɏ��̕������X�L�b�v���Ă��܂��o�O���C��
+    �I���W�i���͏ȗ������X�ł��Ȃ��̂�DotNET�݂̂̌��ہB
 TAG204 2024/10/24
   Driver
     ���[�v�񐔌��o�����̃o�O���C��

Common_NET5/musicDriverInterface.dll

@@ -2,7 +2,7 @@
   "profiles": {
     "Console_NET5": {
       "commandName": "Project",
-      "commandLineArgs": "\"c:\\ks\\Dotnet_test.muc\"",
+      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\自作\\mamonoro\\YO-KAI_DiscoCompileTest\\YO-KAI_Disco_DotNET.muc\"",
       "nativeDebugging": true
     }
   }

Console_NET5/Properties/launchSettings.json

@@ -94,7 +94,7 @@ private static void make(string fn)
                 for (int i = 0; i < 6; i++)
                 {
                     if (pcmdata[i] == null) continue;
-                    string dstFn = Path.Combine(Path.GetDirectoryName(fn), Path.GetFileNameWithoutExtension(fn) + addName[i] );
+                    string dstFn = Path.Combine(Path.GetDirectoryName(fn), Path.GetFileNameWithoutExtension(fn) + addName[i]);
                     File.WriteAllBytes(dstFn, pcmdata[i]);
                     Log.WriteLine(LogLevel.INFO, string.Format("Write:{0} size:{1}", dstFn, pcmdata[i].Length));
                 }
@@ -111,12 +111,12 @@ private static void make(string fn)
 
         private static List<string>[] divider(string[] src)
         {
-            List<string>[] ret = new List<string>[6] { 
+            List<string>[] ret = new List<string>[6] {
                 new List<string>(), new List<string>(), new List<string>(),
-                new List<string>(), new List<string>(), new List<string>() 
+                new List<string>(), new List<string>(), new List<string>()
             };
 
-            foreach(string lin in src)
+            foreach (string lin in src)
             {
                 if (string.IsNullOrEmpty(lin)) continue;
                 if (lin.Length < 3) continue;
@@ -125,7 +125,7 @@ private static List<string>[] divider(string[] src)
 
                 string li = lin.Substring(2).ToLower();
                 //文字列の長いものから比較
-                     if (li.IndexOf("pcm_3rd_b") == 0) { ret[2].Add(lin.Substring(2 + 9)); }
+                if (li.IndexOf("pcm_3rd_b") == 0) { ret[2].Add(lin.Substring(2 + 9)); }
                 else if (li.IndexOf("pcm_4th_b") == 0) { ret[3].Add(lin.Substring(2 + 9)); }
                 else if (li.IndexOf("pcm_3rd_a") == 0) { ret[4].Add(lin.Substring(2 + 9)); }
                 else if (li.IndexOf("pcm_4th_a") == 0) { ret[5].Add(lin.Substring(2 + 9)); }

PCMTool/Program.cs

@@ -165,10 +165,10 @@ private static int AnalyzeOption(string[] args)
             int i = 0;
             loop = 2;
 
-            while (args != null 
-                && args.Length > 0 
-                && args[i].Length > 0 
-                && args[i] != null 
+            while (args != null
+                && args.Length > 0
+                && args[i].Length > 0
+                && args[i] != null
                 && args[i][0] == '-')
             {
                 string op = args[i].Substring(1).ToUpper();

Vgm/Program.cs

@@ -121,7 +121,7 @@ public void WriteYM2610(int v, byte port, byte address, byte data)
         {
             if (dest == null) return;
 
-            if (useChips[2 + v]==0) return;
+            if (useChips[2 + v] == 0) return;
 
             if (waitCounter != 0)
             {
@@ -450,9 +450,9 @@ public void useChipsFromMub(byte[] buf)
                     for (int k = 0; k < pageCount[i][j]; k++)
                     {
                         pageLength[i][j][k] = (uint)(
-                            buf[ptr] 
-                            + buf[ptr + 1] * 0x100 
-                            + buf[ptr + 2] * 0x10000 
+                            buf[ptr]
+                            + buf[ptr + 1] * 0x100
+                            + buf[ptr + 2] * 0x10000
                             + buf[ptr + 3] * 0x1000000);
                         ptr += 8;
                     }

Vgm/VgmWriter.cs

@@ -1905,7 +1905,10 @@ private EnmFCOMPNextRtn SETLPE()
             if (mucInfo.Carry)//数値読み取れなかった
             {
                 if (mucInfo.DriverType == MUCInfo.enmDriverType.DotNet)
+                {
                     rep = 2;
+                    ptr--;
+                }
                 else
                     throw new MucException(
                         string.Format(msg.get("E0201"), msg.get("E0436"))

lib/musicDriverInterface.dll

@@ -2,7 +2,7 @@
   "profiles": {
     "Console": {
       "commandName": "Project",
-      "commandLineArgs": "-LOGLEVEL=TRACE \"C:\\Users\\kuma\\Downloads\\test2608_01\\test2608_Ch3SpecialMode_OK.muc\""
+      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\自作\\Natsuki\\test_20250223.muc\""
     }
   }
 }

mucomDotNETCompiler/muc88.cs

@@ -1,6 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 // ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから
 // 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、