otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

WIP SNES support, part 2

Browse source 
Make the code build again, still no sound though
This commit is contained in:
Natt Akuma 2022-06-10 22:59:44 +07:00
parent f3a90d554c
commit b49b596fbe
10 changed files with 249 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/instrument.h
View file

@ -60,7 +60,6 @@ enum DivInstrumentType: unsigned short {
DIV_INS_SU=30, DIV_INS_SU=30,
DIV_INS_NAMCO=31, DIV_INS_NAMCO=31,
DIV_INS_OPL_DRUMS=32, DIV_INS_OPL_DRUMS=32,
DIV_INS_SNES=33,
DIV_INS_MAX, DIV_INS_MAX,
DIV_INS_NULL DIV_INS_NULL
}; };

282
src/engine/platform/snes.cpp
View file

@ -19,11 +19,12 @@
#include "snes.h" #include "snes.h"
#include "../engine.h" #include "../engine.h"
#include "../../ta-log.h"
#include <math.h> #include <math.h>
#define CHIP_DIVIDER 16 #define CHIP_FREQBASE 4096
#define rWrite(a,v) {dsp->write(a,v); regPool[(a)&0x7f]=v; } #define rWrite(a,v) {dsp.write(a,v); regPool[(a)&0x7f]=v; }
const char* regCheatSheetSNESDSP[]={ const char* regCheatSheetSNESDSP[]={
"VxVOLL", "x0", "VxVOLL", "x0",
@ -61,111 +62,134 @@ const char** DivPlatformSNES::getRegisterSheet() {
return regCheatSheetSNESDSP; return regCheatSheetSNESDSP;
} }
const char* DivPlatformSNES::getEffectName(unsigned char effect) {
switch (effect) {
case 0x10:
return "10xx: Set echo feedback level (signed 8-bit)";
break;
// TODO
}
return NULL;
}
void DivPlatformSNES::acquire(short* bufL, short* bufR, size_t start, size_t len) { void DivPlatformSNES::acquire(short* bufL, short* bufR, size_t start, size_t len) {
short out[2];
short chOut[16];
for (size_t h=start; h<start+len; h++) { for (size_t h=start; h<start+len; h++) {
short out[2]; dsp.set_output(out,1);
dsp->set_output(out,1); dsp.run(32);
dsp->run(32); dsp.get_voice_outputs(chOut);
bufL[h]=out[0]; bufL[h]=out[0];
bufR[h]=out[1]; bufR[h]=out[1];
for (int i=0; i<8; i++) {
oscBuf[i]->data[oscBuf[i]->needle++]=chOut[i*2]+chOut[i*2+1];
}
} }
} }
void DivPlatformSNES::tick() { void DivPlatformSNES::tick() {
// KON/KOFF can't be written several times per one sample
// so they have to be accumulated
unsigned char kon=0;
unsigned char koff=0;
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) { if (chan[i].std.vol.had) {
chan[i].outVol=((chan[i].vol%65)*MIN(64,chan[i].std.vol))>>6; // TODO handle gain writes
} }
double off=1.0; if (chan[i].std.arp.had) {
if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) {
DivSample* s=parent->getSample(chan[i].sample);
if (s->centerRate<1) {
off=1.0;
} else {
off=8363.0/(double)s->centerRate;
}
}
if (chan[i].std.hadArp) {
if (!chan[i].inPorta) { if (!chan[i].inPorta) {
if (chan[i].std.arpMode) { if (chan[i].std.arp.mode) {
chan[i].baseFreq=off*NOTE_PERIODIC(chan[i].std.arp); chan[i].baseFreq=NOTE_FREQUENCY(chan[i].std.arp.val);
} else { } else {
chan[i].baseFreq=off*NOTE_PERIODIC(chan[i].note+chan[i].std.arp); chan[i].baseFreq=NOTE_FREQUENCY(chan[i].note+chan[i].std.arp.val);
} }
} }
chan[i].freqChanged=true; chan[i].freqChanged=true;
} else { } else {
if (chan[i].std.arpMode && chan[i].std.finishedArp) { if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
chan[i].baseFreq=off*NOTE_PERIODIC(chan[i].note); chan[i].baseFreq=NOTE_FREQUENCY(chan[i].note);
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
} }
if (chan[i].std.hadWave) { if (chan[i].std.pitch.had) {
if (chan[i].wave!=chan[i].std.wave) { if (chan[i].std.pitch.mode) {
chan[i].wave=chan[i].std.wave; chan[i].pitch2+=chan[i].std.pitch.val;
if (!chan[i].keyOff) chan[i].keyOn=true; CLAMP_VAR(chan[i].pitch2,-32768,32767);
} else {
chan[i].pitch2=chan[i].std.pitch.val;
} }
chan[i].freqChanged=true;
}
if (chan[i].std.panL.had) {
int val=chan[i].std.panL.val&0x7f;
chan[i].panL=(val<<1)|(val>>6);
}
if (chan[i].std.panR.had) {
int val=chan[i].std.panR.val&0x7f;
chan[i].panR=(val<<1)|(val>>6);
}
if (chan[i].std.panL.had || chan[i].std.panR.had) {
writeOutVol(i);
}
if (chan[i].setPos) {
// force keyon
chan[i].keyOn=true;
chan[i].setPos=false;
} else {
chan[i].audPos=0;
} }
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) { if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
//DivInstrument* ins=parent->getIns(chan[i].ins); DivSample* s=parent->getSample(chan[i].sample);
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true); double off=(s->centerRate>=1)?((double)s->centerRate/8363.0):1.0;
if (chan[i].freq>4095) chan[i].freq=4095; chan[i].freq=(unsigned int)(off*parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,2,chan[i].pitch2,chipClock,CHIP_FREQBASE));
if (chan[i].note>0x5d) chan[i].freq=0x01; if (chan[i].freq>16383) chan[i].freq=16383;
if (chan[i].keyOn) { if (chan[i].keyOn) {
if (chan[i].wave<0) { // TODO handle sample offsets
chan[i].wave=0; kon|=(1<<i);
} chan[i].keyOn=false;
} }
if (chan[i].keyOff) { if (chan[i].keyOff) {
koff|=(1<<i);
chan[i].keyOff=false;
}
if (chan[i].freqChanged) {
rWrite(2+i*16,chan[i].freq&0xff);
rWrite(3+i*16,chan[i].freq>>8);
chan[i].freqChanged=false;
} }
if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false;
chan[i].freqChanged=false;
} }
} }
rWrite(0x4c,kon);
rWrite(0x5c,koff);
} }
int DivPlatformSNES::dispatch(DivCommand c) { int DivPlatformSNES::dispatch(DivCommand c) {
switch (c.cmd) { switch (c.cmd) {
case DIV_CMD_NOTE_ON: { case DIV_CMD_NOTE_ON: {
DivInstrument* ins=parent->getIns(chan[c.chan].ins); DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA);
chan[c.chan].sample=ins->amiga.initSample; chan[c.chan].sample=ins->amiga.getSample(c.value);
double off=1.0;
if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
DivSample* s=parent->getSample(chan[c.chan].sample);
if (s->centerRate<1) {
off=1.0;
} else {
off=8363.0/(double)s->centerRate;
}
}
if (c.value!=DIV_NOTE_NULL) { if (c.value!=DIV_NOTE_NULL) {
chan[c.chan].baseFreq=off*NOTE_PERIODIC(c.value); chan[c.chan].baseFreq=round(NOTE_FREQUENCY(c.value));
} }
if (chan[c.chan].sample<0 || chan[c.chan].sample>=parent->song.sampleLen) { if (chan[c.chan].useWave || chan[c.chan].sample<0 || chan[c.chan].sample>=parent->song.sampleLen) {
chan[c.chan].sample=-1; chan[c.chan].sample=-1;
} }
if (chan[c.chan].setPos) {
chan[c.chan].setPos=false;
} else {
chan[c.chan].audPos=0;
}
chan[c.chan].audSub=0;
if (c.value!=DIV_NOTE_NULL) { if (c.value!=DIV_NOTE_NULL) {
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
} }
chan[c.chan].active=true; chan[c.chan].active=true;
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;
chan[c.chan].std.init(ins); chan[c.chan].macroInit(ins);
chan[c.chan].insChanged=false;
break; break;
} }
case DIV_CMD_NOTE_OFF: case DIV_CMD_NOTE_OFF:
chan[c.chan].sample=-1; chan[c.chan].sample=-1;
chan[c.chan].active=false; chan[c.chan].active=false;
chan[c.chan].keyOff=true; chan[c.chan].keyOff=true;
chan[c.chan].std.init(NULL); chan[c.chan].macroInit(NULL);
break; break;
case DIV_CMD_NOTE_OFF_ENV: case DIV_CMD_NOTE_OFF_ENV:
case DIV_CMD_ENV_RELEASE: case DIV_CMD_ENV_RELEASE:
@ -174,32 +198,35 @@ int DivPlatformSNES::dispatch(DivCommand c) {
case DIV_CMD_INSTRUMENT: case DIV_CMD_INSTRUMENT:
if (chan[c.chan].ins!=c.value || c.value2==1) { if (chan[c.chan].ins!=c.value || c.value2==1) {
chan[c.chan].ins=c.value; chan[c.chan].ins=c.value;
chan[c.chan].insChanged=true;
} }
break; break;
case DIV_CMD_VOLUME: case DIV_CMD_VOLUME:
if (chan[c.chan].vol!=c.value) { if (chan[c.chan].vol!=c.value) {
chan[c.chan].vol=c.value; chan[c.chan].vol=c.value;
if (!chan[c.chan].std.hasVol) { writeOutVol(c.chan);
chan[c.chan].outVol=c.value;
}
} }
break; break;
// case DIV_CMD_GLOBAL_VOLUME:
// gblVolL=MIN(c.value,127);
// gblVolR=MIN(c.value,127);
// rWrite(0x0c,gblVolL);
// rWrite(0x1c,gblVolR);
// break;
case DIV_CMD_GET_VOLUME: case DIV_CMD_GET_VOLUME:
if (chan[c.chan].std.hasVol) { return chan[c.chan].vol;
return chan[c.chan].vol; break;
} case DIV_CMD_PANNING:
return chan[c.chan].outVol; chan[c.chan].panL=c.value;
chan[c.chan].panR=c.value2;
writeOutVol(c.chan);
break; break;
case DIV_CMD_PITCH: case DIV_CMD_PITCH:
chan[c.chan].pitch=c.value; chan[c.chan].pitch=c.value;
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
break; break;
case DIV_CMD_WAVE:
chan[c.chan].wave=c.value;
chan[c.chan].keyOn=true;
break;
case DIV_CMD_NOTE_PORTA: { case DIV_CMD_NOTE_PORTA: {
int destFreq=NOTE_PERIODIC(c.value2); int destFreq=round(NOTE_FREQUENCY(c.value2));
bool return2=false; bool return2=false;
if (destFreq>chan[c.chan].baseFreq) { if (destFreq>chan[c.chan].baseFreq) {
chan[c.chan].baseFreq+=c.value; chan[c.chan].baseFreq+=c.value;
@ -222,23 +249,14 @@ int DivPlatformSNES::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_LEGATO: { case DIV_CMD_LEGATO: {
double off=1.0; chan[c.chan].baseFreq=round(NOTE_FREQUENCY(c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0))));
if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
DivSample* s=parent->getSample(chan[c.chan].sample);
if (s->centerRate<1) {
off=1.0;
} else {
off=8363.0/(double)s->centerRate;
}
}
chan[c.chan].baseFreq=off*NOTE_PERIODIC(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp-12):(0)));
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
break; break;
} }
case DIV_CMD_PRE_PORTA: case DIV_CMD_PRE_PORTA:
if (chan[c.chan].active && c.value2) { if (chan[c.chan].active && c.value2) {
if (parent->song.resetMacroOnPorta) chan[c.chan].std.init(parent->getIns(chan[c.chan].ins)); if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA));
} }
chan[c.chan].inPorta=c.value; chan[c.chan].inPorta=c.value;
break; break;
@ -246,28 +264,37 @@ int DivPlatformSNES::dispatch(DivCommand c) {
chan[c.chan].audPos=c.value; chan[c.chan].audPos=c.value;
chan[c.chan].setPos=true; chan[c.chan].setPos=true;
break; break;
// TODO SNES-specific commands
case DIV_CMD_GET_VOLMAX: case DIV_CMD_GET_VOLMAX:
return 127; return 127;
break; break;
case DIV_ALWAYS_SET_VOLUME:
return 1;
break;
default: default:
break; break;
} }
return 1; return 1;
} }
void DivPlatformSNES::writeOutVol(int ch) {
// TODO negative (inverted) panning support
int outL=0;
int outR=0;
if (!isMuted[ch]) {
outL=chan[ch].vol*chan[ch].panL/255;
outR=chan[ch].vol*chan[ch].panR/255;
}
rWrite(0+ch*16,outL);
rWrite(1+ch*16,outR);
}
void DivPlatformSNES::muteChannel(int ch, bool mute) { void DivPlatformSNES::muteChannel(int ch, bool mute) {
isMuted[ch]=mute; isMuted[ch]=mute;
writeOutVol(ch);
} }
void DivPlatformSNES::forceIns() { void DivPlatformSNES::forceIns() {
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
chan[i].insChanged=true; chan[i].insChanged=true;
chan[i].freqChanged=true; chan[i].freqChanged=true;
chan[i].audPos=131072;
chan[i].audDat=0;
chan[i].sample=-1; chan[i].sample=-1;
} }
} }
@ -276,12 +303,21 @@ void* DivPlatformSNES::getChanState(int ch) {
return &chan[ch]; return &chan[ch];
} }
DivMacroInt* DivPlatformSNES::getChanMacroInt(int ch) {
return &chan[ch].std;
}
DivDispatchOscBuffer* DivPlatformSNES::getOscBuffer(int ch) {
return oscBuf[ch];
}
unsigned char* DivPlatformSNES::getRegisterPool() { unsigned char* DivPlatformSNES::getRegisterPool() {
// get states from emulator // get states from emulator
for (int i=0; i<0x80; i+=0x10) { for (int i=0; i<0x80; i+=0x10) {
regPool[i+8]=dsp->read(i+8); regPool[i+8]=dsp.read(i+8);
regPool[i+9]=dsp->read(i+9); regPool[i+9]=dsp.read(i+9);
} }
regPool[0x7c]=dsp.read(0x7c); // ENDX
return regPool; return regPool;
} }
@ -290,22 +326,25 @@ int DivPlatformSNES::getRegisterPoolSize() {
} }
void DivPlatformSNES::reset() { void DivPlatformSNES::reset() {
dsp.init(sampleMem);
dsp.set_output(NULL,0);
memset(regPool,0,128);
// TODO more initial values
sampleTableBase=0;
rWrite(0x5d,sampleTableBase>>8);
rWrite(0x0c,127); // global volume left
rWrite(0x1c,127); // global volume right
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
chan[i]=Channel(); chan[i]=Channel();
chan[i].std.setEngine(parent);
writeOutVol(i);
} }
dsp->init(&aram);
dsp->set_output(NULL, 0);
memset(regPool,0,128);
} }
bool DivPlatformSNES::isStereo() { bool DivPlatformSNES::isStereo() {
return true; return true;
} }
bool DivPlatformSNES::keyOffAffectsArp(int ch) {
return true;
}
void DivPlatformSNES::notifyInsChange(int ins) { void DivPlatformSNES::notifyInsChange(int ins) {
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
if (chan[i].ins==ins) { if (chan[i].ins==ins) {
@ -314,10 +353,6 @@ void DivPlatformSNES::notifyInsChange(int ins) {
} }
} }
void DivPlatformSNES::notifyWaveChange(int wave) {
// TODO when wavetables are added
}
void DivPlatformSNES::notifyInsDeletion(void* ins) { void DivPlatformSNES::notifyInsDeletion(void* ins) {
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
chan[i].std.notifyInsDeletion((DivInstrument*)ins); chan[i].std.notifyInsDeletion((DivInstrument*)ins);
@ -332,14 +367,59 @@ void DivPlatformSNES::poke(std::vector<DivRegWrite>& wlist) {
for (DivRegWrite& i: wlist) rWrite(i.addr,i.val); for (DivRegWrite& i: wlist) rWrite(i.addr,i.val);
} }
const void* DivPlatformSNES::getSampleMem(int index) {
return index == 0 ? sampleMem : NULL;
}
size_t DivPlatformSNES::getSampleMemCapacity(int index) {
// TODO change it based on current echo buffer size
return index == 0 ? 65536 : 0;
}
size_t DivPlatformSNES::getSampleMemUsage(int index) {
return index == 0 ? sampleMemLen : 0;
}
void DivPlatformSNES::renderSamples() {
memset(sampleMem,0,getSampleMemCapacity());
// skip past sample table
size_t memPos=sampleTableBase+0x400;
for (int i=0; i<parent->song.sampleLen; i++) {
DivSample* s=parent->song.sample[i];
int length=s->lengthBRR;
int actualLength=MIN((int)(getSampleMemCapacity()-memPos)/9*9,length);
if (actualLength>0) {
size_t tabAddr=sampleTableBase+i*4;
size_t loopPos=memPos;
if (s->loopStart>=0) loopPos+=s->loopStart;
s->offSNES=memPos;
sampleMem[tabAddr+0]=memPos&0xff;
sampleMem[tabAddr+1]=memPos>>8;
sampleMem[tabAddr+2]=loopPos&0xff;
sampleMem[tabAddr+3]=loopPos>>8;
memcpy(&sampleMem[memPos],s->data8,actualLength);
memPos+=actualLength;
}
if (actualLength<length) {
// terminate the sample
sampleMem[memPos-9]=1;
logW("out of BRR memory for sample %d!",i);
break;
}
}
sampleMemLen=memPos;
}
int DivPlatformSNES::init(DivEngine* p, int channels, int sugRate, unsigned int flags) { int DivPlatformSNES::init(DivEngine* p, int channels, int sugRate, unsigned int flags) {
parent=p; parent=p;
dsp=new SPC_DSP;
dumpWrites=false; dumpWrites=false;
skipRegisterWrites=false; skipRegisterWrites=false;
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
oscBuf[i]=new DivDispatchOscBuffer;
isMuted[i]=false; isMuted[i]=false;
} }
sampleMemLen=0;
chipClock=1024000; chipClock=1024000;
rate=chipClock/32; rate=chipClock/32;
reset(); reset();
@ -347,5 +427,7 @@ int DivPlatformSNES::init(DivEngine* p, int channels, int sugRate, unsigned int
} }
void DivPlatformSNES::quit() { void DivPlatformSNES::quit() {
delete dsp; for (int i=0; i<8; i++) {
delete oscBuf[i];
}
} }

48
src/engine/platform/snes.h
View file

@ -27,33 +27,29 @@
class DivPlatformSNES: public DivDispatch { class DivPlatformSNES: public DivDispatch {
struct Channel { struct Channel {
int freq, baseFreq, pitch; int freq, baseFreq, pitch, pitch2;
unsigned int audLoc;
unsigned short audLen;
unsigned int audPos; unsigned int audPos;
int audSub; int sample, ins;
signed char audDat;
int sample, wave;
unsigned char ins;
int busClock;
int note; int note;
int panL, panR;
bool active, insChanged, freqChanged, keyOn, keyOff, inPorta, useWave, setPos; bool active, insChanged, freqChanged, keyOn, keyOff, inPorta, useWave, setPos;
signed char vol, outVol; signed char vol;
DivMacroInt std; DivMacroInt std;
void macroInit(DivInstrument* which) {
std.init(which);
pitch2=0;
}
Channel(): Channel():
freq(0), freq(0),
baseFreq(0), baseFreq(0),
pitch(0), pitch(0),
audLoc(0), pitch2(0),
audLen(0),
audPos(0), audPos(0),
audSub(0),
audDat(0),
sample(-1), sample(-1),
wave(0),
ins(-1), ins(-1),
busClock(0),
note(0), note(0),
panL(255),
panR(255),
active(false), active(false),
insChanged(true), insChanged(true),
freqChanged(false), freqChanged(false),
@ -62,21 +58,26 @@ class DivPlatformSNES: public DivDispatch {
inPorta(false), inPorta(false),
useWave(false), useWave(false),
setPos(false), setPos(false),
vol(64), vol(127) {}
outVol(64) {}
}; };
Channel chan[8]; Channel chan[8];
DivDispatchOscBuffer* oscBuf[8];
bool isMuted[8]; bool isMuted[8];
signed char gblVolL, gblVolR;
size_t sampleTableBase;
signed char sampleMem[65536];
size_t sampleMemLen;
unsigned char regPool[0x80]; unsigned char regPool[0x80];
unsigned char aram[0x10000]; SPC_DSP dsp;
SPC_DSP* dsp;
friend void putDispatchChan(void*,int,int); friend void putDispatchChan(void*,int,int);
public: public:
void acquire(short* bufL, short* bufR, size_t start, size_t len); void acquire(short* bufL, short* bufR, size_t start, size_t len);
int dispatch(DivCommand c); int dispatch(DivCommand c);
void* getChanState(int chan); void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);
unsigned char* getRegisterPool(); unsigned char* getRegisterPool();
int getRegisterPoolSize(); int getRegisterPoolSize();
void reset(); void reset();
@ -84,15 +85,20 @@ class DivPlatformSNES: public DivDispatch {
void tick(); void tick();
void muteChannel(int ch, bool mute); void muteChannel(int ch, bool mute);
bool isStereo(); bool isStereo();
bool keyOffAffectsArp(int ch);
void notifyInsChange(int ins); void notifyInsChange(int ins);
void notifyWaveChange(int wave);
void notifyInsDeletion(void* ins); void notifyInsDeletion(void* ins);
void poke(unsigned int addr, unsigned short val); void poke(unsigned int addr, unsigned short val);
void poke(std::vector<DivRegWrite>& wlist); void poke(std::vector<DivRegWrite>& wlist);
const char** getRegisterSheet(); const char** getRegisterSheet();
const char* getEffectName(unsigned char effect);
const void* getSampleMem(int index = 0);
size_t getSampleMemCapacity(int index = 0);
size_t getSampleMemUsage(int index = 0);
void renderSamples();
int init(DivEngine* parent, int channels, int sugRate, unsigned int flags); int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
void quit(); void quit();
private:
void writeOutVol(int ch);
}; };
#endif #endif

9
src/engine/platform/sound/snes/SPC_DSP.cpp
View file

@ -491,10 +491,11 @@ VOICE_CLOCK( V3c )
if ( !v->kon_delay ) if ( !v->kon_delay )
run_envelope( v ); run_envelope( v );
} }
inline void SPC_DSP::voice_output( voice_t const* v, int ch ) inline void SPC_DSP::voice_output( voice_t* const v, int ch )
{ {
// Apply left/right volume // Apply left/right volume
int amp = (m.t_output * (int8_t) VREG(v->regs,voll + ch)) >> 7; int amp = (m.t_output * (int8_t) VREG(v->regs,voll + ch)) >> 7;
v->out [ch] = (sample_t) amp; // Furnace addition
// Add to output total // Add to output total
m.t_main_out [ch] += amp; m.t_main_out [ch] += amp;
@ -801,8 +802,12 @@ void SPC_DSP::run( int clocks_remain )
switch ( phase ) switch ( phase )
{ {
loop: loop:
// GCC, why
#ifdef __GNUC__
#define PHASE( n ) if ( n && !--clocks_remain ) break; __attribute__ ((fallthrough)); case n:
#else
#define PHASE( n ) if ( n && !--clocks_remain ) break; case n: #define PHASE( n ) if ( n && !--clocks_remain ) break; case n:
#endif
GEN_DSP_TIMING GEN_DSP_TIMING
#undef PHASE #undef PHASE

17
src/engine/platform/sound/snes/SPC_DSP.h
View file

@ -65,6 +65,9 @@ public:
// Returns non-zero if new key-on events occurred since last call // Returns non-zero if new key-on events occurred since last call
bool check_kon(); bool check_kon();
// Furnace addition, gets all current voice outputs to an array of samples
void get_voice_outputs( sample_t* outs );
// DSP register addresses // DSP register addresses
// Global registers // Global registers
@ -118,6 +121,7 @@ public:
int env; // current envelope level int env; // current envelope level
int hidden_env; // used by GAIN mode 7, very obscure quirk int hidden_env; // used by GAIN mode 7, very obscure quirk
uint8_t t_envx_out; uint8_t t_envx_out;
sample_t out[2]; // Furnace addition, for per-channel oscilloscope
}; };
private: private:
enum { brr_block_size = 9 }; enum { brr_block_size = 9 };
@ -200,7 +204,7 @@ private:
void misc_29(); void misc_29();
void misc_30(); void misc_30();
void voice_output( voice_t const* v, int ch ); void voice_output( voice_t* const v, int ch );
void voice_V1( voice_t* const ); void voice_V1( voice_t* const );
void voice_V2( voice_t* const ); void voice_V2( voice_t* const );
void voice_V3( voice_t* const ); void voice_V3( voice_t* const );
@ -283,6 +287,17 @@ inline bool SPC_DSP::check_kon()
return old; return old;
} }
inline void SPC_DSP::get_voice_outputs( sample_t* outs )
{
int i;
for ( i = 0; i < voice_count; i++ )
{
voice_t* v = &m.voices [i];
outs [i * 2] = v->out [0];
outs [i * 2 + 1] = v->out [1];
}
}
#if !SPC_NO_COPY_STATE_FUNCS #if !SPC_NO_COPY_STATE_FUNCS
class SPC_State_Copier { class SPC_State_Copier {

3
src/engine/sample.h
View file

@ -86,7 +86,7 @@ struct DivSample {
unsigned int length8, length16, length1, lengthDPCM, lengthZ, lengthQSoundA, lengthA, lengthB, lengthBRR, lengthVOX; unsigned int length8, length16, length1, lengthDPCM, lengthZ, lengthQSoundA, lengthA, lengthB, lengthBRR, lengthVOX;
unsigned int off8, off16, off1, offDPCM, offZ, offQSoundA, offA, offB, offBRR, offVOX; unsigned int off8, off16, off1, offDPCM, offZ, offQSoundA, offA, offB, offBRR, offVOX;
unsigned int offSegaPCM, offQSound, offX1_010, offSU, offYMZ280B, offRF5C68; unsigned int offSegaPCM, offQSound, offX1_010, offSU, offYMZ280B, offRF5C68, offSNES;
unsigned int samples; unsigned int samples;
@ -249,6 +249,7 @@ struct DivSample {
offX1_010(0), offX1_010(0),
offSU(0), offSU(0),
offRF5C68(0), offRF5C68(0),
offSNES(0),
samples(0) {} samples(0) {}
~DivSample(); ~DivSample();
}; };

1
src/gui/gui.h
View file

@ -154,7 +154,6 @@ enum FurnaceGUIColors {
GUI_COLOR_INSTR_SU, GUI_COLOR_INSTR_SU,
GUI_COLOR_INSTR_NAMCO, GUI_COLOR_INSTR_NAMCO,
GUI_COLOR_INSTR_OPL_DRUMS, GUI_COLOR_INSTR_OPL_DRUMS,
GUI_COLOR_INSTR_SNES,
GUI_COLOR_INSTR_UNKNOWN, GUI_COLOR_INSTR_UNKNOWN,
GUI_COLOR_CHANNEL_FM, GUI_COLOR_CHANNEL_FM,

2
src/gui/guiConst.cpp
View file

@ -113,7 +113,6 @@ const char* insTypes[DIV_INS_MAX+1]={
"Sound Unit", "Sound Unit",
"Namco WSG", "Namco WSG",
"OPL (drums)", "OPL (drums)",
"SNES",
NULL NULL
}; };
@ -895,6 +894,7 @@ const int availableSystems[]={
DIV_SYSTEM_MSM6258, DIV_SYSTEM_MSM6258,
DIV_SYSTEM_MSM6295, DIV_SYSTEM_MSM6295,
DIV_SYSTEM_RF5C68, DIV_SYSTEM_RF5C68,
DIV_SYSTEM_SNES,
0 // don't remove this last one! 0 // don't remove this last one!
}; };

12
src/gui/presets.cpp
View file

@ -308,6 +308,12 @@ void FurnaceGUI::initSystemPresets() {
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef(
"SNES", {
DIV_SYSTEM_SNES, 64, 0, 0,
0
}
));
sysCategories.push_back(cat); sysCategories.push_back(cat);
cat=FurnaceGUISysCategory("Wavetable","chips which use user-specified waveforms to generate sound."); cat=FurnaceGUISysCategory("Wavetable","chips which use user-specified waveforms to generate sound.");
@ -589,6 +595,12 @@ void FurnaceGUI::initSystemPresets() {
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef(
"SNES", {
DIV_SYSTEM_SNES, 64, 0, 0,
0
}
));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"Mattel Intellivision", { "Mattel Intellivision", {
DIV_SYSTEM_AY8910, 64, 0, 48, DIV_SYSTEM_AY8910, 64, 0, 48,

1
src/gui/sysConf.cpp
View file

@ -489,6 +489,7 @@ void FurnaceGUI::drawSysConf(int chan, DivSystem type, unsigned int& flags, bool
case DIV_SYSTEM_SCC: case DIV_SYSTEM_SCC:
case DIV_SYSTEM_SCC_PLUS: case DIV_SYSTEM_SCC_PLUS:
case DIV_SYSTEM_YMZ280B: case DIV_SYSTEM_YMZ280B:
case DIV_SYSTEM_SNES:
ImGui::Text("nothing to configure"); ImGui::Text("nothing to configure");
break; break;
default: default: