etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 16:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Amiga: better emulation, part 3

Browse source
This commit is contained in:
tildearrow 2023-03-10 05:29:20 -05:00
parent dca18dc726
commit e18caaca1d
1 changed files with 5 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/engine/platform/amiga.cpp
View file

@ -86,9 +86,8 @@ void DivPlatformAmiga::acquire(short** buf, size_t len) {
outR=0; outR=0;
// NEW CODE // NEW CODE
for (int i=0; i<4; i++) {
amiga.volPos=(amiga.volPos+1)&AMIGA_VPMASK; amiga.volPos=(amiga.volPos+1)&AMIGA_VPMASK;
for (int i=0; i<4; i++) {
// run DMA // run DMA
if (amiga.dmaEn && amiga.audEn[i]) { if (amiga.dmaEn && amiga.audEn[i]) {
amiga.audTick[i]-=AMIGA_DIVIDER; amiga.audTick[i]-=AMIGA_DIVIDER;
@ -104,7 +103,7 @@ void DivPlatformAmiga::acquire(short** buf, size_t len) {
amiga.audDat[1][i]=sampleMem[(amiga.dmaLoc[i]++)&chipMask]; amiga.audDat[1][i]=sampleMem[(amiga.dmaLoc[i]++)&chipMask];
// check for length // check for length
if ((--amiga.dmaLen[i])==0xffff) { if ((--amiga.dmaLen[i])==0) {
if (amiga.audInt[i]) irq(i); if (amiga.audInt[i]) irq(i);
amiga.dmaLoc[i]=amiga.audLoc[i]; amiga.dmaLoc[i]=amiga.audLoc[i];
amiga.dmaLen[i]=amiga.audLen[i]; amiga.dmaLen[i]=amiga.audLen[i];
@ -137,65 +136,6 @@ void DivPlatformAmiga::acquire(short** buf, size_t len) {
} }
} }
// OLD CODE
/*
for (int i=0; i<4; i++) {
chan[i].volPos=(chan[i].volPos+1)&AMIGA_VPMASK;
if (!chan[i].active) {
oscBuf[i]->data[oscBuf[i]->needle++]=0;
continue;
}
if (chan[i].useWave || (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen)) {
chan[i].audSub-=AMIGA_DIVIDER;
if (chan[i].audSub<0) {
if (chan[i].useWave) {
writeAudDat(chan[i].ws.output[(chan[i].audPos++)&255]^0x80);
if (chan[i].audPos>=(unsigned int)(chan[i].audLen<<1)) {
chan[i].audPos=0;
}
} else {
DivSample* s=parent->getSample(chan[i].sample);
if (s->samples>0) {
if (chan[i].audPos<s->samples) {
writeAudDat(s->data8[chan[i].audPos++]);
}
if (s->isLoopable() && chan[i].audPos>=MIN(131071,(unsigned int)s->loopEnd)) {
chan[i].audPos=s->loopStart;
} else if (chan[i].audPos>=MIN(131071,s->samples)) {
chan[i].sample=-1;
}
} else {
chan[i].sample=-1;
}
}
if (bypassLimits) {
chan[i].audSub+=MAX(AMIGA_DIVIDER,chan[i].freq);
} else {
chan[i].audSub+=MAX(114,chan[i].freq);
}
}
}
if (!isMuted[i]) {
if (chan[i].outVol>=64) {
output=chan[i].audDat<<6;
} else if (chan[i].outVol<=0) {
output=0;
} else {
output=chan[i].audDat*volTable[chan[i].outVol][chan[i].volPos];
}
if (i==0 || i==3) {
outL+=(output*sep1)>>7;
outR+=(output*sep2)>>7;
} else {
outL+=(output*sep2)>>7;
outR+=(output*sep1)>>7;
}
oscBuf[i]->data[oscBuf[i]->needle++]=output<<2;
} else {
oscBuf[i]->data[oscBuf[i]->needle++]=0;
}
}
*/
filter[0][0]+=(filtConst*(outL-filter[0][0]))>>12; filter[0][0]+=(filtConst*(outL-filter[0][0]))>>12;
filter[0][1]+=(filtConst*(filter[0][0]-filter[0][1]))>>12; filter[0][1]+=(filtConst*(filter[0][0]-filter[0][1]))>>12;
filter[1][0]+=(filtConst*(outR-filter[1][0]))>>12; filter[1][0]+=(filtConst*(outR-filter[1][0]))>>12;
@ -398,7 +338,7 @@ void DivPlatformAmiga::tick(bool sysTick) {
if (chan[i].useWave) { if (chan[i].useWave) {
chWrite(i,0,0); chWrite(i,0,0);
chWrite(i,2,i<<8); chWrite(i,2,i<<8);
chWrite(i,4,chan[i].audLen-1); chWrite(i,4,chan[i].audLen);
rWrite(0x96,0x8000|(1<<i)); rWrite(0x96,0x8000|(1<<i));
} else { } else {
if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) { if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) {
@ -416,12 +356,12 @@ void DivPlatformAmiga::tick(bool sysTick) {
} else { } else {
chWrite(i,0,0); chWrite(i,0,0);
chWrite(i,2,i<<8); chWrite(i,2,i<<8);
chWrite(i,4,0); chWrite(i,4,1);
} }
} else { } else {
chWrite(i,0,0); chWrite(i,0,0);
chWrite(i,2,i<<8); chWrite(i,2,i<<8);
chWrite(i,4,0); chWrite(i,4,1);
} }
} }
} }