Mercurial > repos > blastem
annotate ym2612.c @ 2684:c649bcc18487
Fix crash bug in Android fallback font loading path
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 29 Mar 2025 23:54:45 -0700 |
parents | eb588f22ec76 |
children |
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 |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
41 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
|
42 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
|
43 |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
44 #define YM_DIVIDER 2 |
374 | 45 #define CYCLE_NEVER 0xFFFFFFFF |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
46 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
47 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
|
48 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
|
49 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
50 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
|
51 |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
52 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
|
53 { |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
54 if (!log_context) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
55 return; |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
56 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
57 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
|
58 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
|
59 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
|
60 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
61 } |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
62 log_context = NULL; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
63 } |
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
|
64 |
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
|
65 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
|
66 { |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
67 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
|
68 } |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
69 |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
70 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
|
71 { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
72 context->current_cycle -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
73 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
|
74 context->write_cycle -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
75 } else { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
76 context->write_cycle = CYCLE_NEVER; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
77 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
78 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
|
79 context->busy_start -= deduction; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
80 } else { |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
81 context->busy_start = CYCLE_NEVER; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
82 } |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
83 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
|
84 context->last_status_cycle -= deduction; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
85 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
86 context->last_status = 0; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
87 context->last_status_cycle = CYCLE_NEVER; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
88 } |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
89 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
90 |
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
|
91 #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
|
92 #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
|
93 |
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
|
94 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
|
95 { |
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
|
96 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
|
97 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
|
98 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
|
99 FILE* savedlogs[OPN2_NUM_CHANNELS]; |
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
100 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
|
101 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
|
102 { |
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
103 savedlogs[i] = context->channels[i].logfile; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
104 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
|
105 } |
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
|
106 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
|
107 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
|
108 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
|
109 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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 //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
|
116 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
|
117 context->timer_b = TIMER_B_MAX; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
118 |
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
|
119 //TODO: Reset LFO state |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
120 |
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
|
121 //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
|
122 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
|
123 context->channels[i].lr = 0xC0; |
1654
4637ab86be8c
Preserve WAVE logging FILE * across YM2612 device reset
Michael Pavone <pavone@retrodev.com>
parents:
1555
diff
changeset
|
124 context->channels[i].logfile = savedlogs[i]; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
125 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
|
126 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
|
127 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
|
128 } 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
|
129 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
|
130 } |
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
|
131 } |
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
|
132 context->write_cycle = CYCLE_NEVER; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
133 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
|
134 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
|
135 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
|
136 } |
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
|
137 } |
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 |
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
|
139 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
|
140 { |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
141 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
|
142 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
|
143 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
|
144 context->clock_inc = clock_div * 6; |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
145 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
|
146 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
|
147 //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
|
148 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
|
149 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
|
150 |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
151 //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
|
152 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
|
153 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
|
154 char fname[64]; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
155 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
|
156 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
|
157 if (!f) { |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
158 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
|
159 continue; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
160 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
161 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
|
162 fclose(f); |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
163 context->channels[i].logfile = NULL; |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
164 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
165 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
166 } |
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
406
diff
changeset
|
167 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
|
168 log_context = context; |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
169 if (!registered_finalize) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
170 atexit(ym_finalize_log); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
171 registered_finalize = 1; |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
172 } |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
173 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
174 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
|
175 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
|
176 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
|
177 } |
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
|
178 |
884
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
179 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
|
180 { |
1551
ce1f93be0104
Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents:
1450
diff
changeset
|
181 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
|
182 if (context == log_context) { |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
183 ym_finalize_log(); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
184 } |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
185 free(context); |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
186 } |
252dfd29831d
Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents:
859
diff
changeset
|
187 |
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
|
188 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
|
189 { |
5278b6e44fc1
Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents:
1656
diff
changeset
|
190 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
|
191 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
|
192 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
|
193 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
|
194 } 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
|
195 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
|
196 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
|
197 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
|
198 } |
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 } |
381
7815ebbbd705
Fix modulation shift value
Mike Pavone <pavone@retrodev.com>
parents:
380
diff
changeset
|
200 #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
|
201 |
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
|
202 #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
|
203 |
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
|
204 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
|
205 |
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
|
206 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
|
207 { |
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
|
208 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
|
209 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
|
210 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
|
211 { |
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
|
212 if (changes & keyon_bits[bit]) { |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
213 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
|
214 } |
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
|
215 } |
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
|
216 } |
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
|
217 |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
218 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
|
219 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
220 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
|
221 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
|
222 context->timer_a++; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
223 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
|
224 csm_keyoff(context); |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
225 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
226 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
227 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
|
228 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
|
229 } 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
|
230 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
|
231 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
232 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
|
233 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
|
234 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
|
235 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
|
236 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
|
237 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
238 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
|
239 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
|
240 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
241 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
242 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
243 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
244 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
245 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
|
246 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
|
247 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
|
248 context->timer_b++; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
249 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
250 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
|
251 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
|
252 } 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
|
253 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
|
254 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
255 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
|
256 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
257 } |
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
|
258 } 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
|
259 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
|
260 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
|
261 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
262 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
|
263 //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
|
264 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
|
265 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
|
266 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
|
267 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
|
268 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
|
269 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
|
270 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
|
271 } else { |
2287 | 272 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
|
273 } |
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
|
274 } 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
|
275 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
|
276 } |
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
|
277 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
|
278 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
|
279 { |
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
|
280 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
|
281 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
|
282 { |
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
|
283 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
|
284 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
285 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
286 } |
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 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
|
291 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
292 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
|
293 uint8_t rate; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
294 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
|
295 //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
|
296 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
|
297 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
298 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
|
299 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
|
300 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
|
301 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
|
302 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
|
303 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
|
304 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
|
305 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
|
306 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
|
307 } |
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
|
308 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
|
309 } |
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
|
310 } |
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 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
|
312 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
|
313 if (rate > 63) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
314 rate = 63; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
315 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
316 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
317 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
|
318 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
|
319 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
|
320 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
|
321 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
|
322 //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
|
323 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
|
324 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
|
325 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
|
326 //Handle overflow |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
327 operator->envelope = 0; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
328 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
329 if (!operator->envelope) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
330 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
|
331 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
332 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
333 if (operator->ssg) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
334 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
|
335 envelope_inc *= 4; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
336 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
337 envelope_inc = 0; |
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 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
340 //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
|
341 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
|
342 //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
|
343 if ( |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
344 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
|
345 || (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
|
346 ) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
347 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
|
348 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
349 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
350 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
351 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
352 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
353 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
|
354 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
355 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
|
356 //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
|
357 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
|
358 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
|
359 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
|
360 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
|
361 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
|
362 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
|
363 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
|
364 if (op & 3) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
365 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
|
366 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
|
367 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
|
368 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
|
369 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
370 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
|
371 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
372 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
373 if (chan->feedback) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
374 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
|
375 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
376 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
377 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
|
378 if (operator->ssg) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
379 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
|
380 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
|
381 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
|
382 !(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
|
383 )) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
384 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
|
385 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
386 } 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
|
387 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
|
388 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
389 if ( |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
390 (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
|
391 && !(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
|
392 ) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
393 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
|
394 env = operator->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 if (operator->inverted) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
398 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
|
399 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
400 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
401 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
|
402 if (operator->am) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
403 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
|
404 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
|
405 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
|
406 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
407 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
|
408 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
409 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
410 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
|
411 env = MAX_ENVELOPE; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
412 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
413 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
|
414 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
|
415 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
|
416 } 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
|
417 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
|
418 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
419 operator->output = output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
420 //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
|
421 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
|
422 if (chan->algorithm < 4) { |
2554
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
423 chan->output = operator->output & ~0x1F; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
424 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
|
425 } else if(chan->algorithm == 4) { |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
426 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
|
427 chan->output = (operator->output & ~0x1F) + (other_op->output & ~0x1F); |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
428 if (chan->output > 0x1FE0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
429 chan->output = 0x1FE0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
430 } else if (chan->output < -0x1FF0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
431 chan->output = - 0x1FF0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
432 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
433 if (operator->phase_inc < other_op->phase_inc) { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
434 chan->phase_overflow = operator->phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
435 } else { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
436 chan->phase_overflow = other_op->phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
437 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
438 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
439 output = 0; |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
440 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
|
441 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
|
442 output += context->operators[op].output & ~0x1F; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
443 if (output > 0x1FE0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
444 output = 0x1FE0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
445 } else if (output < -0x1FF0) { |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
446 output = - 0x1FF0; |
76259d246695
Fix YM2612 channel accumulator precision
Michael Pavone <pavone@retrodev.com>
parents:
2517
diff
changeset
|
447 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
448 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
|
449 lowest_phase_inc = context->operators[op].phase_inc; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
450 chan->phase_overflow = context->operators[op].phase_overflow; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
451 } |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
452 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
453 chan->output = output; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
454 } |
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 //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
|
457 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
458 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
459 |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
460 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
|
461 { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
462 int16_t left = 0, right = 0; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
463 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
|
464 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
|
465 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
466 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
|
467 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
468 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
|
469 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
470 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
|
471 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
|
472 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
473 #ifndef IS_LIB |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
474 if (context->scope) { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
475 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
|
476 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
477 #endif |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
478 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
|
479 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
|
480 } 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
|
481 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
482 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
|
483 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
484 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
|
485 } |
2555
78e1769efcdb
Implement additional YM2612 pan leakage observed by MarkeyJester
Michael Pavone <pavone@retrodev.com>
parents:
2554
diff
changeset
|
486 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
|
487 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
488 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
|
489 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
|
490 } 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
|
491 if (value >= 0) { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
492 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
|
493 } else { |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
494 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
|
495 } |
2555
78e1769efcdb
Implement additional YM2612 pan leakage observed by MarkeyJester
Michael Pavone <pavone@retrodev.com>
parents:
2554
diff
changeset
|
496 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
|
497 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
498 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
499 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
|
500 } |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
501 |
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
|
502 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
|
503 { |
1879
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
504 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
|
505 return; |
43a6cee4fd00
Split ym_run into a few different functions to enhance clarity
Michael Pavone <pavone@retrodev.com>
parents:
1808
diff
changeset
|
506 } |
362 | 507 //printf("Running YM2612 from cycle %d to cycle %d\n", context->current_cycle, to_cycle); |
508 //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
|
509 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
|
510 //Update timers at beginning of 144 cycle period |
403 | 511 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
|
512 ym_run_timers(context); |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
513 } |
359
cc39629e8d06
YM2612 WIP snapshot before register refactor
Mike Pavone <pavone@retrodev.com>
parents:
288
diff
changeset
|
514 //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
|
515 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
|
516 uint32_t op = context->current_env_op; |
362 | 517 ym_operator * operator = context->operators + op; |
518 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
|
519 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
|
520 context->current_env_op++; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
521 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
|
522 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
|
523 context->env_counter++; |
362 | 524 } |
525 } | |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
526 |
362 | 527 //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
|
528 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
|
529 context->current_op++; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
530 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
|
531 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
|
532 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
|
533 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
534 |
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
|
535 } |
362 | 536 //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
|
537 } |
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
|
538 |
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
|
539 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
|
540 { |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
541 //printf("address_write_part1: %X\n", address); |
362 | 542 context->selected_reg = address; |
543 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
|
544 } |
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
|
545 |
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
|
546 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
|
547 { |
364
62177cc39049
Incredibly broken YM2612 support plus a fix to Z80 bus request
Mike Pavone <pavone@retrodev.com>
parents:
362
diff
changeset
|
548 //printf("address_write_part2: %X\n", address); |
362 | 549 context->selected_reg = address; |
550 context->selected_part = 1; | |
551 } | |
552 | |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
553 static uint8_t fnum_to_keycode[] = { |
362 | 554 //F11 = 0 |
555 0,0,0,0,0,0,0,1, | |
556 //F11 = 1 | |
557 2,3,3,3,3,3,3,3 | |
558 }; | |
559 | |
560 //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
|
561 static uint32_t detune_table[][4] = { |
362 | 562 {0, 0, 1, 2}, //0 (0x00) |
563 {0, 0, 1, 2}, //1 (0x01) | |
564 {0, 0, 1, 2}, //2 (0x02) | |
565 {0, 0, 1, 2}, //3 (0x03) | |
566 {0, 1, 2, 2}, //4 (0x04) | |
567 {0, 1, 2, 3}, //5 (0x05) | |
568 {0, 1, 2, 3}, //6 (0x06) | |
569 {0, 1, 2, 3}, //7 (0x07) | |
570 {0, 1, 2, 4}, //8 (0x08) | |
571 {0, 1, 3, 4}, //9 (0x09) | |
572 {0, 1, 3, 4}, //10 (0x0A) | |
573 {0, 1, 3, 5}, //11 (0x0B) | |
574 {0, 2, 4, 5}, //12 (0x0C) | |
575 {0, 2, 4, 6}, //13 (0x0D) | |
576 {0, 2, 4, 6}, //14 (0x0E) | |
577 {0, 2, 5, 7}, //15 (0x0F) | |
578 {0, 2, 5, 8}, //16 (0x10) | |
579 {0, 3, 6, 8}, //17 (0x11) | |
580 {0, 3, 6, 9}, //18 (0x12) | |
581 {0, 3, 7,10}, //19 (0x13) | |
582 {0, 4, 8,11}, //20 (0x14) | |
583 {0, 4, 8,12}, //21 (0x15) | |
584 {0, 4, 9,13}, //22 (0x16) | |
585 {0, 5,10,14}, //23 (0x17) | |
586 {0, 5,11,16}, //24 (0x18) | |
587 {0, 6,12,17}, //25 (0x19) | |
588 {0, 6,13,19}, //26 (0x1A) | |
589 {0, 7,14,20}, //27 (0x1B) | |
590 {0, 8,16,22}, //28 (0x1C) | |
591 {0, 8,16,22}, //29 (0x1D) | |
592 {0, 8,16,22}, //30 (0x1E) | |
593 {0, 8,16,22} | |
594 }; //31 (0x1F) | |
595 | |
1102
c15896605bf2
Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents:
1002
diff
changeset
|
596 static uint32_t ym_calc_phase_inc(ym2612_context * context, ym_operator * operator, uint32_t op) |
362 | 597 { |
598 uint32_t chan_num = op / 4; | |
599 //printf("ym_update_phase_inc | channel: %d, op: %d\n", chan_num, op); | |
600 //base frequency | |
601 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
|
602 uint32_t inc, detune; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
603 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
|
604 //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
|
605 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
|
606 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
|
607 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
|
608 } |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
609 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
|
610 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
611 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
|
612 inc &= 0xFFF; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
613 } |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
614 if (!context->ch3_supp[index].block) { |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
615 inc >>= 1; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
616 } else { |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
617 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
|
618 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
619 //detune |
738
8972378e314f
Fix register to operator mapping for channel 3 special mode
Michael Pavone <pavone@retrodev.com>
parents:
650
diff
changeset
|
620 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
|
621 } else { |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
622 inc = channel->fnum; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
623 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
624 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
|
625 inc &= 0xFFF; |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
626 } |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
627 if (!channel->block) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
628 inc >>= 1; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
629 } else { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
630 inc <<= (channel->block-1); |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
631 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
632 //detune |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
633 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
|
634 } |
935
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
635 if (channel->pms) { |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
636 inc >>= 1; |
01fb50390b27
Remove phase increment caching. Fix LFO phase modulation calculation
Michael Pavone <pavone@retrodev.com>
parents:
930
diff
changeset
|
637 } |
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
|
638 if (operator->detune & 0x4) { |
362 | 639 inc -= detune; |
640 //this can underflow, mask to 17-bit result | |
641 inc &= 0x1FFFF; | |
642 } else { | |
643 inc += detune; | |
644 } | |
645 //multiple | |
646 if (operator->multiple) { | |
647 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
|
648 inc &= 0xFFFFF; |
362 | 649 } else { |
650 //0.5 | |
651 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
|
652 } |
365
3ba3b6656fff
Actually save the shifted phase inc after applying the block shift
Mike Pavone <pavone@retrodev.com>
parents:
364
diff
changeset
|
653 //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
|
654 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
|
655 } |
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
|
656 |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
657 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
|
658 { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
659 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
|
660 context->vgm = vgm; |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
661 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
|
662 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
|
663 //skip invalid registers |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
664 continue; |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
665 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
666 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
|
667 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
668 |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
669 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
|
670 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
|
671 //skip invalid registers |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
672 continue; |
00fb99805445
Skip invalid registers when dumping initial YM2612 state to VGM log
Michael Pavone <pavone@retrodev.com>
parents:
1909
diff
changeset
|
673 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
674 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
|
675 } |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
676 } |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
677 |
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
|
678 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
|
679 { |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
680 context->write_cycle = context->current_cycle; |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
681 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
|
682 |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
683 if (context->selected_reg >= YM_REG_END) { |
362 | 684 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
|
685 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
686 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
|
687 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
|
688 return; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
689 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
690 if (context->vgm) { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
691 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
|
692 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
693 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
|
694 } else { |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
695 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
|
696 return; |
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
697 } |
1909
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
698 if (context->vgm) { |
508522f08e4d
Initial stab at VGM logging support
Michael Pavone <pavone@retrodev.com>
parents:
1904
diff
changeset
|
699 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
|
700 } |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
448
diff
changeset
|
701 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
|
702 } |
1946 | 703 uint8_t buffer[3] = {context->selected_part, context->selected_reg, value}; |
704 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
|
705 dfprintf(debug_file, "write of %X to reg %X in part %d\n", value, context->selected_reg, context->selected_part+1); |
362 | 706 if (context->selected_reg < 0x30) { |
707 //Shared regs | |
708 switch (context->selected_reg) | |
709 { | |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
710 //TODO: Test reg |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
711 case REG_LFO: |
532
666210adf87b
Comment out LFO debug printf
Mike Pavone <pavone@retrodev.com>
parents:
527
diff
changeset
|
712 /*if ((value & 0x8) && !context->lfo_enable) { |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
713 printf("LFO Enabled, Freq: %d\n", value & 0x7); |
532
666210adf87b
Comment out LFO debug printf
Mike Pavone <pavone@retrodev.com>
parents:
527
diff
changeset
|
714 }*/ |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
715 context->lfo_enable = value & 0x8; |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
716 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
|
717 context->lfo_counter = 0; |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
718 } |
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
719 context->lfo_freq = value & 0x7; |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
720 |
411
baf4688901f2
Initial stab at LFO phase modulation
Mike Pavone <pavone@retrodev.com>
parents:
407
diff
changeset
|
721 break; |
362 | 722 case REG_TIMERA_HIGH: |
723 context->timer_a_load &= 0x3; | |
724 context->timer_a_load |= value << 2; | |
725 break; | |
726 case REG_TIMERA_LOW: | |
727 context->timer_a_load &= 0xFFFC; | |
728 context->timer_a_load |= value & 0x3; | |
729 break; | |
730 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
|
731 context->timer_b_load = value; |
362 | 732 break; |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
733 case REG_TIME_CTRL: { |
403 | 734 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
|
735 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
|
736 context->timer_control |= BIT_TIMERA_LOAD; |
403 | 737 } |
738 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
|
739 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
|
740 context->timer_control |= BIT_TIMERB_LOAD; |
403 | 741 } |
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
|
742 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
|
743 context->timer_control |= value & 0xF; |
403 | 744 if (value & BIT_TIMERA_RESET) { |
745 context->status &= ~BIT_STATUS_TIMERA; | |
746 } | |
747 if (value & BIT_TIMERB_RESET) { | |
748 context->status &= ~BIT_STATUS_TIMERB; | |
749 } | |
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
|
750 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
|
751 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
|
752 } |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
753 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
|
754 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
|
755 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
|
756 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
|
757 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
758 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
|
759 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
760 } |
362 | 761 break; |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
762 } |
362 | 763 case REG_KEY_ONOFF: { |
764 uint8_t channel = value & 0x7; | |
386
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
765 if (channel != 3 && channel != 7) { |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
766 if (channel > 2) { |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
767 channel--; |
6e5c4f3ab0e2
Fix channel mapping in key on/off register
Mike Pavone <pavone@retrodev.com>
parents:
383
diff
changeset
|
768 } |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
769 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
|
770 ? (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
|
771 : 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
|
772 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
|
773 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
|
774 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
|
775 if (value & keyon_bits[bit]) { |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
776 first_key_on = 1; |
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
777 //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
|
778 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
|
779 } 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
|
780 //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
|
781 keyoff(context->operators + op); |
448
e85a107e6ec0
Fix handling of key on in YM2612 core
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
782 } |
362 | 783 } |
784 } | |
785 } | |
786 break; | |
787 } | |
788 case REG_DAC: | |
789 if (context->dac_enable) { | |
790 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
|
791 //printf("DAC Write %X(%d) @ %d\n", value, context->channels[5].output, context->current_cycle); |
362 | 792 } |
793 break; | |
794 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
|
795 //printf("DAC Enable: %X\n", value); |
362 | 796 context->dac_enable = value & 0x80; |
797 break; | |
798 } | |
799 } else if (context->selected_reg < 0xA0) { | |
800 //part | |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
801 uint8_t op = context->selected_part ? (OPN2_NUM_OPERATORS/2) : 0; |
362 | 802 //channel in part |
803 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
|
804 op += 4 * (context->selected_reg & 0x3) + ((context->selected_reg & 0xC) / 4); |
362 | 805 //printf("write targets operator %d (%d of channel %d)\n", op, op % 4, op / 4); |
806 ym_operator * operator = context->operators + op; | |
807 switch (context->selected_reg & 0xF0) | |
808 { | |
809 case REG_DETUNE_MULT: | |
810 operator->detune = value >> 4 & 0x7; | |
811 operator->multiple = value & 0xF; | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
812 operator->phase_inc = ym_calc_phase_inc(context, operator, op); |
362 | 813 break; |
814 case REG_TOTAL_LEVEL: | |
815 operator->total_level = (value & 0x7F) << 5; | |
816 break; | |
817 case REG_ATTACK_KS: | |
376 | 818 operator->key_scaling = 3 - (value >> 6); |
362 | 819 operator->rates[PHASE_ATTACK] = value & 0x1F; |
820 break; | |
821 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
|
822 operator->am = value & 0x80; |
362 | 823 operator->rates[PHASE_DECAY] = value & 0x1F; |
824 break; | |
825 case REG_SUSTAIN_RATE: | |
826 operator->rates[PHASE_SUSTAIN] = value & 0x1F; | |
827 break; | |
828 case REG_S_LVL_R_RATE: | |
829 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
|
830 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
|
831 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
|
832 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
|
833 } |
362 | 834 break; |
1301
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
835 case REG_SSG_EG: |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
836 if (!(value & SSG_ENABLE)) { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
837 value = 0; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
838 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
839 if ((value ^ operator->ssg) & SSG_INVERT) { |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
840 operator->inverted ^= SSG_INVERT; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
841 } |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
842 operator->ssg = value; |
babff81e4cfd
Initial implementation of YM2612 SSG-EG mode
Michael Pavone <pavone@retrodev.com>
parents:
1300
diff
changeset
|
843 break; |
362 | 844 } |
845 } | |
846 } else { | |
847 uint8_t channel = context->selected_reg & 0x3; | |
848 if (channel != 3) { | |
849 if (context->selected_part) { | |
850 channel += 3; | |
851 } | |
852 //printf("write targets channel %d\n", channel); | |
853 switch (context->selected_reg & 0xFC) | |
854 { | |
855 case REG_FNUM_LOW: | |
856 context->channels[channel].block = context->channels[channel].block_fnum_latch >> 3 & 0x7; | |
857 context->channels[channel].fnum = (context->channels[channel].block_fnum_latch & 0x7) << 8 | value; | |
858 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
|
859 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
|
860 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
861 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
|
862 } |
362 | 863 break; |
864 case REG_BLOCK_FNUM_H:{ | |
865 context->channels[channel].block_fnum_latch = value; | |
866 break; | |
867 } | |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
868 case REG_FNUM_LOW_CH3: |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
869 if (channel < 3) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
870 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
|
871 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
|
872 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
|
873 if (context->ch3_mode) { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
874 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
|
875 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
|
876 } |
383
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
877 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
878 break; |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
879 case REG_BLOCK_FN_CH3: |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
880 if (channel < 3) { |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
881 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
|
882 } |
72933100c55c
Initial implementation of channel 3 special mode
Mike Pavone <pavone@retrodev.com>
parents:
382
diff
changeset
|
883 break; |
362 | 884 case REG_ALG_FEEDBACK: |
885 context->channels[channel].algorithm = value & 0x7; | |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
886 switch (context->channels[channel].algorithm) |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
887 { |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
888 case 0: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
889 //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
|
890 //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
|
891 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
892 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
|
893 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
|
894 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
895 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
896 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
|
897 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
898 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
899 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
|
900 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
901 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
902 case 1: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
903 //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
|
904 //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
|
905 //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
|
906 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
|
907 //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
|
908 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
909 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
|
910 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
911 //operator 2 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
912 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
|
913 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
914 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
915 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
|
916 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
917 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
918 case 2: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
919 //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
|
920 //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
|
921 //result from op2 when op3 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
922 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
|
923 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
|
924 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
925 //operator 2 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
926 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
|
927 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
928 //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
|
929 //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
|
930 //result from op1 when op4 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
931 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
|
932 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
|
933 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
934 case 3: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
935 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
936 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
937 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
|
938 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
939 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
940 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
|
941 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
942 //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
|
943 //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
|
944 //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
|
945 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
|
946 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
|
947 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
948 case 4: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
949 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
950 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
951 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
|
952 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
953 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
954 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
|
955 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
956 //operator 4 modulated by operator 3 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
957 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
|
958 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
959 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
960 case 5: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
961 //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
|
962 //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
|
963 //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
|
964 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
|
965 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
|
966 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
967 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
968 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
|
969 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
970 //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
|
971 //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
|
972 //result from op1 when op4 starts executing |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
973 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
|
974 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
975 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
976 case 6: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
977 //operator 3 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
978 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
979 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
|
980 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
981 //operator 2 modulated by operator 1 |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
982 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
|
983 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
984 //operator 4 unmodulated |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
985 context->operators[channel*4+3].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
986 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
987 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
988 case 7: |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
989 //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
|
990 context->operators[channel*4+1].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
991 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
|
992 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
993 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
|
994 |
1656
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
995 context->operators[channel*4+3].mod_src[0] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
996 context->operators[channel*4+3].mod_src[1] = NULL; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
997 break; |
804f13c090b4
Optimize YM operator modulation
Mike Pavone <pavone@retrodev.com>
parents:
1654
diff
changeset
|
998 } |
362 | 999 context->channels[channel].feedback = value >> 3 & 0x7; |
527
7df7f493b3b6
Fix operator 1 self-feedback
Michael Pavone <pavone@retrodev.com>
parents:
522
diff
changeset
|
1000 //printf("Algorithm %d, feedback %d for channel %d\n", value & 0x7, value >> 3 & 0x7, channel); |
362 | 1001 break; |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1002 case REG_LR_AMS_PMS: { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1003 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
|
1004 context->channels[channel].pms = (value & 0x7) * 32; |
362 | 1005 context->channels[channel].ams = value >> 4 & 0x3; |
1006 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
|
1007 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
|
1008 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
|
1009 { |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1010 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
|
1011 } |
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1012 } |
369
fc820ab1394b
Fix left/right enable default value
Mike Pavone <pavone@retrodev.com>
parents:
365
diff
changeset
|
1013 //printf("Write of %X to LR_AMS_PMS reg for channel %d\n", value, channel); |
362 | 1014 break; |
1015 } | |
1880
e77f7a7c79a5
Cache operator phase increment for a small perf improvement
Michael Pavone <pavone@retrodev.com>
parents:
1879
diff
changeset
|
1016 } |
362 | 1017 } |
1018 } | |
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
|
1019 } |
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
|
1020 |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1021 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
|
1022 { |
1904
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1023 uint8_t status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1024 port &= context->status_address_mask; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1025 if (port) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1026 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
|
1027 context->last_status = 0; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1028 } |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1029 status = context->last_status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1030 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1031 status = context->status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1032 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
|
1033 status |= 0x80; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1034 } |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1035 context->last_status = status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1036 context->last_status_cycle = cycle; |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1037 } |
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1038 return status; |
2081
cfd53c94fffb
Initial stab at RF5C164 emulation
Michael Pavone <pavone@retrodev.com>
parents:
2029
diff
changeset
|
1039 |
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
|
1040 } |
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
|
1041 |
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
|
1042 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
|
1043 { |
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
|
1044 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
|
1045 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
|
1046 "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
|
1047 "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
|
1048 "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
|
1049 "AMS: %d\n" |
2517
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1050 "PMS: %d\n" |
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1051 "Block: %d\n" |
9fb04d29049e
Include block and f-num values in ymchannel debug output
Michael Pavone <pavone@retrodev.com>
parents:
2302
diff
changeset
|
1052 "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
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 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
|
1058 "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
|
1059 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
|
1060 } |
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
|
1061 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
|
1062 { |
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
|
1063 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
|
1064 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
|
1065 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
|
1066 } 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
|
1067 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
|
1068 } |
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
|
1069 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
|
1070 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
|
1071 " 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
|
1072 " 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
|
1073 " 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
|
1074 " 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
|
1075 " 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
|
1076 " 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
|
1077 " 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
|
1078 " 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
|
1079 " 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
|
1080 " 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
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 } |
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
|
1086 } |
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
|
1087 |
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
|
1088 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
|
1089 { |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1090 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
|
1091 "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
|
1092 "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
|
1093 "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
|
1094 "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
|
1095 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
|
1096 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
|
1097 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
|
1098 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
|
1099 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
|
1100 "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
|
1101 "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
|
1102 "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
|
1103 "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
|
1104 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
|
1105 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
|
1106 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
|
1107 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
|
1108 } |
f33e8d88ab6f
Add yt debug command for printing YM-2612 timer info. Fix AMS shift values.
Michael Pavone <pavone@retrodev.com>
parents:
929
diff
changeset
|
1109 |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1110 void ym_serialize(ym2612_context *context, serialize_buffer *buf) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1111 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1112 save_buffer8(buf, context->part1_regs, YM_PART1_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1113 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
|
1114 for (int i = 0; i < OPN2_NUM_OPERATORS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1115 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1116 save_int32(buf, context->operators[i].phase_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1117 save_int16(buf, context->operators[i].envelope); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1118 save_int16(buf, context->operators[i].output); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1119 save_int8(buf, context->operators[i].env_phase); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1120 save_int8(buf, context->operators[i].inverted); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1121 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1122 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1123 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1124 save_int16(buf, context->channels[i].output); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1125 save_int16(buf, context->channels[i].op1_old); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1126 //Due to the latching behavior, these need to be saved |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1127 //even though duplicate info is probably in the regs array |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1128 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
|
1129 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
|
1130 save_int8(buf, context->channels[i].keyon); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1131 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1132 for (int i = 0; i < 3; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1133 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1134 //Due to the latching behavior, these need to be saved |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1135 //even though duplicate info is probably in the regs array |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1136 save_int8(buf, context->ch3_supp[i].block); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1137 save_int8(buf, context->ch3_supp[i].fnum); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1138 } |
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
|
1139 save_int8(buf, context->timer_control); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1140 save_int16(buf, context->timer_a); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1141 save_int8(buf, context->timer_b); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1142 save_int8(buf, context->sub_timer_b); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1143 save_int16(buf, context->env_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1144 save_int8(buf, context->current_op); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1145 save_int8(buf, context->current_env_op); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1146 save_int8(buf, context->lfo_counter); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1147 save_int8(buf, context->csm_keyon); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1148 save_int8(buf, context->status); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1149 save_int8(buf, context->selected_reg); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1150 save_int8(buf, context->selected_part); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1151 save_int32(buf, context->current_cycle); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1152 save_int32(buf, context->write_cycle); |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1153 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
|
1154 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
|
1155 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
|
1156 save_int8(buf, context->last_status); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1157 } |
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 void ym_deserialize(deserialize_buffer *buf, void *vcontext) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1160 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1161 ym2612_context *context = vcontext; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1162 uint8_t temp_regs[YM_PART1_REGS]; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1163 load_buffer8(buf, temp_regs, YM_PART1_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1164 context->selected_part = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1165 for (int i = 0; i < YM_PART1_REGS; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1166 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1167 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
|
1168 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
|
1169 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
|
1170 } 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
|
1171 context->selected_reg = reg; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1172 ym_data_write(context, temp_regs[i]); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1173 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1174 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1175 load_buffer8(buf, temp_regs, YM_PART2_REGS); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1176 context->selected_part = 1; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1177 for (int i = 0; i < YM_PART2_REGS; i++) |
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 uint8_t reg = YM_PART2_START + i; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1180 if (reg != REG_FNUM_LOW) { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1181 context->selected_reg = reg; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1182 ym_data_write(context, temp_regs[i]); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1183 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1184 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1185 for (int i = 0; i < OPN2_NUM_OPERATORS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1186 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1187 context->operators[i].phase_counter = load_int32(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1188 context->operators[i].envelope = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1189 context->operators[i].output = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1190 context->operators[i].env_phase = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1191 if (context->operators[i].env_phase > PHASE_RELEASE) { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1192 context->operators[i].env_phase = PHASE_RELEASE; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1193 } |
1450
08bc099a622f
Save entirety of fnum register, not just the low 8 bits
Michael Pavone <pavone@retrodev.com>
parents:
1447
diff
changeset
|
1194 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
|
1195 } |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1196 for (int i = 0; i < OPN2_NUM_CHANNELS; i++) |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1197 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1198 context->channels[i].output = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1199 context->channels[i].op1_old = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1200 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
|
1201 context->channels[i].fnum = load_int16(buf); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1202 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
|
1203 context->channels[i].keyon = load_int8(buf); |
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 for (int i = 0; i < 3; i++) |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1206 { |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1207 context->ch3_supp[i].block = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1208 context->ch3_supp[i].fnum = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1209 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
|
1210 } |
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
|
1211 context->timer_control = load_int8(buf); |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1212 context->timer_a = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1213 context->timer_b = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1214 context->sub_timer_b = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1215 context->env_counter = load_int16(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1216 context->current_op = load_int8(buf); |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1217 if (context->current_op >= OPN2_NUM_OPERATORS) { |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1218 context->current_op = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1219 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1220 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
|
1221 if (context->current_env_op >= OPN2_NUM_OPERATORS) { |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1222 context->current_env_op = 0; |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1223 } |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1224 context->lfo_counter = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1225 context->csm_keyon = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1226 context->status = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1227 context->selected_reg = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1228 context->selected_part = load_int8(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1229 context->current_cycle = load_int32(buf); |
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1230 context->write_cycle = load_int32(buf); |
1902
32a3aa7b4a45
Fix YM2612 busy flag timing
Michael Pavone <pavone@retrodev.com>
parents:
1880
diff
changeset
|
1231 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
|
1232 if (buf->size > buf->cur_pos) { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1233 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
|
1234 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
|
1235 context->last_status = load_int8(buf); |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1236 } else { |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1237 context->last_status = context->status; |
8312e574100a
Implement selectable YM2612/YM3834 invalid status port behavior
Michael Pavone <pavone@retrodev.com>
parents:
1902
diff
changeset
|
1238 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
|
1239 } |
1427
4e5797b3935a
WIP - New savestate format
Michael Pavone <pavone@retrodev.com>
parents:
1356
diff
changeset
|
1240 } |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1241 |
2255
74112041b2c7
Proper calculation of sample rate for YM2612/PSG oscilloscope view
Michael Pavone <pavone@retrodev.com>
parents:
2243
diff
changeset
|
1242 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
|
1243 { |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
1244 #ifndef IS_LIB |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1245 static const char *names[] = { |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1246 "YM2612 #1", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1247 "YM2612 #2", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1248 "YM2612 #3", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1249 "YM2612 #4", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1250 "YM2612 #5", |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1251 "YM2612 #6" |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1252 }; |
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1253 context->scope = scope; |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1254 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
|
1255 { |
2558
3f58fec775df
Initial work on YMF262 (aka OPL3) emulation
Michael Pavone <pavone@retrodev.com>
parents:
2555
diff
changeset
|
1256 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
|
1257 } |
2302
0343f0d5add0
Fix libretro build for real
Michael Pavone <pavone@retrodev.com>
parents:
2287
diff
changeset
|
1258 #endif |
2243
0d1d5dccdd28
Initial implementation of oscilloscope debug view
Michael Pavone <pavone@retrodev.com>
parents:
2081
diff
changeset
|
1259 } |