TAG062 2023/06/24

  Compiler:transposeの負数対応。(mc.asmの暫定対応に合わせたもの)
  Compiler:psgprgの処理をオリジナルに合わせた。(出力されるデータに差異無し)

CHANGE.txt

@@ -1,4 +1,8 @@
 �X�V����
+TAG062 2023/06/24
+  Compiler:transpose�̕����Ή��B(mc.asm�̎b��Ή��ɍ��킹������)
+  Compiler:psgprg�̏������I���W�i���ɍ��킹���B(�o�͂����f�[�^�ɍ��ٖ���)
+
 TAG061 2023/06/24
   Console:�R���p�C���G���[�����������ꍇ�̓��^�[���R�[�h�P�ŏI������悤�ɏC��
 

PMDDotNETCompiler/mc.cs

@@ -41,14 +41,14 @@ public class mc
         //;==============================================================================
         //;
         //;	MML Compiler/Effect Compiler FOR PC-9801/88VA 
-        //;							ver 4.8r
+        //;							ver 4.8s
         //;
         //;==============================================================================
         //	.186
 
         public static string ver = "4.8s";// version
         public static int vers = 0x48;
-        public static string date = "2020/01/22";// date
+        public static string date = "2023/09/23";// date
 
 #if !hyouka
         public int hyouka = 0;//1で評価版(save機能cut)
@@ -2638,14 +2638,17 @@ private void memo_set()
         //;==============================================================================
         private void transpose_set()
         {
-            int bx = 0;
-            byte al = 0;
-            if (lngset(out bx, out al))
-            {
-                error('#', 7, work.si);
-            }
+            _ = getnum(out _, out byte dl);//230923 FIXED
+            mml_seg.transpose = dl;//
+
+            //int bx = 0;
+            //byte al = 0;
+            //if (lngset(out bx, out al))
+            //{
+            //    error('#', 7, work.si);
+            //}
 
-            mml_seg.transpose = al;
+            //mml_seg.transpose = al;
         }
 
 
@@ -7711,19 +7714,21 @@ private enmPass2JumpTable neirochg()
             return enmPass2JumpTable.olc03;
 
         psgprg:;
+            work.bx = (byte)work.bx;
+            if (work.bx >= mml_seg.psgenvdat_max + 1) work.bx = 0;
             //work.bx *= 4;
             //work.bx = (byte)work.bx;
             work.bx += 0;//offset psgenvdat
             cmd = new MmlDatum((byte)0xf0, enmMMLType.Instrument, MakeLinePos(), new object[] { });
             m_seg.m_buf.Set(work.di++, cmd);
             cx = 4;
-            if (work.bx > 9)
-            {
-                musicDriverInterface.Log.WriteLine(LogLevel.WARNING,
-                    string.Format(msg.get("W0100"), work.bx)
-                    );
-                work.bx = 0;
-            }
+            //if (work.bx > 9)
+            //{
+            //    musicDriverInterface.Log.WriteLine(LogLevel.WARNING,
+            //        string.Format(msg.get("W0100"), work.bx)
+            //        );
+            //    work.bx = 0;
+            //}
             //pplop0:;
             for (int i = 0; i < 4; i++)
             {

PMDDotNETCompiler/mml_seg.cs

@@ -186,8 +186,8 @@ public class mml_seg
 			,new byte[]{ 1,2,0,1 }// @8 Brass 1
 			,new byte[]{ 1,2,24,1 }// @9 Brass 2
 		};
-
-		public int max_part = 11;
+		public int psgenvdat_max = 9;
+        public int max_part = 11;
 		public int fm = 0;
 		public int fm2 = 1;
 		public int psg = 2;

PMDDotNETConsole/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "PMDDotNETConsole": {
       "commandName": "Project",
-      "commandLineArgs": "-LOGLEVEL=INFO  /V /c C:\\Users\\kuma\\Downloads\\pmdtest.mml"
+      "commandLineArgs": "-LOGLEVEL=INFO  /V /c D:\\bootcamp\\FM音源\\data\\自作\\test\\testPMDTranspose.mml"
     }
   }
 }