@@ -1,19 +1,14 @@

 set(HEADERS

 	snes9x/65c816.h

 	snes9x/apu/apu.h

-	snes9x/apu/blargg_common.h

-	snes9x/apu/blargg_config.h

-	snes9x/apu/blargg_endian.h

-	snes9x/apu/bspline_resampler.h

-	snes9x/apu/hermite_resampler.h

-	snes9x/apu/linear_resampler.h

-	snes9x/apu/osculating_resampler.h

+	snes9x/apu/bapu/dsp/blargg_common.h

+	snes9x/apu/bapu/dsp/blargg_config.h

+	snes9x/apu/bapu/dsp/blargg_endian.h

+	snes9x/apu/bapu/dsp/sdsp.hpp

+	snes9x/apu/bapu/dsp/SPC_DSP.h

+	snes9x/apu/bapu/smp/smp.hpp

+	snes9x/apu/bapu/snes/snes.hpp

 	snes9x/apu/resampler.h

-	snes9x/apu/ring_buffer.h

-	snes9x/apu/sinc_resampler.h

-	snes9x/apu/SNES_SPC.h

-	snes9x/apu/SPC_CPU.h

-	snes9x/apu/SPC_DSP.h

 	snes9x/cpuaddr.h

 	snes9x/cpuexec.h

 	snes9x/cpumacro.h

@@ -28,9 +23,14 @@ set(HEADERS

 	XSFConfigDialog_SNSF.h)

 set(SNES9X_SOURCES

 	snes9x/apu/apu.cpp

-	snes9x/apu/SNES_SPC.cpp

-	snes9x/apu/SNES_SPC_misc.cpp

-	snes9x/apu/SPC_DSP.cpp

+	snes9x/apu/bapu/dsp/sdsp.cpp

+	snes9x/apu/bapu/dsp/SPC_DSP.cpp

+	snes9x/apu/bapu/smp/algorithms.cpp

+	snes9x/apu/bapu/smp/core.cpp

+	snes9x/apu/bapu/smp/iplrom.cpp

+	snes9x/apu/bapu/smp/memory.cpp

+	snes9x/apu/bapu/smp/smp.cpp

+	snes9x/apu/bapu/smp/timing.cpp

 	snes9x/cpu.cpp

 	snes9x/cpuexec.cpp

 	snes9x/cpuops.cpp

@@ -56,6 +56,6 @@ set_target_properties(in_snsf PROPERTIES PREFIX "")

 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Header Files" FILES ${HEADERS})

 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Source Files" FILES ${SOURCES})

 target_compile_options(in_snsf PUBLIC

-	$<$<CXX_COMPILER_ID:MSVC>:/wd4127 /wd4245 /wd6385 /wd6386 /wd26453 /wd26495 /wd26812 /wd26819>)

+	$<$<CXX_COMPILER_ID:MSVC>:/wd4127 /wd4245 /wd4389 /wd6385 /wd6386 /wd26439 /wd26453 /wd26495 /wd26812 /wd26819>)

 target_link_libraries(in_snsf

 	in_xsf_framework)

@@ -31,19 +31,19 @@

 XSFConfigDialog_SNSF::XSFConfigDialog_SNSF(XSFConfig &newConfig, wxWindow *parent, const wxString &title) : XSFConfigDialog(newConfig, parent, title)

 {

-	auto reverseStereoCheckBox = new wxCheckBox(this->outputPanel, wxID_ANY, "Reverse Stereo", wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator{ &this->reverseStereo });

-	this->outputSizer->Add(reverseStereoCheckBox, { 4, 0 }, { 1, 2 }, wxALL, 5);

+	auto separateEchoBufferCheckBox = new wxCheckBox(this->outputPanel, wxID_ANY, "Separate Echo Buffer", wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator{ &this->separateEchoBuffer });

+	this->outputSizer->Add(separateEchoBufferCheckBox, { 4, 0 }, { 1, 2 }, wxALL, 5);

-	auto resamplerLabel = new wxStaticText(this->outputPanel, wxID_ANY, "Resampler");

-	this->outputSizer->Add(resamplerLabel, { 5, 0 }, { 1, 1 }, wxALIGN_CENTER_VERTICAL | wxALL, 5);

-	wxArrayString resamplerChoices;

-	resamplerChoices.Add("Linear Resampler");

-	resamplerChoices.Add("Hermite Resampler");

-	resamplerChoices.Add("Bspline Resampler");

-	resamplerChoices.Add("Osculating Resampler");

-	resamplerChoices.Add("Sinc Resampler");

-	auto resamplerChoice = new wxChoice(this->outputPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, resamplerChoices, 0, wxGenericValidator{ &this->resampler });

-	this->outputSizer->Add(resamplerChoice, { 5, 1 }, { 1, 1 }, wxALL, 5);

+	auto interpolationLabel = new wxStaticText(this->outputPanel, wxID_ANY, "Interpolation");

+	this->outputSizer->Add(interpolationLabel, { 5, 0 }, { 1, 1 }, wxALIGN_CENTER_VERTICAL | wxALL, 5);

+	wxArrayString interpolationChoices;

+	interpolationChoices.Add("None");

+	interpolationChoices.Add("Linear");

+	interpolationChoices.Add("Guassian");

+	interpolationChoices.Add("Cubic");

+	interpolationChoices.Add("Sinc");

+	auto interpolationChoice = new wxChoice(this->outputPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, interpolationChoices, 0, wxGenericValidator{ &this->interpolation });

+	this->outputSizer->Add(interpolationChoice, { 5, 1 }, { 1, 1 }, wxALL, 5);

 	auto muteLabel = new wxStaticText(this->outputPanel, wxID_ANY, "Mute");

 	this->outputSizer->Add(muteLabel, { 6, 0 }, { 1, 1 }, wxALIGN_CENTER_VERTICAL | wxALL, 5);

@@ -31,7 +31,7 @@ class XSFConfigDialog_SNSF : public XSFConfigDialog

 public:

 	XSFConfigDialog_SNSF(XSFConfig &newConfig, wxWindow *parent, const wxString &title);

-	bool reverseStereo;

-	int resampler;

+	bool separateEchoBuffer;

+	int interpolation;

 	wxArrayInt mute;

 };

@@ -3,10 +3,6 @@

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

  *

  * Partially based on the vio*sf framework

- *

- * NOTE: 16-bit sound is always enabled, the player is currently limited to

- * creating a 16-bit PCM for Winamp and can not handle 8-bit sound from

- * snes9x.

  */

 #include <bitset>

@@ -40,7 +36,7 @@ XSFConfig *XSFConfig::Create()

 	return new XSFConfig_SNSF();

 }

-XSFConfig_SNSF::XSFConfig_SNSF() : XSFConfig(), /*sixteenBitSound(false), */reverseStereo(false), mutes(), resampler(0)

+XSFConfig_SNSF::XSFConfig_SNSF() : XSFConfig(), separateEchoBuffer(false), interpolation(0), mutes()

 {

 	this->supportedSampleRates.push_back(8000);

 	this->supportedSampleRates.push_back(11025);

@@ -57,26 +53,24 @@ XSFConfig_SNSF::XSFConfig_SNSF() : XSFConfig(), /*sixteenBitSound(false), */reve

 void XSFConfig_SNSF::LoadSpecificConfig()

 {

-	//this->sixteenBitSound = this->configIO->GetValue("SixteenBitSound", XSFConfig_SNSF::initSixteenBitSound);

-	this->reverseStereo = this->configIO->GetValue("ReverseStereo", XSFConfig_SNSF::initReverseStereo);

-	this->resampler = this->configIO->GetValue("Resampler", XSFConfig_SNSF::initResampler);

+	this->separateEchoBuffer = this->configIO->GetValue("SeparateEchoBuffer", XSFConfig_SNSF::initSeparateEchoBuffer);

+	this->interpolation = this->configIO->GetValue("Interpolation", XSFConfig_SNSF::initInterpolation);

 	std::stringstream mutesSS(this->configIO->GetValue("Mutes", XSFConfig_SNSF::initMutes));

 	mutesSS >> this->mutes;

 }

 void XSFConfig_SNSF::SaveSpecificConfig()

 {

-	//this->configIO->SetValue("SixteenBitSound", this->sixteenBitSound);

-	this->configIO->SetValue("ReverseStereo", this->reverseStereo);

-	this->configIO->SetValue("Resampler", this->resampler);

+	this->configIO->SetValue("SeparateEchoBuffer", this->separateEchoBuffer);

+	this->configIO->SetValue("Interpolation", this->interpolation);

 	this->configIO->SetValue("Mutes", this->mutes.to_string<char>());

 }

 void XSFConfig_SNSF::InitializeSpecificConfigDialog(XSFConfigDialog *dialog)

 {

 	auto snsfDialog = static_cast<XSFConfigDialog_SNSF *>(dialog);

-	snsfDialog->reverseStereo = this->reverseStereo;

-	snsfDialog->resampler = static_cast<int>(this->resampler);

+	snsfDialog->separateEchoBuffer = this->separateEchoBuffer;

+	snsfDialog->interpolation = static_cast<int>(this->interpolation);

 	for (std::size_t x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)

 		if (this->mutes[x])

 			snsfDialog->mute.Add(x);

@@ -85,8 +79,8 @@ void XSFConfig_SNSF::InitializeSpecificConfigDialog(XSFConfigDialog *dialog)

 void XSFConfig_SNSF::ResetSpecificConfigDefaults(XSFConfigDialog *dialog)

 {

 	auto snsfDialog = static_cast<XSFConfigDialog_SNSF *>(dialog);

-	snsfDialog->reverseStereo = XSFConfig_SNSF::initReverseStereo;

-	snsfDialog->resampler = XSFConfig_SNSF::initResampler;

+	snsfDialog->separateEchoBuffer = XSFConfig_SNSF::initSeparateEchoBuffer;

+	snsfDialog->interpolation = XSFConfig_SNSF::initInterpolation;

 	snsfDialog->mute.Clear();

 	auto tmpMutes = std::bitset<8>(XSFConfig_SNSF::initMutes);

 	for (std::size_t x = 0, numMutes = tmpMutes.size(); x < numMutes; ++x)

@@ -97,8 +91,8 @@ void XSFConfig_SNSF::ResetSpecificConfigDefaults(XSFConfigDialog *dialog)

 void XSFConfig_SNSF::SaveSpecificConfigDialog(XSFConfigDialog *dialog)

 {

 	auto snsfDialog = static_cast<XSFConfigDialog_SNSF *>(dialog);

-	this->reverseStereo = snsfDialog->reverseStereo;

-	this->resampler = snsfDialog->resampler;

+	this->separateEchoBuffer = snsfDialog->separateEchoBuffer;

+	this->interpolation = snsfDialog->interpolation;

 	for (std::size_t x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)

 		this->mutes[x] = snsfDialog->mute.Index(x) != wxNOT_FOUND;

 }

@@ -108,8 +102,8 @@ void XSFConfig_SNSF::CopySpecificConfigToMemory(XSFPlayer *, bool preLoad)

 	if (preLoad)

 	{

 		memset(&Settings, 0, sizeof(Settings));

-		//Settings.SixteenBitSound = this->sixteenBitSound;

-		Settings.ReverseStereo = this->reverseStereo;

+		Settings.SeparateEchoBuffer = this->separateEchoBuffer;

+		Settings.InterpolationMethod = this->interpolation;

 	}

 	else

 		S9xSetSoundControl(static_cast<std::uint8_t>(this->mutes.to_ulong()) ^ 0xFF);

@@ -118,7 +112,7 @@ void XSFConfig_SNSF::CopySpecificConfigToMemory(XSFPlayer *, bool preLoad)

 void XSFConfig_SNSF::About(HWND parent)

 {

 	MessageBoxW(parent, ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber + ", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"

-		"Utilizes modified snes9x v1.53 for audio playback.").c_str(), ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber).c_str(), MB_OK);

+		"Utilizes modified snes9x v" VERSION " for audio playback.").c_str(), ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber).c_str(), MB_OK);

 }

 XSFConfigDialog *XSFConfig_SNSF::CreateDialogBox(wxWindow *window, const std::string &title)

@@ -3,10 +3,6 @@

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

  *

  * Partially based on the vio*sf framework

- *

- * NOTE: 16-bit sound is always enabled, the player is currently limited to

- * creating a 16-bit PCM for Winamp and can not handle 8-bit sound from

- * snes9x.

  */

 #pragma once

@@ -23,12 +19,13 @@ class XSFPlayer;

 class XSFConfig_SNSF : public XSFConfig

 {

 protected:

-	static constexpr bool /*initSixteenBitSound = true, */initReverseStereo = false;

-	static constexpr unsigned initResampler = 1;

+	static constexpr bool initSeparateEchoBuffer = false;

+	static constexpr unsigned initInterpolation = 2;

 	inline static const std::string initMutes = "00000000";

 	friend class XSFConfig;

-	bool /*sixteenBitSound, */reverseStereo;

+	bool separateEchoBuffer;

+	unsigned interpolation;

 	std::bitset<8> mutes;

 	XSFConfig_SNSF();

@@ -39,8 +36,6 @@ protected:

 	void SaveSpecificConfigDialog(XSFConfigDialog *dialog) override;

 	void CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool preLoad) override;

 public:

-	unsigned resampler;

-

 	void About(HWND parent) override;

 	XSFConfigDialog *CreateDialogBox(wxWindow *window, const std::string &title) override;

 };

@@ -20,18 +20,13 @@

 #include <cstdint>

 #include <zlib.h>

 #include "XSFCommon.h"

-#include "XSFConfig_SNSF.h"

+#include "XSFConfig.h"

 #include "XSFPlayer.h"

 #undef min

 #undef max

 #include "snes9x/apu/apu.h"

-#include "snes9x/apu/linear_resampler.h"

-#include "snes9x/apu/hermite_resampler.h"

-#include "snes9x/apu/bspline_resampler.h"

-#include "snes9x/apu/osculating_resampler.h"

-#include "snes9x/apu/sinc_resampler.h"

 #include "snes9x/memmap.h"

 class XSFPlayer_SNSF : public XSFPlayer

@@ -211,23 +206,12 @@ bool XSFPlayer_SNSF::Load()

 	Settings.SoundSync = true;

 	Settings.Mute = false;

 	Settings.SoundPlaybackRate = this->sampleRate;

-	Settings.SixteenBitSound = true;

 	Settings.Stereo = true;

 	Memory.Init();

 	S9xInitAPU();

-	XSFConfig_SNSF *xSFConfig_SNSF = dynamic_cast<XSFConfig_SNSF *>(xSFConfig.get());

-	if (xSFConfig_SNSF->resampler == 4)

-		S9xInitSound<SincResampler>(10, 0);

-	else if (xSFConfig_SNSF->resampler == 3)

-		S9xInitSound<OsculatingResampler>(10, 0);

-	else if (xSFConfig_SNSF->resampler == 2)

-		S9xInitSound<BsplineResampler>(10, 0);

-	else if (xSFConfig_SNSF->resampler == 1)

-		S9xInitSound<HermiteResampler>(10, 0);

-	else

-		S9xInitSound<LinearResampler>(10, 0);

+	S9xInitSound(10);

 	if (!buffer.Init())

 		return false;

@@ -1,191 +1,20 @@

-/***********************************************************************************

+/*****************************************************************************\

   Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.

-

-  (c) Copyright 1996 - 2002  Gary Henderson (gary.henderson@ntlworld.com),

-                             Jerremy Koot (jkoot@snes9x.com)

-

-  (c) Copyright 2002 - 2004  Matthew Kendora

-

-  (c) Copyright 2002 - 2005  Peter Bortas (peter@bortas.org)

-

-  (c) Copyright 2004 - 2005  Joel Yliluoma (http://iki.fi/bisqwit/)

-

-  (c) Copyright 2001 - 2006  John Weidman (jweidman@slip.net)

-

-  (c) Copyright 2002 - 2006  funkyass (funkyass@spam.shaw.ca),

-                             Kris Bleakley (codeviolation@hotmail.com)

-

-  (c) Copyright 2002 - 2010  Brad Jorsch (anomie@users.sourceforge.net),

-                             Nach (n-a-c-h@users.sourceforge.net),

-

-  (c) Copyright 2002 - 2011  zones (kasumitokoduck@yahoo.com)

-

-  (c) Copyright 2006 - 2007  nitsuja

-

-  (c) Copyright 2009 - 2011  BearOso,

-                             OV2

-

-

-  BS-X C emulator code

-  (c) Copyright 2005 - 2006  Dreamer Nom,

-                             zones

-

-  C4 x86 assembler and some C emulation code

-  (c) Copyright 2000 - 2003  _Demo_ (_demo_@zsnes.com),

-                             Nach,

-                             zsKnight (zsknight@zsnes.com)

-

-  C4 C++ code

-  (c) Copyright 2003 - 2006  Brad Jorsch,

-                             Nach

-

-  DSP-1 emulator code

-  (c) Copyright 1998 - 2006  _Demo_,

-                             Andreas Naive (andreasnaive@gmail.com),

-                             Gary Henderson,

-                             Ivar (ivar@snes9x.com),

-                             John Weidman,

-                             Kris Bleakley,

-                             Matthew Kendora,

-                             Nach,

-                             neviksti (neviksti@hotmail.com)

-

-  DSP-2 emulator code

-  (c) Copyright 2003         John Weidman,

-                             Kris Bleakley,

-                             Lord Nightmare (lord_nightmare@users.sourceforge.net),

-                             Matthew Kendora,

-                             neviksti

-

-  DSP-3 emulator code

-  (c) Copyright 2003 - 2006  John Weidman,

-                             Kris Bleakley,

-                             Lancer,

-                             z80 gaiden

-

-  DSP-4 emulator code

-  (c) Copyright 2004 - 2006  Dreamer Nom,

-                             John Weidman,

-                             Kris Bleakley,

-                             Nach,

-                             z80 gaiden

-

-  OBC1 emulator code

-  (c) Copyright 2001 - 2004  zsKnight,

-                             pagefault (pagefault@zsnes.com),

-                             Kris Bleakley

-                             Ported from x86 assembler to C by sanmaiwashi

-

-  SPC7110 and RTC C++ emulator code used in 1.39-1.51

-  (c) Copyright 2002         Matthew Kendora with research by

-                             zsKnight,

-                             John Weidman,

-                             Dark Force

-

-  SPC7110 and RTC C++ emulator code used in 1.52+

-  (c) Copyright 2009         byuu,

-                             neviksti

-

-  S-DD1 C emulator code

-  (c) Copyright 2003         Brad Jorsch with research by

-                             Andreas Naive,

-                             John Weidman

-

-  S-RTC C emulator code

-  (c) Copyright 2001 - 2006  byuu,

-                             John Weidman

-

-  ST010 C++ emulator code

-  (c) Copyright 2003         Feather,

-                             John Weidman,

-                             Kris Bleakley,

-                             Matthew Kendora

-

-  Super FX x86 assembler emulator code

-  (c) Copyright 1998 - 2003  _Demo_,

-                             pagefault,

-                             zsKnight

-

-  Super FX C emulator code

-  (c) Copyright 1997 - 1999  Ivar,

-                             Gary Henderson,

-                             John Weidman

-

-  Sound emulator code used in 1.5-1.51

-  (c) Copyright 1998 - 2003  Brad Martin

-  (c) Copyright 1998 - 2006  Charles Bilyue'

-

-  Sound emulator code used in 1.52+

-  (c) Copyright 2004 - 2007  Shay Green (gblargg@gmail.com)

-

-  SH assembler code partly based on x86 assembler code

-  (c) Copyright 2002 - 2004  Marcus Comstedt (marcus@mc.pp.se)

-

-  2xSaI filter

-  (c) Copyright 1999 - 2001  Derek Liauw Kie Fa

-

-  HQ2x, HQ3x, HQ4x filters

-  (c) Copyright 2003         Maxim Stepin (maxim@hiend3d.com)

-

-  NTSC filter

-  (c) Copyright 2006 - 2007  Shay Green

-

-  GTK+ GUI code

-  (c) Copyright 2004 - 2011  BearOso

-

-  Win32 GUI code

-  (c) Copyright 2003 - 2006  blip,

-                             funkyass,

-                             Matthew Kendora,

-                             Nach,

-                             nitsuja

-  (c) Copyright 2009 - 2011  OV2

-

-  Mac OS GUI code

-  (c) Copyright 1998 - 2001  John Stiles

-  (c) Copyright 2001 - 2011  zones

-

-

-  Specific ports contains the works of other authors. See headers in

-  individual files.

-

-

-  Snes9x homepage: http://www.snes9x.com/

-

-  Permission to use, copy, modify and/or distribute Snes9x in both binary

-  and source form, for non-commercial purposes, is hereby granted without

-  fee, providing that this license information and copyright notice appear

-  with all copies and any derived work.

-

-  This software is provided 'as-is', without any express or implied

-  warranty. In no event shall the authors be held liable for any damages

-  arising from the use of this software or it's derivatives.

-

-  Snes9x is freeware for PERSONAL USE only. Commercial users should

-  seek permission of the copyright holders first. Commercial use includes,

-  but is not limited to, charging money for Snes9x or software derived from

-  Snes9x, including Snes9x or derivatives in commercial game bundles, and/or

-  using Snes9x as a promotion for your commercial product.

-

-  The copyright holders request that bug fixes and improvements to the code

-  should be forwarded to them so everyone can benefit from the modifications

-  in future versions.

-

-  Super NES and Super Nintendo Entertainment System are trademarks of

-  Nintendo Co., Limited and its subsidiary companies.

- ***********************************************************************************/

+                This file is licensed under the Snes9x License.

+   For further information, consult the LICENSE file in the root directory.

+\*****************************************************************************/

 #pragma once

-const uint16_t Carry = 1;

-const uint16_t Zero = 2;

-const uint16_t IRQ = 4;

-const uint16_t Decimal = 8;

-const uint16_t IndexFlag = 16;

-const uint16_t MemoryFlag = 32;

-const uint16_t Overflow = 64;

-const uint16_t Negative = 128;

-const uint16_t Emulation = 256;

+inline constexpr uint16_t Carry = 1;

+inline constexpr uint16_t Zero = 2;

+inline constexpr uint16_t IRQ = 4;

+inline constexpr uint16_t Decimal = 8;

+inline constexpr uint16_t IndexFlag = 16;

+inline constexpr uint16_t MemoryFlag = 32;

+inline constexpr uint16_t Overflow = 64;

+inline constexpr uint16_t Negative = 128;

+inline constexpr uint16_t Emulation = 256;

 union pair

 {

similarity index 83%

rename from src/in_snsf/snes9x/docs/snes9x-license.txt

rename to src/in_snsf/snes9x/LICENSE

@@ -16,13 +16,20 @@

   (c) Copyright 2002 - 2010  Brad Jorsch (anomie@users.sourceforge.net),

                              Nach (n-a-c-h@users.sourceforge.net),

-                             zones (kasumitokoduck@yahoo.com)

+

+  (c) Copyright 2002 - 2011  zones (kasumitokoduck@yahoo.com)

   (c) Copyright 2006 - 2007  nitsuja

-  (c) Copyright 2009 - 2010  BearOso,

+  (c) Copyright 2009 - 2019  BearOso,

                              OV2

+  (c) Copyright 2017         qwertymodo

+

+  (c) Copyright 2011 - 2017  Hans-Kristian Arntzen,

+                             Daniel De Matteis

+                             (Under no circumstances will commercial rights be given)

+

   BS-X C emulator code

   (c) Copyright 2005 - 2006  Dreamer Nom,

@@ -116,6 +123,9 @@

   Sound emulator code used in 1.52+

   (c) Copyright 2004 - 2007  Shay Green (gblargg@gmail.com)

+  S-SMP emulator code used in 1.54+

+  (c) Copyright 2016         byuu

+

   SH assembler code partly based on x86 assembler code

   (c) Copyright 2002 - 2004  Marcus Comstedt (marcus@mc.pp.se)

@@ -129,7 +139,7 @@

   (c) Copyright 2006 - 2007  Shay Green

   GTK+ GUI code

-  (c) Copyright 2004 - 2010  BearOso

+  (c) Copyright 2004 - 2019  BearOso

   Win32 GUI code

   (c) Copyright 2003 - 2006  blip,

@@ -137,11 +147,16 @@

                              Matthew Kendora,

                              Nach,

                              nitsuja

-  (c) Copyright 2009 - 2010  OV2

+  (c) Copyright 2009 - 2019  OV2

   Mac OS GUI code

   (c) Copyright 1998 - 2001  John Stiles

-  (c) Copyright 2001 - 2010  zones

+  (c) Copyright 2001 - 2011  zones

+

+  Libretro port

+  (c) Copyright 2011 - 2017  Hans-Kristian Arntzen,

+                             Daniel De Matteis

+                             (Under no circumstances will commercial rights be given)

   Specific ports contains the works of other authors. See headers in

@@ -149,6 +164,7 @@

   Snes9x homepage: http://www.snes9x.com/

+  Snes9x source code: https://github.com/snes9xgit/snes9x/

   Permission to use, copy, modify and/or distribute Snes9x in both binary

   and source form, for non-commercial purposes, is hereby granted without

@@ -171,3 +187,12 @@

   Super NES and Super Nintendo Entertainment System are trademarks of

   Nintendo Co., Limited and its subsidiary companies.

+

+-------------------------------------------------------------------------------

+

+Some parts included in Snes9x are usually available under a different license,

+their authors have granted exception for their use in Snes9x (and/or they are

+licensed as LGPL):

+ - JMA: GPL/LGPL, see jma/license.txt

+ - snes_ntsc: LGPL, see filter/snes_ntsc-license.txt

+ - xBRZ: GPLv3, see filter/xbrz-license.txt

deleted file mode 100644

@@ -1,327 +0,0 @@

-// Core SPC emulation: CPU, timers, SMP registers, memory

-

-// snes_spc 0.9.0. http://www.slack.net/~ant/

-

-#include <algorithm>

-#include <cstring>

-#include "SNES_SPC.h"

-

-/* Copyright (C) 2004-2007 Shay Green. This module is free software; you

-can redistribute it and/or modify it under the terms of the GNU Lesser

-General Public License as published by the Free Software Foundation; either

-version 2.1 of the License, or (at your option) any later version. This

-module 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 Lesser General Public License for more

-details. You should have received a copy of the GNU Lesser General Public

-License along with this module; if not, write to the Free Software Foundation,

-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */

-

-//// Timers

-

-#ifdef SPC_DISABLE_TEMPO

-template<typename T> static inline T TIMER_DIV(SNES_SPC::Timer *t, const T &n) { return n >> t->prescaler; }

-template<typename T> static inline T TIMER_MUL(SNES_SPC::Timer *t, const T &n) { return n << t->prescaler; }

-#else

-template<typename T> static inline T TIMER_DIV(SNES_SPC::Timer *t, const T &n) { return n / t->prescaler; }

-template<typename T> static inline T TIMER_MUL(SNES_SPC::Timer *t, const T &n) { return n * t->prescaler; }

-#endif

-

-auto SNES_SPC::run_timer_(Timer *t, rel_time_t time) -> Timer *

-{

-	int elapsed = TIMER_DIV(t, time - t->next_time) + 1;

-	t->next_time += TIMER_MUL(t, elapsed);

-

-	if (t->enabled)

-	{

-		int remain = IF_0_THEN_256(t->period - t->divider);

-		int divider = t->divider + elapsed;

-		int over = elapsed - remain;

-		if (over >= 0)

-		{

-			int n = over / t->period;

-			t->counter = (t->counter + 1 + n) & 0x0F;

-			divider = over - n * t->period;

-		}

-		t->divider = static_cast<uint8_t>(divider);

-	}

-	return t;

-}

-

-auto SNES_SPC::run_timer(Timer *t, rel_time_t time) -> Timer *

-{

-	if (time >= t->next_time)

-		t = this->run_timer_(t, time);

-	return t;

-}

-

-//// ROM

-

-void SNES_SPC::enable_rom(bool enable)

-{

-	if (this->m.rom_enabled != enable)

-	{

-		this->m.rom_enabled = this->dsp.rom_enabled = enable;

-		if (enable)

-			std::copy_n(&this->m.ram.ram[rom_addr], static_cast<int>(rom_size), &this->m.hi_ram[0]);

-		auto data = enable ? &this->m.rom[0] : &this->m.hi_ram[0];

-		std::copy_n(&data[0], static_cast<int>(rom_size), &this->m.ram.ram[rom_addr]);

-		// TODO: ROM can still get overwritten when DSP writes to echo buffer

-	}

-}

-

-//// DSP

-

-void SNES_SPC::RUN_DSP(rel_time_t time)

-{

-	int count = time - this->m.dsp_time;

-	if (count)

-	{

-		assert(count > 0);

-		this->m.dsp_time = time;

-		this->dsp.run(count);

-	}

-}

-

-int SNES_SPC::dsp_read(rel_time_t time)

-{

-	this->RUN_DSP(time);

-

-	int result = this->dsp.read(this->m.smp_regs[0][r_dspaddr] & 0x7F);

-

-#ifdef SPC_DSP_READ_HOOK

-	SPC_DSP_READ_HOOK(spc_time + time, this->m.smp_regs[0][r_dspaddr] & 0x7F, result);

-#endif

-

-	return result;

-}

-

-void SNES_SPC::dsp_write(int data, rel_time_t time)

-{

-	this->RUN_DSP(time);

-

-#ifdef SPC_DSP_WRITE_HOOK

-	SPC_DSP_WRITE_HOOK(this->m.spc_time + time, this->m.smp_regs[0][r_dspaddr], static_cast<uint8_t>(data));

-#endif

-

-	if (this->m.smp_regs[0][r_dspaddr] <= 0x7F)

-		this->dsp.write(this->m.smp_regs[0][r_dspaddr], data);

-}

-

-//// CPU write

-

-// divided into multiple functions to keep rarely-used functionality separate

-// so often-used functionality can be optimized better by compiler

-

-// If write isn't preceded by read, data has this added to it

-static const int no_read_before_write = 0x2000;

-

-void SNES_SPC::cpu_write_smp_reg_(int data, rel_time_t time, int addr)

-{

-	switch (addr)

-	{

-		case r_t0target:

-		case r_t1target:

-		case r_t2target:

-		{

-			auto t = &this->m.timers[addr - r_t0target];

-			int period = IF_0_THEN_256(data);

-			if (t->period != period)

-			{

-				t = this->run_timer(t, time);

-				t->period = period;

-			}

-			break;

-		}

-

-		case r_t0out:

-		case r_t1out:

-		case r_t2out:

-			if (data < no_read_before_write  / 2)

-				this->run_timer(&this->m.timers[addr - r_t0out], time - 1)->counter = 0;

-			break;

-

-		// Registers that act like RAM

-		case 0x8:

-		case 0x9:

-			this->m.smp_regs[1][addr] = static_cast<uint8_t>(data);

-			break;

-

-		case r_test:

-			break;

-

-		case r_control:

-			// port clears

-			if (data & 0x10)

-			{

-				this->m.smp_regs[1][r_cpuio0] = 0;

-				this->m.smp_regs[1][r_cpuio1] = 0;

-			}

-			if (data & 0x20)

-			{

-				this->m.smp_regs[1][r_cpuio2] = 0;

-				this->m.smp_regs[1][r_cpuio3] = 0;

-			}

-

-			// timers

-			for (int i = 0; i < timer_count; ++i)

-			{

-				auto t = &this->m.timers[i];

-				bool enabled = !!((data >> i) & 1);

-				if (t->enabled != enabled)

-				{

-					t = this->run_timer(t, time);

-					t->enabled = enabled;

-					if (enabled)

-						t->divider = t->counter = 0;

-				}

-			}

-			this->enable_rom(!!(data & 0x80));

-	}

-}

-

-void SNES_SPC::cpu_write_smp_reg(int data, rel_time_t time, int addr)

-{

-	if (addr == r_dspdata) // 99%

-		this->dsp_write(data, time);

-	else

-		this->cpu_write_smp_reg_(data, time, addr);

-}

-

-void SNES_SPC::cpu_write_high(int data, int i, rel_time_t time)

-{

-	if (i < rom_size)

-	{

-		this->m.hi_ram [i] = static_cast<uint8_t>(data);

-		if (this->m.rom_enabled)

-			this->m.ram.ram[i + rom_addr] = this->m.rom[i]; // restore overwritten ROM

-	}

-	else

-	{

-		assert(this->m.ram.ram[i + rom_addr] == static_cast<uint8_t>(data));

-		this->m.ram.ram[i + rom_addr] = cpu_pad_fill; // restore overwritten padding

-		this->cpu_write(data, i + rom_addr - 0x10000, time);

-	}

-}

-

-static const int bits_in_int = CHAR_BIT * sizeof(int);

-

-void SNES_SPC::cpu_write(int data, int addr, rel_time_t time)

-{

-	// RAM

-	this->m.ram.ram[addr] = static_cast<uint8_t>(data);

-	int reg = addr - 0xF0;

-	if (reg >= 0) // 64%

-	{

-		// $F0-$FF

-		if (reg < reg_count) // 87%

-		{

-			this->m.smp_regs[0][reg] = static_cast<uint8_t>(data);

-

-			// Ports

-#ifdef SPC_PORT_WRITE_HOOK

-			if (static_cast<unsigned>(reg - r_cpuio0) < port_count)

-				SPC_PORT_WRITE_HOOK(this->m.spc_time + time, (reg - r_cpuio0), static_cast<uint8_t>(data), &this->m.smp_regs[0][r_cpuio0]);

-#endif

-

-			// Registers other than $F2 and $F4-$F7

-			//if ( reg != 2 && reg != 4 && reg != 5 && reg != 6 && reg != 7 )

-			// TODO: this is a bit on the fragile side

-			if (((~0x2F00 << (bits_in_int - 16)) << reg) < 0) // 36%

-				this->cpu_write_smp_reg(data, time, reg);

-		}

-		// High mem/address wrap-around

-		else

-		{

-			reg -= rom_addr - 0xF0;

-			if (reg >= 0) // 1% in IPL ROM area or address wrapped around

-				this->cpu_write_high(data, reg, time);

-		}

-	}

-}

-

-//// CPU read

-

-int SNES_SPC::cpu_read_smp_reg(int reg, rel_time_t time)

-{

-	int result = this->m.smp_regs[1][reg];

-	reg -= r_dspaddr;

-	// DSP addr and data

-	if (static_cast<unsigned>(reg) <= 1) // 4% 0xF2 and 0xF3

-	{

-		result = this->m.smp_regs[0][r_dspaddr];

-		if (static_cast<unsigned>(reg) == 1)

-			result = this->dsp_read(time); // 0xF3

-	}

-	return result;

-}

-

-int SNES_SPC::cpu_read(int addr, rel_time_t time)

-{

-	// RAM

-	int result = this->m.ram.ram[addr];

-	int reg = addr - 0xF0;

-	if (reg >= 0) // 40%

-	{

-		reg -= 0x10;

-		if (static_cast<unsigned>(reg) >= 0xFF00) // 21%

-		{

-			reg += 0x10 - r_t0out;

-

-			// Timers

-			if (static_cast<unsigned>(reg) < timer_count) // 90%

-			{

-				auto t = &this->m.timers[reg];

-				if (time >= t->next_time)

-					t = this->run_timer_(t, time);

-				result = t->counter;

-				t->counter = 0;

-			}

-			// Other registers

-			else if (reg < 0) // 10%

-				result = this->cpu_read_smp_reg(reg + r_t0out, time);

-			else // 1%

-			{

-				assert(reg + (r_t0out + 0xF0 - 0x10000) < 0x100);

-				result = this->cpu_read(reg + (r_t0out + 0xF0 - 0x10000), time);

-			}

-		}

-	}

-

-	return result;