etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-15 17:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #322 from cam900/n163_initchan

Browse source 
Fix initial channel, Minor optimization for N163
This commit is contained in:
tildearrow 2022-03-28 14:59:40 -05:00 committed by GitHub
commit d8328e91a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/engine/platform/n163.cpp
View file

@ -21,7 +21,7 @@
#include "../engine.h" #include "../engine.h"
#include <math.h> #include <math.h>
#define rRead(a,v) n163->addr_w(a); n163->data_r(v); #define rRead(a,v) n163.addr_w(a); n163.data_r(v);
#define rWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} } #define rWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} }
#define rWriteMask(a,v,m) if (!skipRegisterWrites) {writes.emplace(a,v,m); if (dumpWrites) {addWrite(a,v);} } #define rWriteMask(a,v,m) if (!skipRegisterWrites) {writes.emplace(a,v,m); if (dumpWrites) {addWrite(a,v);} }
#define chWrite(c,a,v) \ #define chWrite(c,a,v) \
@ -155,8 +155,8 @@ const char* DivPlatformN163::getEffectName(unsigned char effect) {
void DivPlatformN163::acquire(short* bufL, short* bufR, size_t start, size_t len) { void DivPlatformN163::acquire(short* bufL, short* bufR, size_t start, size_t len) {
for (size_t i=start; i<start+len; i++) { for (size_t i=start; i<start+len; i++) {
n163->tick(); n163.tick();
int out=(n163->out()<<6)*(chanMax+1); // scale to 16 bit int out=(n163.out()<<6)*(chanMax+1); // scale to 16 bit
if (out>32767) out=32767; if (out>32767) out=32767;
if (out<-32768) out=-32768; if (out<-32768) out=-32768;
bufL[i]=bufR[i]=out; bufL[i]=bufR[i]=out;
@ -164,8 +164,8 @@ void DivPlatformN163::acquire(short* bufL, short* bufR, size_t start, size_t len
// command queue // command queue
while (!writes.empty()) { while (!writes.empty()) {
QueuedWrite w=writes.front(); QueuedWrite w=writes.front();
n163->addr_w(w.addr); n163.addr_w(w.addr);
n163->data_w((n163->data_r()&~w.mask)|(w.val&w.mask)); n163.data_w((n163.data_r()&~w.mask)|(w.val&w.mask));
writes.pop(); writes.pop();
} }
} }
@ -586,7 +586,7 @@ void* DivPlatformN163::getChanState(int ch) {
unsigned char* DivPlatformN163::getRegisterPool() { unsigned char* DivPlatformN163::getRegisterPool() {
for (int i=0; i<128; i++) { for (int i=0; i<128; i++) {
regPool[i]=n163->reg(i); regPool[i]=n163.reg(i);
} }
return regPool; return regPool;
} }
@ -601,15 +601,16 @@ void DivPlatformN163::reset() {
chan[i]=DivPlatformN163::Channel(); chan[i]=DivPlatformN163::Channel();
} }
n163->reset(); n163.reset();
memset(regPool,0,128); memset(regPool,0,128);
n163->set_disable(false); n163.set_disable(false);
rWrite(0x7f,chanMax<<4); chanMax=initChanMax;
loadWave=-1; loadWave=-1;
loadPos=0; loadPos=0;
loadLen=0; loadLen=0;
loadMode=0; loadMode=0;
rWrite(0x7f,initChanMax<<4);
} }
void DivPlatformN163::poke(unsigned int addr, unsigned short val) { void DivPlatformN163::poke(unsigned int addr, unsigned short val) {
@ -632,9 +633,10 @@ void DivPlatformN163::setFlags(unsigned int flags) {
rate=COLOR_PAL*2.0/5.0; rate=COLOR_PAL*2.0/5.0;
break; break;
} }
chanMax=(flags>>4)&7; initChanMax=chanMax=(flags>>4)&7;
chipClock=rate; chipClock=rate;
rate/=15; rate/=15;
rWrite(0x7f,initChanMax<<4);
} }
int DivPlatformN163::init(DivEngine* p, int channels, int sugRate, unsigned int flags) { int DivPlatformN163::init(DivEngine* p, int channels, int sugRate, unsigned int flags) {
@ -644,7 +646,6 @@ int DivPlatformN163::init(DivEngine* p, int channels, int sugRate, unsigned int
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
isMuted[i]=false; isMuted[i]=false;
} }
n163=new n163_core();
setFlags(flags); setFlags(flags);
reset(); reset();
@ -653,7 +654,6 @@ int DivPlatformN163::init(DivEngine* p, int channels, int sugRate, unsigned int
} }
void DivPlatformN163::quit() { void DivPlatformN163::quit() {
delete n163;
} }
DivPlatformN163::~DivPlatformN163() { DivPlatformN163::~DivPlatformN163() {

3
src/engine/platform/n163.h
View file

@ -71,11 +71,12 @@ class DivPlatformN163: public DivDispatch {
QueuedWrite(unsigned char a, unsigned char v, unsigned char m=~0): addr(a), val(v), mask(m) {} QueuedWrite(unsigned char a, unsigned char v, unsigned char m=~0): addr(a), val(v), mask(m) {}
}; };
std::queue<QueuedWrite> writes; std::queue<QueuedWrite> writes;
unsigned char initChanMax;
unsigned char chanMax; unsigned char chanMax;
short loadWave, loadPos, loadLen; short loadWave, loadPos, loadLen;
unsigned char loadMode; unsigned char loadMode;
n163_core *n163; n163_core n163;
unsigned char regPool[128]; unsigned char regPool[128];
void updateWave(int wave, int pos, int len); void updateWave(int wave, int pos, int len);
void updateWaveCh(int ch); void updateWaveCh(int ch);