Mercurial > repos > blastem
annotate ym2612.c @ 2558:3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 19 Jan 2025 00:31:16 -0800 |
parents | 78e1769efcdb |
children | eb588f22ec76 |
rev | line source |
---|---|
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
451
diff
changeset
|
1 /* |
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
451
diff
changeset
|
2 Copyright 2013 Michael Pavone |
483
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
3 This file is part of BlastEm. |
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
451
diff
changeset
|
4 BlastEm is free software distributed under the terms of the GNU General Public License version 3 or greater. See COPYING for full license text. |
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
451
diff
changeset
|
5 */ |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
6 #include <string.h> |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
7 #include <stdlib.h> |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
8 #include "ym2612.h" |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
9 #include "render.h" |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
10 #include "wave.h" |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
483
diff
changeset
|
11 #include "blastem.h" |
1946 | 12 #include "event_log.h" |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
13 |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
14 //#define DO_DEBUG_PRINT |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
15 #ifdef DO_DEBUG_PRINT |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
16 #define dfprintf fprintf |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
17 #define dfopen(var, fname, mode) var=fopen(fname, mode) |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
18 #else |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
19 #define dfprintf |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
20 #define dfopen(var, fname, mode) |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
21 #endif |
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
22 |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
23 #define BUSY_CYCLES 32 |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
24 #define OP_UPDATE_PERIOD 144 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
25 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
26 #define BIT_TIMERA_ENABLE 0x1 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
27 #define BIT_TIMERB_ENABLE 0x2 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
28 #define BIT_TIMERA_OVEREN 0x4 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
29 #define BIT_TIMERB_OVEREN 0x8 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
30 #define BIT_TIMERA_RESET 0x10 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
31 #define BIT_TIMERB_RESET 0x20 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
32 |
845
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
33 #define BIT_TIMERA_LOAD 0x40 |
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
34 #define BIT_TIMERB_LOAD 0x80 |
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
35 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
36 #define BIT_STATUS_TIMERA 0x1 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
37 #define BIT_STATUS_TIMERB 0x2 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
38 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
39 static uint32_t ym_calc_phase_inc(ym2612_context * context, ym_operator * operator, uint32_t op); |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
40 |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
41 enum { |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
42 PHASE_ATTACK, |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
43 PHASE_DECAY, |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
44 PHASE_SUSTAIN, |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
45 PHASE_RELEASE |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
46 }; |
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
47 |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
48 static int16_t ams_shift[] = {8, 1, -1, -2}; |
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
49 static uint8_t lfo_timer_values[] = {108, 77, 71, 67, 62, 44, 8, 5}; |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
50 |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
51 #define YM_DIVIDER 2 |
374 | 52 #define CYCLE_NEVER 0xFFFFFFFF |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
53 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
54 static FILE * debug_file = NULL; |
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
55 static uint32_t first_key_on=0; |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
56 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
57 static ym2612_context * log_context = NULL; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
58 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
59 static void ym_finalize_log() |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
60 { |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
61 if (!log_context) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
62 return; |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
63 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
64 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) { |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
65 if (log_context->channels[i].logfile) { |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
66 wave_finalize(log_context->channels[i].logfile); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
67 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
68 } |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
69 log_context = NULL; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
70 } |
483
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
71 |
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
72 void ym_adjust_master_clock(ym2612_context * context, uint32_t master_clock) |
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
73 { |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
74 render_audio_adjust_clock(context->audio, master_clock, context->clock_inc * OPN2_NUM_OPERATORS); |
483
3e1573fa22cf
Implement turbo/slow motion feature that overclocks or underclocks the entire system at the push of a button
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
75 } |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
76 |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
77 void ym_adjust_cycles(ym2612_context *context, uint32_t deduction) |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
78 { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
79 context->current_cycle -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
80 if (context->write_cycle != CYCLE_NEVER && context->write_cycle >= deduction) { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
81 context->write_cycle -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
82 } else { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
83 context->write_cycle = CYCLE_NEVER; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
84 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
85 if (context->busy_start != CYCLE_NEVER && context->busy_start >= deduction) { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
86 context->busy_start -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
87 } else { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
88 context->busy_start = CYCLE_NEVER; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
89 } |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
90 if (context->last_status_cycle != CYCLE_NEVER && context->last_status_cycle >= deduction) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
91 context->last_status_cycle -= deduction; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
92 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
93 context->last_status = 0; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
94 context->last_status_cycle = CYCLE_NEVER; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
95 } |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
96 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
97 |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
98 #define TIMER_A_MAX 1023 |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
99 #define TIMER_B_MAX 255 |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
100 |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
101 void ym_reset(ym2612_context *context) |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
102 { |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
103 memset(context->part1_regs, 0, sizeof(context->part1_regs)); |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
104 memset(context->part2_regs, 0, sizeof(context->part2_regs)); |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
105 memset(context->operators, 0, sizeof(context->operators)); |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
106 FILE* savedlogs[OPN2_NUM_CHANNELS]; |
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
107 uint8_t saved_scope_channel[OPN2_NUM_CHANNELS]; |
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
108 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
1654
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
109 { |
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
110 savedlogs[i] = context->channels[i].logfile; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
111 saved_scope_channel[i] = context->channels[i].scope_channel; |
1654
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
112 } |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
113 memset(context->channels, 0, sizeof(context->channels)); |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
114 memset(context->ch3_supp, 0, sizeof(context->ch3_supp)); |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
115 context->selected_reg = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
116 context->csm_keyon = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
117 context->ch3_mode = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
118 context->dac_enable = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
119 context->status = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
120 context->timer_a_load = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
121 context->timer_b_load = 0; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
122 //TODO: Confirm these on hardware |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
123 context->timer_a = TIMER_A_MAX; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
124 context->timer_b = TIMER_B_MAX; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
125 |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
126 //TODO: Reset LFO state |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
127 |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
128 //some games seem to expect that the LR flags start out as 1 |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
129 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) { |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
130 context->channels[i].lr = 0xC0; |
1654
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
131 context->channels[i].logfile = savedlogs[i]; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
132 context->channels[i].scope_channel = saved_scope_channel[i]; |
2005
3ce38692a3f2
Set initial pan bits in YM2612 register array and not just the separate lr field of the channel. This fixes an issue in which some channels would be silent in VGM log output
Michael Pavone <pavone@retrodev.com>
parents:
1946
diff
changeset
|
133 if (i < 3) { |
3ce38692a3f2
Set initial pan bits in YM2612 register array and not just the separate lr field of the channel. This fixes an issue in which some channels would be silent in VGM log output
Michael Pavone <pavone@retrodev.com>
parents:
1946
diff
changeset
|
134 context->part1_regs[REG_LR_AMS_PMS - YM_PART1_START + i] = 0xC0; |
3ce38692a3f2
Set initial pan bits in YM2612 register array and not just the separate lr field of the channel. This fixes an issue in which some channels would be silent in VGM log output
Michael Pavone <pavone@retrodev.com>
parents:
1946
diff
changeset
|
135 } else { |
3ce38692a3f2
Set initial pan bits in YM2612 register array and not just the separate lr field of the channel. This fixes an issue in which some channels would be silent in VGM log output
Michael Pavone <pavone@retrodev.com>
parents:
1946
diff
changeset
|
136 context->part2_regs[REG_LR_AMS_PMS - YM_PART2_START + i - 3] = 0xC0; |
3ce38692a3f2
Set initial pan bits in YM2612 register array and not just the separate lr field of the channel. This fixes an issue in which some channels would be silent in VGM log output
Michael Pavone <pavone@retrodev.com>
parents:
1946
diff
changeset
|
137 } |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
138 } |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
139 context->write_cycle = CYCLE_NEVER; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
140 for (int i = 0; i < OPN2_NUM_OPERATORS; i++) { |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
141 context->operators[i].envelope = MAX_ENVELOPE; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
142 context->operators[i].env_phase = PHASE_RELEASE; |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
143 } |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
144 } |
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
145 |
1555
6ce36c3f250b
More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control
Michael Pavone <pavone@retrodev.com>
parents:
1551
diff
changeset
|
146 void ym_init(ym2612_context * context, uint32_t master_clock, uint32_t clock_div, uint32_t options) |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
147 { |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
148 static uint8_t registered_finalize; |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
149 dfopen(debug_file, "ym_debug.txt", "w"); |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
150 memset(context, 0, sizeof(*context)); |
380
1c8d74f2ab0b
Make the PSG and YM2612 use the master clock internal with an increment based on clock divider so that they stay perflectly in sync. Run both the PSG and YM2612 whenver one of them needs to be run.
Mike Pavone <pavone@retrodev.com>
parents:
379
diff
changeset
|
151 context->clock_inc = clock_div * 6; |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
152 context->busy_cycles = BUSY_CYCLES * context->clock_inc; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
153 context->audio = render_audio_source("YM2612", master_clock, context->clock_inc * OPN2_NUM_OPERATORS, 2); |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
154 //TODO: pick a randomish high initial value and lower it over time |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
155 context->invalid_status_decay = 225000 * context->clock_inc; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
156 context->status_address_mask = (options & YM_OPT_3834) ? 0 : 3; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
157 |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
158 //some games seem to expect that the LR flags start out as 1 |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
159 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) { |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
160 if (options & YM_OPT_WAVE_LOG) { |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
161 char fname[64]; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
162 sprintf(fname, "ym_channel_%d.wav", i); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
163 FILE * f = context->channels[i].logfile = fopen(fname, "wb"); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
164 if (!f) { |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
165 fprintf(stderr, "Failed to open WAVE log file %s for writing\n", fname); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
166 continue; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
167 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
168 if (!wave_init(f, master_clock / (context->clock_inc * OPN2_NUM_OPERATORS), 16, 1)) { |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
169 fclose(f); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
170 context->channels[i].logfile = NULL; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
171 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
172 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
173 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
174 if (options & YM_OPT_WAVE_LOG) { |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
175 log_context = context; |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
176 if (!registered_finalize) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
177 atexit(ym_finalize_log); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
178 registered_finalize = 1; |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
179 } |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
180 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
181 ym_init_tables(); |
1308
1b3fe6e03e7b
Reset YM2612 whenver the Z80 is reset. Fixes issue with stuck notes in Fantastic Dizzy and Kid Chameleon
Michael Pavone <pavone@retrodev.com>
parents:
1301
diff
changeset
|
182 ym_reset(context); |
1798
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
183 ym_enable_zero_offset(context, 1); |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
184 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
185 |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
186 void ym_free(ym2612_context *context) |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
187 { |
1551
ce1f93be0104
Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents:
1450
diff
changeset
|
188 render_free_source(context->audio); |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
189 if (context == log_context) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
190 ym_finalize_log(); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
191 } |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
192 free(context); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
193 } |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
194 |
1798
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
195 void ym_enable_zero_offset(ym2612_context *context, uint8_t enabled) |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
196 { |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
197 if (enabled) { |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
198 context->zero_offset = 0x70; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
199 context->volume_mult = 79; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
200 context->volume_div = 120; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
201 } else { |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
202 context->zero_offset = 0; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
203 context->volume_mult = 2; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
204 context->volume_div = 3; |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
205 } |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
206 } |
381
7815ebbbd705
Fix modulation shift value
Mike Pavone <pavone@retrodev.com>
parents:
380
diff
changeset
|
207 #define YM_MOD_SHIFT 1 |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
208 |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
209 #define CSM_MODE 0x80 |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
210 |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
211 #define SSG_ENABLE 8 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
212 #define SSG_INVERT 4 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
213 #define SSG_ALTERNATE 2 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
214 #define SSG_HOLD 1 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
215 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
216 #define SSG_CENTER 0x800 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
217 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
218 static void start_envelope(ym_operator *op, ym_channel *channel) |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
219 { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
220 //Deal with "infinite" attack rates |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
221 uint8_t rate = op->rates[PHASE_ATTACK]; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
222 if (rate) { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
223 uint8_t ks = channel->keycode >> op->key_scaling;; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
224 rate = rate*2 + ks; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
225 } |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
226 if (rate >= 62) { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
227 op->env_phase = PHASE_DECAY; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
228 op->envelope = 0; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
229 } else { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
230 op->env_phase = PHASE_ATTACK; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
231 } |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
232 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
233 |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
234 static void keyon(ym_operator *op, ym_channel *channel) |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
235 { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
236 start_envelope(op, channel); |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
237 op->phase_counter = 0; |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
238 op->inverted = op->ssg & SSG_INVERT; |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
239 } |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
240 |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
241 static const uint8_t keyon_bits[] = {0x10, 0x40, 0x20, 0x80}; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
242 |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
243 static void keyoff(ym_operator *op) |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
244 { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
245 op->env_phase = PHASE_RELEASE; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
246 if (op->inverted) { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
247 //Nemesis says the inversion state doesn't change here, but I don't see how that is observable either way |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
248 op->inverted = 0; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
249 op->envelope = (SSG_CENTER - op->envelope) & MAX_ENVELOPE; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
250 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
251 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
252 |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
253 static void csm_keyoff(ym2612_context *context) |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
254 { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
255 context->csm_keyon = 0; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
256 uint8_t changes = 0xF0 ^ context->channels[2].keyon; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
257 for (uint8_t op = 2*4, bit = 0; op < 3*4; op++, bit++) |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
258 { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
259 if (changes & keyon_bits[bit]) { |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
260 keyoff(context->operators + op); |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
261 } |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
262 } |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
263 } |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
264 |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
265 void ym_run_timers(ym2612_context *context) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
266 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
267 if (context->timer_control & BIT_TIMERA_ENABLE) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
268 if (context->timer_a != TIMER_A_MAX) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
269 context->timer_a++; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
270 if (context->csm_keyon) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
271 csm_keyoff(context); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
272 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
273 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
274 if (context->timer_control & BIT_TIMERA_LOAD) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
275 context->timer_control &= ~BIT_TIMERA_LOAD; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
276 } else if (context->timer_control & BIT_TIMERA_OVEREN) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
277 context->status |= BIT_STATUS_TIMERA; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
278 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
279 context->timer_a = context->timer_a_load; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
280 if (!context->csm_keyon && context->ch3_mode == CSM_MODE) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
281 context->csm_keyon = 0xF0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
282 uint8_t changes = 0xF0 ^ context->channels[2].keyon;; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
283 for (uint8_t op = 2*4, bit = 0; op < 3*4; op++, bit++) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
284 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
285 if (changes & keyon_bits[bit]) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
286 keyon(context->operators + op, context->channels + 2); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
287 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
288 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
289 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
290 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
291 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
292 if (!context->sub_timer_b) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
293 if (context->timer_control & BIT_TIMERB_ENABLE) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
294 if (context->timer_b != TIMER_B_MAX) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
295 context->timer_b++; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
296 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
297 if (context->timer_control & BIT_TIMERB_LOAD) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
298 context->timer_control &= ~BIT_TIMERB_LOAD; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
299 } else if (context->timer_control & BIT_TIMERB_OVEREN) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
300 context->status |= BIT_STATUS_TIMERB; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
301 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
302 context->timer_b = context->timer_b_load; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
303 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
304 } |
2029
1e7a63f0ccf4
Fix Timer B load bug that made games using Konami sound driver to have slower music tempo than they should
Michael Pavone <pavone@retrodev.com>
parents:
2005
diff
changeset
|
305 } else if (context->timer_control & BIT_TIMERB_LOAD) { |
1e7a63f0ccf4
Fix Timer B load bug that made games using Konami sound driver to have slower music tempo than they should
Michael Pavone <pavone@retrodev.com>
parents:
2005
diff
changeset
|
306 context->timer_control &= ~BIT_TIMERB_LOAD; |
1e7a63f0ccf4
Fix Timer B load bug that made games using Konami sound driver to have slower music tempo than they should
Michael Pavone <pavone@retrodev.com>
parents:
2005
diff
changeset
|
307 context->timer_b = context->timer_b_load; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
308 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
309 context->sub_timer_b += 0x10; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
310 //Update LFO |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
311 uint8_t old_pm_step = context->lfo_pm_step; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
312 if (context->lfo_enable) { |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
313 if (context->lfo_counter >= lfo_timer_values[context->lfo_freq]) { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
314 context->lfo_counter = 0; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
315 context->lfo_am_step += 2; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
316 context->lfo_am_step &= 0xFE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
317 context->lfo_pm_step = context->lfo_am_step / 8; |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
318 } else { |
2287 | 319 context->lfo_counter++; |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
320 } |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
321 } else { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
322 context->lfo_am_step = context->lfo_pm_step = 0; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
323 } |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
324 if (context->lfo_pm_step != old_pm_step) { |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
325 for (int chan = 0; chan < OPN2_NUM_CHANNELS; chan++) |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
326 { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
327 if (context->channels[chan].pms) { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
328 for (int op = chan * 4; op < (chan + 1) * 4; op++) |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
329 { |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
330 context->operators[op].phase_inc = ym_calc_phase_inc(context, context->operators + op, op); |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
331 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
332 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
333 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
334 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
335 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
336 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
337 void ym_run_envelope(ym2612_context *context, ym_channel *channel, ym_operator *operator) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
338 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
339 uint32_t env_cyc = context->env_counter; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
340 uint8_t rate; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
341 if (operator->env_phase == PHASE_DECAY && operator->envelope >= operator->sustain_level) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
342 //operator->envelope = operator->sustain_level; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
343 operator->env_phase = PHASE_SUSTAIN; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
344 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
345 rate = operator->rates[operator->env_phase]; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
346 if (rate) { |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
347 uint8_t keycode = channel->keycode; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
348 if (context->ch3_mode) { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
349 int opnum = operator - context->operators; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
350 if (opnum >= 2 * 4 && opnum < 2 * 4 + 3) { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
351 opnum &= 3; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
352 if (opnum < 2) { |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
353 opnum ^= 1; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
354 } |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
355 keycode = context->ch3_supp[opnum].keycode; |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
356 } |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
357 } |
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
358 uint8_t ks = keycode >> operator->key_scaling; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
359 rate = rate*2 + ks; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
360 if (rate > 63) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
361 rate = 63; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
362 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
363 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
364 uint32_t cycle_shift = rate < 0x30 ? ((0x2F - rate) >> 2) : 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
365 if (!(env_cyc & ((1 << cycle_shift) - 1))) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
366 uint32_t update_cycle = env_cyc >> cycle_shift & 0x7; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
367 uint16_t envelope_inc = rate_table[rate * 8 + update_cycle]; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
368 if (operator->env_phase == PHASE_ATTACK) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
369 //this can probably be optimized to a single shift rather than a multiply + shift |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
370 uint16_t old_env = operator->envelope; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
371 operator->envelope += ((~operator->envelope * envelope_inc) >> 4) & 0xFFFFFFFC; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
372 if (operator->envelope > old_env) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
373 //Handle overflow |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
374 operator->envelope = 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
375 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
376 if (!operator->envelope) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
377 operator->env_phase = PHASE_DECAY; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
378 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
379 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
380 if (operator->ssg) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
381 if (operator->envelope < SSG_CENTER) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
382 envelope_inc *= 4; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
383 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
384 envelope_inc = 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
385 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
386 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
387 //envelope value is 10-bits, but it will be used as a 4.8 value |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
388 operator->envelope += envelope_inc << 2; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
389 //clamp to max attenuation value |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
390 if ( |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
391 operator->envelope > MAX_ENVELOPE |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
392 || (operator->env_phase == PHASE_RELEASE && operator->envelope >= SSG_CENTER) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
393 ) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
394 operator->envelope = MAX_ENVELOPE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
395 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
396 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
397 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
398 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
399 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
400 void ym_run_phase(ym2612_context *context, uint32_t channel, uint32_t op) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
401 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
402 if (channel != 5 || !context->dac_enable) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
403 //printf("updating operator %d of channel %d\n", op, channel); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
404 ym_operator * operator = context->operators + op; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
405 ym_channel * chan = context->channels + channel; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
406 uint16_t phase = operator->phase_counter >> 10 & 0x3FF; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
407 uint32_t old_phase = operator->phase_counter; |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
408 operator->phase_counter += operator->phase_inc;//ym_calc_phase_inc(context, operator, op); |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
409 operator->phase_overflow = (old_phase & 0xFFFFF) > (operator->phase_counter & 0xFFFFF); |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
410 int16_t mod = 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
411 if (op & 3) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
412 if (operator->mod_src[0]) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
413 mod = *operator->mod_src[0]; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
414 if (operator->mod_src[1]) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
415 mod += *operator->mod_src[1]; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
416 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
417 mod >>= YM_MOD_SHIFT; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
418 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
419 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
420 if (chan->feedback) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
421 mod = (chan->op1_old + operator->output) >> (10-chan->feedback); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
422 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
423 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
424 uint16_t env = operator->envelope; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
425 if (operator->ssg) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
426 if (env >= SSG_CENTER) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
427 if (operator->ssg & SSG_ALTERNATE) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
428 if (operator->env_phase != PHASE_RELEASE && ( |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
429 !(operator->ssg & SSG_HOLD) || ((operator->ssg ^ operator->inverted) & SSG_INVERT) == 0 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
430 )) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
431 operator->inverted ^= SSG_INVERT; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
432 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
433 } else if (!(operator->ssg & SSG_HOLD)) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
434 phase = operator->phase_counter = 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
435 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
436 if ( |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
437 (operator->env_phase == PHASE_DECAY || operator->env_phase == PHASE_SUSTAIN) |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
438 && !(operator->ssg & SSG_HOLD) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
439 ) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
440 start_envelope(operator, chan); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
441 env = operator->envelope; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
442 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
443 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
444 if (operator->inverted) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
445 env = (SSG_CENTER - env) & MAX_ENVELOPE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
446 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
447 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
448 env += operator->total_level; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
449 if (operator->am) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
450 uint16_t base_am = (context->lfo_am_step & 0x80 ? context->lfo_am_step : ~context->lfo_am_step) & 0x7E; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
451 if (ams_shift[chan->ams] >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
452 env += (base_am >> ams_shift[chan->ams]) & MAX_ENVELOPE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
453 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
454 env += base_am << (-ams_shift[chan->ams]); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
455 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
456 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
457 if (env > MAX_ENVELOPE) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
458 env = MAX_ENVELOPE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
459 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
460 int16_t output = ym_sine(phase, mod, env); |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
461 if (op % 4 == 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
462 chan->op1_old = operator->output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
463 } else if (op % 4 == 2) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
464 chan->op2_old = operator->output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
465 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
466 operator->output = output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
467 //Update the channel output if we've updated all operators |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
468 if (op % 4 == 3) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
469 if (chan->algorithm < 4) { |
2554
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
470 chan->output = operator->output & ~0x1F; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
471 chan->phase_overflow = operator->phase_overflow; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
472 } else if(chan->algorithm == 4) { |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
473 ym_operator *other_op = context->operators + channel * 4 + 2; |
2554
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
474 chan->output = (operator->output & ~0x1F) + (other_op->output & ~0x1F); |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
475 if (chan->output > 0x1FE0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
476 chan->output = 0x1FE0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
477 } else if (chan->output < -0x1FF0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
478 chan->output = - 0x1FF0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
479 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
480 if (operator->phase_inc < other_op->phase_inc) { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
481 chan->phase_overflow = operator->phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
482 } else { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
483 chan->phase_overflow = other_op->phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
484 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
485 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
486 output = 0; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
487 uint32_t lowest_phase_inc = 0xFFFFFFFF; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
488 for (uint32_t op = ((chan->algorithm == 7) ? 0 : 1) + channel*4; op < (channel+1)*4; op++) { |
2554
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
489 output += context->operators[op].output & ~0x1F; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
490 if (output > 0x1FE0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
491 output = 0x1FE0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
492 } else if (output < -0x1FF0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
493 output = - 0x1FF0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
494 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
495 if (context->operators[op].phase_inc < lowest_phase_inc) { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
496 lowest_phase_inc = context->operators[op].phase_inc; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
497 chan->phase_overflow = context->operators[op].phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
498 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
499 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
500 chan->output = output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
501 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
502 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
503 //puts("operator update done"); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
504 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
505 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
506 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
507 void ym_output_sample(ym2612_context *context) |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
508 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
509 int16_t left = 0, right = 0; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
510 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) { |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
511 int16_t value = context->channels[i].output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
512 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
513 value += context->zero_offset; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
514 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
515 value -= context->zero_offset; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
516 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
517 if (context->channels[i].logfile) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
518 fwrite(&value, sizeof(value), 1, context->channels[i].logfile); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
519 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
520 #ifndef IS_LIB |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
521 if (context->scope) { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
522 scope_add_sample(context->scope, context->channels[i].scope_channel, value, context->channels[i].phase_overflow); |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
523 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
524 #endif |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
525 if (context->channels[i].lr & 0x80) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
526 left += (value * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
527 } else if (context->zero_offset) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
528 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
529 left += (context->zero_offset * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
530 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
531 left -= (context->zero_offset * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
532 } |
2555
78e1769efcdb
Implement additional YM2612 pan leakage observed by MarkeyJester
Michael Pavone <pavone@retrodev.com>
parents:
2554
diff
changeset
|
533 left += (value * context->volume_mult) / (60 * context->volume_div); |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
534 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
535 if (context->channels[i].lr & 0x40) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
536 right += (value * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
537 } else if (context->zero_offset) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
538 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
539 right += (context->zero_offset * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
540 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
541 right -= (context->zero_offset * context->volume_mult) / context->volume_div; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
542 } |
2555
78e1769efcdb
Implement additional YM2612 pan leakage observed by MarkeyJester
Michael Pavone <pavone@retrodev.com>
parents:
2554
diff
changeset
|
543 right += (value * context->volume_mult) / (60 * context->volume_div); |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
544 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
545 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
546 render_put_stereo_sample(context->audio, left, right); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
547 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
548 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
549 void ym_run(ym2612_context * context, uint32_t to_cycle) |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
550 { |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
551 if (context->current_cycle >= to_cycle) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
552 return; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
553 } |
362 | 554 //printf("Running YM2612 from cycle %d to cycle %d\n", context->current_cycle, to_cycle); |
555 //TODO: Fix channel update order OR remap channels in register write | |
380
1c8d74f2ab0b
Make the PSG and YM2612 use the master clock internal with an increment based on clock divider so that they stay perflectly in sync. Run both the PSG and YM2612 whenver one of them needs to be run.
Mike Pavone <pavone@retrodev.com>
parents:
379
diff
changeset
|
556 for (; context->current_cycle < to_cycle; context->current_cycle += context->clock_inc) { |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
557 //Update timers at beginning of 144 cycle period |
403 | 558 if (!context->current_op) { |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
559 ym_run_timers(context); |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
560 } |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
561 //Update Envelope Generator |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
562 if (!(context->current_op % 3)) { |
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
563 uint32_t op = context->current_env_op; |
362 | 564 ym_operator * operator = context->operators + op; |
565 ym_channel * channel = context->channels + op/4; | |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
566 ym_run_envelope(context, channel, operator); |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
567 context->current_env_op++; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
568 if (context->current_env_op == OPN2_NUM_OPERATORS) { |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
569 context->current_env_op = 0; |
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
570 context->env_counter++; |
362 | 571 } |
572 } | |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
573 |
362 | 574 //Update Phase Generator |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
575 ym_run_phase(context, context->current_op / 4, context->current_op); |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
576 context->current_op++; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
577 if (context->current_op == OPN2_NUM_OPERATORS) { |
396
09328dbe6700
Fix output of algorithm 4 and make some other minor YM2612 core improvements
Mike Pavone <pavone@retrodev.com>
parents:
386
diff
changeset
|
578 context->current_op = 0; |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
579 ym_output_sample(context); |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
580 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
581 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
582 } |
362 | 583 //printf("Done running YM2612 at cycle %d\n", context->current_cycle, to_cycle); |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
584 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
585 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
586 void ym_address_write_part1(ym2612_context * context, uint8_t address) |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
587 { |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
588 //printf("address_write_part1: %X\n", address); |
362 | 589 context->selected_reg = address; |
590 context->selected_part = 0; | |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
591 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
592 |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
593 void ym_address_write_part2(ym2612_context * context, uint8_t address) |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
594 { |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
595 //printf("address_write_part2: %X\n", address); |
362 | 596 context->selected_reg = address; |
597 context->selected_part = 1; | |
598 } | |
599 | |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
600 static uint8_t fnum_to_keycode[] = { |
362 | 601 //F11 = 0 |
602 0,0,0,0,0,0,0,1, | |
603 //F11 = 1 | |
604 2,3,3,3,3,3,3,3 | |
605 }; | |
606 | |
607 //table courtesy of Nemesis | |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
608 static uint32_t detune_table[][4] = { |
362 | 609 {0, 0, 1, 2}, //0 (0x00) |
610 {0, 0, 1, 2}, //1 (0x01) | |
611 {0, 0, 1, 2}, //2 (0x02) | |
612 {0, 0, 1, 2}, //3 (0x03) | |
613 {0, 1, 2, 2}, //4 (0x04) | |
614 {0, 1, 2, 3}, //5 (0x05) | |
615 {0, 1, 2, 3}, //6 (0x06) | |
616 {0, 1, 2, 3}, //7 (0x07) | |
617 {0, 1, 2, 4}, //8 (0x08) | |
618 {0, 1, 3, 4}, //9 (0x09) | |
619 {0, 1, 3, 4}, //10 (0x0A) | |
620 {0, 1, 3, 5}, //11 (0x0B) | |
621 {0, 2, 4, 5}, //12 (0x0C) | |
622 {0, 2, 4, 6}, //13 (0x0D) | |
623 {0, 2, 4, 6}, //14 (0x0E) | |
624 {0, 2, 5, 7}, //15 (0x0F) | |
625 {0, 2, 5, 8}, //16 (0x10) | |
626 {0, 3, 6, 8}, //17 (0x11) | |
627 {0, 3, 6, 9}, //18 (0x12) | |
628 {0, 3, 7,10}, //19 (0x13) | |
629 {0, 4, 8,11}, //20 (0x14) | |
630 {0, 4, 8,12}, //21 (0x15) | |
631 {0, 4, 9,13}, //22 (0x16) | |
632 {0, 5,10,14}, //23 (0x17) | |
633 {0, 5,11,16}, //24 (0x18) | |
634 {0, 6,12,17}, //25 (0x19) | |
635 {0, 6,13,19}, //26 (0x1A) | |
636 {0, 7,14,20}, //27 (0x1B) | |
637 {0, 8,16,22}, //28 (0x1C) | |
638 {0, 8,16,22}, //29 (0x1D) | |
639 {0, 8,16,22}, //30 (0x1E) | |
640 {0, 8,16,22} | |
641 }; //31 (0x1F) | |
642 | |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
643 static uint32_t ym_calc_phase_inc(ym2612_context * context, ym_operator * operator, uint32_t op) |
362 | 644 { |
645 uint32_t chan_num = op / 4; | |
646 //printf("ym_update_phase_inc | channel: %d, op: %d\n", chan_num, op); | |
647 //base frequency | |
648 ym_channel * channel = context->channels + chan_num; | |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
649 uint32_t inc, detune; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
650 if (chan_num == 2 && context->ch3_mode && (op < (2*4 + 3))) { |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
651 //supplemental fnum registers are in a different order than normal slot paramters |
936
f1a8124ad881
Fix register to operator mapping for channel 3 special mode and actually get it right this time
Michael Pavone <pavone@retrodev.com>
parents:
935
diff
changeset
|
652 int index = op-2*4; |
f1a8124ad881
Fix register to operator mapping for channel 3 special mode and actually get it right this time
Michael Pavone <pavone@retrodev.com>
parents:
935
diff
changeset
|
653 if (index < 2) { |
f1a8124ad881
Fix register to operator mapping for channel 3 special mode and actually get it right this time
Michael Pavone <pavone@retrodev.com>
parents:
935
diff
changeset
|
654 index ^= 1; |
f1a8124ad881
Fix register to operator mapping for channel 3 special mode and actually get it right this time
Michael Pavone <pavone@retrodev.com>
parents:
935
diff
changeset
|
655 } |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
656 inc = context->ch3_supp[index].fnum; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
657 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
658 inc = inc * 2 + lfo_pm_table[(inc & 0x7F0) * 16 + channel->pms + context->lfo_pm_step]; |
1802
1d1198f16279
Fix a couple of minor cases of extra precision in LFO implementation
Michael Pavone <pavone@retrodev.com>
parents:
1798
diff
changeset
|
659 inc &= 0xFFF; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
660 } |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
661 if (!context->ch3_supp[index].block) { |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
662 inc >>= 1; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
663 } else { |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
664 inc <<= (context->ch3_supp[index].block-1); |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
665 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
666 //detune |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
667 detune = detune_table[context->ch3_supp[index].keycode][operator->detune & 0x3]; |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
668 } else { |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
669 inc = channel->fnum; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
670 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
671 inc = inc * 2 + lfo_pm_table[(inc & 0x7F0) * 16 + channel->pms + context->lfo_pm_step]; |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
672 inc &= 0xFFF; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
673 } |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
674 if (!channel->block) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
675 inc >>= 1; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
676 } else { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
677 inc <<= (channel->block-1); |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
678 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
679 //detune |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
680 detune = detune_table[channel->keycode][operator->detune & 0x3]; |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
681 } |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
682 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
683 inc >>= 1; |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
684 } |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
685 if (operator->detune & 0x4) { |
362 | 686 inc -= detune; |
687 //this can underflow, mask to 17-bit result | |
688 inc &= 0x1FFFF; | |
689 } else { | |
690 inc += detune; | |
691 } | |
692 //multiple | |
693 if (operator->multiple) { | |
694 inc *= operator->multiple; | |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
695 inc &= 0xFFFFF; |
362 | 696 } else { |
697 //0.5 | |
698 inc >>= 1; | |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
699 } |
365
3ba3b6656fff
Actually save the shifted phase inc after applying the block shift
Mike Pavone <pavone@retrodev.com>
parents:
364
diff
changeset
|
700 //printf("phase_inc for operator %d: %d, block: %d, fnum: %d, detune: %d, multiple: %d\n", op, inc, channel->block, channel->fnum, detune, operator->multiple); |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
701 return inc; |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
702 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
703 |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
704 void ym_vgm_log(ym2612_context *context, uint32_t master_clock, vgm_writer *vgm) |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
705 { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
706 vgm_ym2612_init(vgm, 6 * master_clock / context->clock_inc); |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
707 context->vgm = vgm; |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
708 for (uint8_t reg = YM_PART1_START; reg < YM_REG_END; reg++) { |
1912
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
709 if ((reg >= REG_DETUNE_MULT && (reg & 3) == 3) || (reg >= 0x2D && reg < REG_DETUNE_MULT) || reg == 0x23 || reg == 0x29) { |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
710 //skip invalid registers |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
711 continue; |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
712 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
713 vgm_ym2612_part1_write(context->vgm, context->current_cycle, reg, context->part1_regs[reg - YM_PART1_START]); |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
714 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
715 |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
716 for (uint8_t reg = YM_PART2_START; reg < YM_REG_END; reg++) { |
1912
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
717 if ((reg & 3) == 3 || (reg >= REG_FNUM_LOW_CH3 && reg < REG_ALG_FEEDBACK)) { |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
718 //skip invalid registers |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
719 continue; |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
720 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
721 vgm_ym2612_part2_write(context->vgm, context->current_cycle, reg, context->part2_regs[reg - YM_PART2_START]); |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
722 } |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
723 } |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
724 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
725 void ym_data_write(ym2612_context * context, uint8_t value) |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
726 { |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
727 context->write_cycle = context->current_cycle; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
728 context->busy_start = context->current_cycle + context->clock_inc; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
729 |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
730 if (context->selected_reg >= YM_REG_END) { |
362 | 731 return; |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
732 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
733 if (context->selected_part) { |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
734 if (context->selected_reg < YM_PART2_START) { |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
735 return; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
736 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
737 if (context->vgm) { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
738 vgm_ym2612_part2_write(context->vgm, context->current_cycle, context->selected_reg, value); |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
739 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
740 context->part2_regs[context->selected_reg - YM_PART2_START] = value; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
741 } else { |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
742 if (context->selected_reg < YM_PART1_START) { |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
743 return; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
744 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
745 if (context->vgm) { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
746 vgm_ym2612_part1_write(context->vgm, context->current_cycle, context->selected_reg, value); |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
747 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
748 context->part1_regs[context->selected_reg - YM_PART1_START] = value; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
749 } |
1946 | 750 uint8_t buffer[3] = {context->selected_part, context->selected_reg, value}; |
751 event_log(EVENT_YM_REG, context->current_cycle, sizeof(buffer), buffer); | |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
752 dfprintf(debug_file, "write of %X to reg %X in part %d\n", value, context->selected_reg, context->selected_part+1); |
362 | 753 if (context->selected_reg < 0x30) { |
754 //Shared regs | |
755 switch (context->selected_reg) | |
756 { | |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
757 //TODO: Test reg |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
758 case REG_LFO: |
532
666210adf87b
Comment out LFO debug printf
Mike Pavone <pavone@retrodev.com>
parents:
527
diff
changeset
|
759 /*if ((value & 0x8) && !context->lfo_enable) { |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
760 printf("LFO Enabled, Freq: %d\n", value & 0x7); |
532
666210adf87b
Comment out LFO debug printf
Mike Pavone <pavone@retrodev.com>
parents:
527
diff
changeset
|
761 }*/ |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
762 context->lfo_enable = value & 0x8; |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
763 if (!context->lfo_enable) { |
2284
5a53a8453241
Fix envelope key scaling when CH3 special mode is active. Fixes sound effects in Toy Story and Maui Mallard
Michael Pavone <pavone@retrodev.com>
parents:
2255
diff
changeset
|
764 context->lfo_counter = 0; |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
765 } |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
766 context->lfo_freq = value & 0x7; |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
767 |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
768 break; |
362 | 769 case REG_TIMERA_HIGH: |
770 context->timer_a_load &= 0x3; | |
771 context->timer_a_load |= value << 2; | |
772 break; | |
773 case REG_TIMERA_LOW: | |
774 context->timer_a_load &= 0xFFFC; | |
775 context->timer_a_load |= value & 0x3; | |
776 break; | |
777 case REG_TIMERB: | |
845
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
778 context->timer_b_load = value; |
362 | 779 break; |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
780 case REG_TIME_CTRL: { |
403 | 781 if (value & BIT_TIMERA_ENABLE && !(context->timer_control & BIT_TIMERA_ENABLE)) { |
845
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
782 context->timer_a = TIMER_A_MAX; |
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
783 context->timer_control |= BIT_TIMERA_LOAD; |
403 | 784 } |
785 if (value & BIT_TIMERB_ENABLE && !(context->timer_control & BIT_TIMERB_ENABLE)) { | |
845
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
786 context->timer_b = TIMER_B_MAX; |
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
787 context->timer_control |= BIT_TIMERB_LOAD; |
403 | 788 } |
845
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
789 context->timer_control &= (BIT_TIMERA_LOAD | BIT_TIMERB_LOAD); |
3a18b5f63afc
Small fix to how manual YM-2612 timer reloads work. Seems to better match a small test program and gets audio to match up in TM.EE's "I've got Italo Inside" track.
Michael Pavone <pavone@retrodev.com>
parents:
740
diff
changeset
|
790 context->timer_control |= value & 0xF; |
403 | 791 if (value & BIT_TIMERA_RESET) { |
792 context->status &= ~BIT_STATUS_TIMERA; | |
793 } | |
794 if (value & BIT_TIMERB_RESET) { | |
795 context->status &= ~BIT_STATUS_TIMERB; | |
796 } | |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
797 if (context->ch3_mode == CSM_MODE && (value & 0xC0) != CSM_MODE && context->csm_keyon) { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
798 csm_keyoff(context); |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
799 } |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
800 uint8_t old_mode = context->ch3_mode; |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
801 context->ch3_mode = value & 0xC0; |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
802 if (context->ch3_mode != old_mode) { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
803 for (int op = 2 * 4; op < 3*4; op++) |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
804 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
805 context->operators[op].phase_inc = ym_calc_phase_inc(context, context->operators + op, op); |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
806 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
807 } |
362 | 808 break; |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
809 } |
362 | 810 case REG_KEY_ONOFF: { |
811 uint8_t channel = value & 0x7; | |
386
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
812 if (channel != 3 && channel != 7) { |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
813 if (channel > 2) { |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
814 channel--; |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
815 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
816 uint8_t changes = channel == 2 |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
817 ? (value | context->csm_keyon) ^ (context->channels[channel].keyon | context->csm_keyon) |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
818 : value ^ context->channels[channel].keyon; |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
819 context->channels[channel].keyon = value & 0xF0; |
851
b10cf2c921ad
Fix mapping of key on/off reg bits to operators
Michael Pavone <pavone@retrodev.com>
parents:
848
diff
changeset
|
820 for (uint8_t op = channel * 4, bit = 0; op < (channel + 1) * 4; op++, bit++) { |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
821 if (changes & keyon_bits[bit]) { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
822 if (value & keyon_bits[bit]) { |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
823 first_key_on = 1; |
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
824 //printf("Key On for operator %d in channel %d\n", op, channel); |
1300
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
825 keyon(context->operators + op, context->channels + channel); |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
826 } else { |
4b893b02444e
Basic implementation of CSM mode that should handle documented edge cases. Dodesn't handle the weird undocumented edge cases I don't have a good understanding of yet though
Michael Pavone <pavone@retrodev.com>
parents:
1102
diff
changeset
|
827 //printf("Key Off for operator %d in channel %d\n", op, channel); |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
828 keyoff(context->operators + op); |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
829 } |
362 | 830 } |
831 } | |
832 } | |
833 break; | |
834 } | |
835 case REG_DAC: | |
836 if (context->dac_enable) { | |
837 context->channels[5].output = (((int16_t)value) - 0x80) << 6; | |
396
09328dbe6700
Fix output of algorithm 4 and make some other minor YM2612 core improvements
Mike Pavone <pavone@retrodev.com>
parents:
386
diff
changeset
|
838 //printf("DAC Write %X(%d) @ %d\n", value, context->channels[5].output, context->current_cycle); |
362 | 839 } |
840 break; | |
841 case REG_DAC_ENABLE: | |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
842 //printf("DAC Enable: %X\n", value); |
362 | 843 context->dac_enable = value & 0x80; |
844 break; | |
845 } | |
846 } else if (context->selected_reg < 0xA0) { | |
847 //part | |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
848 uint8_t op = context->selected_part ? (OPN2_NUM_OPERATORS/2) : 0; |
362 | 849 //channel in part |
850 if ((context->selected_reg & 0x3) != 0x3) { | |
370
5f215603d001
Fix register to operator mapping. Fix rate table generation. Add TL to envelope value rather than using it as a limit for the attack phase.
Mike Pavone <pavone@retrodev.com>
parents:
369
diff
changeset
|
851 op += 4 * (context->selected_reg & 0x3) + ((context->selected_reg & 0xC) / 4); |
362 | 852 //printf("write targets operator %d (%d of channel %d)\n", op, op % 4, op / 4); |
853 ym_operator * operator = context->operators + op; | |
854 switch (context->selected_reg & 0xF0) | |
855 { | |
856 case REG_DETUNE_MULT: | |
857 operator->detune = value >> 4 & 0x7; | |
858 operator->multiple = value & 0xF; | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
859 operator->phase_inc = ym_calc_phase_inc(context, operator, op); |
362 | 860 break; |
861 case REG_TOTAL_LEVEL: | |
862 operator->total_level = (value & 0x7F) << 5; | |
863 break; | |
864 case REG_ATTACK_KS: | |
376 | 865 operator->key_scaling = 3 - (value >> 6); |
362 | 866 operator->rates[PHASE_ATTACK] = value & 0x1F; |
867 break; | |
868 case REG_DECAY_AM: | |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
869 operator->am = value & 0x80; |
362 | 870 operator->rates[PHASE_DECAY] = value & 0x1F; |
871 break; | |
872 case REG_SUSTAIN_RATE: | |
873 operator->rates[PHASE_SUSTAIN] = value & 0x1F; | |
874 break; | |
875 case REG_S_LVL_R_RATE: | |
876 operator->rates[PHASE_RELEASE] = (value & 0xF) << 1 | 1; | |
852
5de8759b87af
Fix some bugs in the attack phase and sustain level in the envelope generator
Michael Pavone <pavone@retrodev.com>
parents:
851
diff
changeset
|
877 operator->sustain_level = (value & 0xF0) << 3; |
5de8759b87af
Fix some bugs in the attack phase and sustain level in the envelope generator
Michael Pavone <pavone@retrodev.com>
parents:
851
diff
changeset
|
878 if (operator->sustain_level == 0x780) { |
5de8759b87af
Fix some bugs in the attack phase and sustain level in the envelope generator
Michael Pavone <pavone@retrodev.com>
parents:
851
diff
changeset
|
879 operator->sustain_level = MAX_ENVELOPE; |
5de8759b87af
Fix some bugs in the attack phase and sustain level in the envelope generator
Michael Pavone <pavone@retrodev.com>
parents:
851
diff
changeset
|
880 } |
362 | 881 break; |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
882 case REG_SSG_EG: |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
883 if (!(value & SSG_ENABLE)) { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
884 value = 0; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
885 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
886 if ((value ^ operator->ssg) & SSG_INVERT) { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
887 operator->inverted ^= SSG_INVERT; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
888 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
889 operator->ssg = value; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
890 break; |
362 | 891 } |
892 } | |
893 } else { | |
894 uint8_t channel = context->selected_reg & 0x3; | |
895 if (channel != 3) { | |
896 if (context->selected_part) { | |
897 channel += 3; | |
898 } | |
899 //printf("write targets channel %d\n", channel); | |
900 switch (context->selected_reg & 0xFC) | |
901 { | |
902 case REG_FNUM_LOW: | |
903 context->channels[channel].block = context->channels[channel].block_fnum_latch >> 3 & 0x7; | |
904 context->channels[channel].fnum = (context->channels[channel].block_fnum_latch & 0x7) << 8 | value; | |
905 context->channels[channel].keycode = context->channels[channel].block << 2 | fnum_to_keycode[context->channels[channel].fnum >> 7]; | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
906 for (int op = channel * 4; op < (channel + 1) * 4; op++) |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
907 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
908 context->operators[op].phase_inc = ym_calc_phase_inc(context, context->operators + op, op); |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
909 } |
362 | 910 break; |
911 case REG_BLOCK_FNUM_H:{ | |
912 context->channels[channel].block_fnum_latch = value; | |
913 break; | |
914 } | |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
915 case REG_FNUM_LOW_CH3: |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
916 if (channel < 3) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
917 context->ch3_supp[channel].block = context->ch3_supp[channel].block_fnum_latch >> 3 & 0x7; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
918 context->ch3_supp[channel].fnum = (context->ch3_supp[channel].block_fnum_latch & 0x7) << 8 | value; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
919 context->ch3_supp[channel].keycode = context->ch3_supp[channel].block << 2 | fnum_to_keycode[context->ch3_supp[channel].fnum >> 7]; |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
920 if (context->ch3_mode) { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
921 int op = 2 * 4 + (channel < 2 ? (channel ^ 1) : channel); |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
922 context->operators[op].phase_inc = ym_calc_phase_inc(context, context->operators + op, op); |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
923 } |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
924 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
925 break; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
926 case REG_BLOCK_FN_CH3: |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
927 if (channel < 3) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
928 context->ch3_supp[channel].block_fnum_latch = value; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
929 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
930 break; |
362 | 931 case REG_ALG_FEEDBACK: |
932 context->channels[channel].algorithm = value & 0x7; | |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
933 switch (context->channels[channel].algorithm) |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
934 { |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
935 case 0: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
936 //operator 3 modulated by operator 2 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
937 //this uses a special op2 result reg on HW, but that reg will have the most recent |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
938 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
939 context->operators[channel*4+1].mod_src[0] = &context->operators[channel*4+2].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
940 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
941 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
942 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
943 context->operators[channel*4+2].mod_src[0] = &context->operators[channel*4+0].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
944 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
945 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
946 context->operators[channel*4+3].mod_src[0] = &context->operators[channel*4+1].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
947 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
948 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
949 case 1: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
950 //operator 3 modulated by operator 1+2 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
951 //op1 starts executing before this, but due to pipeline length the most current result is |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
952 //not available and instead the previous result is used |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
953 context->operators[channel*4+1].mod_src[0] = &context->channels[channel].op1_old; |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
954 //this uses a special op2 result reg on HW, but that reg will have the most recent |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
955 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
956 context->operators[channel*4+1].mod_src[1] = &context->operators[channel*4+2].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
957 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
958 //operator 2 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
959 context->operators[channel*4+2].mod_src[0] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
960 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
961 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
962 context->operators[channel*4+3].mod_src[0] = &context->operators[channel*4+1].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
963 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
964 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
965 case 2: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
966 //operator 3 modulated by operator 2 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
967 //this uses a special op2 result reg on HW, but that reg will have the most recent |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
968 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
969 context->operators[channel*4+1].mod_src[0] = &context->operators[channel*4+2].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
970 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
971 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
972 //operator 2 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
973 context->operators[channel*4+2].mod_src[0] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
974 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
975 //operator 4 modulated by operator 1+3 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
976 //this uses a special op1 result reg on HW, but that reg will have the most recent |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
977 //result from op1 when op4 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
978 context->operators[channel*4+3].mod_src[0] = &context->operators[channel*4+0].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
979 context->operators[channel*4+3].mod_src[1] = &context->operators[channel*4+1].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
980 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
981 case 3: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
982 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
983 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
984 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
985 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
986 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
987 context->operators[channel*4+2].mod_src[0] = &context->operators[channel*4+0].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
988 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
989 //operator 4 modulated by operator 2+3 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
990 //op2 starts executing before this, but due to pipeline length the most current result is |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
991 //not available and instead the previous result is used |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
992 context->operators[channel*4+3].mod_src[0] = &context->channels[channel].op2_old; |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
993 context->operators[channel*4+3].mod_src[1] = &context->operators[channel*4+1].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
994 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
995 case 4: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
996 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
997 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
998 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
999 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1000 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1001 context->operators[channel*4+2].mod_src[0] = &context->operators[channel*4+0].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1002 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1003 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1004 context->operators[channel*4+3].mod_src[0] = &context->operators[channel*4+1].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1005 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1006 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1007 case 5: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1008 //operator 3 modulated by operator 1 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
1009 //op1 starts executing before this, but due to pipeline length the most current result is |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
1010 //not available and instead the previous result is used |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
1011 context->operators[channel*4+1].mod_src[0] = &context->channels[channel].op1_old; |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1012 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1013 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1014 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1015 context->operators[channel*4+2].mod_src[0] = &context->operators[channel*4+0].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1016 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1017 //operator 4 modulated by operator 1 |
1808
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
1018 //this uses a special op1 result reg on HW, but that reg will have the most recent |
ce6881d64eef
Operator results should be delayed by one sample when used as a modulator in some cases based on relative execution time and pipeline length
Michael Pavone <pavone@retrodev.com>
parents:
1803
diff
changeset
|
1019 //result from op1 when op4 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1020 context->operators[channel*4+3].mod_src[0] = &context->operators[channel*4+0].output; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1021 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1022 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1023 case 6: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1024 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1025 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1026 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1027 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1028 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1029 context->operators[channel*4+2].mod_src[0] = &context->operators[channel*4+0].output; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1030 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1031 //operator 4 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1032 context->operators[channel*4+3].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1033 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1034 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1035 case 7: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1036 //everything is an output so no modulation (except for op 1 feedback) |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1037 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1038 context->operators[channel*4+1].mod_src[1] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1039 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1040 context->operators[channel*4+2].mod_src[0] = NULL; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1041 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1042 context->operators[channel*4+3].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1043 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1044 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
1045 } |
362 | 1046 context->channels[channel].feedback = value >> 3 & 0x7; |
527
7df7f493b3b6
Fix operator 1 self-feedback
Michael Pavone <pavone@retrodev.com>
parents:
522
diff
changeset
|
1047 //printf("Algorithm %d, feedback %d for channel %d\n", value & 0x7, value >> 3 & 0x7, channel); |
362 | 1048 break; |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1049 case REG_LR_AMS_PMS: { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1050 uint8_t old_pms = context->channels[channel].pms; |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
1051 context->channels[channel].pms = (value & 0x7) * 32; |
362 | 1052 context->channels[channel].ams = value >> 4 & 0x3; |
1053 context->channels[channel].lr = value & 0xC0; | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1054 if (old_pms != context->channels[channel].pms) { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1055 for (int op = channel * 4; op < (channel + 1) * 4; op++) |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1056 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1057 context->operators[op].phase_inc = ym_calc_phase_inc(context, context->operators + op, op); |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1058 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1059 } |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
1060 //printf("Write of %X to LR_AMS_PMS reg for channel %d\n", value, channel); |
362 | 1061 break; |
1062 } | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1063 } |
362 | 1064 } |
1065 } | |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
1066 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
1067 |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1068 uint8_t ym_read_status(ym2612_context * context, uint32_t cycle, uint32_t port) |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
1069 { |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1070 uint8_t status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1071 port &= context->status_address_mask; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1072 if (port) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1073 if (context->last_status_cycle != CYCLE_NEVER && cycle - context->last_status_cycle > context->invalid_status_decay) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1074 context->last_status = 0; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1075 } |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1076 status = context->last_status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1077 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1078 status = context->status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1079 if (cycle >= context->busy_start && cycle < context->busy_start + context->busy_cycles) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1080 status |= 0x80; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1081 } |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1082 context->last_status = status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1083 context->last_status_cycle = cycle; |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1084 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1085 return status; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1086 |
288
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
1087 } |
a8ee7934a1f8
Add a YM2612 stub implementation with just timers and status registers so that games that depend on it can run.
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
1088 |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1089 void ym_print_channel_info(ym2612_context *context, int channel) |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1090 { |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1091 ym_channel *chan = context->channels + channel; |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1092 printf("\n***Channel %d***\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1093 "Algorithm: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1094 "Feedback: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1095 "Pan: %s\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1096 "AMS: %d\n" |
2517
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1097 "PMS: %d\n" |
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1098 "Block: %d\n" |
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1099 "F-Num: %d\n", |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1100 channel+1, chan->algorithm, chan->feedback, |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1101 chan->lr == 0xC0 ? "LR" : chan->lr == 0x80 ? "L" : chan->lr == 0x40 ? "R" : "", |
2517
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1102 chan->ams, chan->pms, chan->block, chan->fnum); |
930
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1103 if (channel == 2) { |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1104 printf( |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1105 "Mode: %X: %s\n", |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1106 context->ch3_mode, context->ch3_mode ? "special" : "normal"); |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1107 } |
739
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1108 for (int operator = channel * 4; operator < channel * 4+4; operator++) |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1109 { |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1110 int dispnum = operator - channel * 4 + 1; |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1111 if (dispnum == 2) { |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1112 dispnum = 3; |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1113 } else if (dispnum == 3) { |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1114 dispnum = 2; |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1115 } |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1116 ym_operator *op = context->operators + operator; |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1117 printf("\nOperator %d:\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1118 " Multiple: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1119 " Detune: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1120 " Total Level: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1121 " Attack Rate: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1122 " Key Scaling: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1123 " Decay Rate: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1124 " Sustain Level: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1125 " Sustain Rate: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1126 " Release Rate: %d\n" |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1127 " Amplitude Modulation %s\n", |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1128 dispnum, op->multiple, op->detune, op->total_level, |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1129 op->rates[PHASE_ATTACK], op->key_scaling, op->rates[PHASE_DECAY], |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1130 op->sustain_level, op->rates[PHASE_SUSTAIN], op->rates[PHASE_RELEASE], |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1131 op->am ? "On" : "Off"); |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1132 } |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1133 } |
2317bdca03b4
Add a basic YM-2612 command to the debugger. Fix negative detune values and get the correct precision for the multiplication step of phase inc calculation
Michael Pavone <pavone@retrodev.com>
parents:
738
diff
changeset
|
1134 |
930
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1135 void ym_print_timer_info(ym2612_context *context) |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1136 { |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1137 printf("***Timer A***\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1138 "Current Value: %d\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1139 "Load Value: %d\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1140 "Triggered: %s\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1141 "Enabled: %s\n\n", |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1142 context->timer_a, |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1143 context->timer_a_load, |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1144 context->status & BIT_STATUS_TIMERA ? "yes" : "no", |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1145 context->timer_control & BIT_TIMERA_ENABLE ? "yes" : "no"); |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1146 printf("***Timer B***\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1147 "Current Value: %d\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1148 "Load Value: %d\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1149 "Triggered: %s\n" |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1150 "Enabled: %s\n\n", |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1151 context->timer_b, |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1152 context->timer_b_load, |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1153 context->status & BIT_STATUS_TIMERB ? "yes" : "no", |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1154 context->timer_control & BIT_TIMERB_ENABLE ? "yes" : "no"); |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1155 } |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1156 |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1157 void ym_serialize(ym2612_context *context, serialize_buffer *buf) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1158 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1159 save_buffer8(buf, context->part1_regs, YM_PART1_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1160 save_buffer8(buf, context->part2_regs, YM_PART2_REGS); |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1161 for (int i = 0; i < OPN2_NUM_OPERATORS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1162 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1163 save_int32(buf, context->operators[i].phase_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1164 save_int16(buf, context->operators[i].envelope); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1165 save_int16(buf, context->operators[i].output); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1166 save_int8(buf, context->operators[i].env_phase); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1167 save_int8(buf, context->operators[i].inverted); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1168 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1169 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1170 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1171 save_int16(buf, context->channels[i].output); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1172 save_int16(buf, context->channels[i].op1_old); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1173 //Due to the latching behavior, these need to be saved |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1174 //even though duplicate info is probably in the regs array |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1175 save_int8(buf, context->channels[i].block); |
1450
08bc099a622f
Save entirety of fnum register, not just the low 8 bits
Michael Pavone <pavone@retrodev.com>
parents:
1447
diff
changeset
|
1176 save_int16(buf, context->channels[i].fnum); |
1447
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1177 save_int8(buf, context->channels[i].keyon); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1178 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1179 for (int i = 0; i < 3; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1180 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1181 //Due to the latching behavior, these need to be saved |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1182 //even though duplicate info is probably in the regs array |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1183 save_int8(buf, context->ch3_supp[i].block); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1184 save_int8(buf, context->ch3_supp[i].fnum); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1185 } |
1447
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1186 save_int8(buf, context->timer_control); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1187 save_int16(buf, context->timer_a); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1188 save_int8(buf, context->timer_b); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1189 save_int8(buf, context->sub_timer_b); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1190 save_int16(buf, context->env_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1191 save_int8(buf, context->current_op); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1192 save_int8(buf, context->current_env_op); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1193 save_int8(buf, context->lfo_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1194 save_int8(buf, context->csm_keyon); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1195 save_int8(buf, context->status); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1196 save_int8(buf, context->selected_reg); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1197 save_int8(buf, context->selected_part); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1198 save_int32(buf, context->current_cycle); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1199 save_int32(buf, context->write_cycle); |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1200 save_int32(buf, context->busy_start); |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1201 save_int32(buf, context->last_status_cycle); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1202 save_int32(buf, context->invalid_status_decay); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1203 save_int8(buf, context->last_status); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1204 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1205 |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1206 void ym_deserialize(deserialize_buffer *buf, void *vcontext) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1207 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1208 ym2612_context *context = vcontext; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1209 uint8_t temp_regs[YM_PART1_REGS]; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1210 load_buffer8(buf, temp_regs, YM_PART1_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1211 context->selected_part = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1212 for (int i = 0; i < YM_PART1_REGS; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1213 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1214 uint8_t reg = YM_PART1_START + i; |
1447
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1215 if (reg == REG_TIME_CTRL) { |
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1216 context->ch3_mode = temp_regs[i] & 0xC0; |
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1217 } else if (reg != REG_FNUM_LOW && reg != REG_KEY_ONOFF) { |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1218 context->selected_reg = reg; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1219 ym_data_write(context, temp_regs[i]); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1220 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1221 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1222 load_buffer8(buf, temp_regs, YM_PART2_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1223 context->selected_part = 1; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1224 for (int i = 0; i < YM_PART2_REGS; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1225 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1226 uint8_t reg = YM_PART2_START + i; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1227 if (reg != REG_FNUM_LOW) { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1228 context->selected_reg = reg; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1229 ym_data_write(context, temp_regs[i]); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1230 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1231 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1232 for (int i = 0; i < OPN2_NUM_OPERATORS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1233 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1234 context->operators[i].phase_counter = load_int32(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1235 context->operators[i].envelope = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1236 context->operators[i].output = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1237 context->operators[i].env_phase = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1238 if (context->operators[i].env_phase > PHASE_RELEASE) { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1239 context->operators[i].env_phase = PHASE_RELEASE; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1240 } |
1450
08bc099a622f
Save entirety of fnum register, not just the low 8 bits
Michael Pavone <pavone@retrodev.com>
parents:
1447
diff
changeset
|
1241 context->operators[i].inverted = load_int8(buf) != 0 ? SSG_INVERT : 0; |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1242 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1243 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1244 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1245 context->channels[i].output = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1246 context->channels[i].op1_old = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1247 context->channels[i].block = load_int8(buf); |
1450
08bc099a622f
Save entirety of fnum register, not just the low 8 bits
Michael Pavone <pavone@retrodev.com>
parents:
1447
diff
changeset
|
1248 context->channels[i].fnum = load_int16(buf); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1249 context->channels[i].keycode = context->channels[i].block << 2 | fnum_to_keycode[context->channels[i].fnum >> 7]; |
1447
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1250 context->channels[i].keyon = load_int8(buf); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1251 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1252 for (int i = 0; i < 3; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1253 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1254 context->ch3_supp[i].block = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1255 context->ch3_supp[i].fnum = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1256 context->ch3_supp[i].keycode = context->ch3_supp[i].block << 2 | fnum_to_keycode[context->ch3_supp[i].fnum >> 7]; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1257 } |
1447
a094815b1168
Save and restore YM2612 timer control and keyon/off state in native save states
Michael Pavone <pavone@retrodev.com>
parents:
1427
diff
changeset
|
1258 context->timer_control = load_int8(buf); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1259 context->timer_a = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1260 context->timer_b = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1261 context->sub_timer_b = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1262 context->env_counter = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1263 context->current_op = load_int8(buf); |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1264 if (context->current_op >= OPN2_NUM_OPERATORS) { |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1265 context->current_op = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1266 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1267 context->current_env_op = load_int8(buf); |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1268 if (context->current_env_op >= OPN2_NUM_OPERATORS) { |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1269 context->current_env_op = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1270 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1271 context->lfo_counter = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1272 context->csm_keyon = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1273 context->status = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1274 context->selected_reg = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1275 context->selected_part = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1276 context->current_cycle = load_int32(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1277 context->write_cycle = load_int32(buf); |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1278 context->busy_start = load_int32(buf); |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1279 if (buf->size > buf->cur_pos) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1280 context->last_status_cycle = load_int32(buf); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1281 context->invalid_status_decay = load_int32(buf); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1282 context->last_status = load_int8(buf); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1283 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1284 context->last_status = context->status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1285 context->last_status_cycle = context->write_cycle; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1286 } |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1287 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1288 |
2255
74112041b2c7
Proper calculation of sample rate for YM2612/PSG oscilloscope view
Michael Pavone <pavone@retrodev.com>
parents:
2243
diff
changeset
|
1289 void ym_enable_scope(ym2612_context *context, oscilloscope *scope, uint32_t master_clock) |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1290 { |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
1291 #ifndef IS_LIB |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1292 static const char *names[] = { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1293 "YM2612 #1", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1294 "YM2612 #2", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1295 "YM2612 #3", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1296 "YM2612 #4", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1297 "YM2612 #5", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1298 "YM2612 #6" |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1299 }; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1300 context->scope = scope; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1301 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1302 { |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1303 context->channels[i].scope_channel = scope_add_channel(scope, names[i], master_clock / (context->clock_inc * OPN2_NUM_OPERATORS)); |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1304 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
1305 #endif |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1306 } |