From 3831bc249c959fef39e688387da563ceca3a1e46 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Fri, 28 Mar 2025 05:43:20 +0700 Subject: [PATCH 1/6] Add Kurumitsu-8L support No sample playback yet --- CMakeLists.txt | 1 + src/engine/dispatchContainer.cpp | 4 + src/engine/instrument.h | 1 + src/engine/platform/kurumitsu8l.cpp | 496 ++++++++++++++++++++++++++++ src/engine/platform/kurumitsu8l.h | 78 +++++ src/engine/song.h | 1 + src/engine/sysDef.cpp | 15 + src/gui/gui.h | 1 + src/gui/guiConst.cpp | 6 +- src/gui/insEdit.cpp | 14 +- src/gui/presets.cpp | 5 + src/gui/sysConf.cpp | 13 +- 12 files changed, 627 insertions(+), 8 deletions(-) create mode 100644 src/engine/platform/kurumitsu8l.cpp create mode 100644 src/engine/platform/kurumitsu8l.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b78d49ae9..0d9ac73e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -815,6 +815,7 @@ src/engine/platform/bifurcator.cpp src/engine/platform/sid2.cpp src/engine/platform/sid3.cpp src/engine/platform/multipcm.cpp +src/engine/platform/kurumitsu8l.cpp src/engine/platform/pcmdac.cpp src/engine/platform/dummy.cpp diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp index c5ed67e91..3fde4c467 100644 --- a/src/engine/dispatchContainer.cpp +++ b/src/engine/dispatchContainer.cpp @@ -94,6 +94,7 @@ #include "platform/sid2.h" #include "platform/sid3.h" #include "platform/multipcm.h" +#include "platform/kurumitsu8l.h" #include "platform/dummy.h" #include "../ta-log.h" #include "song.h" @@ -791,6 +792,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do case DIV_SYSTEM_MULTIPCM: dispatch=new DivPlatformMultiPCM; break; + case DIV_SYSTEM_KURUMITSU_8L: + dispatch=new DivPlatformKurumitsu8L; + break; case DIV_SYSTEM_DUMMY: dispatch=new DivPlatformDummy; break; diff --git a/src/engine/instrument.h b/src/engine/instrument.h index dfabfeaef..e7a737fb0 100644 --- a/src/engine/instrument.h +++ b/src/engine/instrument.h @@ -99,6 +99,7 @@ enum DivInstrumentType: unsigned short { DIV_INS_SUPERVISION=64, DIV_INS_UPD1771C=65, DIV_INS_SID3=66, + DIV_INS_KURUMITSU_8L=67, DIV_INS_MAX, DIV_INS_NULL }; diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp new file mode 100644 index 000000000..c13b27338 --- /dev/null +++ b/src/engine/platform/kurumitsu8l.cpp @@ -0,0 +1,496 @@ +/** + * Furnace Tracker - multi-system chiptune tracker + * Copyright (C) 2021-2025 tildearrow and contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "kurumitsu8l.h" +#include "../engine.h" +#include + +#define chRead(c,a) regPool[(c)*16+(a)] +#define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*16+(a)]=v; if (dumpWrites) {addWrite(a,v);} } + +#define CHIP_FREQBASE 67108864 + +const char* regCheatSheetKurumitsu8L[]={ + "CHxAtt", "00+x*10", + "CHxPanL", "01+x*10", + "CHxPanR", "02+x*10", + "CHxMod", "03+x*10", + "CHxFreq", "04+x*10", + "CHxAcc", "08+x*10", + "CHxLoopS", "0C+x*10", + "CHxLoopE", "0E+x*10", + NULL +}; + +const char** DivPlatformKurumitsu8L::getRegisterSheet() { + return regCheatSheetKurumitsu8L; +} + +void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { + const int volTab[32]={ + 32767, 32064, 31377, 30705, 30047, 29403, 28773, 28156, 27553, 26963, 26385, 25820, 25266, 24725, 24195, 23677, 23169, 22673, 22187, 21712, 21246, 20791, 20345, 19910, 19483, 19065, 18657, 18257, 17866, 17483, 17108, 16742 + }; + + for (int i=0; i<8; i++) { + oscBuf[i]->begin(len); + } + + for (size_t h=0; h>4)&0xf; + unsigned freq=chRead(i,4)|((unsigned)chRead(i,5)<<8)|((unsigned)chRead(i,6)<<16)|((unsigned)chRead(i,7)<<24); + unsigned phase=chRead(i,8)|((unsigned)chRead(i,9)<<8)|((unsigned)chRead(i,10)<<16)|((unsigned)chRead(i,11)<<24); + int fbData=chRead(i,13)|((unsigned)chRead(i,14)<<8); + if (fbData>=0x8000) fbData-=0x10000; + + unsigned phase_modded=phase; + phase_modded+=(fbData<<8)>>fb; + phase_modded+=(modData<<8)>>mod; + phase+=freq; + + unsigned char data=wtMem[i][(phase_modded>>16)&255]; + int out=(data>>1)+vol; + out=volTab[out&0x1f]>>(out>>5); + if (data&1) out=-out; + fbData=out; + modData=out; + outAL+=out*panL; + outAR+=out*panR; + oscBuf[i]->putSample(h,(out*((int)panL+panR))>>9); + + chWrite(i,8,phase&0xff); + chWrite(i,9,(phase>>8)&0xff); + chWrite(i,10,(phase>>16)&0xff); + chWrite(i,11,(phase>>24)&0xff); + chWrite(i,13,fbData&0xff); + chWrite(i,14,(fbData>>8)&0xff); + chWrite(i,15,(fbData>>16)&0xff); + } + buf[0][h]=outAL>>11; + buf[1][h]=outAR>>11; + } + + for (int i=0; i<8; i++) { + oscBuf[i]->end(len); + } +} + +void DivPlatformKurumitsu8L::updateWave(int ch) { + for (int i=0; i<256; i++) { + int data=chan[ch].ws.output[i]-128; + unsigned char val=0; + if (data<0) { + val|=1; + data=-data; + } + // convert to log attenuation format + if (data>0) { + val|=((unsigned char)MIN(roundf((7.f-log2f(data))*32.f),127.f))<<1; + } else { + val|=0xfe; + } + wtMem[ch][i]=val; + } +} + +void DivPlatformKurumitsu8L::tick(bool sysTick) { + for (int i=0; i<8; i++) { + chan[i].std.next(); + if (chan[i].std.vol.had) { + chan[i].outVol=VOL_SCALE_LOG(chan[i].vol,chan[i].std.vol.val,255); + if (!isMuted[i] && chan[i].active) { + chWrite(i,0,~chan[i].outVol&255); + } + } + if (NEW_ARP_STRAT) { + chan[i].handleArp(); + } else if (chan[i].std.arp.had) { + if (!chan[i].inPorta) { + chan[i].baseFreq=NOTE_FREQUENCY(parent->calcArp(chan[i].note,chan[i].std.arp.val)); + } + chan[i].freqChanged=true; + } + if (chan[i].std.wave.had) { + if (chan[i].wave!=chan[i].std.wave.val || chan[i].ws.activeChanged()) { + chan[i].wave=chan[i].std.wave.val; + chan[i].ws.changeWave1(chan[i].wave); + if (!chan[i].keyOff) chan[i].keyOn=true; + } + } + if (chan[i].std.panL.had) { + chan[i].panL=chan[i].std.panL.val; + if (!isMuted[i] && chan[i].active) { + chWrite(i,1,chan[i].panL); + } + } + if (chan[i].std.panR.had) { + chan[i].panR=chan[i].std.panR.val; + if (!isMuted[i] && chan[i].active) { + chWrite(i,2,chan[i].panR); + } + } + if (chan[i].std.pitch.had) { + if (chan[i].std.pitch.mode) { + chan[i].pitch2+=chan[i].std.pitch.val; + CLAMP_VAR(chan[i].pitch2,-1048575,1048575); + } else { + chan[i].pitch2=chan[i].std.pitch.val; + } + chan[i].freqChanged=true; + } + if (chan[i].std.phaseReset.had) { + if (chan[i].std.phaseReset.val==1) { + chWrite(i,8,0); + chWrite(i,9,0); + chWrite(i,10,0); + chWrite(i,11,0); + } + } + if (chan[i].std.ex1.had) { + unsigned char val=chRead(i,3)&0xf0; + chWrite(i,3,val|(~chan[i].std.ex1.val&0xf)); + } + if (chan[i].std.ex2.had) { + unsigned char val=chRead(i,3)&0x0f; + chWrite(i,3,val|((~chan[i].std.ex2.val&0xf)<<4)); + } + if (chan[i].active) { + if (chan[i].ws.tick() || (chan[i].std.phaseReset.had && chan[i].std.phaseReset.val==1)) { + updateWave(i); + } + } + if (chan[i].freqChanged) { + chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,false,2,chan[i].pitch2,chipClock,CHIP_FREQBASE); + if (chan[i].freq<0) chan[i].freq=0; + if (chan[i].freq>8388608) chan[i].freq=8388608; + chWrite(i,4,chan[i].freq&0xff); + chWrite(i,5,(chan[i].freq>>8)&0xff); + chWrite(i,6,(chan[i].freq>>16)&0xff); + chWrite(i,7,(chan[i].freq>>24)&0xff); + chan[i].freqChanged=false; + } + if (chan[i].keyOn || chan[i].keyOff) { + if (!chan[i].std.vol.had) { + chan[i].outVol=chan[i].vol; + } + if (!isMuted[i] && chan[i].active) { + chWrite(i,0,~chan[i].outVol&255); + chWrite(i,1,chan[i].panL); + chWrite(i,2,chan[i].panR); + } else { + chWrite(i,0,255); + chWrite(i,1,0); + chWrite(i,2,0); + } + if (chan[i].keyOn) chan[i].keyOn=false; + if (chan[i].keyOff) chan[i].keyOff=false; + } + } +} + +int DivPlatformKurumitsu8L::dispatch(DivCommand c) { + switch (c.cmd) { + case DIV_CMD_NOTE_ON: { + DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_PCE); + if (c.value!=DIV_NOTE_NULL) { + chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value); + chan[c.chan].freqChanged=true; + chan[c.chan].note=c.value; + } + chan[c.chan].active=true; + chan[c.chan].keyOn=true; + chan[c.chan].macroInit(ins); + if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) { + chan[c.chan].outVol=chan[c.chan].vol; + if (!isMuted[c.chan] && chan[c.chan].active) { + chWrite(c.chan,0,~chan[c.chan].outVol&255); + } + } + if (chan[c.chan].wave<0) { + chan[c.chan].wave=0; + chan[c.chan].ws.changeWave1(chan[c.chan].wave); + } + chan[c.chan].ws.init(ins,256,255,chan[c.chan].insChanged); + chan[c.chan].insChanged=false; + break; + } + case DIV_CMD_NOTE_OFF: + chan[c.chan].active=false; + chan[c.chan].keyOff=true; + chan[c.chan].macroInit(NULL); + break; + case DIV_CMD_NOTE_OFF_ENV: + case DIV_CMD_ENV_RELEASE: + chan[c.chan].std.release(); + break; + case DIV_CMD_INSTRUMENT: + if (chan[c.chan].ins!=c.value || c.value2==1) { + chan[c.chan].ins=c.value; + chan[c.chan].insChanged=true; + } + break; + case DIV_CMD_VOLUME: + if (chan[c.chan].vol!=c.value) { + chan[c.chan].vol=c.value; + if (!chan[c.chan].std.vol.has) { + chan[c.chan].outVol=c.value; + if (!isMuted[c.chan] && chan[c.chan].active) { + chWrite(c.chan,0,~chan[c.chan].outVol&255); + } + } + } + break; + case DIV_CMD_GET_VOLUME: + if (chan[c.chan].std.vol.has) { + return chan[c.chan].vol; + } + return chan[c.chan].outVol; + break; + case DIV_CMD_PITCH: + chan[c.chan].pitch=c.value; + chan[c.chan].freqChanged=true; + break; + case DIV_CMD_WAVE: + chan[c.chan].wave=c.value; + chan[c.chan].ws.changeWave1(chan[c.chan].wave); + chan[c.chan].keyOn=true; + break; + case DIV_CMD_NOTE_PORTA: { + int destFreq=NOTE_FREQUENCY(c.value2); + bool return2=false; + if (destFreq>chan[c.chan].baseFreq) { + chan[c.chan].baseFreq+=c.value*((parent->song.linearPitch==2)?1:8); + if (chan[c.chan].baseFreq>=destFreq) { + chan[c.chan].baseFreq=destFreq; + return2=true; + } + } else { + chan[c.chan].baseFreq-=c.value*((parent->song.linearPitch==2)?1:8); + if (chan[c.chan].baseFreq<=destFreq) { + chan[c.chan].baseFreq=destFreq; + return2=true; + } + } + chan[c.chan].freqChanged=true; + if (return2) { + chan[c.chan].inPorta=false; + return 2; + } + break; + } + case DIV_CMD_PANNING: { + chan[c.chan].panL=c.value; + chan[c.chan].panR=c.value2; + if (!isMuted[c.chan] && chan[c.chan].active) { + chWrite(c.chan,1,chan[c.chan].panL); + chWrite(c.chan,2,chan[c.chan].panR); + } + break; + } + case DIV_CMD_LEGATO: + chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value+((HACKY_LEGATO_MESS)?(chan[c.chan].std.arp.val):(0))); + chan[c.chan].freqChanged=true; + chan[c.chan].note=c.value; + break; + case DIV_CMD_PRE_PORTA: + if (chan[c.chan].active && c.value2) { + if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_PCE)); + } + if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_FREQUENCY(chan[c.chan].note); + chan[c.chan].inPorta=c.value; + break; + case DIV_CMD_FM_FB: { + unsigned char val=chRead(c.chan,3)&0xf0; + chWrite(c.chan,3,val|(~c.value&0xf)); + break; + } + case DIV_CMD_FM_PM_DEPTH: { + unsigned char val=chRead(c.chan,3)&0x0f; + chWrite(c.chan,3,val|((~c.value&0xf)<<4)); + break; + } + case DIV_CMD_GET_VOLMAX: + return 255; + break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; + case DIV_CMD_MACRO_RESTART: + chan[c.chan].std.restart(c.value); + break; + default: + break; + } + return 1; +} + +void DivPlatformKurumitsu8L::muteChannel(int ch, bool mute) { + isMuted[ch]=mute; + if (!mute && chan[ch].active) { + chWrite(ch,0,~chan[ch].outVol&255); + chWrite(ch,1,chan[ch].panL); + chWrite(ch,2,chan[ch].panR); + } else { + chWrite(ch,0,255); + chWrite(ch,1,0); + chWrite(ch,2,0); + } +} + +void DivPlatformKurumitsu8L::forceIns() { + for (int i=0; i<8; i++) { + chan[i].insChanged=true; + chan[i].freqChanged=true; + updateWave(i); + } +} + +void* DivPlatformKurumitsu8L::getChanState(int ch) { + return &chan[ch]; +} + +DivMacroInt* DivPlatformKurumitsu8L::getChanMacroInt(int ch) { + return &chan[ch].std; +} + +unsigned short DivPlatformKurumitsu8L::getPan(int ch) { + return (chRead(ch,1)<<8)|chRead(ch,2); +} + +void DivPlatformKurumitsu8L::getPaired(int ch, std::vector& ret) { + unsigned char mod=~(chRead(ch,3)>>4)&0xf; + if (mod>0) { + sprintf(modLabel[ch],"%d",mod); + if (ch==0){ + ret.push_back(DivChannelPair(modLabel[ch],7)); + } else { + ret.push_back(DivChannelPair(modLabel[ch],ch-1)); + } + } +} + +DivDispatchOscBuffer* DivPlatformKurumitsu8L::getOscBuffer(int ch) { + return oscBuf[ch]; +} + +unsigned char* DivPlatformKurumitsu8L::getRegisterPool() { + return regPool; +} + +int DivPlatformKurumitsu8L::getRegisterPoolSize() { + return 16*8; +} + +void DivPlatformKurumitsu8L::reset() { + memset(regPool,0,sizeof(regPool)); + memset(wtMem,0xff,sizeof(wtMem)); + for (int i=0; i<8; i++) { + chan[i]=DivPlatformKurumitsu8L::Channel(); + chan[i].std.setEngine(parent); + chan[i].ws.setEngine(parent); + chan[i].ws.init(NULL,256,255,false); + chWrite(i,3,0xff); // set mod to min + } + modData=0; + if (dumpWrites) { + addWrite(0xffffffff,0); + } +} + +int DivPlatformKurumitsu8L::getOutputCount() { + return 2; +} + +bool DivPlatformKurumitsu8L::keyOffAffectsArp(int ch) { + return true; +} + +void DivPlatformKurumitsu8L::notifyWaveChange(int wave) { + for (int i=0; i<8; i++) { + if (chan[i].wave==wave) { + chan[i].ws.changeWave1(wave); + updateWave(i); + } + } +} + +void DivPlatformKurumitsu8L::notifyInsDeletion(void* ins) { + for (int i=0; i<8; i++) { + chan[i].std.notifyInsDeletion((DivInstrument*)ins); + } +} + +int DivPlatformKurumitsu8L::mapVelocity(int ch, float vel) { + // -0.19dB per step + if (vel==0) return 0; + if (vel>=1.0) return 255; + return CLAMP(roundf(256.f-(32.f-log2f(vel)*32.f)),0,255); +} + +void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { + chipClock=6144000; + CHECK_CUSTOM_CLOCK; + rate=chipClock/64; + for (int i=0; i<8; i++) { + oscBuf[i]->setRate(rate); + } +} + +void DivPlatformKurumitsu8L::poke(unsigned int addr, unsigned short val) { + chWrite((addr>>4)&7,addr&0xf,val); +} + +void DivPlatformKurumitsu8L::poke(std::vector& wlist) { + for (DivRegWrite& i: wlist) chWrite((i.addr>>4)&7,i.addr&0xf,i.val); +} + +int DivPlatformKurumitsu8L::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { + parent=p; + dumpWrites=false; + skipRegisterWrites=false; + memset(modLabel,0,sizeof(modLabel)); + for (int i=0; i<8; i++) { + isMuted[i]=false; + oscBuf[i]=new DivDispatchOscBuffer; + } + setFlags(flags); + reset(); + return 8; +} + +void DivPlatformKurumitsu8L::quit() { + for (int i=0; i<8; i++) { + delete oscBuf[i]; + } +} + +DivPlatformKurumitsu8L::~DivPlatformKurumitsu8L() { +} diff --git a/src/engine/platform/kurumitsu8l.h b/src/engine/platform/kurumitsu8l.h new file mode 100644 index 000000000..52eb7c16a --- /dev/null +++ b/src/engine/platform/kurumitsu8l.h @@ -0,0 +1,78 @@ +/** + * Furnace Tracker - multi-system chiptune tracker + * Copyright (C) 2021-2025 tildearrow and contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _KURUMITSU_8L_H +#define _KURUMITSU_8L_H + +#include "../dispatch.h" +#include "../../fixedQueue.h" +#include "../waveSynth.h" + +class DivPlatformKurumitsu8L: public DivDispatch { + struct Channel: public SharedChannel { + unsigned char panL; + unsigned char panR; + signed short wave; + DivWaveSynth ws; + Channel(): + SharedChannel(255), + panL(255), + panR(255), + wave(-1) {} + }; + Channel chan[8]; + DivDispatchOscBuffer* oscBuf[8]; + bool isMuted[8]; + + unsigned char regPool[8*16]; + unsigned char wtMem[8][256]; + char modLabel[8][4]; + int modData; + void updateWave(int ch); + friend void putDispatchChip(void*,int); + friend void putDispatchChan(void*,int,int); + public: + void acquire(short** buf, size_t len); + int dispatch(DivCommand c); + void* getChanState(int chan); + DivMacroInt* getChanMacroInt(int ch); + unsigned short getPan(int chan); + void getPaired(int ch, std::vector& ret); + DivDispatchOscBuffer* getOscBuffer(int chan); + unsigned char* getRegisterPool(); + int getRegisterPoolSize(); + void reset(); + void forceIns(); + void tick(bool sysTick=true); + void muteChannel(int ch, bool mute); + int getOutputCount(); + bool keyOffAffectsArp(int ch); + void setFlags(const DivConfig& flags); + void notifyWaveChange(int wave); + void notifyInsDeletion(void* ins); + int mapVelocity(int ch, float vel); + void poke(unsigned int addr, unsigned short val); + void poke(std::vector& wlist); + const char** getRegisterSheet(); + int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags); + void quit(); + ~DivPlatformKurumitsu8L(); +}; + +#endif diff --git a/src/engine/song.h b/src/engine/song.h index e13d8b101..03d0e27f5 100644 --- a/src/engine/song.h +++ b/src/engine/song.h @@ -146,6 +146,7 @@ enum DivSystem { DIV_SYSTEM_UPD1771C, DIV_SYSTEM_SID3, DIV_SYSTEM_C64_PCM, + DIV_SYSTEM_KURUMITSU_8L, DIV_SYSTEM_MAX }; diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 7448d858e..d9cb0a7c8 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -2350,6 +2350,21 @@ void DivEngine::registerSystems() { {DIV_INS_STD, DIV_INS_STD, DIV_INS_STD, DIV_INS_STD, DIV_INS_STD, DIV_INS_STD, DIV_INS_STD, DIV_INS_STD} ); + sysDefs[DIV_SYSTEM_KURUMITSU_8L]=new DivSysDef( + _("Kurumitsu-8L"), NULL, 0xfe, 0, 8, false, true, 0, false, 1U<id!=0) { diff --git a/src/gui/gui.h b/src/gui/gui.h index 1e9fca083..d9979a764 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -373,6 +373,7 @@ enum FurnaceGUIColors { GUI_COLOR_INSTR_SUPERVISION, GUI_COLOR_INSTR_UPD1771C, GUI_COLOR_INSTR_SID3, + GUI_COLOR_INSTR_KURUMITSU_8L, GUI_COLOR_INSTR_UNKNOWN, GUI_COLOR_CHANNEL_BG, diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 608df187f..4f760b446 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -187,6 +187,7 @@ const char* insTypes[DIV_INS_MAX+1][3]={ {"Watara Supervision",ICON_FA_GAMEPAD,ICON_FUR_INS_SUPERVISION}, {"NEC μPD1771C",ICON_FA_BAR_CHART,ICON_FUR_INS_UPD1771C}, {"SID3",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID3}, + {"Kurumitsu-8L",ICON_FA_CALCULATOR,ICON_FA_QUESTION}, {NULL,ICON_FA_QUESTION,ICON_FA_QUESTION} }; @@ -248,7 +249,7 @@ const char* chanNames[CHANNEL_TYPE_MAX+1]={ _N("Square"), _N("Triangle"), // NES _N("Saw"), // VRC6 - _N("Ext. Operator"), + _N("Ext. Operator"), _N("Drums"), _N("Slope"), // PowerNoise _N("Wave"), // not wavetable (VERA, 5E01) @@ -1069,6 +1070,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={ D(GUI_COLOR_INSTR_SUPERVISION,"",ImVec4(0.52f,1.0f,0.6f,1.0f)), D(GUI_COLOR_INSTR_UPD1771C,"",ImVec4(0.94f,0.52f,0.6f,1.0f)), D(GUI_COLOR_INSTR_SID3,"",ImVec4(0.6f,0.75f,0.6f,1.0f)), + D(GUI_COLOR_INSTR_KURUMITSU_8L,"",ImVec4(0.9f,0.3f,0.3f,1.0f)), D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)), D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)), @@ -1331,6 +1333,7 @@ const int availableSystems[]={ DIV_SYSTEM_UPD1771C, DIV_SYSTEM_SID3, DIV_SYSTEM_MULTIPCM, + DIV_SYSTEM_KURUMITSU_8L, 0 // don't remove this last one! }; @@ -1404,6 +1407,7 @@ const int chipsWave[]={ DIV_SYSTEM_NAMCO, DIV_SYSTEM_NAMCO_15XX, DIV_SYSTEM_NAMCO_CUS30, + DIV_SYSTEM_KURUMITSU_8L, 0 // don't remove this last one! }; diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index 6efdc8892..7062e3254 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -8060,7 +8060,8 @@ void FurnaceGUI::drawInsEdit() { ins->type==DIV_INS_SNES || ins->type==DIV_INS_NAMCO || ins->type==DIV_INS_SM8521 || - (ins->type==DIV_INS_GBA_MINMOD && ins->amiga.useWave)) + (ins->type==DIV_INS_GBA_MINMOD && ins->amiga.useWave) || + ins->type==DIV_INS_KURUMITSU_8L) { insTabWavetable(ins); } @@ -8745,6 +8746,17 @@ void FurnaceGUI::drawInsEdit() { macroList.push_back(FurnaceGUIMacroDesc(_("Sample Mode"),&ins->std.opMacros[1].arMacro,0,1,32,uiColors[GUI_COLOR_MACRO_NOISE],false,NULL,NULL,true)); } break; + case DIV_INS_KURUMITSU_8L: + macroList.push_back(FurnaceGUIMacroDesc(_("Volume"),&ins->std.volMacro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME])); + macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); + macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,waveCount,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (right)"),&ins->std.panRMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER])); + macroList.push_back(FurnaceGUIMacroDesc(_("Pitch"),&ins->std.pitchMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode)); + macroList.push_back(FurnaceGUIMacroDesc(_("Phase Reset"),&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true)); + macroList.push_back(FurnaceGUIMacroDesc(_("Feedback"),&ins->std.ex1Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Modulation"),&ins->std.ex2Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); + break; case DIV_INS_MAX: case DIV_INS_NULL: break; diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 972d77e9c..479c988cc 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -3784,6 +3784,11 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_X1_010, 1.0f, 0, "") } ); + ENTRY( + _("Kurumitsu-8L"), { + CH(DIV_SYSTEM_KURUMITSU_8L, 1.0f, 0, "") + } + ); CATEGORY_END; CATEGORY_BEGIN(_("Specialized"),_("chips/systems with unique sound synthesis methods.")); diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index 7690a2671..f935e540a 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -31,7 +31,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl switch (type) { case DIV_SYSTEM_YM2612: - case DIV_SYSTEM_YM2612_EXT: + case DIV_SYSTEM_YM2612_EXT: case DIV_SYSTEM_YM2612_DUALPCM: case DIV_SYSTEM_YM2612_DUALPCM_EXT: case DIV_SYSTEM_YM2612_CSM: { @@ -108,7 +108,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl if (interruptSimCycles>256) interruptSimCycles=256; altered=true; } rightClickable - + if (altered) { e->lockSave([&]() { flags.set("clockSel",clockSel); @@ -761,7 +761,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl altered=true; } popWarningColor(); - + ImGui::Text(_("- 0 disables envelope reset. not recommended!\n- 1 may trigger SID envelope bugs.\n- values that are too high may result in notes being skipped.")); if (ImGui::Checkbox(_("Disable 1Exy env update (compatibility)"),&no1EUpdate)) { @@ -1591,7 +1591,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl altered=true; } ImGui::Unindent(); - + int chipClock=flags.getInt("customClock",0); if (!chipClock) { switch (clockSel) { @@ -2044,7 +2044,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl if (ImGui::Checkbox(_("Enable echo"),&echo)) { altered=true; } - + ImGui::Text(_("Initial echo state:")); for (int i=0; i<8; i++) { bool echoChan=(bool)(echoMask&(1< Date: Sat, 29 Mar 2025 22:29:19 +0700 Subject: [PATCH 2/6] Kurumitsu-8L: change channel volume handling In order to keep the same modulation output, it now scales with pan instead of envelope --- src/engine/platform/kurumitsu8l.cpp | 47 ++++++++++++----------------- src/engine/platform/kurumitsu8l.h | 1 + src/gui/insEdit.cpp | 2 +- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp index c13b27338..8f09dedc6 100644 --- a/src/engine/platform/kurumitsu8l.cpp +++ b/src/engine/platform/kurumitsu8l.cpp @@ -118,11 +118,19 @@ void DivPlatformKurumitsu8L::updateWave(int ch) { } } +void DivPlatformKurumitsu8L::writePan(int ch) { + if (!isMuted[ch] && chan[ch].active) { + chWrite(ch,1,VOL_SCALE_LINEAR(chan[ch].panL,chan[ch].vol,255)); + chWrite(ch,2,VOL_SCALE_LINEAR(chan[ch].panR,chan[ch].vol,255)); + } +} + void DivPlatformKurumitsu8L::tick(bool sysTick) { for (int i=0; i<8; i++) { + bool panChanged=false; chan[i].std.next(); if (chan[i].std.vol.had) { - chan[i].outVol=VOL_SCALE_LOG(chan[i].vol,chan[i].std.vol.val,255); + chan[i].outVol=chan[i].std.vol.val; if (!isMuted[i] && chan[i].active) { chWrite(i,0,~chan[i].outVol&255); } @@ -144,15 +152,11 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].std.panL.had) { chan[i].panL=chan[i].std.panL.val; - if (!isMuted[i] && chan[i].active) { - chWrite(i,1,chan[i].panL); - } + panChanged=true; } if (chan[i].std.panR.had) { chan[i].panR=chan[i].std.panR.val; - if (!isMuted[i] && chan[i].active) { - chWrite(i,2,chan[i].panR); - } + panChanged=true; } if (chan[i].std.pitch.had) { if (chan[i].std.pitch.mode) { @@ -196,20 +200,21 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].keyOn || chan[i].keyOff) { if (!chan[i].std.vol.had) { - chan[i].outVol=chan[i].vol; + chan[i].outVol=255; } if (!isMuted[i] && chan[i].active) { chWrite(i,0,~chan[i].outVol&255); - chWrite(i,1,chan[i].panL); - chWrite(i,2,chan[i].panR); + panChanged=true; } else { chWrite(i,0,255); chWrite(i,1,0); chWrite(i,2,0); + panChanged=false; } if (chan[i].keyOn) chan[i].keyOn=false; if (chan[i].keyOff) chan[i].keyOff=false; } + if (panChanged) writePan(i); } } @@ -226,7 +231,7 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { chan[c.chan].keyOn=true; chan[c.chan].macroInit(ins); if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) { - chan[c.chan].outVol=chan[c.chan].vol; + chan[c.chan].outVol=255; if (!isMuted[c.chan] && chan[c.chan].active) { chWrite(c.chan,0,~chan[c.chan].outVol&255); } @@ -257,19 +262,11 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { case DIV_CMD_VOLUME: if (chan[c.chan].vol!=c.value) { chan[c.chan].vol=c.value; - if (!chan[c.chan].std.vol.has) { - chan[c.chan].outVol=c.value; - if (!isMuted[c.chan] && chan[c.chan].active) { - chWrite(c.chan,0,~chan[c.chan].outVol&255); - } - } + writePan(c.chan); } break; case DIV_CMD_GET_VOLUME: - if (chan[c.chan].std.vol.has) { - return chan[c.chan].vol; - } - return chan[c.chan].outVol; + return chan[c.chan].vol; break; case DIV_CMD_PITCH: chan[c.chan].pitch=c.value; @@ -306,10 +303,7 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { case DIV_CMD_PANNING: { chan[c.chan].panL=c.value; chan[c.chan].panR=c.value2; - if (!isMuted[c.chan] && chan[c.chan].active) { - chWrite(c.chan,1,chan[c.chan].panL); - chWrite(c.chan,2,chan[c.chan].panR); - } + writePan(c.chan); break; } case DIV_CMD_LEGATO: @@ -356,8 +350,7 @@ void DivPlatformKurumitsu8L::muteChannel(int ch, bool mute) { isMuted[ch]=mute; if (!mute && chan[ch].active) { chWrite(ch,0,~chan[ch].outVol&255); - chWrite(ch,1,chan[ch].panL); - chWrite(ch,2,chan[ch].panR); + writePan(ch); } else { chWrite(ch,0,255); chWrite(ch,1,0); diff --git a/src/engine/platform/kurumitsu8l.h b/src/engine/platform/kurumitsu8l.h index 52eb7c16a..3a3365916 100644 --- a/src/engine/platform/kurumitsu8l.h +++ b/src/engine/platform/kurumitsu8l.h @@ -45,6 +45,7 @@ class DivPlatformKurumitsu8L: public DivDispatch { char modLabel[8][4]; int modData; void updateWave(int ch); + void writePan(int ch); friend void putDispatchChip(void*,int); friend void putDispatchChan(void*,int,int); public: diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index 7062e3254..d9a3b3fb9 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -8747,7 +8747,7 @@ void FurnaceGUI::drawInsEdit() { } break; case DIV_INS_KURUMITSU_8L: - macroList.push_back(FurnaceGUIMacroDesc(_("Volume"),&ins->std.volMacro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME])); + macroList.push_back(FurnaceGUIMacroDesc(_("Envelope"),&ins->std.volMacro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME])); macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,waveCount,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); From 1755e5b371ea27c5a00dab0578373ef4eba7f780 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Sat, 26 Apr 2025 14:41:22 +0700 Subject: [PATCH 3/6] Kurumitsu-8L: add echo and PCM sample --- src/engine/export.h | 1 + src/engine/platform/kurumitsu8l.cpp | 405 +++++++++++++++++++++------- src/engine/platform/kurumitsu8l.h | 49 +++- src/engine/sysDef.cpp | 15 +- src/gui/insEdit.cpp | 9 +- src/gui/sampleEdit.cpp | 23 +- src/gui/sysConf.cpp | 33 ++- 7 files changed, 420 insertions(+), 115 deletions(-) diff --git a/src/engine/export.h b/src/engine/export.h index fc05ed949..13f8bbe9b 100644 --- a/src/engine/export.h +++ b/src/engine/export.h @@ -34,6 +34,7 @@ enum DivROMExportOptions { DIV_ROM_SAP_R, DIV_ROM_IPOD, DIV_ROM_GRUB, + DIV_ROM_KMM, DIV_ROM_MAX }; diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp index 8f09dedc6..42ab813a4 100644 --- a/src/engine/platform/kurumitsu8l.cpp +++ b/src/engine/platform/kurumitsu8l.cpp @@ -23,6 +23,7 @@ #define chRead(c,a) regPool[(c)*16+(a)] #define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*16+(a)]=v; if (dumpWrites) {addWrite(a,v);} } +#define chDWrite(c,a,v) regPool[(c)*16+(a)]=v; #define CHIP_FREQBASE 67108864 @@ -32,9 +33,14 @@ const char* regCheatSheetKurumitsu8L[]={ "CHxPanR", "02+x*10", "CHxMod", "03+x*10", "CHxFreq", "04+x*10", + "CHxEcho", "07+x*10", "CHxAcc", "08+x*10", - "CHxLoopS", "0C+x*10", - "CHxLoopE", "0E+x*10", + "CH7Bank", "73", + "CH7LoopE", "7C", + "CH7LoopL", "7E", + "EchoFB", "80", + "EchoVolL", "81", + "EchoVolR", "82", NULL }; @@ -44,55 +50,78 @@ const char** DivPlatformKurumitsu8L::getRegisterSheet() { void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { const int volTab[32]={ - 32767, 32064, 31377, 30705, 30047, 29403, 28773, 28156, 27553, 26963, 26385, 25820, 25266, 24725, 24195, 23677, 23169, 22673, 22187, 21712, 21246, 20791, 20345, 19910, 19483, 19065, 18657, 18257, 17866, 17483, 17108, 16742 + 65535, 64130, 62756, 61411, 60095, 58808, 57547, 56314, 55108, 53927, 52771, 51640, 50534, 49451, 48391, 47354, + 46340, 45347, 44375, 43424, 42494, 41583, 40692, 39820, 38967, 38132, 37315, 36515, 35733, 34967, 34218, 33485 }; for (int i=0; i<8; i++) { oscBuf[i]->begin(len); } + signed char echoFB=chRead(8,0); + signed char echoL=chRead(8,1); + signed char echoR=chRead(8,2); for (size_t h=0; h>4)&0xf; + signed char panL=chRead(i,1); + signed char panR=chRead(i,2); + signed char echo=chRead(i,7); unsigned freq=chRead(i,4)|((unsigned)chRead(i,5)<<8)|((unsigned)chRead(i,6)<<16)|((unsigned)chRead(i,7)<<24); unsigned phase=chRead(i,8)|((unsigned)chRead(i,9)<<8)|((unsigned)chRead(i,10)<<16)|((unsigned)chRead(i,11)<<24); - int fbData=chRead(i,13)|((unsigned)chRead(i,14)<<8); - if (fbData>=0x8000) fbData-=0x10000; + int fbData=0; - unsigned phase_modded=phase; - phase_modded+=(fbData<<8)>>fb; - phase_modded+=(modData<<8)>>mod; - phase+=freq; + int data=0; + if (i<7) { + unsigned char fb=chRead(i,3)&0xf; + unsigned char mod=(chRead(i,3)>>4)&0xf; + fbData=chRead(i,12)|((int)chRead(i,13)<<8)|((int)chRead(i,14)<<16)|((int)chRead(i,15)<<24); + + unsigned phase_modded=phase; + phase_modded+=fbData>>fb; + phase_modded+=modData>>mod; + + data=wtMem[i][(phase_modded>>16)&255]; + phase+=freq; + } else { + unsigned loopE=chRead(i,12)|((unsigned)chRead(i,13)<<8); + unsigned loopL=chRead(i,14)|((unsigned)chRead(i,15)<<8); + data=sampleMem[(phase>>16)|(chRead(i,3)<<16)]; + int64_t newPhase=phase+(freq&0x00ffffff); + if (newPhase>=(loopE<<16)) { + newPhase-=loopL<<16; + } + phase=newPhase; + } + int out=data*(volTab[vol&0x1f]>>(vol>>5)); + outAL+=out*panL/256; + outAR+=out*panR/256; + outE+=out*echo/256; + oscBuf[i]->putSample(h,out*((int)abs(panL)+abs(panR))/65536); - unsigned char data=wtMem[i][(phase_modded>>16)&255]; - int out=(data>>1)+vol; - out=volTab[out&0x1f]>>(out>>5); - if (data&1) out=-out; - fbData=out; - modData=out; - outAL+=out*panL; - outAR+=out*panR; - oscBuf[i]->putSample(h,(out*((int)panL+panR))>>9); - - chWrite(i,8,phase&0xff); - chWrite(i,9,(phase>>8)&0xff); - chWrite(i,10,(phase>>16)&0xff); - chWrite(i,11,(phase>>24)&0xff); - chWrite(i,13,fbData&0xff); - chWrite(i,14,(fbData>>8)&0xff); - chWrite(i,15,(fbData>>16)&0xff); + chDWrite(i,8,phase&0xff); + chDWrite(i,9,(phase>>8)&0xff); + chDWrite(i,10,(phase>>16)&0xff); + chDWrite(i,11,(phase>>24)&0xff); + if (i<7) { + fbData=out; + modData=out; + chDWrite(i,12,fbData&0xff); + chDWrite(i,13,(fbData>>8)&0xff); + chDWrite(i,14,(fbData>>16)&0xff); + chDWrite(i,15,(fbData>>24)&0xff); + } } - buf[0][h]=outAL>>11; - buf[1][h]=outAR>>11; + buf[0][h]=outAL>>10; + buf[1][h]=outAR>>10; + outE>>=18; + if (outE<0) outE++; + echoMem[echoPtr]=outE; + echoPtr=(echoPtr+1)&4095; } for (int i=0; i<8; i++) { @@ -101,36 +130,38 @@ void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { } void DivPlatformKurumitsu8L::updateWave(int ch) { + if (ch>=7) return; for (int i=0; i<256; i++) { - int data=chan[ch].ws.output[i]-128; - unsigned char val=0; - if (data<0) { - val|=1; - data=-data; - } - // convert to log attenuation format - if (data>0) { - val|=((unsigned char)MIN(roundf((7.f-log2f(data))*32.f),127.f))<<1; - } else { - val|=0xfe; - } - wtMem[ch][i]=val; + wtMem[ch][i]=chan[ch].ws.output[i]^128; } } void DivPlatformKurumitsu8L::writePan(int ch) { if (!isMuted[ch] && chan[ch].active) { - chWrite(ch,1,VOL_SCALE_LINEAR(chan[ch].panL,chan[ch].vol,255)); - chWrite(ch,2,VOL_SCALE_LINEAR(chan[ch].panR,chan[ch].vol,255)); + chWrite(ch,1,VOL_SCALE_LINEAR(chan[ch].panL,chan[ch].vol,127)*(chan[ch].invertL?-1:1)); + chWrite(ch,2,VOL_SCALE_LINEAR(chan[ch].panR,chan[ch].vol,127)*(chan[ch].invertR?-1:1)); + } else { + chWrite(ch,1,0); + chWrite(ch,2,0); + } +} + +void DivPlatformKurumitsu8L::writeEcho(int ch) { + if (!isMuted[ch] && chan[ch].active) { + chWrite(ch,7,chan[ch].echo); + } else { + chWrite(ch,7,0); } } void DivPlatformKurumitsu8L::tick(bool sysTick) { for (int i=0; i<8; i++) { bool panChanged=false; + bool echoChanged=false; chan[i].std.next(); if (chan[i].std.vol.had) { - chan[i].outVol=chan[i].std.vol.val; + chan[i].outVol=chan[i].std.vol.val*(chan[i].isAmiga?4:1); + if (chan[i].outVol>255) chan[i].outVol=255; if (!isMuted[i] && chan[i].active) { chWrite(i,0,~chan[i].outVol&255); } @@ -143,6 +174,10 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } chan[i].freqChanged=true; } + if (chan[i].std.duty.had) { + chan[i].echo=chan[i].std.duty.val; + echoChanged=true; + } if (chan[i].std.wave.had) { if (chan[i].wave!=chan[i].std.wave.val || chan[i].ws.activeChanged()) { chan[i].wave=chan[i].std.wave.val; @@ -168,21 +203,38 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].freqChanged=true; } if (chan[i].std.phaseReset.had) { - if (chan[i].std.phaseReset.val==1) { - chWrite(i,8,0); - chWrite(i,9,0); - chWrite(i,10,0); - chWrite(i,11,0); + if (chan[i].std.phaseReset.val==1 && chan[i].active) { + if (i==7) { + chan[i].audPos=0; + chan[i].setPos=true; + } else { + chWrite(i,8,0); + chWrite(i,9,0); + chWrite(i,10,0); + chWrite(i,11,0); + } } } - if (chan[i].std.ex1.had) { + if (i<7 && chan[i].std.ex1.had) { unsigned char val=chRead(i,3)&0xf0; chWrite(i,3,val|(~chan[i].std.ex1.val&0xf)); } - if (chan[i].std.ex2.had) { + if (i<7 && chan[i].std.ex2.had) { unsigned char val=chRead(i,3)&0x0f; chWrite(i,3,val|((~chan[i].std.ex2.val&0xf)<<4)); } + if (chan[i].std.ex3.had) { + chan[i].invertL=chan[i].std.ex3.val&2; + chan[i].invertR=chan[i].std.ex3.val&1; + panChanged=true; + } + if (chan[i].setPos) { + // force keyon + chan[i].keyOn=true; + chan[i].setPos=false; + } else { + chan[i].audPos=0; + } if (chan[i].active) { if (chan[i].ws.tick() || (chan[i].std.phaseReset.had && chan[i].std.phaseReset.val==1)) { updateWave(i); @@ -190,12 +242,16 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].freqChanged) { chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,false,2,chan[i].pitch2,chipClock,CHIP_FREQBASE); + if (i==7) { + DivSample* s=parent->getSample(chan[i].sample); + double off=(s->centerRate>=1)?((double)s->centerRate/parent->getCenterRate()):1.0; + chan[i].freq*=off/16.; + } if (chan[i].freq<0) chan[i].freq=0; if (chan[i].freq>8388608) chan[i].freq=8388608; chWrite(i,4,chan[i].freq&0xff); chWrite(i,5,(chan[i].freq>>8)&0xff); chWrite(i,6,(chan[i].freq>>16)&0xff); - chWrite(i,7,(chan[i].freq>>24)&0xff); chan[i].freqChanged=false; } if (chan[i].keyOn || chan[i].keyOff) { @@ -204,24 +260,65 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (!isMuted[i] && chan[i].active) { chWrite(i,0,~chan[i].outVol&255); - panChanged=true; } else { chWrite(i,0,255); - chWrite(i,1,0); - chWrite(i,2,0); - panChanged=false; } - if (chan[i].keyOn) chan[i].keyOn=false; + panChanged=true; + echoChanged=true; + if (chan[i].keyOn) { + chan[i].keyOn=false; + if (i==7) { + DivSample* s=parent->getSample(chan[i].sample); + size_t maxPos=getSampleMemCapacity(); + unsigned int start, length, loop; + start=sampleOff[chan[i].sample]; + if (s->isLoopable()) { + length=s->loopEnd; + loop=s->loopEnd-s->loopStart; + } else { + length=s->samples+16; + loop=16; + } + if (length>65535) length=65535; + if (chan[i].audPos>0) { + start=start+MIN(chan[i].audPos,length); + } + chWrite(i,8,0); + chWrite(i,9,0); + chWrite(i,10,start&0xff); + chWrite(i,11,(start>>8)&0xff); + chWrite(i,3,start>>16); + chWrite(i,12,(start+length)&0xff); + chWrite(i,13,((start+length)>>8)&0xff); + chWrite(i,14,loop&0xff); + chWrite(i,15,(loop>>8)&0xff); + } + } if (chan[i].keyOff) chan[i].keyOff=false; } if (panChanged) writePan(i); + if (echoChanged) writeEcho(i); } } int DivPlatformKurumitsu8L::dispatch(DivCommand c) { switch (c.cmd) { case DIV_CMD_NOTE_ON: { - DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_PCE); + DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA); + chan[c.chan].isAmiga=ins->type==DIV_INS_AMIGA; + if (c.chan==7 && c.value!=DIV_NOTE_NULL) { + chan[c.chan].sample=ins->amiga.getSample(c.value); + c.value=ins->amiga.getFreq(c.value); + } else { + if (chan[c.chan].wave<0) { + chan[c.chan].wave=0; + chan[c.chan].ws.changeWave1(chan[c.chan].wave); + } + chan[c.chan].ws.init(ins,256,255,chan[c.chan].insChanged); + } + if (c.chan!=7 || chan[c.chan].sample<0 || chan[c.chan].sample>=parent->song.sampleLen) { + chan[c.chan].sample=-1; + } if (c.value!=DIV_NOTE_NULL) { chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value); chan[c.chan].freqChanged=true; @@ -236,15 +333,11 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { chWrite(c.chan,0,~chan[c.chan].outVol&255); } } - if (chan[c.chan].wave<0) { - chan[c.chan].wave=0; - chan[c.chan].ws.changeWave1(chan[c.chan].wave); - } - chan[c.chan].ws.init(ins,256,255,chan[c.chan].insChanged); chan[c.chan].insChanged=false; break; } case DIV_CMD_NOTE_OFF: + chan[c.chan].sample=-1; chan[c.chan].active=false; chan[c.chan].keyOff=true; chan[c.chan].macroInit(NULL); @@ -268,6 +361,11 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { case DIV_CMD_GET_VOLUME: return chan[c.chan].vol; break; + case DIV_CMD_SNES_INVERT: + chan[c.chan].invertL=(c.value>>4); + chan[c.chan].invertR=c.value&15; + writePan(c.chan); + break; case DIV_CMD_PITCH: chan[c.chan].pitch=c.value; chan[c.chan].freqChanged=true; @@ -318,18 +416,37 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_FREQUENCY(chan[c.chan].note); chan[c.chan].inPorta=c.value; break; + case DIV_CMD_SAMPLE_POS: + chan[c.chan].audPos=c.value; + chan[c.chan].setPos=true; + break; case DIV_CMD_FM_FB: { + if (c.chan>=7) break; unsigned char val=chRead(c.chan,3)&0xf0; chWrite(c.chan,3,val|(~c.value&0xf)); break; } case DIV_CMD_FM_PM_DEPTH: { + if (c.chan>=7) break; unsigned char val=chRead(c.chan,3)&0x0f; chWrite(c.chan,3,val|((~c.value&0xf)<<4)); break; - } + } + case DIV_CMD_SNES_ECHO: + chan[c.chan].echo=c.value; + writeEcho(c.chan); + break; + case DIV_CMD_SNES_ECHO_FEEDBACK: + chWrite(8,0,c.value); + break; + case DIV_CMD_SNES_ECHO_VOL_LEFT: + chWrite(8,1,c.value); + break; + case DIV_CMD_SNES_ECHO_VOL_RIGHT: + chWrite(8,2,c.value); + break; case DIV_CMD_GET_VOLMAX: - return 255; + return 127; break; case DIV_CMD_MACRO_OFF: chan[c.chan].std.mask(c.value,true); @@ -351,15 +468,15 @@ void DivPlatformKurumitsu8L::muteChannel(int ch, bool mute) { if (!mute && chan[ch].active) { chWrite(ch,0,~chan[ch].outVol&255); writePan(ch); + writeEcho(ch); } else { chWrite(ch,0,255); - chWrite(ch,1,0); - chWrite(ch,2,0); } } void DivPlatformKurumitsu8L::forceIns() { for (int i=0; i<8; i++) { + chan[i].sample=-1; chan[i].insChanged=true; chan[i].freqChanged=true; updateWave(i); @@ -379,17 +496,27 @@ unsigned short DivPlatformKurumitsu8L::getPan(int ch) { } void DivPlatformKurumitsu8L::getPaired(int ch, std::vector& ret) { + if (ch==0 || ch==7) return; unsigned char mod=~(chRead(ch,3)>>4)&0xf; if (mod>0) { sprintf(modLabel[ch],"%d",mod); - if (ch==0){ - ret.push_back(DivChannelPair(modLabel[ch],7)); - } else { - ret.push_back(DivChannelPair(modLabel[ch],ch-1)); - } + ret.push_back(DivChannelPair(modLabel[ch],ch-1)); } } +DivSamplePos DivPlatformKurumitsu8L::getSamplePos(int ch) { + if (ch!=7 || chan[ch].sample<0 || + chan[ch].sample>=parent->song.sampleLen || !chan[ch].active + ) { + return DivSamplePos(); + } + return DivSamplePos( + chan[ch].sample, + (((int)regPool[0x7a]|((int)regPool[0x7b]<<8)|((int)regPool[0x73]<<16)))-sampleOff[chan[ch].sample], + (int64_t)chan[ch].freq*rate/0x10000 + ); +} + DivDispatchOscBuffer* DivPlatformKurumitsu8L::getOscBuffer(int ch) { return oscBuf[ch]; } @@ -399,23 +526,94 @@ unsigned char* DivPlatformKurumitsu8L::getRegisterPool() { } int DivPlatformKurumitsu8L::getRegisterPoolSize() { - return 16*8; + return 16*8+3; +} + +const void* DivPlatformKurumitsu8L::getSampleMem(int index) { + return index == 0 ? sampleMem : NULL; +} + +size_t DivPlatformKurumitsu8L::getSampleMemCapacity(int index) { + return index == 0 ? 16777216 : 0; +} + +size_t DivPlatformKurumitsu8L::getSampleMemUsage(int index) { + return index == 0 ? sampleMemLen : 0; +} + +bool DivPlatformKurumitsu8L::isSampleLoaded(int index, int sample) { + if (index!=0) return false; + if (sample<0 || sample>255) return false; + return sampleLoaded[sample]; +} + +const DivMemoryComposition* DivPlatformKurumitsu8L::getMemCompo(int index) { + switch (index) { + case 0: return &romMemCompo; + case 1: return &wtMemCompo; + case 2: return &echoMemCompo; + } + return NULL; +} + +void DivPlatformKurumitsu8L::renderSamples(int sysID) { + size_t maxPos=getSampleMemCapacity(); + memset(sampleMem,0,maxPos); + romMemCompo.entries.clear(); + romMemCompo.capacity=maxPos; + + size_t memPos=0; + for (int i=0; isong.sampleLen; i++) { + DivSample* s=parent->song.sample[i]; + if (!s->renderOn[0][sysID]) { + sampleOff[i]=0; + continue; + } + int length=s->isLoopable()?s->loopEnd:s->samples; + int actualLength=length; + // if it's one-shot, add 16 silent samples for looping area + // this should be enough for most cases even though the + // frequency register can make position jump by up to 256 samples + int oneShotPos=length; + if (!s->isLoopable()) actualLength+=16; + if (actualLength>65535) actualLength=65535; + if (!s->isLoopable()) oneShotPos=actualLength-16; + if (0x10000-(memPos&0xffff)data8,oneShotPos); + memPos+=actualLength; + romMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_SAMPLE,"PCM",i,sampleOff[i],memPos)); + sampleLoaded[i]=true; + } + sampleMemLen=memPos; + romMemCompo.used=sampleMemLen; } void DivPlatformKurumitsu8L::reset() { memset(regPool,0,sizeof(regPool)); memset(wtMem,0xff,sizeof(wtMem)); + memset(echoMem,0,sizeof(echoMem)); + echoPtr=0; + if (dumpWrites) { + addWrite(0xffffffff,0); + } for (int i=0; i<8; i++) { chan[i]=DivPlatformKurumitsu8L::Channel(); chan[i].std.setEngine(parent); chan[i].ws.setEngine(parent); chan[i].ws.init(NULL,256,255,false); - chWrite(i,3,0xff); // set mod to min - } - modData=0; - if (dumpWrites) { - addWrite(0xffffffff,0); + chWrite(i,0,0xff); // set env to min + if (i<7) chWrite(i,3,0xff); // set mod to min } + chWrite(8,0,initEchoFeedback); + chWrite(8,1,initEchoVolL); + chWrite(8,2,initEchoVolR); } int DivPlatformKurumitsu8L::getOutputCount() { @@ -449,20 +647,25 @@ int DivPlatformKurumitsu8L::mapVelocity(int ch, float vel) { } void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { - chipClock=6144000; + chipClock=3072000; CHECK_CUSTOM_CLOCK; rate=chipClock/64; for (int i=0; i<8; i++) { oscBuf[i]->setRate(rate); } + initEchoVolL=flags.getInt("echoVolL",0); + initEchoVolR=flags.getInt("echoVolR",0); + initEchoFeedback=flags.getInt("echoFeedback",0); } void DivPlatformKurumitsu8L::poke(unsigned int addr, unsigned short val) { - chWrite((addr>>4)&7,addr&0xf,val); + if (addr < getRegisterPoolSize()) chWrite(addr>>4,addr&0xf,val); } void DivPlatformKurumitsu8L::poke(std::vector& wlist) { - for (DivRegWrite& i: wlist) chWrite((i.addr>>4)&7,i.addr&0xf,i.val); + for (DivRegWrite& i: wlist) { + if (i.addr < getRegisterPoolSize()) chWrite(i.addr>>4,i.addr&0xf,i.val); + } } int DivPlatformKurumitsu8L::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { @@ -474,6 +677,28 @@ int DivPlatformKurumitsu8L::init(DivEngine* p, int channels, int sugRate, const isMuted[i]=false; oscBuf[i]=new DivDispatchOscBuffer; } + sampleMem=new signed char[getSampleMemCapacity()]; + sampleMemLen=0; + romMemCompo=DivMemoryComposition(); + romMemCompo.name="Sample ROM"; + wtMemCompo=DivMemoryComposition(); + wtMemCompo.name="Wavetable RAM"; + wtMemCompo.capacity=256*7; + wtMemCompo.memory=(unsigned char*)wtMem; + wtMemCompo.waveformView=DIV_MEMORY_WAVE_8BIT_SIGNED; + echoMemCompo=DivMemoryComposition(); + echoMemCompo.name="Echo Buffer"; + echoMemCompo.capacity=4096; + echoMemCompo.memory=(unsigned char*)echoMem; + echoMemCompo.waveformView=DIV_MEMORY_WAVE_8BIT_SIGNED; + wtMemCompo.used=256*7; + echoMemCompo.used=4096; + wtMemCompo.entries.clear(); + echoMemCompo.entries.clear(); + for (int i=0; i<7; i++) { + wtMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Channel %d",i+1),-1,i*256,i*256+256)); + } + echoMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_ECHO, "Echo Buffer",-1,0,4096)); setFlags(flags); reset(); return 8; diff --git a/src/engine/platform/kurumitsu8l.h b/src/engine/platform/kurumitsu8l.h index 3a3365916..84820cee4 100644 --- a/src/engine/platform/kurumitsu8l.h +++ b/src/engine/platform/kurumitsu8l.h @@ -26,26 +26,48 @@ class DivPlatformKurumitsu8L: public DivDispatch { struct Channel: public SharedChannel { - unsigned char panL; - unsigned char panR; - signed short wave; + unsigned char panL, panR; + unsigned char echo; + unsigned int audPos; + int sample, wave; + bool invertL, invertR; + bool setPos, isAmiga; DivWaveSynth ws; Channel(): - SharedChannel(255), - panL(255), - panR(255), - wave(-1) {} + SharedChannel(127), + panL(127), + panR(127), + echo(0), + audPos(0), + sample(-1), + wave(-1), + invertL(false), + invertR(false), + setPos(false), + isAmiga(false) {} }; Channel chan[8]; DivDispatchOscBuffer* oscBuf[8]; bool isMuted[8]; + unsigned int sampleOff[256]; + bool sampleLoaded[256]; - unsigned char regPool[8*16]; - unsigned char wtMem[8][256]; + unsigned char regPool[8*16+3]; + signed char wtMem[7][256]; + signed char echoMem[4096]; + int echoPtr; char modLabel[8][4]; - int modData; + signed char initEchoVolL; + signed char initEchoVolR; + signed char initEchoFeedback; + signed char* sampleMem; + size_t sampleMemLen; + DivMemoryComposition romMemCompo; + DivMemoryComposition wtMemCompo; + DivMemoryComposition echoMemCompo; void updateWave(int ch); void writePan(int ch); + void writeEcho(int ch); friend void putDispatchChip(void*,int); friend void putDispatchChan(void*,int,int); public: @@ -55,6 +77,7 @@ class DivPlatformKurumitsu8L: public DivDispatch { DivMacroInt* getChanMacroInt(int ch); unsigned short getPan(int chan); void getPaired(int ch, std::vector& ret); + DivSamplePos getSamplePos(int ch); DivDispatchOscBuffer* getOscBuffer(int chan); unsigned char* getRegisterPool(); int getRegisterPoolSize(); @@ -71,6 +94,12 @@ class DivPlatformKurumitsu8L: public DivDispatch { void poke(unsigned int addr, unsigned short val); void poke(std::vector& wlist); const char** getRegisterSheet(); + const void* getSampleMem(int index = 0); + size_t getSampleMemCapacity(int index = 0); + size_t getSampleMemUsage(int index = 0); + bool isSampleLoaded(int index, int sample); + const DivMemoryComposition* getMemCompo(int index); + void renderSamples(int chipID); int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags); void quit(); ~DivPlatformKurumitsu8L(); diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index d9cb0a7c8..f5db96bcb 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -2351,17 +2351,22 @@ void DivEngine::registerSystems() { ); sysDefs[DIV_SYSTEM_KURUMITSU_8L]=new DivSysDef( - _("Kurumitsu-8L"), NULL, 0xfe, 0, 8, false, true, 0, false, 1U<std.volMacro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME])); macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); + macroList.push_back(FurnaceGUIMacroDesc(_("Echo Level"),&ins->std.dutyMacro,-127,127,160,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,waveCount,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); - macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); - macroList.push_back(FurnaceGUIMacroDesc(_("Panning (right)"),&ins->std.panRMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER])); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,127,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (right)"),&ins->std.panRMacro,0,127,160,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc(_("Pitch"),&ins->std.pitchMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode)); macroList.push_back(FurnaceGUIMacroDesc(_("Phase Reset"),&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true)); macroList.push_back(FurnaceGUIMacroDesc(_("Feedback"),&ins->std.ex1Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Modulation"),&ins->std.ex2Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Special"),&ins->std.ex3Macro,0,2,96,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,minModModeBits)); break; case DIV_INS_MAX: case DIV_INS_NULL: @@ -8804,7 +8806,8 @@ void FurnaceGUI::drawInsEdit() { ins->type==DIV_INS_PCE || ins->type==DIV_INS_X1_010 || ins->type==DIV_INS_SWAN || - ins->type==DIV_INS_VRC6) { + ins->type==DIV_INS_VRC6 || + ins->type==DIV_INS_KURUMITSU_8L) { insTabSample(ins); } if (ins->type>=DIV_INS_MAX) { diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp index c69a92216..f474be26f 100644 --- a/src/gui/sampleEdit.cpp +++ b/src/gui/sampleEdit.cpp @@ -580,6 +580,17 @@ void FurnaceGUI::drawSampleEdit() { SAMPLE_WARN(warnLength,_("MultiPCM: maximum sample length is 65535")); } break; + case DIV_SYSTEM_KURUMITSU_8L: + if (sample->isLoopable()) { + if (sample->samples>65535) { + SAMPLE_WARN(warnLength,"Kurumitsu-8L: maximum sample length is 65535"); + } + } else { + if (sample->samples>65519) { + SAMPLE_WARN(warnLength,"Kurumitsu-8L: maximum sample length is 65519"); + } + } + break; default: break; } @@ -669,7 +680,7 @@ void FurnaceGUI::drawSampleEdit() { ImGui::TableNextColumn(); ImGui::Text(_("Chips")); } - + if (sampleInfo) { ImGui::TableNextRow(); ImGui::TableNextColumn(); @@ -774,7 +785,7 @@ void FurnaceGUI::drawSampleEdit() { sample->centerRate=targetRate; } } - + ImGui::AlignTextToFramePadding(); ImGui::Text(_("Note")); ImGui::SameLine(); @@ -1053,7 +1064,7 @@ void FurnaceGUI::drawSampleEdit() { ImGui::EndTable(); } } - + } ImGui::EndTable(); @@ -2125,7 +2136,7 @@ void FurnaceGUI::drawSampleEdit() { start^=end; } ImVec2 p1=rectMin; - p1.x+=(e->getSamplePreviewPos()-samplePos)/sampleZoom; + p1.x+=(e->getSamplePreviewPos()-samplePos)/sampleZoom; ImVec4 posColor=uiColors[GUI_COLOR_SAMPLE_NEEDLE]; ImVec4 posTrail1=posColor; ImVec4 posTrail2=posColor; @@ -2163,7 +2174,7 @@ void FurnaceGUI::drawSampleEdit() { start^=end; } ImVec2 p1=rectMin; - p1.x+=(chanPos.pos-samplePos)/sampleZoom; + p1.x+=(chanPos.pos-samplePos)/sampleZoom; ImVec4 posColor=uiColors[GUI_COLOR_SAMPLE_NEEDLE_PLAYING]; ImVec4 posTrail1=posColor; ImVec4 posTrail2=posColor; @@ -2427,7 +2438,7 @@ void FurnaceGUI::drawSampleEdit() { if (sample->depth!=DIV_SAMPLE_DEPTH_8BIT && sample->depth!=DIV_SAMPLE_DEPTH_16BIT && sampleDragMode) { statusBar=_("Non-8/16-bit samples cannot be edited without prior conversion."); } - + ImGui::SetCursorPosY(ImGui::GetCursorPosY()+ImGui::GetStyle().ScrollbarSize); ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,ImVec2(0,0)); if (ImGui::BeginTable("SEStatus",3,ImGuiTableFlags_BordersInnerV)) { diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index f935e540a..685ce4142 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -2720,6 +2720,38 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl } break; } + case DIV_SYSTEM_KURUMITSU_8L: { + int echoVolL=flags.getInt("echoVolL",0); + int echoVolR=flags.getInt("echoVolR",0); + int echoFeedback=flags.getInt("echoFeedback",0); + + ImGui::Text(_("Initial echo state:")); + + if (CWSliderInt(_("Feedback##EchoFeedback"),&echoFeedback,-128,127)) { + if (echoFeedback<-128) echoFeedback=-128; + if (echoFeedback>127) echoFeedback=127; + altered=true; + } rightClickable + if (CWSliderInt(_("Left Volume##EchoVolL"),&echoVolL,-128,127)) { + if (echoVolL<-128) echoVolL=-128; + if (echoVolL>127) echoVolL=127; + altered=true; + } rightClickable + if (CWSliderInt(_("Right Volume##EchoVolL"),&echoVolR,-128,127)) { + if (echoVolR<-128) echoVolR=-128; + if (echoVolR>127) echoVolR=127; + altered=true; + } rightClickable + + if (altered) { + e->lockSave([&]() { + flags.set("echoVolL",echoVolL); + flags.set("echoVolR",echoVolR); + flags.set("echoFeedback",echoFeedback); + }); + } + break; + } case DIV_SYSTEM_BUBSYS_WSG: case DIV_SYSTEM_PET: case DIV_SYSTEM_GA20: @@ -2729,7 +2761,6 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl case DIV_SYSTEM_POWERNOISE: case DIV_SYSTEM_UPD1771C: case DIV_SYSTEM_MULTIPCM: - case DIV_SYSTEM_KURUMITSU_8L: break; case DIV_SYSTEM_YMU759: case DIV_SYSTEM_ESFM: From cf4d72dd7c3fec6872849a91d5ce1789377ddb17 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Sat, 28 Jun 2025 01:19:25 +0700 Subject: [PATCH 4/6] Kurumitsu-8L: add (nonstandard) VGM export --- src/engine/engine.h | 2 +- src/engine/instrument.cpp | 2 ++ src/engine/platform/kurumitsu8l.cpp | 13 ++++++----- src/engine/sysDef.cpp | 2 +- src/engine/vgmOps.cpp | 36 ++++++++++++++++++++++++----- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index 74b8064f5..334c264f4 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -583,7 +583,7 @@ class DivEngine { void processRow(int i, bool afterDelay); void nextOrder(); void nextRow(); - void performVGMWrite(SafeWriter* w, DivSystem sys, DivRegWrite& write, int streamOff, double* loopTimer, double* loopFreq, int* loopSample, bool* sampleDir, bool isSecond, int* pendingFreq, int* playingSample, int* setPos, unsigned int* sampleOff8, unsigned int* sampleLen8, size_t bankOffset, bool directStream, bool* sampleStoppable, bool dpcm07, DivDispatch** writeNES, int rateCorrection); + void performVGMWrite(SafeWriter* w, int disIdx, DivSystem sys, DivRegWrite& write, int streamOff, double* loopTimer, double* loopFreq, int* loopSample, bool* sampleDir, bool isSecond, int* pendingFreq, int* playingSample, int* setPos, unsigned int* sampleOff8, unsigned int* sampleLen8, size_t bankOffset, bool directStream, bool* sampleStoppable, bool dpcm07, DivDispatch** writeNES, int rateCorrection); // returns true if end of song. bool nextTick(bool noAccum=false, bool inhibitLowLat=false); bool perSystemEffect(int ch, unsigned char effect, unsigned char effectVal); diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp index d76f21997..af62ca756 100644 --- a/src/engine/instrument.cpp +++ b/src/engine/instrument.cpp @@ -1444,6 +1444,8 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo break; case DIV_INS_UPD1771C: break; + case DIV_INS_KURUMITSU_8L: + break; case DIV_INS_MAX: break; case DIV_INS_NULL: diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp index 42ab813a4..9ba887cd6 100644 --- a/src/engine/platform/kurumitsu8l.cpp +++ b/src/engine/platform/kurumitsu8l.cpp @@ -269,7 +269,6 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].keyOn=false; if (i==7) { DivSample* s=parent->getSample(chan[i].sample); - size_t maxPos=getSampleMemCapacity(); unsigned int start, length, loop; start=sampleOff[chan[i].sample]; if (s->isLoopable()) { @@ -530,7 +529,9 @@ int DivPlatformKurumitsu8L::getRegisterPoolSize() { } const void* DivPlatformKurumitsu8L::getSampleMem(int index) { - return index == 0 ? sampleMem : NULL; + if (index == 0) return sampleMem; + if (index == 1) return wtMem; + return NULL; } size_t DivPlatformKurumitsu8L::getSampleMemCapacity(int index) { @@ -557,12 +558,12 @@ const DivMemoryComposition* DivPlatformKurumitsu8L::getMemCompo(int index) { } void DivPlatformKurumitsu8L::renderSamples(int sysID) { - size_t maxPos=getSampleMemCapacity(); + int maxPos=getSampleMemCapacity(); memset(sampleMem,0,maxPos); romMemCompo.entries.clear(); romMemCompo.capacity=maxPos; - size_t memPos=0; + int memPos=0; for (int i=0; isong.sampleLen; i++) { DivSample* s=parent->song.sample[i]; if (!s->renderOn[0][sysID]) { @@ -659,12 +660,12 @@ void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { } void DivPlatformKurumitsu8L::poke(unsigned int addr, unsigned short val) { - if (addr < getRegisterPoolSize()) chWrite(addr>>4,addr&0xf,val); + if (addr < (unsigned int)getRegisterPoolSize()) chWrite(addr>>4,addr&0xf,val); } void DivPlatformKurumitsu8L::poke(std::vector& wlist) { for (DivRegWrite& i: wlist) { - if (i.addr < getRegisterPoolSize()) chWrite(i.addr>>4,i.addr&0xf,i.val); + if (i.addr < (unsigned int)getRegisterPoolSize()) chWrite(i.addr>>4,i.addr&0xf,i.val); } } diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index f5db96bcb..14b2ef122 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -2351,7 +2351,7 @@ void DivEngine::registerSystems() { ); sysDefs[DIV_SYSTEM_KURUMITSU_8L]=new DivSysDef( - _("Kurumitsu-8L"), NULL, 0xfe, 0, 8, false, true, 0, false, 1U<writeC(0x28); w->writeC(5+i); } - + // reset AY w->writeC(8|baseAddr1); w->writeC(7); @@ -970,7 +970,7 @@ void DivEngine::performVGMWrite(SafeWriter* w, DivSystem sys, DivRegWrite& write } else { w->writeC(baseAddr2|(write.addr&0xff)); } - + w->writeC(write.val); break; case DIV_SYSTEM_YM2151: @@ -1236,6 +1236,23 @@ void DivEngine::performVGMWrite(SafeWriter* w, DivSystem sys, DivRegWrite& write w->writeC(baseAddr2|(write.addr&0x7f)); w->writeC(write.val); break; + case DIV_SYSTEM_KURUMITSU_8L: // HACK + if (write.addr>=0x10000) { + // wavetable writes + const signed char* wtMem=(const signed char*)disCont[disIdx].dispatch->getSampleMem(1); + w->writeC(0x67); + w->writeC(0x66); + w->writeC(0xc0); + w->writeI(write.val+2); + w->writeI(write.addr&0xffff); + w->write(&wtMem[write.addr&0xffff],write.val); + } else { + // register writes + w->writeC(0xa0); + w->writeC(baseAddr2|(write.addr&0xff)); + w->writeC(write.val); + } + break; default: logW("write not handled!"); break; @@ -1419,7 +1436,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p DivDispatch* writeNES[2]={NULL,NULL}; DivDispatch* writePCM_OPL4[2]={NULL,NULL}; DivDispatch* writeMultiPCM[2]={NULL,NULL}; - + int writeNESIndex[2]={0,0}; size_t bankOffsetNESCurrent=0; @@ -2052,6 +2069,13 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p writeMultiPCM[1]=disCont[i].dispatch; hasMultiPCM|=0x40000000; howManyChips++; + break; + // HACK + case DIV_SYSTEM_KURUMITSU_8L: + if (!hasAY) { + hasAY=disCont[i].dispatch->chipClock|0x40000000; + willExport[i]=true; + writeSegaPCM[0]=disCont[i].dispatch; } break; default: @@ -2140,7 +2164,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p w->writeC(0); // loop count // 1.51 w->writeC(0); // loop modifier - + if (version>=0x161) { w->writeI(hasGB); w->writeI(hasNES); @@ -2905,7 +2929,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p lastOne=i.second.time; } // write write - performVGMWrite(w,song.system[i.first],i.second.write,streamIDs[i.first],loopTimer,loopFreq,loopSample,sampleDir,isSecond[i.first],pendingFreq,playingSample,setPos,sampleOff8,sampleLen8,bankOffset[i.first],directStream,sampleStoppable,dpcm07,writeNES,correctedRate); + performVGMWrite(w,i.first,song.system[i.first],i.second.write,streamIDs[i.first],loopTimer,loopFreq,loopSample,sampleDir,isSecond[i.first],pendingFreq,playingSample,setPos,sampleOff8,sampleLen8,bankOffset[i.first],directStream,sampleStoppable,dpcm07,writeNES,correctedRate); writeCount++; } sortedWrites.clear(); From 33fa17ff461f2bc3d654ab7c8ae59275c9d37618 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Mon, 22 Sep 2025 04:10:41 +0700 Subject: [PATCH 5/6] Kurumitsu-8L: channel redesign, remove echo --- src/engine/platform/kurumitsu8l.cpp | 303 +++++++++++----------------- src/engine/platform/kurumitsu8l.h | 23 +-- src/engine/sysDef.cpp | 34 ++-- src/engine/vgmOps.cpp | 1 + src/gui/insEdit.cpp | 60 +++--- src/gui/sysConf.cpp | 33 +-- 6 files changed, 175 insertions(+), 279 deletions(-) diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp index 9ba887cd6..2ed78cc64 100644 --- a/src/engine/platform/kurumitsu8l.cpp +++ b/src/engine/platform/kurumitsu8l.cpp @@ -21,26 +21,24 @@ #include "../engine.h" #include -#define chRead(c,a) regPool[(c)*16+(a)] -#define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*16+(a)]=v; if (dumpWrites) {addWrite(a,v);} } -#define chDWrite(c,a,v) regPool[(c)*16+(a)]=v; +#define chRead(c,a) regPool[(c)*24+(a)] +#define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*24+(a)]=v; if (dumpWrites) {addWrite(a,v);} } +#define chDWrite(c,a,v) regPool[(c)*24+(a)]=v; #define CHIP_FREQBASE 67108864 const char* regCheatSheetKurumitsu8L[]={ - "CHxAtt", "00+x*10", - "CHxPanL", "01+x*10", - "CHxPanR", "02+x*10", - "CHxMod", "03+x*10", - "CHxFreq", "04+x*10", - "CHxEcho", "07+x*10", - "CHxAcc", "08+x*10", - "CH7Bank", "73", - "CH7LoopE", "7C", - "CH7LoopL", "7E", - "EchoFB", "80", - "EchoVolL", "81", - "EchoVolR", "82", + "CHxBank", "00+x*18", + "CHxVol", "01+x*18", + "CHxModF", "02+x*18", + "CHxModI", "03+x*18", + "CHxPanL", "04+x*18", + "CHxPanR", "06+x*18", + "CHxLoopE", "08+x*18", + "CHxLoopL", "0A+x*18", + "CHxFreq", "0C+x*18", + "CHxAcc", "10+x*18", + "CHxOut", "14+x*18", NULL }; @@ -49,79 +47,70 @@ const char** DivPlatformKurumitsu8L::getRegisterSheet() { } void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { - const int volTab[32]={ - 65535, 64130, 62756, 61411, 60095, 58808, 57547, 56314, 55108, 53927, 52771, 51640, 50534, 49451, 48391, 47354, - 46340, 45347, 44375, 43424, 42494, 41583, 40692, 39820, 38967, 38132, 37315, 36515, 35733, 34967, 34218, 33485 - }; + // channel diagram: + // .---[ModF]-------+-[PanL]-> DryL + // V | + // [Freq]->(+)->[Wave]-[Env]-+-[PanR]-> DryR + // ^ | + // Wet ---[ModI]---' '--------> Wet for (int i=0; i<8; i++) { oscBuf[i]->begin(len); } - signed char echoFB=chRead(8,0); - signed char echoL=chRead(8,1); - signed char echoR=chRead(8,2); for (size_t h=0; h>4)&0xf; - fbData=chRead(i,12)|((int)chRead(i,13)<<8)|((int)chRead(i,14)<<16)|((int)chRead(i,15)<<24); - - unsigned phase_modded=phase; - phase_modded+=fbData>>fb; - phase_modded+=modData>>mod; - - data=wtMem[i][(phase_modded>>16)&255]; + int phase_inc=(((int)fbData1+fbData2)*fb)+((modData*mod)<<3); + if (loopE==0) { + // wavetable, does stable phasemod + data=wtMem[i][((phase+phase_inc)>>16)&255]; phase+=freq; } else { - unsigned loopE=chRead(i,12)|((unsigned)chRead(i,13)<<8); - unsigned loopL=chRead(i,14)|((unsigned)chRead(i,15)<<8); - data=sampleMem[(phase>>16)|(chRead(i,3)<<16)]; - int64_t newPhase=phase+(freq&0x00ffffff); - if (newPhase>=(loopE<<16)) { + // samples, does unstable pitchmod + unsigned loopL=chRead(i,10)|((unsigned)chRead(i,11)<<8); + data=sampleMem[(phase>>16)|(chRead(i,0)<<16)]; + phase_inc+=freq; + if (phase_inc<0) phase_inc=0; + int64_t newPhase=phase+phase_inc; + if (newPhase>=0x100000000LL || (newPhase)>=(loopE<<16)) { newPhase-=loopL<<16; } phase=newPhase; } - int out=data*(volTab[vol&0x1f]>>(vol>>5)); - outAL+=out*panL/256; - outAR+=out*panR/256; - outE+=out*echo/256; - oscBuf[i]->putSample(h,out*((int)abs(panL)+abs(panR))/65536); + int out=data*vol; // 16 bits + outAL+=(out*panL)>>2; // 29 bits + outAR+=(out*panR)>>2; + oscBuf[i]->putSample(h,(out*((int)abs(panL)+abs(panR)))>>17); - chDWrite(i,8,phase&0xff); - chDWrite(i,9,(phase>>8)&0xff); - chDWrite(i,10,(phase>>16)&0xff); - chDWrite(i,11,(phase>>24)&0xff); - if (i<7) { - fbData=out; - modData=out; - chDWrite(i,12,fbData&0xff); - chDWrite(i,13,(fbData>>8)&0xff); - chDWrite(i,14,(fbData>>16)&0xff); - chDWrite(i,15,(fbData>>24)&0xff); - } - } - buf[0][h]=outAL>>10; - buf[1][h]=outAR>>10; - outE>>=18; - if (outE<0) outE++; - echoMem[echoPtr]=outE; - echoPtr=(echoPtr+1)&4095; + fbData2=fbData1; + fbData1=out; + modData=out; + chDWrite(i,16,phase&0xff); + chDWrite(i,17,(phase>>8)&0xff); + chDWrite(i,18,(phase>>16)&0xff); + chDWrite(i,19,(phase>>24)&0xff); + chDWrite(i,20,fbData1&0xff); + chDWrite(i,21,(fbData1>>8)&0xff); + chDWrite(i,22,fbData2&0xff); + chDWrite(i,23,(fbData2>>24)&0xff); + } // 32 bits + buf[0][h]=outAL>>16; // 16 bits + buf[1][h]=outAR>>16; } for (int i=0; i<8; i++) { @@ -130,7 +119,6 @@ void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { } void DivPlatformKurumitsu8L::updateWave(int ch) { - if (ch>=7) return; for (int i=0; i<256; i++) { wtMem[ch][i]=chan[ch].ws.output[i]^128; } @@ -138,32 +126,29 @@ void DivPlatformKurumitsu8L::updateWave(int ch) { void DivPlatformKurumitsu8L::writePan(int ch) { if (!isMuted[ch] && chan[ch].active) { - chWrite(ch,1,VOL_SCALE_LINEAR(chan[ch].panL,chan[ch].vol,127)*(chan[ch].invertL?-1:1)); - chWrite(ch,2,VOL_SCALE_LINEAR(chan[ch].panR,chan[ch].vol,127)*(chan[ch].invertR?-1:1)); - } else { - chWrite(ch,1,0); - chWrite(ch,2,0); - } -} - -void DivPlatformKurumitsu8L::writeEcho(int ch) { - if (!isMuted[ch] && chan[ch].active) { - chWrite(ch,7,chan[ch].echo); + int valL=chan[ch].panL*chan[ch].vol*(chan[ch].invertL?-1:1)/2; + int valR=chan[ch].panR*chan[ch].vol*(chan[ch].invertR?-1:1)/2; + chWrite(ch,4,valL&0xff); + chWrite(ch,5,valL>>8); + chWrite(ch,6,valR&0xff); + chWrite(ch,7,valR>>8); } else { + chWrite(ch,4,0); + chWrite(ch,5,0); + chWrite(ch,6,0); chWrite(ch,7,0); } } - + void DivPlatformKurumitsu8L::tick(bool sysTick) { for (int i=0; i<8; i++) { bool panChanged=false; - bool echoChanged=false; chan[i].std.next(); if (chan[i].std.vol.had) { chan[i].outVol=chan[i].std.vol.val*(chan[i].isAmiga?4:1); if (chan[i].outVol>255) chan[i].outVol=255; if (!isMuted[i] && chan[i].active) { - chWrite(i,0,~chan[i].outVol&255); + chWrite(i,1,chan[i].outVol); } } if (NEW_ARP_STRAT) { @@ -174,10 +159,6 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } chan[i].freqChanged=true; } - if (chan[i].std.duty.had) { - chan[i].echo=chan[i].std.duty.val; - echoChanged=true; - } if (chan[i].std.wave.had) { if (chan[i].wave!=chan[i].std.wave.val || chan[i].ws.activeChanged()) { chan[i].wave=chan[i].std.wave.val; @@ -204,24 +185,22 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].std.phaseReset.had) { if (chan[i].std.phaseReset.val==1 && chan[i].active) { - if (i==7) { + if (chan[i].pcm) { chan[i].audPos=0; chan[i].setPos=true; } else { - chWrite(i,8,0); - chWrite(i,9,0); - chWrite(i,10,0); - chWrite(i,11,0); + chWrite(i,16,0); + chWrite(i,17,0); + chWrite(i,18,0); + chWrite(i,19,0); } } } - if (i<7 && chan[i].std.ex1.had) { - unsigned char val=chRead(i,3)&0xf0; - chWrite(i,3,val|(~chan[i].std.ex1.val&0xf)); + if (chan[i].std.ex1.had) { + chWrite(i,2,chan[i].std.ex1.val); } - if (i<7 && chan[i].std.ex2.had) { - unsigned char val=chRead(i,3)&0x0f; - chWrite(i,3,val|((~chan[i].std.ex2.val&0xf)<<4)); + if (chan[i].std.ex2.had) { + chWrite(i,3,chan[i].std.ex2.val); } if (chan[i].std.ex3.had) { chan[i].invertL=chan[i].std.ex3.val&2; @@ -242,16 +221,16 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].freqChanged) { chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,false,2,chan[i].pitch2,chipClock,CHIP_FREQBASE); - if (i==7) { + if (chan[i].pcm) { DivSample* s=parent->getSample(chan[i].sample); double off=(s->centerRate>=1)?((double)s->centerRate/parent->getCenterRate()):1.0; chan[i].freq*=off/16.; } if (chan[i].freq<0) chan[i].freq=0; if (chan[i].freq>8388608) chan[i].freq=8388608; - chWrite(i,4,chan[i].freq&0xff); - chWrite(i,5,(chan[i].freq>>8)&0xff); - chWrite(i,6,(chan[i].freq>>16)&0xff); + chWrite(i,12,chan[i].freq&0xff); + chWrite(i,13,(chan[i].freq>>8)&0xff); + chWrite(i,14,(chan[i].freq>>16)&0xff); chan[i].freqChanged=false; } if (chan[i].keyOn || chan[i].keyOff) { @@ -259,15 +238,14 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].outVol=255; } if (!isMuted[i] && chan[i].active) { - chWrite(i,0,~chan[i].outVol&255); + chWrite(i,1,chan[i].outVol); } else { - chWrite(i,0,255); + chWrite(i,1,0); } panChanged=true; - echoChanged=true; if (chan[i].keyOn) { chan[i].keyOn=false; - if (i==7) { + if (chan[i].pcm) { DivSample* s=parent->getSample(chan[i].sample); unsigned int start, length, loop; start=sampleOff[chan[i].sample]; @@ -282,21 +260,23 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { if (chan[i].audPos>0) { start=start+MIN(chan[i].audPos,length); } + chWrite(i,16,0); + chWrite(i,17,0); + chWrite(i,18,start&0xff); + chWrite(i,19,(start>>8)&0xff); + chWrite(i,0,start>>16); + chWrite(i,8,(start+length)&0xff); + chWrite(i,9,((start+length)>>8)&0xff); + chWrite(i,10,loop&0xff); + chWrite(i,11,(loop>>8)&0xff); + } else { chWrite(i,8,0); chWrite(i,9,0); - chWrite(i,10,start&0xff); - chWrite(i,11,(start>>8)&0xff); - chWrite(i,3,start>>16); - chWrite(i,12,(start+length)&0xff); - chWrite(i,13,((start+length)>>8)&0xff); - chWrite(i,14,loop&0xff); - chWrite(i,15,(loop>>8)&0xff); } } if (chan[i].keyOff) chan[i].keyOff=false; } if (panChanged) writePan(i); - if (echoChanged) writeEcho(i); } } @@ -305,7 +285,8 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { case DIV_CMD_NOTE_ON: { DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA); chan[c.chan].isAmiga=ins->type==DIV_INS_AMIGA; - if (c.chan==7 && c.value!=DIV_NOTE_NULL) { + chan[c.chan].pcm=ins->type==DIV_INS_AMIGA || ins->amiga.useSample; + if (chan[c.chan].pcm && c.value!=DIV_NOTE_NULL) { chan[c.chan].sample=ins->amiga.getSample(c.value); c.value=ins->amiga.getFreq(c.value); } else { @@ -315,7 +296,7 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { } chan[c.chan].ws.init(ins,256,255,chan[c.chan].insChanged); } - if (c.chan!=7 || chan[c.chan].sample<0 || chan[c.chan].sample>=parent->song.sampleLen) { + if (!chan[c.chan].pcm || chan[c.chan].sample<0 || chan[c.chan].sample>=parent->song.sampleLen) { chan[c.chan].sample=-1; } if (c.value!=DIV_NOTE_NULL) { @@ -329,7 +310,7 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) { chan[c.chan].outVol=255; if (!isMuted[c.chan] && chan[c.chan].active) { - chWrite(c.chan,0,~chan[c.chan].outVol&255); + chWrite(c.chan,1,chan[c.chan].outVol); } } chan[c.chan].insChanged=false; @@ -420,32 +401,15 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { chan[c.chan].setPos=true; break; case DIV_CMD_FM_FB: { - if (c.chan>=7) break; - unsigned char val=chRead(c.chan,3)&0xf0; - chWrite(c.chan,3,val|(~c.value&0xf)); + chWrite(c.chan,2,c.value); break; } case DIV_CMD_FM_PM_DEPTH: { - if (c.chan>=7) break; - unsigned char val=chRead(c.chan,3)&0x0f; - chWrite(c.chan,3,val|((~c.value&0xf)<<4)); + chWrite(c.chan,3,c.value); break; } - case DIV_CMD_SNES_ECHO: - chan[c.chan].echo=c.value; - writeEcho(c.chan); - break; - case DIV_CMD_SNES_ECHO_FEEDBACK: - chWrite(8,0,c.value); - break; - case DIV_CMD_SNES_ECHO_VOL_LEFT: - chWrite(8,1,c.value); - break; - case DIV_CMD_SNES_ECHO_VOL_RIGHT: - chWrite(8,2,c.value); - break; case DIV_CMD_GET_VOLMAX: - return 127; + return 255; break; case DIV_CMD_MACRO_OFF: chan[c.chan].std.mask(c.value,true); @@ -465,11 +429,10 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { void DivPlatformKurumitsu8L::muteChannel(int ch, bool mute) { isMuted[ch]=mute; if (!mute && chan[ch].active) { - chWrite(ch,0,~chan[ch].outVol&255); + chWrite(ch,1,chan[ch].outVol); writePan(ch); - writeEcho(ch); } else { - chWrite(ch,0,255); + chWrite(ch,1,0); } } @@ -491,20 +454,22 @@ DivMacroInt* DivPlatformKurumitsu8L::getChanMacroInt(int ch) { } unsigned short DivPlatformKurumitsu8L::getPan(int ch) { - return (chRead(ch,1)<<8)|chRead(ch,2); + short panL=abs(chRead(ch,4)|((short)chRead(ch,5)<<8)); + short panR=abs(chRead(ch,6)|((short)chRead(ch,7)<<8)); + return ((panL/128)<<8)|(panR/128); } void DivPlatformKurumitsu8L::getPaired(int ch, std::vector& ret) { - if (ch==0 || ch==7) return; - unsigned char mod=~(chRead(ch,3)>>4)&0xf; - if (mod>0) { + if (ch==0) return; + unsigned char mod=chRead(ch,3); + if (mod!=0) { sprintf(modLabel[ch],"%d",mod); ret.push_back(DivChannelPair(modLabel[ch],ch-1)); } } DivSamplePos DivPlatformKurumitsu8L::getSamplePos(int ch) { - if (ch!=7 || chan[ch].sample<0 || + if (!chan[ch].pcm || chan[ch].sample<0 || chan[ch].sample>=parent->song.sampleLen || !chan[ch].active ) { return DivSamplePos(); @@ -525,7 +490,7 @@ unsigned char* DivPlatformKurumitsu8L::getRegisterPool() { } int DivPlatformKurumitsu8L::getRegisterPoolSize() { - return 16*8+3; + return 24*8; } const void* DivPlatformKurumitsu8L::getSampleMem(int index) { @@ -552,7 +517,6 @@ const DivMemoryComposition* DivPlatformKurumitsu8L::getMemCompo(int index) { switch (index) { case 0: return &romMemCompo; case 1: return &wtMemCompo; - case 2: return &echoMemCompo; } return NULL; } @@ -598,9 +562,7 @@ void DivPlatformKurumitsu8L::renderSamples(int sysID) { void DivPlatformKurumitsu8L::reset() { memset(regPool,0,sizeof(regPool)); - memset(wtMem,0xff,sizeof(wtMem)); - memset(echoMem,0,sizeof(echoMem)); - echoPtr=0; + memset(wtMem,0,sizeof(wtMem)); if (dumpWrites) { addWrite(0xffffffff,0); } @@ -609,12 +571,7 @@ void DivPlatformKurumitsu8L::reset() { chan[i].std.setEngine(parent); chan[i].ws.setEngine(parent); chan[i].ws.init(NULL,256,255,false); - chWrite(i,0,0xff); // set env to min - if (i<7) chWrite(i,3,0xff); // set mod to min } - chWrite(8,0,initEchoFeedback); - chWrite(8,1,initEchoVolL); - chWrite(8,2,initEchoVolR); } int DivPlatformKurumitsu8L::getOutputCount() { @@ -640,13 +597,6 @@ void DivPlatformKurumitsu8L::notifyInsDeletion(void* ins) { } } -int DivPlatformKurumitsu8L::mapVelocity(int ch, float vel) { - // -0.19dB per step - if (vel==0) return 0; - if (vel>=1.0) return 255; - return CLAMP(roundf(256.f-(32.f-log2f(vel)*32.f)),0,255); -} - void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { chipClock=3072000; CHECK_CUSTOM_CLOCK; @@ -654,18 +604,15 @@ void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { for (int i=0; i<8; i++) { oscBuf[i]->setRate(rate); } - initEchoVolL=flags.getInt("echoVolL",0); - initEchoVolR=flags.getInt("echoVolR",0); - initEchoFeedback=flags.getInt("echoFeedback",0); } void DivPlatformKurumitsu8L::poke(unsigned int addr, unsigned short val) { - if (addr < (unsigned int)getRegisterPoolSize()) chWrite(addr>>4,addr&0xf,val); + if (addr < (unsigned int)getRegisterPoolSize()) chWrite(addr/24,addr%24,val); } void DivPlatformKurumitsu8L::poke(std::vector& wlist) { for (DivRegWrite& i: wlist) { - if (i.addr < (unsigned int)getRegisterPoolSize()) chWrite(i.addr>>4,i.addr&0xf,i.val); + if (i.addr < (unsigned int)getRegisterPoolSize()) chWrite(i.addr/24,i.addr%24,i.val); } } @@ -684,22 +631,14 @@ int DivPlatformKurumitsu8L::init(DivEngine* p, int channels, int sugRate, const romMemCompo.name="Sample ROM"; wtMemCompo=DivMemoryComposition(); wtMemCompo.name="Wavetable RAM"; - wtMemCompo.capacity=256*7; + wtMemCompo.capacity=256*8; wtMemCompo.memory=(unsigned char*)wtMem; wtMemCompo.waveformView=DIV_MEMORY_WAVE_8BIT_SIGNED; - echoMemCompo=DivMemoryComposition(); - echoMemCompo.name="Echo Buffer"; - echoMemCompo.capacity=4096; - echoMemCompo.memory=(unsigned char*)echoMem; - echoMemCompo.waveformView=DIV_MEMORY_WAVE_8BIT_SIGNED; - wtMemCompo.used=256*7; - echoMemCompo.used=4096; + wtMemCompo.used=256*8; wtMemCompo.entries.clear(); - echoMemCompo.entries.clear(); - for (int i=0; i<7; i++) { + for (int i=0; i<8; i++) { wtMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Channel %d",i+1),-1,i*256,i*256+256)); } - echoMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_ECHO, "Echo Buffer",-1,0,4096)); setFlags(flags); reset(); return 8; diff --git a/src/engine/platform/kurumitsu8l.h b/src/engine/platform/kurumitsu8l.h index 84820cee4..a605919e5 100644 --- a/src/engine/platform/kurumitsu8l.h +++ b/src/engine/platform/kurumitsu8l.h @@ -27,22 +27,21 @@ class DivPlatformKurumitsu8L: public DivDispatch { struct Channel: public SharedChannel { unsigned char panL, panR; - unsigned char echo; unsigned int audPos; int sample, wave; bool invertL, invertR; - bool setPos, isAmiga; + bool pcm, setPos, isAmiga; DivWaveSynth ws; Channel(): - SharedChannel(127), - panL(127), - panR(127), - echo(0), + SharedChannel(255), + panL(255), + panR(255), audPos(0), sample(-1), wave(-1), invertL(false), invertR(false), + pcm(false), setPos(false), isAmiga(false) {} }; @@ -52,22 +51,15 @@ class DivPlatformKurumitsu8L: public DivDispatch { unsigned int sampleOff[256]; bool sampleLoaded[256]; - unsigned char regPool[8*16+3]; - signed char wtMem[7][256]; - signed char echoMem[4096]; - int echoPtr; + unsigned char regPool[8*24]; + signed char wtMem[8][256]; char modLabel[8][4]; - signed char initEchoVolL; - signed char initEchoVolR; - signed char initEchoFeedback; signed char* sampleMem; size_t sampleMemLen; DivMemoryComposition romMemCompo; DivMemoryComposition wtMemCompo; - DivMemoryComposition echoMemCompo; void updateWave(int ch); void writePan(int ch); - void writeEcho(int ch); friend void putDispatchChip(void*,int); friend void putDispatchChan(void*,int,int); public: @@ -90,7 +82,6 @@ class DivPlatformKurumitsu8L: public DivDispatch { void setFlags(const DivConfig& flags); void notifyWaveChange(int wave); void notifyInsDeletion(void* ins); - int mapVelocity(int ch, float vel); void poke(unsigned int addr, unsigned short val); void poke(std::vector& wlist); const char** getRegisterSheet(); diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 14b2ef122..eed0ce48c 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -314,7 +314,7 @@ const char* DivEngine::getChannelName(int chan) { if (chan<0 || chan>chans) return "??"; if (!curSubSong->chanName[chan].empty()) return curSubSong->chanName[chan].c_str(); if (sysDefs[sysOfChan[chan]]==NULL) return "??"; - + const char* ret=sysDefs[sysOfChan[chan]]->chanNames[dispatchChanOfChan[chan]]; if (ret==NULL) return "??"; return ret; @@ -324,7 +324,7 @@ const char* DivEngine::getChannelShortName(int chan) { if (chan<0 || chan>chans) return "??"; if (!curSubSong->chanShortName[chan].empty()) return curSubSong->chanShortName[chan].c_str(); if (sysDefs[sysOfChan[chan]]==NULL) return "??"; - + const char* ret=sysDefs[sysOfChan[chan]]->chanShortNames[dispatchChanOfChan[chan]]; if (ret==NULL) return "??"; return ret; @@ -2174,7 +2174,7 @@ void DivEngine::registerSystems() { ); sysDefs[DIV_SYSTEM_ESFM]=new DivSysDef( - _("ESS ES1xxx series (ESFM)"), NULL, 0xd1, 0, 18, true, false, 0, false, 0, 0, 0, + _("ESS ES1xxx series (ESFM)"), NULL, 0xd1, 0, 18, true, false, 0, false, 0, 0, 0, _("a unique FM synth featured in PC sound cards.\nbased on the OPL3 design, but with lots of its features extended."), {_("FM 1"), _("FM 2"), _("FM 3"), _("FM 4"), _("FM 5"), _("FM 6"), _("FM 7"), _("FM 8"), _("FM 9"), _("FM 10"), _("FM 11"), _("FM 12"), _("FM 13"), _("FM 14"), _("FM 15"), _("FM 16"), _("FM 17"), _("FM 18")}, {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"}, @@ -2186,9 +2186,9 @@ void DivEngine::registerSystems() { }, fmESFMPostEffectHandlerMap ); - + sysDefs[DIV_SYSTEM_POWERNOISE]=new DivSysDef( - _("PowerNoise"), NULL, 0xd4, 0, 4, false, false, 0, false, 0, 0, 0, + _("PowerNoise"), NULL, 0xd4, 0, 4, false, false, 0, false, 0, 0, 0, _("a fantasy sound chip designed by jvsTSX and The Beesh-Spweesh!\nused in the Hexheld fantasy console."), {_("Noise 1"), _("Noise 2"), _("Noise 3"), _("Slope")}, {"N1", "N2", "N3", "SL"}, @@ -2222,7 +2222,7 @@ void DivEngine::registerSystems() { {0x16, {DIV_CMD_DAVE_CLOCK_DIV, _("16xx: Set clock divider (0: /2; 1: /3)")}}, } ); - + sysDefs[DIV_SYSTEM_GBA_DMA]=new DivSysDef( _("Game Boy Advance DMA Sound"), NULL, 0xd7, 0, 2, false, true, 0, false, 1U<62)?1.0:((float)sLen/384.0); float envEndPoint=((float)len/7.0)*((float)(dir?(15-vol):vol)/15.0); @@ -2450,7 +2450,7 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::TableNextColumn(); - + ImGui::TableNextColumn(); ImGui::AlignTextToFramePadding(); ImGui::Text(_("Release")); @@ -2757,7 +2757,7 @@ void FurnaceGUI::drawMacros(std::vector& macros, FurnaceGUI ImGui::TableNextColumn(); if (++curColumn>=columns) curColumn=0; - + float availableWidth=ImGui::GetContentRegionAvail().x-reservedSpace; int totalFit=i.macro->len; if (totalFit<1) totalFit=1; @@ -3459,7 +3459,8 @@ void FurnaceGUI::insTabSample(DivInstrument* ins) { ins->type==DIV_INS_SU || ins->type==DIV_INS_NDS || ins->type==DIV_INS_SUPERVISION || - ins->type==DIV_INS_SID3) { + ins->type==DIV_INS_SID3 || + ins->type==DIV_INS_KURUMITSU_8L) { P(ImGui::Checkbox(_("Use sample"),&ins->amiga.useSample)); if (ins->type==DIV_INS_X1_010) { if (ImGui::InputInt(_("Sample bank slot##BANKSLOT"),&ins->x1_010.bankSlot,1,4)) { PARAMETER @@ -4110,7 +4111,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { if (ImGui::Button(_("Request from TX81Z"))) { doAction(GUI_ACTION_TX81Z_REQUEST); } - /* + /* ImGui::SameLine(); if (ImGui::Button("Send to TX81Z")) { showError("Coming soon!"); @@ -5128,7 +5129,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { } ImGui::SetCursorPos(prevCurPos); - + ImGui::TableNextColumn(); switch (ins->type) { case DIV_INS_FM: { @@ -5145,7 +5146,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,_(ssgEnvTypes[ssgEnv]))) { PARAMETER op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7); } - + // params ImGui::Separator(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -5219,7 +5220,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { if (ImGui::Checkbox(FM_NAME(FM_EGS),&ssgOn)) { PARAMETER op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3); } - + ImGui::EndTable(); } @@ -5265,11 +5266,11 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER op.sus=susOn; } - + ImGui::EndTable(); } - pushWarningColor(ins->type==DIV_INS_OPL_DRUMS && i==0); + pushWarningColor(ins->type==DIV_INS_OPL_DRUMS && i==0); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT)); P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable @@ -5314,7 +5315,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { if (block>7) block=7; op.dt=block; } - + ImGui::Text(_("Freq")); ImGui::SameLine(); ImGui::SetCursorPos(ImVec2(cursorAlign.x,ImGui::GetCursorPosY())); @@ -5871,7 +5872,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { ImGui::Separator(); ImGui::TableNextColumn(); ImGui::Separator(); - + ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -5953,7 +5954,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { } else { ImGui::TableNextRow(); ImGui::TableNextColumn(); - pushWarningColor(ins->type==DIV_INS_OPL_DRUMS && i==0); + pushWarningColor(ins->type==DIV_INS_OPL_DRUMS && i==0); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); P(CWSliderScalar(FM_NAME(FM_MULT),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN)); rightClickable if (ins->type==DIV_INS_OPL_DRUMS && i==0) { @@ -5965,7 +5966,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) { ImGui::TableNextColumn(); ImGui::Text("%s",FM_NAME(FM_MULT)); } - + if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) { if (!(ins->type==DIV_INS_OPZ && op.egt)) { int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7]; @@ -6275,7 +6276,7 @@ void FurnaceGUI::drawInsSID3(DivInstrument* ins) { ImGui::EndTable(); } - + if (!ins->sid3.doWavetable) { strncpy(buffer,macroSID3WaveMixMode(0,(float)ins->sid3.mixMode,NULL).c_str(),40); P(CWSliderScalar(_("Wave Mix Mode"),ImGuiDataType_U8,&ins->sid3.mixMode,&_ZERO,&_FOUR,buffer)); @@ -6764,7 +6765,7 @@ void FurnaceGUI::drawInsEdit() { ImGui::EndTable(); } - + if (ImGui::BeginTabBar("insEditTab")) { std::vector macroList; @@ -6926,7 +6927,7 @@ void FurnaceGUI::drawInsEdit() { macroList.push_back(FurnaceGUIMacroDesc(_("Op. Pitch"),&ins->std.opMacros[ordi].susMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode,NULL,false,NULL,false,NULL,false,true)); } } - + macroList.push_back(FurnaceGUIMacroDesc(FM_NAME(FM_AR),&ins->std.opMacros[ordi].arMacro,0,maxArDr,64,uiColors[GUI_COLOR_MACRO_ENVELOPE])); macroList.push_back(FurnaceGUIMacroDesc(FM_NAME(FM_DR),&ins->std.opMacros[ordi].drMacro,0,maxArDr,64,uiColors[GUI_COLOR_MACRO_ENVELOPE])); macroList.push_back(FurnaceGUIMacroDesc(FM_NAME(FM_D2R),&ins->std.opMacros[ordi].d2rMacro,0,31,64,uiColors[GUI_COLOR_MACRO_ENVELOPE])); @@ -7284,7 +7285,7 @@ void FurnaceGUI::drawInsEdit() { P(ImGui::Checkbox(_("Enable filter"),&ins->c64.toFilter)); P(ImGui::Checkbox(_("Initialize filter"),&ins->c64.initFilter)); - + if (ins->type==DIV_INS_SID2) { P(CWSliderScalar(_("Cutoff"),ImGuiDataType_U16,&ins->c64.cut,&_ZERO,&_FOUR_THOUSAND_NINETY_FIVE)); rightClickable P(CWSliderScalar(_("Resonance"),ImGuiDataType_U8,&ins->c64.res,&_ZERO,&_TWO_HUNDRED_FIFTY_FIVE)); rightClickable @@ -7769,7 +7770,7 @@ void FurnaceGUI::drawInsEdit() { processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y); ImGui::InhibitInertialScroll(); } - + if (ImGui::Button(modTableHex?"Hex##MTHex":"Dec##MTHex")) { modTableHex=!modTableHex; } @@ -8061,7 +8062,7 @@ void FurnaceGUI::drawInsEdit() { ins->type==DIV_INS_NAMCO || ins->type==DIV_INS_SM8521 || (ins->type==DIV_INS_GBA_MINMOD && ins->amiga.useWave) || - ins->type==DIV_INS_KURUMITSU_8L) + ins->type==DIV_INS_KURUMITSU_8L) { insTabWavetable(ins); } @@ -8720,7 +8721,7 @@ void FurnaceGUI::drawInsEdit() { macroList.push_back(FurnaceGUIMacroDesc(_("Ring Mod Source"),&ins->std.fmsMacro,0,SID3_NUM_CHANNELS,64,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,macroSID3SourceChan)); macroList.push_back(FurnaceGUIMacroDesc(_("Hard Sync Source"),&ins->std.amsMacro,0,SID3_NUM_CHANNELS - 1,64,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,macroSID3SourceChan)); macroList.push_back(FurnaceGUIMacroDesc(_("Phase Mod Source"),&ins->std.fbMacro,0,SID3_NUM_CHANNELS - 1,64,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,macroSID3SourceChan)); - + if (!ins->sid3.doWavetable) { macroList.push_back(FurnaceGUIMacroDesc(_("Feedback"),&ins->std.opMacros[3].arMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER])); } @@ -8749,14 +8750,13 @@ void FurnaceGUI::drawInsEdit() { case DIV_INS_KURUMITSU_8L: macroList.push_back(FurnaceGUIMacroDesc(_("Envelope"),&ins->std.volMacro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME])); macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); - macroList.push_back(FurnaceGUIMacroDesc(_("Echo Level"),&ins->std.dutyMacro,-127,127,160,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,waveCount,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); - macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,127,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); - macroList.push_back(FurnaceGUIMacroDesc(_("Panning (right)"),&ins->std.panRMacro,0,127,160,uiColors[GUI_COLOR_MACRO_OTHER])); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (left)"),&ins->std.panLMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Panning (right)"),&ins->std.panRMacro,0,255,160,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc(_("Pitch"),&ins->std.pitchMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode)); macroList.push_back(FurnaceGUIMacroDesc(_("Phase Reset"),&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true)); - macroList.push_back(FurnaceGUIMacroDesc(_("Feedback"),&ins->std.ex1Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); - macroList.push_back(FurnaceGUIMacroDesc(_("Modulation"),&ins->std.ex2Macro,0,15,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Feedback"),&ins->std.ex1Macro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Modulation"),&ins->std.ex2Macro,0,255,160,uiColors[GUI_COLOR_MACRO_VOLUME],false,NULL,NULL,false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Special"),&ins->std.ex3Macro,0,2,96,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,minModModeBits)); break; case DIV_INS_MAX: @@ -8949,7 +8949,7 @@ void FurnaceGUI::drawInsEdit() { } ImGui::EndMenu(); } - + ImGui::EndPopup(); } } diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index 685ce4142..f935e540a 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -2720,38 +2720,6 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl } break; } - case DIV_SYSTEM_KURUMITSU_8L: { - int echoVolL=flags.getInt("echoVolL",0); - int echoVolR=flags.getInt("echoVolR",0); - int echoFeedback=flags.getInt("echoFeedback",0); - - ImGui::Text(_("Initial echo state:")); - - if (CWSliderInt(_("Feedback##EchoFeedback"),&echoFeedback,-128,127)) { - if (echoFeedback<-128) echoFeedback=-128; - if (echoFeedback>127) echoFeedback=127; - altered=true; - } rightClickable - if (CWSliderInt(_("Left Volume##EchoVolL"),&echoVolL,-128,127)) { - if (echoVolL<-128) echoVolL=-128; - if (echoVolL>127) echoVolL=127; - altered=true; - } rightClickable - if (CWSliderInt(_("Right Volume##EchoVolL"),&echoVolR,-128,127)) { - if (echoVolR<-128) echoVolR=-128; - if (echoVolR>127) echoVolR=127; - altered=true; - } rightClickable - - if (altered) { - e->lockSave([&]() { - flags.set("echoVolL",echoVolL); - flags.set("echoVolR",echoVolR); - flags.set("echoFeedback",echoFeedback); - }); - } - break; - } case DIV_SYSTEM_BUBSYS_WSG: case DIV_SYSTEM_PET: case DIV_SYSTEM_GA20: @@ -2761,6 +2729,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl case DIV_SYSTEM_POWERNOISE: case DIV_SYSTEM_UPD1771C: case DIV_SYSTEM_MULTIPCM: + case DIV_SYSTEM_KURUMITSU_8L: break; case DIV_SYSTEM_YMU759: case DIV_SYSTEM_ESFM: From 9ff74396271564a2786f9df633138e121e361a75 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Fri, 26 Sep 2025 23:30:51 +0700 Subject: [PATCH 6/6] Kurumitsu-8L: channel redesign, fix export --- src/engine/platform/kurumitsu8l.cpp | 214 ++++++++++++++-------------- src/engine/platform/kurumitsu8l.h | 2 +- src/engine/vgmOps.cpp | 4 +- 3 files changed, 113 insertions(+), 107 deletions(-) diff --git a/src/engine/platform/kurumitsu8l.cpp b/src/engine/platform/kurumitsu8l.cpp index 2ed78cc64..b2665ad53 100644 --- a/src/engine/platform/kurumitsu8l.cpp +++ b/src/engine/platform/kurumitsu8l.cpp @@ -21,24 +21,25 @@ #include "../engine.h" #include -#define chRead(c,a) regPool[(c)*24+(a)] -#define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*24+(a)]=v; if (dumpWrites) {addWrite(a,v);} } -#define chDWrite(c,a,v) regPool[(c)*24+(a)]=v; +#define chRead(c,a) regPool[(c)*32+(a)] +#define chWrite(c,a,v) if (!skipRegisterWrites) {regPool[(c)*32+(a)]=v; if (dumpWrites) {addWrite((c)*32+(a),v);} } +#define chDWrite(c,a,v) regPool[(c)*32+(a)]=v; #define CHIP_FREQBASE 67108864 const char* regCheatSheetKurumitsu8L[]={ - "CHxBank", "00+x*18", - "CHxVol", "01+x*18", - "CHxModF", "02+x*18", - "CHxModI", "03+x*18", - "CHxPanL", "04+x*18", - "CHxPanR", "06+x*18", - "CHxLoopE", "08+x*18", - "CHxLoopL", "0A+x*18", - "CHxFreq", "0C+x*18", - "CHxAcc", "10+x*18", - "CHxOut", "14+x*18", + "CHxWPtr", "00+x*20", + "CHxSPtr", "04+x*20", + "CHxVol", "09+x*20", + "CHxModF", "0A+x*20", + "CHxModI", "0B+x*20", + "CHxPanL", "0C+x*20", + "CHxPanR", "0E+x*20", + "CHxLoopE", "10+x*20", + "CHxLoopL", "12+x*20", + "CHxFreq", "14+x*20", + "CHxAcc", "18+x*20", + "CHxOut", "1C+x*20", NULL }; @@ -63,16 +64,16 @@ void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { int outAR=0; int modData=0; for (int i=0; i<8; i++) { - unsigned char vol=chRead(i,1); - unsigned char fb=chRead(i,2); - unsigned char mod=chRead(i,3); - short panL=chRead(i,4)|((short)chRead(i,5)<<8); - short panR=chRead(i,6)|((short)chRead(i,7)<<8); - unsigned freq=chRead(i,12)|((unsigned)chRead(i,13)<<8)|((unsigned)chRead(i,14)<<16)|((unsigned)chRead(i,15)<<24); - unsigned phase=chRead(i,16)|((unsigned)chRead(i,17)<<8)|((unsigned)chRead(i,18)<<16)|((unsigned)chRead(i,19)<<24); - unsigned loopE=chRead(i,8)|((unsigned)chRead(i,9)<<8); - short fbData1=chRead(i,20)|((short)chRead(i,21)<<8); - short fbData2=chRead(i,22)|((short)chRead(i,23)<<8); + unsigned char vol=chRead(i,9); + unsigned char fb=chRead(i,10); + unsigned char mod=chRead(i,11); + short panL=chRead(i,12)|((short)chRead(i,13)<<8); + short panR=chRead(i,14)|((short)chRead(i,15)<<8); + unsigned freq=chRead(i,20)|((unsigned)chRead(i,21)<<8)|((unsigned)chRead(i,22)<<16)|((unsigned)chRead(i,23)<<24); + unsigned phase=chRead(i,24)|((unsigned)chRead(i,25)<<8)|((unsigned)chRead(i,26)<<16)|((unsigned)chRead(i,27)<<24); + unsigned loopE=chRead(i,18)|((unsigned)chRead(i,19)<<8); + short fbData1=chRead(i,28)|((short)chRead(i,29)<<8); + short fbData2=chRead(i,30)|((short)chRead(i,31)<<8); int data=0; int phase_inc=(((int)fbData1+fbData2)*fb)+((modData*mod)<<3); @@ -82,32 +83,35 @@ void DivPlatformKurumitsu8L::acquire(short** buf, size_t len) { phase+=freq; } else { // samples, does unstable pitchmod - unsigned loopL=chRead(i,10)|((unsigned)chRead(i,11)<<8); - data=sampleMem[(phase>>16)|(chRead(i,0)<<16)]; - phase_inc+=freq; + unsigned base=chRead(i,4)|((unsigned)chRead(i,5)<<8)|((unsigned)chRead(i,6)<<16)|((unsigned)chRead(i,7)<<24); + unsigned loopL=chRead(i,16)|((unsigned)chRead(i,17)<<8); + data=sampleMem[base+(phase>>16)]; + phase_inc=(phase_inc>>9)+freq; + // ROM symphony prevention if (phase_inc<0) phase_inc=0; + if ((unsigned)phase_inc>(loopL<<16)) phase_inc=loopL<<16; int64_t newPhase=phase+phase_inc; - if (newPhase>=0x100000000LL || (newPhase)>=(loopE<<16)) { + if (newPhase>=0x100000000LL || newPhase>=(loopE<<16)) { newPhase-=loopL<<16; } phase=newPhase; } int out=data*vol; // 16 bits - outAL+=(out*panL)>>2; // 29 bits - outAR+=(out*panR)>>2; - oscBuf[i]->putSample(h,(out*((int)abs(panL)+abs(panR)))>>17); - fbData2=fbData1; fbData1=out; modData=out; - chDWrite(i,16,phase&0xff); - chDWrite(i,17,(phase>>8)&0xff); - chDWrite(i,18,(phase>>16)&0xff); - chDWrite(i,19,(phase>>24)&0xff); - chDWrite(i,20,fbData1&0xff); - chDWrite(i,21,(fbData1>>8)&0xff); - chDWrite(i,22,fbData2&0xff); - chDWrite(i,23,(fbData2>>24)&0xff); + outAL+=out*panL; // 29 bits + outAR+=out*panR; + oscBuf[i]->putSample(h,(out*((int)abs(panL)+abs(panR)))>>15); + + chDWrite(i,24,phase&0xff); + chDWrite(i,25,(phase>>8)&0xff); + chDWrite(i,26,(phase>>16)&0xff); + chDWrite(i,27,(phase>>24)&0xff); + chDWrite(i,28,fbData1&0xff); + chDWrite(i,29,(fbData1>>8)&0xff); + chDWrite(i,30,fbData2&0xff); + chDWrite(i,31,(fbData2>>24)&0xff); } // 32 bits buf[0][h]=outAL>>16; // 16 bits buf[1][h]=outAR>>16; @@ -122,21 +126,24 @@ void DivPlatformKurumitsu8L::updateWave(int ch) { for (int i=0; i<256; i++) { wtMem[ch][i]=chan[ch].ws.output[i]^128; } + if (!skipRegisterWrites && dumpWrites) { + addWrite(0x10000+ch*256,256); + } } void DivPlatformKurumitsu8L::writePan(int ch) { if (!isMuted[ch] && chan[ch].active) { - int valL=chan[ch].panL*chan[ch].vol*(chan[ch].invertL?-1:1)/2; - int valR=chan[ch].panR*chan[ch].vol*(chan[ch].invertR?-1:1)/2; - chWrite(ch,4,valL&0xff); - chWrite(ch,5,valL>>8); - chWrite(ch,6,valR&0xff); - chWrite(ch,7,valR>>8); + int valL=chan[ch].panL*chan[ch].vol*(chan[ch].invertL?-1:1)/8; + int valR=chan[ch].panR*chan[ch].vol*(chan[ch].invertR?-1:1)/8; + chWrite(ch,12,valL&0xff); + chWrite(ch,13,valL>>8); + chWrite(ch,14,valR&0xff); + chWrite(ch,15,valR>>8); } else { - chWrite(ch,4,0); - chWrite(ch,5,0); - chWrite(ch,6,0); - chWrite(ch,7,0); + chWrite(ch,12,0); + chWrite(ch,13,0); + chWrite(ch,14,0); + chWrite(ch,15,0); } } @@ -148,7 +155,7 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].outVol=chan[i].std.vol.val*(chan[i].isAmiga?4:1); if (chan[i].outVol>255) chan[i].outVol=255; if (!isMuted[i] && chan[i].active) { - chWrite(i,1,chan[i].outVol); + chWrite(i,9,chan[i].outVol); } } if (NEW_ARP_STRAT) { @@ -189,18 +196,18 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].audPos=0; chan[i].setPos=true; } else { - chWrite(i,16,0); - chWrite(i,17,0); - chWrite(i,18,0); - chWrite(i,19,0); + chWrite(i,24,0); + chWrite(i,25,0); + chWrite(i,26,0); + chWrite(i,27,0); } } } if (chan[i].std.ex1.had) { - chWrite(i,2,chan[i].std.ex1.val); + chWrite(i,10,chan[i].std.ex1.val); } if (chan[i].std.ex2.had) { - chWrite(i,3,chan[i].std.ex2.val); + chWrite(i,11,chan[i].std.ex2.val); } if (chan[i].std.ex3.had) { chan[i].invertL=chan[i].std.ex3.val&2; @@ -228,9 +235,9 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { } if (chan[i].freq<0) chan[i].freq=0; if (chan[i].freq>8388608) chan[i].freq=8388608; - chWrite(i,12,chan[i].freq&0xff); - chWrite(i,13,(chan[i].freq>>8)&0xff); - chWrite(i,14,(chan[i].freq>>16)&0xff); + chWrite(i,20,chan[i].freq&0xff); + chWrite(i,21,(chan[i].freq>>8)&0xff); + chWrite(i,22,(chan[i].freq>>16)&0xff); chan[i].freqChanged=false; } if (chan[i].keyOn || chan[i].keyOff) { @@ -238,40 +245,39 @@ void DivPlatformKurumitsu8L::tick(bool sysTick) { chan[i].outVol=255; } if (!isMuted[i] && chan[i].active) { - chWrite(i,1,chan[i].outVol); + chWrite(i,9,chan[i].outVol); } else { - chWrite(i,1,0); + chWrite(i,9,0); } panChanged=true; if (chan[i].keyOn) { chan[i].keyOn=false; if (chan[i].pcm) { DivSample* s=parent->getSample(chan[i].sample); - unsigned int start, length, loop; + unsigned int start, loopEnd, loopLength; start=sampleOff[chan[i].sample]; if (s->isLoopable()) { - length=s->loopEnd; - loop=s->loopEnd-s->loopStart; + loopEnd=s->loopEnd; + loopLength=s->loopEnd-s->loopStart; } else { - length=s->samples+16; - loop=16; + loopEnd=s->samples+16; + loopLength=16; } - if (length>65535) length=65535; - if (chan[i].audPos>0) { - start=start+MIN(chan[i].audPos,length); - } - chWrite(i,16,0); - chWrite(i,17,0); - chWrite(i,18,start&0xff); - chWrite(i,19,(start>>8)&0xff); - chWrite(i,0,start>>16); - chWrite(i,8,(start+length)&0xff); - chWrite(i,9,((start+length)>>8)&0xff); - chWrite(i,10,loop&0xff); - chWrite(i,11,(loop>>8)&0xff); + if (loopEnd>65535) loopEnd=65535; + chWrite(i,4,start&0xff); + chWrite(i,5,(start>>8)&0xff); + chWrite(i,6,(start>>16)&0xff); + chWrite(i,16,loopLength&0xff); + chWrite(i,17,(loopLength>>8)&0xff); + chWrite(i,18,loopEnd&0xff); + chWrite(i,19,(loopEnd>>8)&0xff); + chWrite(i,24,0); + chWrite(i,25,0); + chWrite(i,26,chan[i].audPos); + chWrite(i,27,(chan[i].audPos>>8)&0xff); } else { - chWrite(i,8,0); - chWrite(i,9,0); + chWrite(i,18,0); + chWrite(i,19,0); } } if (chan[i].keyOff) chan[i].keyOff=false; @@ -310,7 +316,7 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) { chan[c.chan].outVol=255; if (!isMuted[c.chan] && chan[c.chan].active) { - chWrite(c.chan,1,chan[c.chan].outVol); + chWrite(c.chan,9,chan[c.chan].outVol); } } chan[c.chan].insChanged=false; @@ -401,11 +407,11 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { chan[c.chan].setPos=true; break; case DIV_CMD_FM_FB: { - chWrite(c.chan,2,c.value); + chWrite(c.chan,10,c.value); break; } case DIV_CMD_FM_PM_DEPTH: { - chWrite(c.chan,3,c.value); + chWrite(c.chan,11,c.value); break; } case DIV_CMD_GET_VOLMAX: @@ -429,19 +435,21 @@ int DivPlatformKurumitsu8L::dispatch(DivCommand c) { void DivPlatformKurumitsu8L::muteChannel(int ch, bool mute) { isMuted[ch]=mute; if (!mute && chan[ch].active) { - chWrite(ch,1,chan[ch].outVol); + chWrite(ch,9,chan[ch].outVol); writePan(ch); } else { - chWrite(ch,1,0); + chWrite(ch,9,0); } } void DivPlatformKurumitsu8L::forceIns() { for (int i=0; i<8; i++) { - chan[i].sample=-1; chan[i].insChanged=true; chan[i].freqChanged=true; + chan[i].audPos=0; + chan[i].sample=-1; updateWave(i); + writePan(i); } } @@ -454,14 +462,14 @@ DivMacroInt* DivPlatformKurumitsu8L::getChanMacroInt(int ch) { } unsigned short DivPlatformKurumitsu8L::getPan(int ch) { - short panL=abs(chRead(ch,4)|((short)chRead(ch,5)<<8)); - short panR=abs(chRead(ch,6)|((short)chRead(ch,7)<<8)); + short panL=abs(chRead(ch,12)|((short)chRead(ch,13)<<8)); + short panR=abs(chRead(ch,14)|((short)chRead(ch,15)<<8)); return ((panL/128)<<8)|(panR/128); } void DivPlatformKurumitsu8L::getPaired(int ch, std::vector& ret) { if (ch==0) return; - unsigned char mod=chRead(ch,3); + unsigned char mod=chRead(ch,11); if (mod!=0) { sprintf(modLabel[ch],"%d",mod); ret.push_back(DivChannelPair(modLabel[ch],ch-1)); @@ -490,7 +498,7 @@ unsigned char* DivPlatformKurumitsu8L::getRegisterPool() { } int DivPlatformKurumitsu8L::getRegisterPoolSize() { - return 24*8; + return 32*8; } const void* DivPlatformKurumitsu8L::getSampleMem(int index) { @@ -534,24 +542,22 @@ void DivPlatformKurumitsu8L::renderSamples(int sysID) { sampleOff[i]=0; continue; } + if (memPos>=maxPos) { + logW("out of Kurumitsu-8L PCM memory for sample %d!",i); + break; + } int length=s->isLoopable()?s->loopEnd:s->samples; int actualLength=length; // if it's one-shot, add 16 silent samples for looping area // this should be enough for most cases even though the // frequency register can make position jump by up to 256 samples - int oneShotPos=length; + int oneShotLength=length; if (!s->isLoopable()) actualLength+=16; if (actualLength>65535) actualLength=65535; - if (!s->isLoopable()) oneShotPos=actualLength-16; - if (0x10000-(memPos&0xffff)(maxPos-memPos)) actualLength=maxPos-memPos; + if (!s->isLoopable()) oneShotLength=actualLength-16; sampleOff[i]=memPos; - memcpy(&sampleMem[memPos],s->data8,oneShotPos); + memcpy(&sampleMem[memPos],s->data8,oneShotLength); memPos+=actualLength; romMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_SAMPLE,"PCM",i,sampleOff[i],memPos)); sampleLoaded[i]=true; @@ -607,12 +613,12 @@ void DivPlatformKurumitsu8L::setFlags(const DivConfig& flags) { } void DivPlatformKurumitsu8L::poke(unsigned int addr, unsigned short val) { - if (addr < (unsigned int)getRegisterPoolSize()) chWrite(addr/24,addr%24,val); + if (addr < (unsigned int)getRegisterPoolSize()) chWrite(addr/32,addr%32,val); } void DivPlatformKurumitsu8L::poke(std::vector& wlist) { for (DivRegWrite& i: wlist) { - if (i.addr < (unsigned int)getRegisterPoolSize()) chWrite(i.addr/24,i.addr%24,i.val); + if (i.addr < (unsigned int)getRegisterPoolSize()) chWrite(i.addr/32,i.addr%32,i.val); } } diff --git a/src/engine/platform/kurumitsu8l.h b/src/engine/platform/kurumitsu8l.h index a605919e5..9ddae0080 100644 --- a/src/engine/platform/kurumitsu8l.h +++ b/src/engine/platform/kurumitsu8l.h @@ -51,7 +51,7 @@ class DivPlatformKurumitsu8L: public DivDispatch { unsigned int sampleOff[256]; bool sampleLoaded[256]; - unsigned char regPool[8*24]; + unsigned char regPool[8*32]; signed char wtMem[8][256]; char modLabel[8][4]; signed char* sampleMem; diff --git a/src/engine/vgmOps.cpp b/src/engine/vgmOps.cpp index cc48401cb..11769e600 100644 --- a/src/engine/vgmOps.cpp +++ b/src/engine/vgmOps.cpp @@ -1244,12 +1244,12 @@ void DivEngine::performVGMWrite(SafeWriter* w, int disIdx, DivSystem sys, DivReg w->writeC(0x66); w->writeC(0xc0); w->writeI(write.val+2); - w->writeI(write.addr&0xffff); + w->writeS(write.addr&0xffff); w->write(&wtMem[write.addr&0xffff],write.val); } else { // register writes w->writeC(0xa0); - w->writeC(baseAddr2|(write.addr&0xff)); + w->writeC(write.addr&0xff); w->writeC(write.val); } break;