デバッグメッセージの除去。

MUCOM88emを1.01に更新。
BouKiCHi · Sep 26, 2021 · bc84148 · bc84148
1 parent c2b5173
commit bc84148
Show file tree

Hide file tree

Showing 6 changed files with 554 additions and 475 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,69 @@
+# 変更点
+
+## 2021-09-26
+* MUCOM88emをv1.01に更新しました。
+
+MUCOM88em v1.01変更点は次の通り(MUCOM88em変更点より引用)
+
+* [拡張]SSGハードウェアエンベロープコマンドを追加。
+* [拡張]yコマンドのアドレス指定可能範囲を拡張。(OriginalのBugFix.)
+
+
+## 変更内容の引用
+
+https://github.com/MUCOM88/mucom88/blob/master/mucom88em/sdk_package/MUCOM88em.txt
+より
+
+```
+● 従来のMUCOM88から拡張されたMMLコマンド
+
+(1)SSGハードウェアエンベロープ 波形(MUCOM88em v1.01にて復活)
+  コマンド
+      S
+  書式
+      Sn
+  値の範囲
+      n : (0～15)
+  使用可能なパート
+      D/E/F (SSG)
+  内容
+      指定するとSSGのハードウェアエンベロープモードに切り替わる。
+      0～15はエンベロープの波形の種類になる。
+      ハードウェアエンベロープを使用中に'v'(ボリュームコマンド)を使用すると通常のモードに戻る。
+      ')'や'('は無視される。
+  補足
+      MUCOM88 v1.5のコマンド「s」(小文字)と同等の機能。
+      MUCOM88 v1.7でオミットされたこの機能をコマンド名を変えて復活。
+
+(2)SSGハードウェアエンベロープ 速度(MUCOM88em v1.01にて復活)
+  コマンド
+      m
+  書式
+      mn
+  値の範囲
+      n : (0～65535)
+  使用可能なパート
+      D/E/F (SSG)
+  内容
+      SSGハードウェアエンベロープの波形の変化スピードを設定する。
+      値が小さいほど早く変化する。
+  補足
+      MUCOM88 v1.7でオミットされた機能の復活。
+
+(3)レジスタ値直指定(MUCOM88em v1.01にて修正)
+  コマンド
+      y
+  書式
+      yn1,n2
+  値の範囲
+      n1 : (0～182)
+      n2 : (0～255)
+  使用可能なパート
+      A/B/C/G/H/I/J/K (SSG以外)
+  内容
+      レジスタに値を直接書き込むコマンド。
+      n1で指定したアドレスにn2の値を書き込む。
+  補足
+      従来、n1の指定可能範囲が狭かった(0～178)のを修正。
+
+```
diff --git a/src/Z80/Z80.cpp b/src/Z80/Z80.cpp
@@ -671,9 +671,9 @@ int32_t Z80::Execute(int32_t n) {
 			case 0xcd: // call nn
 			st16(sp -= 2, pc + 2);
 			tmp2 = IMM16;
-			if (tmp2 < 0x8000) {
-				printf("cd pc:%04x -> %04x\n", tmp2, pc);
-			}
+			// if (tmp2 < 0x8000) {
+			// 	printf("cd pc:%04x -> %04x\n", tmp2, pc);
+			// }
 			pc = tmp2;
 			CLOCK(1);
 			break;

diff --git a/src/bin_em/bin_expand_em.h b/src/bin_em/bin_expand_em.h
@@ -44,13 +44,13 @@ const unsigned char bin_expand_em[1294] = {
 0x40,0x20,0x12,0x23,0x7E,0xFE,0x25,0x20,0x04,0x23,0x32,0x63,0xBB,0xCD,0x27,0x90,0x3E,
 0x00,0xBB,0x28,0x05,0x2A,0xD8,0xBB,0x18,0xC2,0x3A,0x63,0xBB,0xB7,0x28,0x23,0x3E,0x06,
 0x32,0x38,0xBB,0x3E,0x04,0x32,0x49,0xBB,0xCD,0x37,0xBB,0x2A,0xD8,0xBB,0x11,0x09,0x00,
-0x19,0xCD,0x27,0x90,0xCD,0xA0,0x95,0x7B,0xD9,0x77,0xD9,0xCD,0xA6,0x95,0xA7,0xC9,0x2A,
+0x19,0xCD,0x27,0x90,0xCD,0xD0,0x95,0x7B,0xD9,0x77,0xD9,0xCD,0xD6,0x95,0xA7,0xC9,0x2A,
 0xD8,0xBB,0x5E,0x23,0x56,0xED,0x53,0xD8,0xBB,0x11,0x08,0x00,0x19,0xCD,0x27,0x90,0xD5,
 0x23,0xCD,0x27,0x90,0x7B,0xD1,0x57,0xD5,0x3E,0x04,0x32,0x38,0xBB,0x3E,0x09,0x32,0x49,
-0xBB,0xCD,0x37,0xBB,0xCD,0xA0,0x95,0xD9,0xD1,0x73,0x23,0x72,0xD9,0xCD,0xA6,0x95,0x21,
+0xBB,0xCD,0x37,0xBB,0xCD,0xD0,0x95,0xD9,0xD1,0x73,0x23,0x72,0xD9,0xCD,0xD6,0x95,0x21,
 0x01,0xBF,0xCD,0x06,0xDE,0xA7,0xC9,0x06,0x06,0xC5,0x2A,0xD8,0xBB,0x5E,0x23,0x56,0xED,
-0x53,0xD8,0xBB,0x11,0x08,0x00,0x19,0x06,0x04,0xC5,0xCD,0x27,0x90,0x23,0xCD,0xA0,0x95,
-0x7B,0xD9,0x77,0x23,0xD9,0xCD,0xA6,0x95,0xC1,0x10,0xED,0xC1,0x10,0xD9,0xC9,0x37,0xC9,
+0x53,0xD8,0xBB,0x11,0x08,0x00,0x19,0x06,0x04,0xC5,0xCD,0x27,0x90,0x23,0xCD,0xD0,0x95,
+0x7B,0xD9,0x77,0x23,0xD9,0xCD,0xD6,0x95,0xC1,0x10,0xED,0xC1,0x10,0xD9,0xC9,0x37,0xC9,
 0x00,0xE5,0xD5,0xC5,0x4F,0x87,0x81,0x21,0x92,0xBB,0x5F,0x16,0x00,0x19,0xCD,0xC6,0x6E,
 0xC1,0xD1,0xE1,0xC9,0xED,0x78,0xB0,0x46,0x77,0xFE,0xFF,0xC8,0xB8,0xC9,0x21,0xC8,0xF3,
 0x11,0xC9,0xF3,0x01,0x77,0x00,0x36,0x00,0xED,0xB0,0xC9,0x00,0x00,0x20,0x30,0x00,0x20,

diff --git a/src/bin_em/bin_msub_em.h b/src/bin_em/bin_msub_em.h
@@ -1,5 +1,5 @@
-const long msub_em_size = 1488;
-const unsigned char bin_msub_em[1488] = {
+const long msub_em_size = 1536;
+const unsigned char bin_msub_em[1536] = {
 0xC3,0x66,0x90,0xC3,0x9C,0x90,0xC3,0xB6,0x90,0xC3,0xC8,0x90,0xC3,0xCB,0x90,0xC3,0xCF,
 0x90,0xC3,0xD3,0x90,0xC3,0xD7,0x90,0xC3,0xDB,0x90,0xC3,0xDF,0x90,0xC3,0xE3,0x90,0xC3,
 0x7C,0x91,0xC3,0x08,0x92,0xC3,0x70,0x92,0xC3,0xA2,0x93,0xC3,0xB9,0x93,0xC3,0xDE,0x93,
@@ -20,8 +20,8 @@ const unsigned char bin_msub_em[1488] = {
 0x23,0x56,0xED,0x53,0x2E,0xF3,0xCD,0x70,0x94,0xE1,0xE5,0x2A,0x86,0xEF,0xE5,0x21,0xC8,
 0xF3,0x11,0xC9,0xF3,0x36,0x00,0x01,0x4F,0x00,0xED,0xB0,0x08,0x87,0x21,0x00,0x88,0x5F,
 0x16,0x00,0x19,0x7E,0x23,0x66,0x6F,0x11,0x01,0x10,0xED,0x53,0x86,0xEF,0xCD,0x50,0x55,
-0x11,0x01,0x01,0xED,0x53,0x86,0xEF,0x21,0x90,0x95,0xCD,0x50,0x55,0x2A,0x2E,0xF3,0x22,
-0x56,0xE6,0xE1,0x22,0x86,0xEF,0xE1,0xCD,0xB2,0x95,0x1E,0x02,0xC3,0xB3,0x03,0xC9,0x20,
+0x11,0x01,0x01,0xED,0x53,0x86,0xEF,0x21,0x91,0x95,0xCD,0x50,0x55,0x2A,0x2E,0xF3,0x22,
+0x56,0xE6,0xE1,0x22,0x86,0xEF,0xE1,0xCD,0xE2,0x95,0x1E,0x02,0xC3,0xB3,0x03,0xC9,0x20,
 0x00,0x00,0x00,0x00,0x00,0x00,0xD5,0xE5,0x7E,0x4F,0x21,0x94,0x93,0x06,0x07,0x7E,0xB9,
 0x28,0x08,0x23,0x23,0x10,0xF8,0xE1,0xD1,0x37,0xC9,0x23,0x4E,0x3A,0x26,0xF3,0x47,0xE1,
 0x23,0x7E,0xFE,0x2B,0x20,0x12,0x79,0xFE,0x0B,0x20,0x0A,0x0E,0xFF,0x04,0x78,0xFE,0x08,
@@ -83,9 +83,12 @@ const unsigned char bin_msub_em[1488] = {
 0x7B,0xE6,0x0F,0x82,0xD1,0xC9,0x1A,0xB7,0xC8,0x4E,0xB9,0x20,0x04,0x13,0x23,0x18,0xF5,
 0x37,0xC9,0x6C,0x6F,0x44,0x76,0x40,0x3E,0x3C,0x29,0x28,0x26,0x79,0x4D,0x72,0x5B,0x5D,
 0x53,0x4C,0x71,0x45,0x50,0x77,0x74,0x43,0x21,0x4B,0x2F,0x56,0x5C,0x6B,0x73,0x25,0x70,
-0x48,0x54,0x4A,0x3B,0x52,0x2A,0x3A,0x5E,0x7C,0x7D,0x7B,0x23,0x00,0x45,0x52,0x52,0x4F,
-0x52,0x20,0x4D,0x45,0x53,0x53,0x41,0x47,0x45,0x20,0x3A,0x00,0xC3,0xB2,0x95,0xC3,0xB7,
-0x95,0xC3,0xBC,0x95,0xC3,0xC1,0x95,0xC3,0xC6,0x95,0xC3,0xCB,0x95,0x3E,0x00,0xD3,0xE2,
-0xC9,0x3E,0x01,0xD3,0xE2,0xC9,0x3E,0x10,0xD3,0xE2,0xC9,0x3E,0x11,0xD3,0xE2,0xC9,0x3E,
-0x00,0xD3,0xE3,0xC9,0x3E,0x01,0xD3,0xE3,0xC9
+0x48,0x54,0x4A,0x3B,0x52,0x2A,0x3A,0x5E,0x7C,0x7D,0x7B,0x23,0x6D,0x00,0x45,0x52,0x52,
+0x4F,0x52,0x20,0x4D,0x45,0x53,0x53,0x41,0x47,0x45,0x20,0x3A,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC3,0xE2,0x95,0xC3,0xE7,0x95,0xC3,0xEC,
+0x95,0xC3,0xF1,0x95,0xC3,0xF6,0x95,0xC3,0xFB,0x95,0x3E,0x00,0xD3,0xE2,0xC9,0x3E,0x01,
+0xD3,0xE2,0xC9,0x3E,0x10,0xD3,0xE2,0xC9,0x3E,0x11,0xD3,0xE2,0xC9,0x3E,0x00,0xD3,0xE3,
+0xC9,0x3E,0x01,0xD3,0xE3,0xC9
 };