From b90eb659e8c96f50a036344020b9d1314beb55b0 Mon Sep 17 00:00:00 2001 From: cam900 Date: Sun, 5 Jan 2020 06:12:10 +0900 Subject: [PATCH] VRender0 Sound Engine Fixes, Improves (#6112) * sound/vrender0.cpp : Use struct for Each channels, Use address map for sound interface, Fix wave address calculation, Volume, Use shorter/correct type values, Add notes reference : https://web.archive.org/web/20040628133240/http://www.mesdigital.com/support/downfile/vr0510q_datasheet_v1.31.pdf * sound/vrender0.cpp : Add notes * sound/vrender0.cpp : More notes * sound/vrender0.cpp : Use address map for Wave memory, Fix Channel starting behavior (Fix start position) * vrender0.cpp : Reduce duplicates * vrender0.cpp : Partially implement envelopes, interrupts, Move dynamic sample rate change behavior into device_clock_changed, Use operation clock related sample rate, Add notes --- src/devices/machine/vrender0.cpp | 30 +- src/devices/machine/vrender0.h | 4 + src/devices/sound/vrender0.cpp | 620 ++++++++++++++++++++++++------- src/devices/sound/vrender0.h | 134 ++++++- 4 files changed, 648 insertions(+), 140 deletions(-) diff --git a/src/devices/machine/vrender0.cpp b/src/devices/machine/vrender0.cpp index 76442866a6d..ef00ccc6ee1 100644 --- a/src/devices/machine/vrender0.cpp +++ b/src/devices/machine/vrender0.cpp @@ -98,9 +98,19 @@ void vrender0soc_device::regs_map(address_map &map) void vrender0soc_device::audiovideo_map(address_map &map) { map(0x00000000, 0x0000ffff).m(m_vr0vid, FUNC(vr0video_device::regs_map)); - map(0x00800000, 0x00ffffff).rw(FUNC(vrender0soc_device::textureram_r), FUNC(vrender0soc_device::textureram_w)); - map(0x01000000, 0x017fffff).rw(FUNC(vrender0soc_device::frameram_r), FUNC(vrender0soc_device::frameram_w)); - map(0x01800000, 0x01800fff).rw(m_vr0snd, FUNC(vr0sound_device::vr0_snd_read), FUNC(vr0sound_device::vr0_snd_write)); + map(0x00800000, 0x00ffffff).m(FUNC(vrender0soc_device::texture_map)); + map(0x01000000, 0x017fffff).m(FUNC(vrender0soc_device::frame_map)); + map(0x01800000, 0x01800fff).m(m_vr0snd, FUNC(vr0sound_device::sound_map)); +} + +void vrender0soc_device::texture_map(address_map &map) +{ + map(0x000000, 0x7fffff).rw(FUNC(vrender0soc_device::textureram_r), FUNC(vrender0soc_device::textureram_w)); +} + +void vrender0soc_device::frame_map(address_map &map) +{ + map(0x000000, 0x7fffff).rw(FUNC(vrender0soc_device::frameram_r), FUNC(vrender0soc_device::frameram_w)); } //------------------------------------------------- @@ -130,7 +140,10 @@ void vrender0soc_device::device_add_mconfig(machine_config &config) SPEAKER(config, m_lspeaker).front_left(); SPEAKER(config, m_rspeaker).front_right(); - SOUND_VRENDER0(config, m_vr0snd, 0); + SOUND_VRENDER0(config, m_vr0snd, DERIVED_CLOCK(1,1)); // Correct? + m_vr0snd->set_addrmap(vr0sound_device::AS_TEXTURE, &vrender0soc_device::texture_map); + m_vr0snd->set_addrmap(vr0sound_device::AS_FRAME, &vrender0soc_device::frame_map); + m_vr0snd->irq_callback().set(FUNC(vrender0soc_device::soundirq_cb)); m_vr0snd->add_route(0, m_lspeaker, 1.0); m_vr0snd->add_route(1, m_rspeaker, 1.0); } @@ -147,7 +160,6 @@ void vrender0soc_device::device_start() m_frameram = auto_alloc_array_clear(machine(), uint16_t, 0x00800000/2); m_vr0vid->set_areas(m_textureram, m_frameram); - m_vr0snd->set_areas(m_textureram, m_frameram); m_host_space = &m_host_cpu->space(AS_PROGRAM); if (this->clock() == 0) @@ -326,6 +338,14 @@ int vrender0soc_device::irq_callback() } +WRITE_LINE_MEMBER(vrender0soc_device::soundirq_cb) +{ + if (state) + { + IntReq(2); + } +} + /* * * Timer diff --git a/src/devices/machine/vrender0.h b/src/devices/machine/vrender0.h index 8947f6f1a95..287068631c9 100644 --- a/src/devices/machine/vrender0.h +++ b/src/devices/machine/vrender0.h @@ -97,6 +97,8 @@ public: void regs_map(address_map &map); void audiovideo_map(address_map &map); + void texture_map(address_map &map); + void frame_map(address_map &map); template void set_host_cpu_tag(T &&tag) { m_host_cpu.set_tag(std::forward(tag)); } void set_external_vclk(const uint32_t vclk) { m_ext_vclk = vclk; } void set_external_vclk(const XTAL vclk) { m_ext_vclk = vclk.value(); } @@ -147,6 +149,8 @@ private: DECLARE_READ32_MEMBER(intst_r); DECLARE_WRITE32_MEMBER(intst_w); + DECLARE_WRITE_LINE_MEMBER(soundirq_cb); + // Timer template DECLARE_WRITE32_MEMBER(tmcon_w); template DECLARE_READ32_MEMBER(tmcon_r); diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp index df934fcc834..b97db4f67ef 100644 --- a/src/devices/sound/vrender0.cpp +++ b/src/devices/sound/vrender0.cpp @@ -3,20 +3,26 @@ #include "emu.h" #include "vrender0.h" -/*********************************** - VRENDER ZERO - AUDIO EMULATION -************************************/ -/************ -MISSING: -envelopes -reverb -interrupts -*************/ +/************************************************************************************* + VRENDER ZERO + AUDIO EMULATION + + TODO + - Envelope, Interrupt functions aren't verified from real hardware behavior. + - Reverb, Pingpong/Reversed loop, Most of Channel/Overall control registers + are Not implemented + - Sample Rate is unverified + +*************************************************************************************/ +static inline s32 sign_ext(s32 val, s32 bit) +{ + bit = 32 - bit; + return ((s32)(val << bit)) >> bit; +} //Correct table thanks to Evoga //they left a ulaw<->linear conversion tool inside the roms -static const unsigned short ULawTo16[]= +static const u16 ULawTo16[]= { 0x8000,0x8400,0x8800,0x8C00,0x9000,0x9400,0x9800,0x9C00, 0xA000,0xA400,0xA800,0xAC00,0xB000,0xB400,0xB800,0xBC00, @@ -52,26 +58,58 @@ static const unsigned short ULawTo16[]= 0xFFC0,0xFFC8,0xFFD0,0xFFD8,0xFFE0,0xFFE8,0xFFF0,0xFFF8, }; +// 16 bit access only +void vr0sound_device::sound_map(address_map &map) +{ + map(0x000, 0x3ff).rw(FUNC(vr0sound_device::channel_r), FUNC(vr0sound_device::channel_w)); -#define STATUS m_SOUNDREGS[0x404/4] -#define CURSADDR(chan) (m_SOUNDREGS[(0x20/4)*chan+0x00]) -#define DSADDR(chan) ((m_SOUNDREGS[(0x20/4)*chan+0x08/4]>>0)&0xffff) -#define LOOPBEGIN(chan) (m_SOUNDREGS[(0x20/4)*chan+0x0c/4]&0x3fffff) -#define LOOPEND(chan) (m_SOUNDREGS[(0x20/4)*chan+0x10/4]&0x3fffff) -#define ENVVOL(chan) (m_SOUNDREGS[(0x20/4)*chan+0x04/4]&0xffffff) - -/* -#define GETSOUNDREG16(Chan,Offs) space.read_word(m_reg_base+0x20*Chan+Offs) -#define GETSOUNDREG32(Chan,Offs) space.read_dword(m_reg_base+0x20*Chan+Offs) - -#define CURSADDR(chan) GETSOUNDREG32(chan,0x00) -#define DSADDR(chan) GETSOUNDREG16(chan,0x08) -#define LOOPBEGIN(chan) (GETSOUNDREG32(chan,0x0c)&0x3fffff) -#define LOOPEND(chan) (GETSOUNDREG32(chan,0x10)&0x3fffff) -#define ENVVOL(chan) (GETSOUNDREG32(chan,0x04)&0xffffff) -*/ + /* + Sound Control Registers + fedcba98 76543210 + 404(R) xxxxxxxx xxxxxxxx Status (Low); Channel 0-15 + 406(R) xxxxxxxx xxxxxxxx Status (High); Channel 16-31 + 404(W) + 406(W) x------- -------- Status Assign (0 = Off, 1 = On) + -------- ---xxxxx Status Channel + 408(R) xxxxxxxx xxxxxxxx NoteOn (Low); Channel 0-15 + 40a(R) xxxxxxxx xxxxxxxx NoteOn (High); Channel 16-31 + 408(W) + 40a(W) x------- -------- NoteOn Assign (0 = Off, 1 = On) + -------- ---xxxxx NoteOn Channel + 410 -------- xxxxxxxx RevFactor + 412 -------- -xxxxxxx BufferSAddr (Top 7 bit of Reverb Buffer Start Address) + 420 ----xxxx xxxxxxxx BufferSize0 + 422 ----xxxx xxxxxxxx BufferSize1 + 440 ----xxxx xxxxxxxx BufferSize2 + 442 ----xxxx xxxxxxxx BufferSize3 + 480 ----xxxx xxxxxxxx IntMask (Low); Channel 0-15 + 482 ----xxxx xxxxxxxx IntMask (High); Channel 16-31 + 500 ----xxxx xxxxxxxx IntPend (Low); Channel 0-15 + 502 ----xxxx xxxxxxxx IntPend (High); Channel 16-31 + 600 ---xxxxx -------- MaxChn + -------- xxxxxxxx ChnClkNum (Clock Number per Channel) + 602 x------- -------- RS (Run Sound) + -------- --x----- TM (Texture Memory) + -------- ---x---- RE (Reverb Enable) + -------- -----x-- CW (32bit Adder Wait) + -------- ------x- AW (16bit Adder Wait) + -------- -------x MW (Multipler Wait) + */ + map(0x404, 0x407).rw(FUNC(vr0sound_device::status_r), FUNC(vr0sound_device::status_w)); + map(0x408, 0x40b).rw(FUNC(vr0sound_device::noteon_r), FUNC(vr0sound_device::noteon_w)); + map(0x410, 0x411).rw(FUNC(vr0sound_device::revfactor_r), FUNC(vr0sound_device::revfactor_w)); + map(0x412, 0x413).rw(FUNC(vr0sound_device::buffersaddr_r), FUNC(vr0sound_device::buffersaddr_w)); + map(0x420, 0x421).rw(FUNC(vr0sound_device::buffersize0_r), FUNC(vr0sound_device::buffersize0_w)); + map(0x422, 0x423).rw(FUNC(vr0sound_device::buffersize1_r), FUNC(vr0sound_device::buffersize1_w)); + map(0x440, 0x441).rw(FUNC(vr0sound_device::buffersize2_r), FUNC(vr0sound_device::buffersize2_w)); + map(0x442, 0x443).rw(FUNC(vr0sound_device::buffersize3_r), FUNC(vr0sound_device::buffersize3_w)); + map(0x480, 0x483).rw(FUNC(vr0sound_device::intmask_r), FUNC(vr0sound_device::intmask_w)); + map(0x500, 0x503).rw(FUNC(vr0sound_device::intpend_r), FUNC(vr0sound_device::intpend_w)); + map(0x600, 0x601).rw(FUNC(vr0sound_device::chnnum_r), FUNC(vr0sound_device::chnnum_w)); + map(0x602, 0x603).rw(FUNC(vr0sound_device::ctrl_r), FUNC(vr0sound_device::ctrl_w)); +} //************************************************************************** // LIVE DEVICE @@ -83,12 +121,14 @@ DEFINE_DEVICE_TYPE(SOUND_VRENDER0, vr0sound_device, "vr0sound", "MagicEyes VRend // vr0sound_device - constructor //------------------------------------------------- -vr0sound_device::vr0sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, SOUND_VRENDER0, tag, owner, clock), - device_sound_interface(mconfig, *this), - m_TexBase(nullptr), - m_FBBase(nullptr), - m_stream(nullptr) +vr0sound_device::vr0sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, SOUND_VRENDER0, tag, owner, clock) + , device_sound_interface(mconfig, *this) + , device_memory_interface(mconfig, *this) + , m_texture_config("texture", ENDIANNESS_LITTLE, 16, 23) // 64 MBit (8 MB) Texture Memory Support + , m_frame_config("frame", ENDIANNESS_LITTLE, 16, 23) // 64 MBit (8 MB) Framebuffer Memory Support + , m_stream(nullptr) + , m_irq_cb(*this) { } @@ -99,13 +139,79 @@ vr0sound_device::vr0sound_device(const machine_config &mconfig, const char *tag, void vr0sound_device::device_start() { - memset(m_SOUNDREGS,0,sizeof(m_SOUNDREGS)); + m_irq_cb.resolve_safe(); - m_stream = stream_alloc(0, 2, 44100); // TODO : Related to clock? + // Find our direct access + m_texcache = space(AS_TEXTURE).cache<1, 0, ENDIANNESS_LITTLE>(); + m_fbcache = space(AS_FRAME).cache<1, 0, ENDIANNESS_LITTLE>(); + m_texcache_ctrl = m_fbcache; + for (auto &elem : m_channel) + elem.Cache = m_fbcache; - save_item(NAME(m_SOUNDREGS)); + m_stream = stream_alloc(0, 2, clock() / 972); // TODO : Correct source / divider? + + save_item(STRUCT_MEMBER(m_channel, CurSAddr)); + save_item(STRUCT_MEMBER(m_channel, EnvVol)); + save_item(STRUCT_MEMBER(m_channel, EnvStage)); + save_item(STRUCT_MEMBER(m_channel, dSAddr)); + save_item(STRUCT_MEMBER(m_channel, Modes)); + save_item(STRUCT_MEMBER(m_channel, LD)); + save_item(STRUCT_MEMBER(m_channel, LoopBegin)); + save_item(STRUCT_MEMBER(m_channel, LoopEnd)); + save_item(STRUCT_MEMBER(m_channel, LChnVol)); + save_item(STRUCT_MEMBER(m_channel, RChnVol)); + save_item(STRUCT_MEMBER(m_channel, EnvRate)); + save_item(STRUCT_MEMBER(m_channel, EnvTarget)); + save_item(NAME(m_Status)); + save_item(NAME(m_NoteOn)); + save_item(NAME(m_RevFactor)); + save_item(NAME(m_BufferAddr)); + save_item(NAME(m_BufferSize)); + save_item(NAME(m_IntMask)); + save_item(NAME(m_IntPend)); + save_item(NAME(m_MaxChn)); + save_item(NAME(m_ChnClkNum)); + save_item(NAME(m_Ctrl)); } +//------------------------------------------------- +// device_post_load - device-specific post-load +//------------------------------------------------- + +void vr0sound_device::device_post_load() +{ + device_clock_changed(); +} + + +//------------------------------------------------- +// device_clock_changed - called if the clock +// changes +//------------------------------------------------- + +void vr0sound_device::device_clock_changed() +{ + int div; + if (m_ChnClkNum) + div = ((30 << 16) | 0x8000) / (m_ChnClkNum + 1); // TODO : Verify algorithm + else + div = 1 << 16; + + m_stream->set_sample_rate(((clock() * div) / 972) >> 16); +} + +//------------------------------------------------- +// memory_space_config - return a description of +// any address spaces owned by this device +//------------------------------------------------- + +device_memory_interface::space_config_vector vr0sound_device::memory_space_config() const +{ + return space_config_vector { + std::make_pair(AS_TEXTURE, &m_texture_config), + std::make_pair(AS_FRAME, &m_frame_config) + }; +} //------------------------------------------------- // sound_stream_update - handle update requests @@ -117,133 +223,397 @@ void vr0sound_device::sound_stream_update(sound_stream &stream, stream_sample_t VR0_RenderAudio(samples, outputs[0], outputs[1]); } - - -READ32_MEMBER(vr0sound_device::vr0_snd_read) +u16 vr0sound_device::channel_r(offs_t offset) { - return m_SOUNDREGS[offset]; + return m_channel[(offset >> 4) & 0x1f].read(offset & 0xf); } - -WRITE32_MEMBER(vr0sound_device::vr0_snd_write) +void vr0sound_device::channel_w(offs_t offset, u16 data, u16 mem_mask) { - if(offset==0x404/4) + channel_t *channel = &m_channel[(offset >> 4) & 0x1f]; + u16 old_mode = channel->Modes; + m_channel[(offset >> 4) & 0x1f].write(offset & 0xf, data, mem_mask); + if ((old_mode ^ channel->Modes) & MODE_TEXTURE) { - data&=0xffff; - if(data&0x8000) - { - uint32_t c=data&0x1f; - STATUS|=1<Cache = (channel->Modes & MODE_TEXTURE) ? m_texcache_ctrl : m_fbcache; + } +} + +u16 vr0sound_device::status_r(offs_t offset) +{ + return m_Status >> ((offset & 1) << 2); +} + +void vr0sound_device::status_w(offs_t offset, u16 data) +{ + const u32 c = data & 0x1f; + if (data & 0x8000) + { + m_Status |= 1 << c; } else { - COMBINE_DATA(&m_SOUNDREGS[offset]); + m_Status &= ~(1 << c); } } - -void vr0sound_device::set_areas(uint16_t *texture, uint16_t *frame) +u16 vr0sound_device::noteon_r(offs_t offset) { - m_TexBase=(int16_t *)texture; - m_FBBase=(int16_t *)frame; + return m_NoteOn >> ((offset & 1) << 2); } +void vr0sound_device::noteon_w(offs_t offset, u16 data) +{ + const u32 c = data & 0x1f; + if (data & 0x8000) + { + m_NoteOn |= 1 << c; + } + else + { + m_NoteOn &= ~(1 << c); + } +} + +u16 vr0sound_device::revfactor_r(offs_t offset) +{ + return m_RevFactor & 0xff; +} + +void vr0sound_device::revfactor_w(offs_t offset, u16 data, u16 mem_mask) +{ + if (ACCESSING_BITS_0_7) + m_RevFactor = data & 0xff; +} + +/* + Buffer Address + 1 0 + fedcba9876543210 fedcba9876543210 + ----------0xxxxx x--------------- BufferSAddr + ---------------- -xxx------------ Buffer Select + ---------------- ----xxxxxxxxxxxx Buffer Pointer +*/ + +u16 vr0sound_device::buffersaddr_r(offs_t offset) +{ + return (m_BufferAddr >> 14) & 0x7f; +} + +void vr0sound_device::buffersaddr_w(offs_t offset, u16 data, u16 mem_mask) +{ + if (ACCESSING_BITS_0_7) + m_BufferAddr = (m_BufferAddr & ~(0x7f << 14)) | ((data & 0x7f) << 14); +} + +u16 vr0sound_device::buffersize0_r(offs_t offset) { return m_BufferSize[0] & 0xfff; } +u16 vr0sound_device::buffersize1_r(offs_t offset) { return m_BufferSize[1] & 0xfff; } +u16 vr0sound_device::buffersize2_r(offs_t offset) { return m_BufferSize[2] & 0xfff; } +u16 vr0sound_device::buffersize3_r(offs_t offset) { return m_BufferSize[3] & 0xfff; } + +void vr0sound_device::buffersize0_w(offs_t offset, u16 data, u16 mem_mask) { data &= 0xfff; COMBINE_DATA(&m_BufferSize[0]); } +void vr0sound_device::buffersize1_w(offs_t offset, u16 data, u16 mem_mask) { data &= 0xfff; COMBINE_DATA(&m_BufferSize[1]); } +void vr0sound_device::buffersize2_w(offs_t offset, u16 data, u16 mem_mask) { data &= 0xfff; COMBINE_DATA(&m_BufferSize[2]); } +void vr0sound_device::buffersize3_w(offs_t offset, u16 data, u16 mem_mask) { data &= 0xfff; COMBINE_DATA(&m_BufferSize[3]); } + +u16 vr0sound_device::intmask_r(offs_t offset) +{ + return m_IntMask >> ((offset & 1) << 2); +} + +void vr0sound_device::intmask_w(offs_t offset, u16 data, u16 mem_mask) +{ + const int shift = ((offset & 1) << 2); + m_IntMask = (m_IntMask & ~(mem_mask << shift)) | ((data & mem_mask) << shift); +} + +u16 vr0sound_device::intpend_r(offs_t offset) +{ + return m_IntPend >> ((offset & 1) << 2); +} + +void vr0sound_device::intpend_w(offs_t offset, u16 data, u16 mem_mask) +{ + m_IntPend &= ~((data & mem_mask) << ((offset & 1) << 2)); + if (!m_IntPend) + m_irq_cb(false); +} + +u16 vr0sound_device::chnnum_r(offs_t offset) +{ + return ((m_MaxChn & 0x1f) << 8) | (m_ChnClkNum & 0xff); +} + +void vr0sound_device::chnnum_w(offs_t offset, u16 data, u16 mem_mask) +{ + if (ACCESSING_BITS_0_7) + { + u8 old_chnclknum = m_ChnClkNum; + m_ChnClkNum = data & 0xff; + if (old_chnclknum != m_ChnClkNum) + { + device_clock_changed(); + } + } + if (ACCESSING_BITS_8_15) + m_MaxChn = (data >> 8) & 0x1f; +} + +u16 vr0sound_device::ctrl_r(offs_t offset) +{ + return m_Ctrl; +} + +void vr0sound_device::ctrl_w(offs_t offset, u16 data, u16 mem_mask) +{ + const u16 old_ctrl = m_Ctrl; + COMBINE_DATA(&m_Ctrl); + if ((old_ctrl ^ m_Ctrl) & CTRL_TM) + m_texcache_ctrl = (m_Ctrl & CTRL_TM) ? m_texcache : m_fbcache; +} + +/* +Channel Parameter Register (32 bytes for each channels) + + fedcba98 76543210 +00 xxxxxxxx xxxxxxxx CurSAddr (15:0) +02 xxxxxxxx xxxxxxxx CurSAddr (31:16) +04 xxxxxxxx xxxxxxxx EnvVol (15:0) +06 -11x---- -------- Loop Direction(LD) + -11-xxxx -------- EnvStage + -------- xxxxxxxx EnvVol (23:16) +08 xxxxxxxx xxxxxxxx DSAddr (15:0) +0a -xxxxxxx -------- Modes +0c xxxxxxxx xxxxxxxx LoopBegin (15:0) +0e -xxxxxxx -------- LChnVol + -------- --xxxxxx LoopBegin (21:16) +10 xxxxxxxx xxxxxxxx LoopEnd (15:0) +12 -xxxxxxx -------- RChnVol + -------- --xxxxxx LoopEnd (21:16) +14 xxxxxxxx xxxxxxxx EnvRate0 (15:0) +16 xxxxxxxx xxxxxxxx EnvRate1 (15:0) +18 xxxxxxxx xxxxxxxx EnvRate2 (15:0) +1a xxxxxxxx xxxxxxxx EnvRate3 (15:0) +1c x------- -------- EnvRate1 (16) + -xxxxxxx -------- EnvTarget1 + -------- x------- EnvRate0 (16) + -------- -xxxxxxx EnvTarget0 +1e x------- -------- EnvRate3 (16) + -xxxxxxx -------- EnvTarget3 + -------- x------- EnvRate2 (16) + -------- -xxxxxxx EnvTarget2 +*/ + +u16 vr0sound_device::channel_t::read(offs_t offset) +{ + u16 ret = 0; + + switch (offset) + { + case 0x00/2: + ret = CurSAddr & 0x0000ffff; + break; + case 0x02/2: + ret = (CurSAddr & 0xffff0000) >> 16; + break; + case 0x04/2: + ret = EnvVol & 0xffff; + break; + case 0x06/2: + ret = 0x6000 | (LD ? 0x1000 : 0) | ((EnvStage << 8) & 0x0f00) | ((EnvVol & 0xff0000) >> 16); + break; + case 0x08/2: + ret = dSAddr; + break; + case 0x0a/2: + ret = (Modes << 8) & 0x7f00; + break; + case 0x0c/2: + ret = LoopBegin & 0x00ffff; + break; + case 0x0e/2: + ret = ((LChnVol << 8) & 0x7f00) | ((LoopBegin & 0x3f0000) >> 16); + break; + case 0x10/2: + ret = LoopEnd & 0x00ffff; + break; + case 0x12/2: + ret = ((RChnVol << 8) & 0x7f00) | ((LoopEnd & 0x3f0000) >> 16); + break; + case 0x14/2: + case 0x16/2: + case 0x18/2: + case 0x1a/2: + ret = EnvRate[offset - (0x14/2)] & 0x0ffff; + break; + case 0x1c/2: + case 0x1e/2: + ret = (EnvTarget[((offset - (0x1c/2)) * 2) + 0] & 0x007f) | ((EnvTarget[((offset - (0x1c/2)) * 2) + 1] << 8) & 0x7f00); + ret |= ((EnvRate[((offset - (0x1c/2)) * 2) + 0] & 0x10000) >> 9) | ((EnvRate[((offset - (0x1c/2)) * 2) + 1] & 0x10000) >> 1); + break; + } + return ret; +} + +void vr0sound_device::channel_t::write(offs_t offset, u16 data, u16 mem_mask) +{ + u16 newdata = read(offset); + COMBINE_DATA(&newdata); + + data = newdata; + switch (offset) + { + case 0x00/2: + CurSAddr = (CurSAddr & 0xffff0000) | (data & 0x0000ffff); + break; + case 0x02/2: + CurSAddr = (CurSAddr & 0x0000ffff) | ((data << 16) & 0xffff0000); + break; + case 0x04/2: + EnvVol = (EnvVol & ~0xffff) | (data & 0xffff); + break; + case 0x06/2: + LD = data & 0x1000; + EnvStage = (data & 0x0f00) >> 8; + EnvVol = sign_ext((EnvVol & 0x00ffff) | ((data << 16) & 0xff0000), 24); + break; + case 0x08/2: + dSAddr = data & 0xffff; + break; + case 0x0a/2: + Modes = (data & 0x7f00) >> 8; + break; + case 0x0c/2: + LoopBegin = (LoopBegin & 0x3f0000) | (data & 0x00ffff); + break; + case 0x0e/2: + LChnVol = (data & 0x7f00) >> 8; + LoopBegin = (LoopBegin & 0x00ffff) | ((data << 16) & 0x3f0000); + break; + case 0x10/2: + LoopEnd = (LoopEnd & 0x3f0000) | (data & 0x00ffff); + break; + case 0x12/2: + RChnVol = (data & 0x7f00) >> 8; + LoopEnd = (LoopEnd & 0x00ffff) | ((data << 16) & 0x3f0000); + break; + case 0x14/2: + case 0x16/2: + case 0x18/2: + case 0x1a/2: + EnvRate[offset - (0x14/2)] = (EnvRate[offset - (0x14/2)] & ~0xffff) | (data & 0xffff); + break; + case 0x1c/2: + case 0x1e/2: + EnvTarget[((offset - (0x1c/2)) * 2) + 0] = (data & 0x007f); + EnvTarget[((offset - (0x1c/2)) * 2) + 1] = ((data & 0x7f00) >> 8); + EnvRate[((offset - (0x1c/2)) * 2) + 0] = sign_ext((EnvRate[((offset - (0x1c/2)) * 2) + 0] & 0xffff) | ((data & 0x0080) << 9), 17); + EnvRate[((offset - (0x1c/2)) * 2) + 1] = sign_ext((EnvRate[((offset - (0x1c/2)) * 2) + 1] & 0xffff) | ((data & 0x8000) << 1), 17); + break; + } +} + +/* +Bit 0 Attack (0) +Bit 1 Decay (1) +Bit 2 Sustain (2) +Bit 3 Release (3) +static inline u8 get_envstate(u8 stage) +{ + for (int bit = 3; bit >= 0; bit--) + { + if (BIT(stage, bit)) + return bit; + } + return 0; +} +*/ void vr0sound_device::VR0_RenderAudio(int nsamples, stream_sample_t *l, stream_sample_t *r) { - int16_t *SAMPLES; - uint32_t st=STATUS; - signed int lsample,rsample=0; - uint32_t CLK=(m_SOUNDREGS[0x600/4]>>0)&0xff; - uint32_t NCH=(m_SOUNDREGS[0x600/4]>>8)&0xff; - uint32_t CT1=(m_SOUNDREGS[0x600/4]>>16)&0xff; - uint32_t CT2=(m_SOUNDREGS[0x600/4]>>24)&0xff; - int div; - int s; - - - if(CT1&0x20) - SAMPLES = m_TexBase; - else - SAMPLES = m_FBBase; - - if(CLK) - div=((30<<16)|0x8000)/(CLK+1); - else - div=1<<16; - - for(s=0;s>10); - uint8_t Mode=m_SOUNDREGS[(0x20/4)*i+0x8/4]>>24; - signed int LVOL=m_SOUNDREGS[(0x20/4)*i+0xc/4]>>24; - signed int RVOL=m_SOUNDREGS[(0x20/4)*i+0x10/4]>>24; + channel_t *channel = &m_channel[i]; + s32 sample = 0; + const u32 loopbegin_scaled = channel->LoopBegin << 10; + const u32 loopend_scaled = channel->LoopEnd << 10; - int32_t DSADD=(DSADDR(i)*div)>>16; - - if(!(st&(1<Modes & MODE_ULAW) //u-law { - uint16_t s=SAMPLES[a]; - if((cur&0x200)) - s>>=8; - sample=(signed short)ULawTo16[s&0xff]; + sample = channel->Cache->read_byte(channel->CurSAddr >> 9); + sample = (s16)ULawTo16[sample & 0xff]; } else { - if(Mode&0x20) //8bit + if (channel->Modes & MODE_8BIT) //8bit { - uint16_t s=SAMPLES[a]; - if((cur&0x200)) - s>>=8; - sample=(signed short) (((signed char) (s&0xff))<<8); + sample = channel->Cache->read_byte(channel->CurSAddr >> 9); + sample = (s16)(((s8)(sample & 0xff)) << 8); } else //16bit { - sample=SAMPLES[a]; + sample = (s16)(channel->Cache->read_word((channel->CurSAddr >> 9) & ~1)); } } - CURSADDR(i)+=DSADD; - if(a>=LOOPEND(i)) + channel->CurSAddr += channel->dSAddr; + if (channel->CurSAddr >= loopend_scaled) { - if(Mode&1) //Loop - CURSADDR(i)=0;//LOOPBEGIN(i)<<10; + if (channel->Modes & MODE_LOOP) //Loop + channel->CurSAddr = (channel->CurSAddr - loopend_scaled) + loopbegin_scaled; else { - STATUS&=~(1<<(i&0x1f)); + m_Status &= ~(1 << (i & 0x1f)); + if (m_IntMask != 0xffffffff) // Interrupt, TODO : Partially implemented, Verify behavior from real hardware + { + const u32 old_pend = m_IntPend; + m_IntPend |= (~m_IntMask & (1 << (i & 0x1f))); // it's can be with loop? + if ((m_IntPend != 0) && (old_pend != m_IntPend)) + m_irq_cb(true); + } break; } } -// uint32_t v=(ENVVOL(i))>>8; -// sample=(sample*v)>>16; - lsample+=(sample*LVOL)>>8; - rsample+=(sample*RVOL)>>8; + + const s32 v = channel->EnvVol >> 16; + sample = (sample * v) >> 8; + + if (channel->Modes & MODE_ENVELOPE) // Envelope, TODO : Partially implemented, Verify behavior from real hardware + { + for (int level = 0; level < 4; level++) + { + if (BIT(channel->EnvStage, level)) + { + s32 RATE = channel->EnvRate[level]; + + channel->EnvVol += RATE; + if (RATE > 0) + { + if (((channel->EnvVol >> 16) & 0x7f) >= channel->EnvTarget[level]) + { + channel->EnvStage <<= 1; + } + } + else if (RATE < 0) + { + if (((channel->EnvVol >> 16) & 0x7f) <= channel->EnvTarget[level]) + { + channel->EnvStage <<= 1; + } + } + } + } + } + lsample += (sample * channel->LChnVol) >> 8; + rsample += (sample * channel->RChnVol) >> 8; } - if(lsample>32767) - lsample=32767; - if(lsample<-32768) - lsample=-32768; - l[s]=lsample; - if(rsample>32767) - rsample=32767; - if(rsample<-32768) - rsample=-32768; - r[s]=rsample; + l[s] = std::max(-32768, std::min(32767, lsample)); + r[s] = std::max(-32768, std::min(32767, rsample)); } } diff --git a/src/devices/sound/vrender0.h b/src/devices/sound/vrender0.h index a8af6da45c1..f14567840de 100644 --- a/src/devices/sound/vrender0.h +++ b/src/devices/sound/vrender0.h @@ -5,6 +5,7 @@ #pragma once +#include //************************************************************************** // TYPE DEFINITIONS @@ -14,29 +15,142 @@ // ======================> vr0sound_device class vr0sound_device : public device_t, - public device_sound_interface + public device_sound_interface, + public device_memory_interface { public: - vr0sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + enum + { + AS_TEXTURE = 0, + AS_FRAME + }; - DECLARE_READ32_MEMBER( vr0_snd_read ); - DECLARE_WRITE32_MEMBER( vr0_snd_write ); + static constexpr feature_type imperfect_features() { return feature::SOUND; } - void set_areas(uint16_t *texture, uint16_t *frame); + vr0sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + auto irq_callback() { return m_irq_cb.bind(); } + + u16 channel_r(offs_t offset); + void channel_w(offs_t offset, u16 data, u16 mem_mask); + + u16 status_r(offs_t offset); + void status_w(offs_t offset, u16 data); + + u16 noteon_r(offs_t offset); + void noteon_w(offs_t offset, u16 data); + + u16 revfactor_r(offs_t offset); + void revfactor_w(offs_t offset, u16 data, u16 mem_mask); + + u16 buffersaddr_r(offs_t offset); + void buffersaddr_w(offs_t offset, u16 data, u16 mem_mask); + + u16 buffersize0_r(offs_t offset); + void buffersize0_w(offs_t offset, u16 data, u16 mem_mask); + + u16 buffersize1_r(offs_t offset); + void buffersize1_w(offs_t offset, u16 data, u16 mem_mask); + + u16 buffersize2_r(offs_t offset); + void buffersize2_w(offs_t offset, u16 data, u16 mem_mask); + + u16 buffersize3_r(offs_t offset); + void buffersize3_w(offs_t offset, u16 data, u16 mem_mask); + + u16 intmask_r(offs_t offset); + void intmask_w(offs_t offset, u16 data, u16 mem_mask); + + u16 intpend_r(offs_t offset); + void intpend_w(offs_t offset, u16 data, u16 mem_mask); + + u16 chnnum_r(offs_t offset); + void chnnum_w(offs_t offset, u16 data, u16 mem_mask); + + u16 ctrl_r(offs_t offset); + void ctrl_w(offs_t offset, u16 data, u16 mem_mask); + + void sound_map(address_map &map); protected: // device-level overrides virtual void device_start() override; + virtual void device_post_load() override; + virtual void device_clock_changed() override; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; -private: - int16_t *m_TexBase; - int16_t *m_FBBase; - uint32_t m_SOUNDREGS[0x10000/4]; - sound_stream *m_stream; + // device_memory_interface configuration + virtual space_config_vector memory_space_config() const override; + address_space_config m_texture_config; + address_space_config m_frame_config; +private: + enum + { + MODE_LOOP = (1 << 0), // Loop Enable + MODE_SUSTAIN = (1 << 1), // Run Sustain when Note Off (Not Implemented) + MODE_ENVELOPE = (1 << 2), // Enable Envelope + MODE_PINGPONG = (1 << 3), // Pingpong Loop (Not Implemented) + MODE_ULAW = (1 << 4), // u-Law + MODE_8BIT = (1 << 5), // 8 Bit (1) / 16 Bit (0) samples + MODE_TEXTURE = (1 << 6) // Wave Source (1 = Texture memory, 0 = Frame memory) + }; + + enum + { + CTRL_RS = (1 << 15), // Enable Sound + CTRL_TM = (1 << 5), // Texture Memory Select (1 = Texture memory, 0 = Frame memory) + CTRL_RE = (1 << 4), // Reverb Enable (Not Implemented) + CTRL_CW = (1 << 2), // 32bit Adder Wait (Not Implemented) + CTRL_AW = (1 << 1), // 16bit Adder Wait (Not Implemented) + CTRL_MW = (1 << 0) // Multiplier Wait (Not Implemented) + }; + + struct channel_t + { + channel_t() + { + std::fill(std::begin(EnvRate), std::end(EnvRate), 0); + std::fill(std::begin(EnvTarget), std::end(EnvTarget), 0); + } + + memory_access_cache<1, 0, ENDIANNESS_LITTLE> *Cache; + u32 CurSAddr = 0; // Current Address Pointer, 22.10 Fixed Point + s32 EnvVol = 0; // Envelope Volume (Overall Volume), S.7.16 Fixed Point + u8 EnvStage = 1; // Envelope Stage + u16 dSAddr = 0; // Frequency, 6.10 Fixed Point + u8 Modes = 0; // Modes + bool LD = true; // Loop Direction (Not Implemented) + u32 LoopBegin = 0; // Loop Start Pointer, High 22 Bits + u32 LoopEnd = 0; // Loop End Pointer, High 22 Bits + u8 LChnVol = 0; // Left Volume, 7 bit unsigned + u8 RChnVol = 0; // Right Volume, 7 bit unsigned + s32 EnvRate[4]; // Envenloe Rate per Each stages, S.16 Fixed Point + u8 EnvTarget[4]; // Envelope Target Volume per Each stages, High 7 Bits + u16 read(offs_t offset); + void write(offs_t offset, u16 data, u16 mem_mask); + }; + + memory_access_cache<1, 0, ENDIANNESS_LITTLE> *m_texcache; + memory_access_cache<1, 0, ENDIANNESS_LITTLE> *m_fbcache; + memory_access_cache<1, 0, ENDIANNESS_LITTLE> *m_texcache_ctrl; + + channel_t m_channel[32]; + sound_stream *m_stream; + devcb_write_line m_irq_cb; + + // Registers + u32 m_Status = 0; // Status (0 Idle, 1 Busy) + u32 m_NoteOn = 0; // Note On (0 Off, 1 On) (Not Implemented) + u8 m_RevFactor = 0; // Reverb Factor (Not Implemented) + u32 m_BufferAddr = 0; // 21bit Reverb Buffer Start Address (Not Implemented) + u16 m_BufferSize[4] = {0, 0, 0, 0}; // Reverb Buffer Size (Not Implemented) + u32 m_IntMask = 0; // Interrupt Mask (0 Enable, 1 Disable) + u32 m_IntPend = 0; // Interrupt Pending + u8 m_MaxChn = 0x1f; // Max Channels - 1 + u8 m_ChnClkNum = 0; // Clock Number per Channel + u16 m_Ctrl = 0; // 0x602 Control Functions void VR0_RenderAudio(int nsamples, stream_sample_t *l, stream_sample_t *r); };