summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/sidvoice.cpp
blob: 9135e36c6f8343477521b1b4a04a1e6d27f7bffb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
// license:BSD-3-Clause
// copyright-holders:Peter Trauner
#include "emu.h"
#include "sidvoice.h"

#include "sid.h"
#include "sidenvel.h"
#include "sidw6581.h"
#include "sidw8580.h"

#include "sound/mos6581.h"


static uint8_t triangleTable[4096];
static uint8_t sawtoothTable[4096];
static uint8_t squareTable[2*4096];
static const uint8_t* waveform30;
static const uint8_t* waveform50;
static const uint8_t* waveform60;
static const uint8_t* waveform70;
#if defined(LARGE_NOISE_TABLE)
	static uint8_t noiseTableMSB[1<<8];
	static uint8_t noiseTableLSB[1L<<16];
#else
	static uint8_t noiseTableMSB[1<<8];
	static uint8_t noiseTableMID[1<<8];
	static uint8_t noiseTableLSB[1<<8];
#endif


static std::unique_ptr<int8_t[]> ampMod1x8;

static const uint32_t noiseSeed = 0x7ffff8;

void sidInitMixerEngine(running_machine &machine)
{
	/* 8-bit volume modulation tables. */
	float filterAmpl = 0.7f;

	ampMod1x8 = std::make_unique<int8_t[]>(256*256);

	uint16_t uk = 0;
	for (int32_t si = 0; si < 256; si++)
	{
		for (int32_t sj = -128; sj < 128; sj++, uk++)
		{
			ampMod1x8[uk] = (int8_t)(((si*sj)/255)*filterAmpl);
		}
	}

}

static inline void waveAdvance(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	pVoice->waveStep.l += pVoice->waveStepAdd.l;
	pVoice->waveStep.w.h &= 4095;
#else
	pVoice->waveStepPnt += pVoice->waveStepAddPnt;
	pVoice->waveStep += pVoice->waveStepAdd;
	if (pVoice->waveStepPnt > 65535) pVoice->waveStep++;
	pVoice->waveStepPnt &= 0xFFFF;
	pVoice->waveStep &= 4095;
#endif
}

static inline void noiseAdvance(sidOperator* pVoice)
{
	pVoice->noiseStep += pVoice->noiseStepAdd;
	if (pVoice->noiseStep >= (1L << 20))
	{
		pVoice->noiseStep -= (1L << 20);
#if defined(DIRECT_FIXPOINT)
		pVoice->noiseReg.l = (pVoice->noiseReg.l << 1) |
			(((pVoice->noiseReg.l >> 22) ^ (pVoice->noiseReg.l >> 17)) & 1);
#else
		pVoice->noiseReg = (pVoice->noiseReg << 1) |
			(((pVoice->noiseReg >> 22) ^ (pVoice->noiseReg >> 17)) & 1);
#endif
#if defined(DIRECT_FIXPOINT) && defined(LARGE_NOISE_TABLE)
		pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg.w.l]
								|noiseTableMSB[pVoice->noiseReg.w.h & 0xff]);
#elif defined(DIRECT_FIXPOINT)
		pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg.b.l]
								|noiseTableMID[pVoice->noiseReg.b.h]
								|noiseTableMSB[pVoice->noiseReg.b.h2]);
#else
		pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg & 0xff]
								|noiseTableMID[pVoice->noiseReg >> 8 & 0xff]
								|noiseTableMSB[pVoice->noiseReg >> 16 & 0xff]);
#endif
	}
}

static inline void noiseAdvanceHp(sidOperator* pVoice)
{
	uint32_t tmp = pVoice->noiseStepAdd;
	while (tmp >= (1L << 20))
	{
		tmp -= (1L << 20);
#if defined(DIRECT_FIXPOINT)
		pVoice->noiseReg.l = (pVoice->noiseReg.l << 1) |
			(((pVoice->noiseReg.l >> 22) ^ (pVoice->noiseReg.l >> 17)) & 1);
#else
		pVoice->noiseReg = (pVoice->noiseReg << 1) |
			(((pVoice->noiseReg >> 22) ^ (pVoice->noiseReg >> 17)) & 1);
#endif
	}
	pVoice->noiseStep += tmp;
	if (pVoice->noiseStep >= (1L << 20))
	{
		pVoice->noiseStep -= (1L << 20);
#if defined(DIRECT_FIXPOINT)
		pVoice->noiseReg.l = (pVoice->noiseReg.l << 1) |
			(((pVoice->noiseReg.l >> 22) ^ (pVoice->noiseReg.l >> 17)) & 1);
#else
		pVoice->noiseReg = (pVoice->noiseReg << 1) |
			(((pVoice->noiseReg >> 22) ^ (pVoice->noiseReg >> 17)) & 1);
#endif
	}
#if defined(DIRECT_FIXPOINT) && defined(LARGE_NOISE_TABLE)
	pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg.w.l]
							|noiseTableMSB[pVoice->noiseReg.w.h & 0xff]);
#elif defined(DIRECT_FIXPOINT)
	pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg.b.l]
							|noiseTableMID[pVoice->noiseReg.b.h]
							|noiseTableMSB[pVoice->noiseReg.b.h2]);
#else
	pVoice->noiseOutput = (noiseTableLSB[pVoice->noiseReg & 0xff]
							|noiseTableMID[pVoice->noiseReg >> 8 & 0xff]
							|noiseTableMSB[pVoice->noiseReg >> 16 & 0xff]);
#endif
}


#if defined(DIRECT_FIXPOINT)
	#define triangle triangleTable[pVoice->waveStep.w.h]
	#define sawtooth sawtoothTable[pVoice->waveStep.w.h]
	#define square squareTable[pVoice->waveStep.w.h + pVoice->pulseIndex]
	#define triSaw waveform30[pVoice->waveStep.w.h]
	#define triSquare waveform50[pVoice->waveStep.w.h + pVoice->SIDpulseWidth]
	#define sawSquare waveform60[pVoice->waveStep.w.h + pVoice->SIDpulseWidth]
	#define triSawSquare waveform70[pVoice->waveStep.w.h + pVoice->SIDpulseWidth]
#else
	#define triangle triangleTable[pVoice->waveStep]
	#define sawtooth sawtoothTable[pVoice->waveStep]
	#define square squareTable[pVoice->waveStep + pVoice->pulseIndex]
	#define triSaw waveform30[pVoice->waveStep]
	#define triSquare waveform50[pVoice->waveStep + pVoice->SIDpulseWidth]
	#define sawSquare waveform60[pVoice->waveStep + pVoice->SIDpulseWidth]
	#define triSawSquare waveform70[pVoice->waveStep + pVoice->SIDpulseWidth]
#endif


static void sidMode00(sidOperator* pVoice)
{
	pVoice->output = (pVoice->filtIO - 0x80);
	waveAdvance(pVoice);
}

#if 0
/* not used */
static void sidModeReal00(sidOperator* pVoice)
{
	pVoice->output = 0;
	waveAdvance(pVoice);
}
#endif

static void sidMode10(sidOperator* pVoice)
{
	pVoice->output = triangle;
	waveAdvance(pVoice);
}

static void sidMode20(sidOperator* pVoice)
{
	pVoice->output = sawtooth;
	waveAdvance(pVoice);
}

static void sidMode30(sidOperator* pVoice)
{
	pVoice->output = triSaw;
	waveAdvance(pVoice);
}

static void sidMode40(sidOperator* pVoice)
{
	pVoice->output = square;
	waveAdvance(pVoice);
}

static void sidMode50(sidOperator* pVoice)
{
	pVoice->output = triSquare;
	waveAdvance(pVoice);
}

static void sidMode60(sidOperator* pVoice)
{
	pVoice->output = sawSquare;
	waveAdvance(pVoice);
}

static void sidMode70(sidOperator* pVoice)
{
	pVoice->output = triSawSquare;
	waveAdvance(pVoice);
}

static void sidMode80(sidOperator* pVoice)
{
	pVoice->output = pVoice->noiseOutput;
	waveAdvance(pVoice);
	noiseAdvance(pVoice);
}

static void sidMode80hp(sidOperator* pVoice)
{
	pVoice->output = pVoice->noiseOutput;
	waveAdvance(pVoice);
	noiseAdvanceHp(pVoice);
}

static void sidModeLock(sidOperator* pVoice)
{
	pVoice->noiseIsLocked = true;
	pVoice->output = (pVoice->filtIO - 0x80);
	waveAdvance(pVoice);
}

/* */
/* */
/* */

static void sidMode14(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	if (pVoice->modulator->waveStep.w.h < 2048)
#else
	if (pVoice->modulator->waveStep < 2048)
#endif
	pVoice->output = triangle;
	else
	pVoice->output = 0xFF ^ triangle;
	waveAdvance(pVoice);
}

static void sidMode34(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	if (pVoice->modulator->waveStep.w.h < 2048)
#else
	if (pVoice->modulator->waveStep < 2048)
#endif
	pVoice->output = triSaw;
	else
	pVoice->output = 0xFF ^ triSaw;
	waveAdvance(pVoice);
}

static void sidMode54(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	if (pVoice->modulator->waveStep.w.h < 2048)
#else
	if (pVoice->modulator->waveStep < 2048)
#endif
	pVoice->output = triSquare;
	else
	pVoice->output = 0xFF ^ triSquare;
	waveAdvance(pVoice);
}

static void sidMode74(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	if (pVoice->modulator->waveStep.w.h < 2048)
#else
	if (pVoice->modulator->waveStep < 2048)
#endif
	pVoice->output = triSawSquare;
	else
	pVoice->output = 0xFF ^ triSawSquare;
	waveAdvance(pVoice);
}

/* */
/* */
/* */

static inline void waveCalcFilter(sidOperator* pVoice)
{
	if (pVoice->filtEnabled)
	{
		if (pVoice->sid->filter.Type != 0)
		{
			if (pVoice->sid->filter.Type == 0x20)
			{
				float tmp;
				pVoice->filtLow += (pVoice->filtRef * pVoice->sid->filter.Dy);
				tmp = (float)pVoice->filtIO - pVoice->filtLow;
				tmp -= pVoice->filtRef * pVoice->sid->filter.ResDy;
				pVoice->filtRef += (tmp * (pVoice->sid->filter.Dy));
				pVoice->filtIO = (int8_t)(pVoice->filtRef-pVoice->filtLow/4);
			}
			else if (pVoice->sid->filter.Type == 0x40)
			{
				float tmp, tmp2;
				pVoice->filtLow += (pVoice->filtRef * pVoice->sid->filter.Dy * 0.1f);
				tmp = (float)pVoice->filtIO - pVoice->filtLow;
				tmp -= pVoice->filtRef * pVoice->sid->filter.ResDy;
				pVoice->filtRef += (tmp * (pVoice->sid->filter.Dy));
				tmp2 = pVoice->filtRef - pVoice->filtIO/8;
				if (tmp2 < -128)
					tmp2 = -128;
				if (tmp2 > 127)
					tmp2 = 127;
				pVoice->filtIO = (int8_t)tmp2;
			}
			else
			{
				float sample, sample2;
				int tmp;
				pVoice->filtLow += (pVoice->filtRef * pVoice->sid->filter.Dy);
				sample = pVoice->filtIO;
				sample2 = sample - pVoice->filtLow;
				tmp = (int)sample2;
				sample2 -= pVoice->filtRef * pVoice->sid->filter.ResDy;
				pVoice->filtRef += (sample2 * pVoice->sid->filter.Dy);

				if (pVoice->sid->filter.Type == 0x10)
				{
					pVoice->filtIO = (int8_t)pVoice->filtLow;
				}
				else if (pVoice->sid->filter.Type == 0x30)
				{
					pVoice->filtIO = (int8_t)pVoice->filtLow;
				}
				else if (pVoice->sid->filter.Type == 0x50)
				{
					pVoice->filtIO = (int8_t)(sample - (tmp >> 1));
				}
				else if (pVoice->sid->filter.Type == 0x60)
				{
					pVoice->filtIO = (int8_t)tmp;
				}
				else if (pVoice->sid->filter.Type == 0x70)
				{
					pVoice->filtIO = (int8_t)(sample - (tmp >> 1));
				}
			}
		}
		else /* pVoice->sid->filter.Type == 0x00 */
		{
			pVoice->filtIO = 0;
		}
	}
}

static int8_t waveCalcMute(sidOperator* pVoice)
{
	(*pVoice->ADSRproc)(pVoice);  /* just process envelope */
	return pVoice->filtIO;//&pVoice->outputMask;
}


static int8_t waveCalcRangeCheck(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
	pVoice->waveStepOld = pVoice->waveStep.w.h;
	(*pVoice->waveProc)(pVoice);
	if (pVoice->waveStep.w.h < pVoice->waveStepOld)
#else
	pVoice->waveStepOld = pVoice->waveStep;
	(*pVoice->waveProc)(pVoice);
	if (pVoice->waveStep < pVoice->waveStepOld)
#endif
	{
		/* Next step switch back to normal calculation. */
		pVoice->cycleLenCount = 0;
		pVoice->outProc = &sidOperator::wave_calc_normal;
#if defined(DIRECT_FIXPOINT)
				pVoice->waveStep.w.h = 4095;
#else
				pVoice->waveStep = 4095;
#endif
	}
	pVoice->filtIO = ampMod1x8[(*pVoice->ADSRproc)(pVoice)|pVoice->output];
	waveCalcFilter(pVoice);
	return pVoice->filtIO;//&pVoice->outputMask;
}

/* MOS-8580, MOS-6581 (no 70) */
static ptr2sidVoidFunc sidModeNormalTable[16] =
{
	sidMode00, sidMode10, sidMode20, sidMode30, sidMode40, sidMode50, sidMode60, sidMode70,
	sidMode80, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock
};

/* MOS-8580, MOS-6581 (no 74) */
static ptr2sidVoidFunc sidModeRingTable[16] =
{
	sidMode00, sidMode14, sidMode00, sidMode34, sidMode00, sidMode54, sidMode00, sidMode74,
	sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock, sidModeLock
};


void sidOperator::clear()
{
	SIDfreq = 0;
	SIDctrl = 0;
	SIDAD = 0;
	SIDSR = 0;

	sync = false;

	pulseIndex = newPulseIndex = SIDpulseWidth = 0;
	curSIDfreq = curNoiseFreq = 0;

	output = noiseOutput = 0;
	filtIO = 0;

	filtEnabled = false;
	filtLow = filtRef = 0;

	cycleLenCount = 0;
#if defined(DIRECT_FIXPOINT)
	cycleLen.l = cycleAddLen.l = 0;
#else
	cycleLen = cycleLenPnt = 0;
	cycleAddLenPnt = 0;
#endif

	outProc = waveCalcMute;

#if defined(DIRECT_FIXPOINT)
	waveStepAdd.l = waveStep.l = 0;
	wavePre[0].len = (wavePre[0].stp = 0);
	wavePre[1].len = (wavePre[1].stp = 0);
#else
	waveStepAdd = waveStepAddPnt = 0;
	waveStep = waveStepPnt = 0;
	wavePre[0].len = 0;
	wavePre[0].stp = wavePre[0].pnt = 0;
	wavePre[1].len = 0;
	wavePre[1].stp = wavePre[1].pnt = 0;
#endif
	waveStepOld = 0;

#if defined(DIRECT_FIXPOINT)
	noiseReg.l = noiseSeed;
#else
	noiseReg = noiseSeed;
#endif
	noiseStepAdd = noiseStep = 0;
	noiseIsLocked = false;
}


/* -------------------------------------------------- Operator frame set-up 1 */

void sidOperator::set()
{
	SIDfreq = reg[0] | (reg[1] << 8);

	SIDpulseWidth = (reg[2] | (reg[3] << 8)) & 0x0FFF;
	newPulseIndex = 4096 - SIDpulseWidth;
#if defined(DIRECT_FIXPOINT)
	if (((waveStep.w.h + pulseIndex) >= 0x1000) && ((waveStep.w.h + newPulseIndex) >= 0x1000))
	{
		pulseIndex = newPulseIndex;
	}
	else if (((waveStep.w.h + pulseIndex) < 0x1000) && ((waveStep.w.h + newPulseIndex) < 0x1000))
	{
		pulseIndex = newPulseIndex;
	}
#else
	if (((waveStep + pulseIndex) >= 0x1000) && ((waveStep + newPulseIndex) >= 0x1000))
	{
		pulseIndex = newPulseIndex;
	}
	else if (((waveStep + pulseIndex) < 0x1000) && ((waveStep + newPulseIndex) < 0x1000))
	{
		pulseIndex = newPulseIndex;
	}
#endif

	uint8_t const oldWave = SIDctrl;
	uint8_t const newWave = reg[4] | (reg[5] << 8); // FIXME: what's actually supposed to happen here?
	uint8_t enveTemp = ADSRctrl;
	SIDctrl = newWave;

	if (!(newWave & 1))
	{
		if (oldWave & 1)
			enveTemp = ENVE_STARTRELEASE;
#if 0
		else if (gateOnCtrl)
			enveTemp = ENVE_STARTSHORTATTACK;
#endif
	}
	else if (/*gateOffCtrl || */!(oldWave & 1))
	{
		enveTemp = ENVE_STARTATTACK;
	}

	if ((oldWave ^ newWave) & 0xF0)
		cycleLenCount = 0;

	uint8_t const ADtemp = reg[5];
	uint8_t const SRtemp = reg[6];
	if (SIDAD != ADtemp)
		enveTemp |= ENVE_ALTER;
	else if (SIDSR != SRtemp)
		enveTemp |= ENVE_ALTER;

	SIDAD = ADtemp;
	SIDSR = SRtemp;
	uint8_t const tmpSusVol = masterVolumeLevels[SRtemp >> 4];
	if (ADSRctrl != ENVE_SUSTAIN)  // !!!
		enveSusVol = tmpSusVol;
	else if (enveSusVol > enveVol)
		enveSusVol = 0;
	else
		enveSusVol = tmpSusVol;

	ADSRproc = enveModeTable[enveTemp >> 1];  // shifting out the KEY-bit
	ADSRctrl = enveTemp & (255 - ENVE_ALTER - 1);

	filtEnabled = sid->filter.Enabled && (sid->reg[0x17] & filtVoiceMask);
}


/* -------------------------------------------------- Operator frame set-up 2 */

void sidOperator::set2()
{
	outProc = &sidOperator::wave_calc_normal;
	sync = false;

	if ((SIDfreq < 16) || (SIDctrl & 8))
	//if (/*(SIDfreq < 16) || */(SIDctrl & 8))
	{
		outProc = waveCalcMute;
		if (SIDfreq == 0)
		{
#if defined(DIRECT_FIXPOINT)
			cycleLen.l = cycleAddLen.l = 0;
			waveStep.l = 0;
#else
			cycleLen = cycleLenPnt = 0;
			cycleAddLenPnt = 0;
			waveStep = 0;
			waveStepPnt = 0;
#endif
			curSIDfreq = curNoiseFreq = 0;
			noiseStepAdd = 0;
			cycleLenCount = 0;
		}
		if (SIDctrl & 8)
		{
			if (noiseIsLocked)
			{
				noiseIsLocked = false;
#if defined(DIRECT_FIXPOINT)
				noiseReg.l = noiseSeed;
#else
				noiseReg = noiseSeed;
#endif
			}
		}
	}
	else
	{
		if (curSIDfreq != SIDfreq)
		{
			curSIDfreq = SIDfreq;
			// We keep the value cycleLen between 1 <= x <= 65535.
			// This makes a range-check in wave_calc_cycle_len() unrequired.
#if defined(DIRECT_FIXPOINT)
			cycleLen.l = ((sid->PCMsid << 12) / SIDfreq) << 4;
			if (cycleLenCount > 0)
			{
				wave_calc_cycle_len();
				outProc = &waveCalcRangeCheck;
			}
#else
			cycleLen = sid->PCMsid / SIDfreq;
			cycleLenPnt = ((sid->PCMsid % SIDfreq) * 65536UL) / SIDfreq;
			if (cycleLenCount > 0)
			{
				wave_calc_cycle_len();
				outProc = &waveCalcRangeCheck;
			}
#endif
		}

		if ((SIDctrl & 0x80) && (curNoiseFreq != SIDfreq))
		{
			curNoiseFreq = SIDfreq;
			noiseStepAdd = (sid->PCMsidNoise * SIDfreq) >> 8;
			if (noiseStepAdd >= (1L << 21))
				sidModeNormalTable[8] = sidMode80hp;
			else
				sidModeNormalTable[8] = sidMode80;
		}

		if (SIDctrl & 2)
		{
			if (!modulator->SIDfreq || (modulator->SIDctrl & 8))
			{
			}
			else if ((carrier->SIDctrl & 2) && (modulator->SIDfreq >= (SIDfreq << 1)))
			{
			}
			else
			{
				sync = true;
			}
		}

	if (((SIDctrl & 0x14) == 0x14) && modulator->SIDfreq)
		waveProc = sidModeRingTable[SIDctrl >> 4];
	else
		waveProc = sidModeNormalTable[SIDctrl >> 4];
	}
}


int8_t sidOperator::wave_calc_normal(sidOperator* pVoice)
{
	if (pVoice->cycleLenCount <= 0)
	{
		pVoice->wave_calc_cycle_len();
		if (pVoice->SIDctrl & 0x40)
		{
			pVoice->pulseIndex = pVoice->newPulseIndex;
			if (pVoice->pulseIndex > 2048)
			{
#if defined(DIRECT_FIXPOINT)
				pVoice->waveStep.w.h = 0;
#else
				pVoice->waveStep = 0;
#endif
			}
		}
	}

	(*pVoice->waveProc)(pVoice);
	pVoice->filtIO = ampMod1x8[(*pVoice->ADSRproc)(pVoice) | pVoice->output];
	//pVoice->filtIO = pVoice->sid->masterVolume; // test for digi sound
	waveCalcFilter(pVoice);
	return pVoice->filtIO;//&pVoice->outputMask;
}


inline void sidOperator::wave_calc_cycle_len()
{
#if defined(DIRECT_FIXPOINT)
	cycleAddLen.w.h = 0;
	cycleAddLen.l += cycleLen.l;
	cycleLenCount = cycleAddLen.w.h;
#else
	cycleAddLenPnt += cycleLenPnt;
	cycleLenCount = cycleLen;
	if (cycleAddLenPnt > 65535)
		cycleLenCount++;
	cycleAddLenPnt &= 0xFFFF;
#endif
	// If we keep the value cycleLen between 1 <= x <= 65535, the following check is not required.
#if 0
	if (!cycleLenCount)
	{
#if defined(DIRECT_FIXPOINT)
		waveStep.l = 0;
#else
		waveStep = waveStepPnt = 0;
#endif
		cycleLenCount = 0;
	}
	else
#endif
	{
#if defined(DIRECT_FIXPOINT)
		uint16_t diff = cycleLenCount - cycleLen.w.h;
#else
		uint16_t diff = cycleLenCount - cycleLen;
#endif
		if (wavePre[diff].len != cycleLenCount)
		{
			wavePre[diff].len = cycleLenCount;
#if defined(DIRECT_FIXPOINT)
			wavePre[diff].stp = waveStepAdd.l = (4096UL*65536UL) / cycleLenCount;
#else
			wavePre[diff].stp = waveStepAdd = 4096UL / cycleLenCount;
			wavePre[diff].pnt = waveStepAddPnt = ((4096UL % cycleLenCount) * 65536UL) / cycleLenCount;
#endif
		}
		else
		{
#if defined(DIRECT_FIXPOINT)
			waveStepAdd.l = wavePre[diff].stp;
#else
			waveStepAdd = wavePre[diff].stp;
			waveStepAddPnt = wavePre[diff].pnt;
#endif
		}
	}  // see above (opening bracket)
}


void sidInitWaveformTables(int type)
{
	int i,j;
	uint16_t k;

	k = 0;
	for (i = 0; i < 256; i++)
		for (j = 0; j < 8; j++)
			triangleTable[k++] = i;
	for (i = 255; i >= 0; i--)
		for (j = 0; j < 8; j++)
			triangleTable[k++] = i;

	k = 0;
	for (i = 0; i < 256; i++)
		for (j = 0; j < 16; j++)
			sawtoothTable[k++] = i;

	k = 0;
	for (i = 0; i < 4096; i++)
		squareTable[k++] = 255; //0; my estimation; especial for digi sound
	for (i = 0; i < 4096; i++)
		squareTable[k++] = 0; //255;

	if (type == mos6581_device::TYPE_8580)
	{
		waveform30 = waveform30_8580;
		waveform50 = waveform50_8580;
		waveform60 = waveform60_8580;
		waveform70 = waveform70_8580;
	}
	else
	{
		waveform30 = waveform30_6581;
		waveform50 = waveform50_6581;
		waveform60 = waveform60_6581;
		waveform70 = waveform70_6581;  /* really audible? */
	}

	if (type == mos6581_device::TYPE_8580)
	{
		sidModeNormalTable[3] = sidMode30;
		sidModeNormalTable[6] = sidMode60;
		sidModeNormalTable[7] = sidMode70;
		sidModeRingTable[7] = sidMode74;
	}
	else
	{
		sidModeNormalTable[3] = sidMode30;
		sidModeNormalTable[6] = sidMode60;
		sidModeNormalTable[7] = sidMode00;  /* really audible? */
		sidModeRingTable[7] = sidMode00;    /* */
	}

	{
#if defined(LARGE_NOISE_TABLE)
	uint32_t ni;
	for (ni = 0; ni < sizeof(noiseTableLSB); ni++)
	{
		noiseTableLSB[ni] = (uint8_t)
			(((ni >> (13-4)) & 0x10) |
				((ni >> (11-3)) & 0x08) |
				((ni >> (7-2)) & 0x04) |
				((ni >> (4-1)) & 0x02) |
				((ni >> (2-0)) & 0x01));
	}
	for (ni = 0; ni < sizeof(noiseTableMSB); ni++)
	{
		noiseTableMSB[ni] = (uint8_t)
			(((ni << (7-(22-16))) & 0x80) |
				((ni << (6-(20-16))) & 0x40) |
				((ni << (5-(16-16))) & 0x20));
	}
#else
	uint32_t ni;
	for (ni = 0; ni < sizeof(noiseTableLSB); ni++)
	{
		noiseTableLSB[ni] = (uint8_t)
			(((ni >> (7-2)) & 0x04) |
				((ni >> (4-1)) & 0x02) |
				((ni >> (2-0)) & 0x01));
	}
	for (ni = 0; ni < sizeof(noiseTableMID); ni++)
	{
		noiseTableMID[ni] = (uint8_t)
			(((ni >> (13-8-4)) & 0x10) |
				((ni << (3-(11-8))) & 0x08));
	}
	for (ni = 0; ni < sizeof(noiseTableMSB); ni++)
	{
		noiseTableMSB[ni] = (uint8_t)
			(((ni << (7-(22-16))) & 0x80) |
				((ni << (6-(20-16))) & 0x40) |
				((ni << (5-(16-16))) & 0x20));
	}
#endif
	}
}