Merge pull request #8 from ShutOstrich/master

Update to Snes9x 1.62.3
2023-04-29 20:53:21 -06:00 · 2023-04-30 00:32:42 +02:00 · 2022-12-18 22:49:29 -07:00 · 2022-12-18 01:01:46 -07:00 · 2022-12-17 22:03:45 -07:00 · 2021-02-20 02:54:09 -07:00
174 changed files with 5148 additions and 32855 deletions
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.57</string>
+	<string>1.62.3</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>
@@ -70,7 +70,7 @@
 	<key>OEGameCorePlayerCount</key>
 	<string>8</string>
 	<key>OEProjectURL</key>
-	<string>http://www.snes9x.com/</string>
+	<string>https://github.com/snes9xgit/snes9x</string>
 	<key>OESystemIdentifiers</key>
 	<array>
 		<string>openemu.system.snes</string>
@@ -26,15 +26,18 @@
 		826C1B1F0F420C2200FB9014 /* SNESGameCore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 826C1B1E0F420C2200FB9014 /* SNESGameCore.mm */; };
 		828F16CB0F43A10000FD7321 /* APPL.icns in Resources */ = {isa = PBXBuildFile; fileRef = 828F16CA0F43A10000FD7321 /* APPL.icns */; };
 		8725B0B91E933E1B00F68CA5 /* sdsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8725B08F1E931ED600F68CA5 /* sdsp.cpp */; };
-		8725B0BA1E933E1E00F68CA5 /* SPC_DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8725B0911E931ED600F68CA5 /* SPC_DSP.cpp */; };
 		8725B0BB1E933E2B00F68CA5 /* smp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8725B0B31E931ED600F68CA5 /* smp.cpp */; };
 		8725B0BC1E933E2D00F68CA5 /* smp_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8725B0B51E931ED600F68CA5 /* smp_state.cpp */; };
 		8741B3AC1FC9361100A95A00 /* msu1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8741B3AA1FC9361000A95A00 /* msu1.cpp */; };
 		87431C061B02F20700F82158 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87431C041B02F20700F82158 /* stream.cpp */; };
 		8769DC9D20D19CDC005ABC18 /* bml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8769DC9C20D19CDB005ABC18 /* bml.cpp */; };
 		8769DCA020D19D1C005ABC18 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8769DC9E20D19D1C005ABC18 /* sha256.cpp */; };
+		87709EEC294EDD590084AEE0 /* tileimpl-n1x1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87709EE9294EDD580084AEE0 /* tileimpl-n1x1.cpp */; };
+		87709EED294EDD590084AEE0 /* tileimpl-h2x1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87709EEA294EDD580084AEE0 /* tileimpl-h2x1.cpp */; };
+		87709EEE294EDD590084AEE0 /* tileimpl-n2x1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87709EEB294EDD580084AEE0 /* tileimpl-n2x1.cpp */; };
 		8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
 		8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
+		8F6CC7A029FD51E2006C7D59 /* fscompat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F6CC79E29FD51E2006C7D59 /* fscompat.cpp */; };
 		94790D7A14C0C46900B30798 /* apu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94790CDC14C0C46900B30798 /* apu.cpp */; };
 		94790D8114C0C46900B30798 /* bsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94790CF014C0C46900B30798 /* bsx.cpp */; };
 		94790D8214C0C46900B30798 /* c4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94790CF214C0C46900B30798 /* c4.cpp */; };
@@ -106,10 +109,10 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		089C167EFE841241C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		3DA5C31714DCF0180029660B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		8233FF2814C1E1B100FC4547 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		8233FF2A14C1E1C100FC4547 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -125,23 +128,6 @@
 		8725B0911E931ED600F68CA5 /* SPC_DSP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SPC_DSP.cpp; sourceTree = "<group>"; };
 		8725B0921E931ED600F68CA5 /* SPC_DSP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPC_DSP.h; sourceTree = "<group>"; };
 		8725B0941E931ED600F68CA5 /* algorithms.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = algorithms.cpp; sourceTree = "<group>"; };
-		8725B0961E931ED600F68CA5 /* cc.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = cc.sh; sourceTree = "<group>"; };
-		8725B0971E931ED600F68CA5 /* generate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = generate.cpp; sourceTree = "<group>"; };
-		8725B0981E931ED600F68CA5 /* op_misc.b */ = {isa = PBXFileReference; lastKnownFileType = text; path = op_misc.b; sourceTree = "<group>"; };
-		8725B0991E931ED600F68CA5 /* op_misc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = op_misc.cpp; sourceTree = "<group>"; };
-		8725B09A1E931ED600F68CA5 /* op_mov.b */ = {isa = PBXFileReference; lastKnownFileType = text; path = op_mov.b; sourceTree = "<group>"; };
-		8725B09B1E931ED600F68CA5 /* op_mov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = op_mov.cpp; sourceTree = "<group>"; };
-		8725B09C1E931ED600F68CA5 /* op_pc.b */ = {isa = PBXFileReference; lastKnownFileType = text; path = op_pc.b; sourceTree = "<group>"; };
-		8725B09D1E931ED600F68CA5 /* op_pc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = op_pc.cpp; sourceTree = "<group>"; };
-		8725B09E1E931ED600F68CA5 /* op_read.b */ = {isa = PBXFileReference; lastKnownFileType = text; path = op_read.b; sourceTree = "<group>"; };
-		8725B09F1E931ED600F68CA5 /* op_read.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = op_read.cpp; sourceTree = "<group>"; };
-		8725B0A01E931ED600F68CA5 /* op_rmw.b */ = {isa = PBXFileReference; lastKnownFileType = text; path = op_rmw.b; sourceTree = "<group>"; };
-		8725B0A11E931ED600F68CA5 /* op_rmw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = op_rmw.cpp; sourceTree = "<group>"; };
-		8725B0A21E931ED600F68CA5 /* opcycle_misc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = opcycle_misc.cpp; sourceTree = "<group>"; };
-		8725B0A31E931ED600F68CA5 /* opcycle_mov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = opcycle_mov.cpp; sourceTree = "<group>"; };
-		8725B0A41E931ED600F68CA5 /* opcycle_pc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = opcycle_pc.cpp; sourceTree = "<group>"; };
-		8725B0A51E931ED600F68CA5 /* opcycle_read.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = opcycle_read.cpp; sourceTree = "<group>"; };
-		8725B0A61E931ED600F68CA5 /* opcycle_rmw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = opcycle_rmw.cpp; sourceTree = "<group>"; };
 		8725B0A71E931ED600F68CA5 /* oppseudo_misc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = oppseudo_misc.cpp; sourceTree = "<group>"; };
 		8725B0A81E931ED600F68CA5 /* oppseudo_mov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = oppseudo_mov.cpp; sourceTree = "<group>"; };
 		8725B0A91E931ED600F68CA5 /* oppseudo_pc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = oppseudo_pc.cpp; sourceTree = "<group>"; };
@@ -167,15 +153,18 @@
 		8769DC9C20D19CDB005ABC18 /* bml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bml.cpp; path = src/bml.cpp; sourceTree = "<group>"; };
 		8769DC9E20D19D1C005ABC18 /* sha256.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sha256.cpp; path = src/sha256.cpp; sourceTree = "<group>"; };
 		8769DC9F20D19D1C005ABC18 /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sha256.h; path = src/sha256.h; sourceTree = "<group>"; };
+		87709EE8294EDD580084AEE0 /* tileimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tileimpl.h; path = src/tileimpl.h; sourceTree = "<group>"; };
+		87709EE9294EDD580084AEE0 /* tileimpl-n1x1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tileimpl-n1x1.cpp"; path = "src/tileimpl-n1x1.cpp"; sourceTree = "<group>"; };
+		87709EEA294EDD580084AEE0 /* tileimpl-h2x1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tileimpl-h2x1.cpp"; path = "src/tileimpl-h2x1.cpp"; sourceTree = "<group>"; };
+		87709EEB294EDD580084AEE0 /* tileimpl-n2x1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tileimpl-n2x1.cpp"; path = "src/tileimpl-n2x1.cpp"; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* SNES9x.oecoreplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SNES9x.oecoreplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		942597D5151470C00074E3A3 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenEmuBase.framework; path = ../OpenEmu/build/Release/OpenEmuBase.framework; sourceTree = "<group>"; };
+		8F6CC79E29FD51E2006C7D59 /* fscompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fscompat.cpp; path = src/fscompat.cpp; sourceTree = "<group>"; };
+		8F6CC79F29FD51E2006C7D59 /* fscompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fscompat.h; path = src/fscompat.h; sourceTree = "<group>"; };
 		94790CDA14C0C46900B30798 /* 65c816.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 65c816.h; path = src/65c816.h; sourceTree = "<group>"; };
 		94790CDC14C0C46900B30798 /* apu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = apu.cpp; sourceTree = "<group>"; };
 		94790CDD14C0C46900B30798 /* apu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apu.h; sourceTree = "<group>"; };
-		94790CE214C0C46900B30798 /* hermite_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hermite_resampler.h; sourceTree = "<group>"; };
 		94790CE514C0C46900B30798 /* resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resampler.h; sourceTree = "<group>"; };
-		94790CE614C0C46900B30798 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = "<group>"; };
 		94790CF014C0C46900B30798 /* bsx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bsx.cpp; path = src/bsx.cpp; sourceTree = "<group>"; };
 		94790CF114C0C46900B30798 /* bsx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsx.h; path = src/bsx.h; sourceTree = "<group>"; };
 		94790CF214C0C46900B30798 /* c4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c4.cpp; path = src/c4.cpp; sourceTree = "<group>"; };
@@ -268,9 +257,9 @@
 		94790D6914C0C46900B30798 /* srtcemu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = srtcemu.h; path = src/srtcemu.h; sourceTree = "<group>"; };
 		94790D6A14C0C46900B30798 /* tile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile.cpp; path = src/tile.cpp; sourceTree = "<group>"; };
 		94790D6B14C0C46900B30798 /* tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile.h; path = src/tile.h; sourceTree = "<group>"; };
-		C6480FFA1364B1CF0094FA33 /* OESNESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESNESSystemResponderClient.h; path = ../OpenEmu/SuperNES/OESNESSystemResponderClient.h; sourceTree = "<group>"; };
+		C6480FFA1364B1CF0094FA33 /* OESNESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESNESSystemResponderClient.h; path = ../OpenEmu/SystemPlugins/SuperNES/OESNESSystemResponderClient.h; sourceTree = "<group>"; };
 		C6D120FA1711314D00E868A8 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenEmuBase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -337,7 +326,6 @@
 		1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				942597D5151470C00074E3A3 /* OpenEmuBase.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
 			);
 			name = "Linked Frameworks";
@@ -409,6 +397,8 @@
 				94790D0F14C0C46900B30798 /* dsp3.cpp */,
 				94790D1014C0C46900B30798 /* dsp4.cpp */,
 				94790D1114C0C46900B30798 /* font.h */,
+				8F6CC79E29FD51E2006C7D59 /* fscompat.cpp */,
+				8F6CC79F29FD51E2006C7D59 /* fscompat.h */,
 				94790D1214C0C46900B30798 /* fxdbg.cpp */,
 				94790D1314C0C46900B30798 /* fxemu.cpp */,
 				94790D1414C0C46900B30798 /* fxemu.h */,
@@ -474,6 +464,10 @@
 				87431C051B02F20700F82158 /* stream.h */,
 				94790D6A14C0C46900B30798 /* tile.cpp */,
 				94790D6B14C0C46900B30798 /* tile.h */,
+				87709EEA294EDD580084AEE0 /* tileimpl-h2x1.cpp */,
+				87709EE9294EDD580084AEE0 /* tileimpl-n1x1.cpp */,
+				87709EEB294EDD580084AEE0 /* tileimpl-n2x1.cpp */,
+				87709EE8294EDD580084AEE0 /* tileimpl.h */,
 			);
 			name = core;
 			sourceTree = "<group>";
@@ -523,23 +517,6 @@
 		8725B0951E931ED600F68CA5 /* core */ = {
 			isa = PBXGroup;
 			children = (
-				8725B0961E931ED600F68CA5 /* cc.sh */,
-				8725B0971E931ED600F68CA5 /* generate.cpp */,
-				8725B0981E931ED600F68CA5 /* op_misc.b */,
-				8725B0991E931ED600F68CA5 /* op_misc.cpp */,
-				8725B09A1E931ED600F68CA5 /* op_mov.b */,
-				8725B09B1E931ED600F68CA5 /* op_mov.cpp */,
-				8725B09C1E931ED600F68CA5 /* op_pc.b */,
-				8725B09D1E931ED600F68CA5 /* op_pc.cpp */,
-				8725B09E1E931ED600F68CA5 /* op_read.b */,
-				8725B09F1E931ED600F68CA5 /* op_read.cpp */,
-				8725B0A01E931ED600F68CA5 /* op_rmw.b */,
-				8725B0A11E931ED600F68CA5 /* op_rmw.cpp */,
-				8725B0A21E931ED600F68CA5 /* opcycle_misc.cpp */,
-				8725B0A31E931ED600F68CA5 /* opcycle_mov.cpp */,
-				8725B0A41E931ED600F68CA5 /* opcycle_pc.cpp */,
-				8725B0A51E931ED600F68CA5 /* opcycle_read.cpp */,
-				8725B0A61E931ED600F68CA5 /* opcycle_rmw.cpp */,
 				8725B0A71E931ED600F68CA5 /* oppseudo_misc.cpp */,
 				8725B0A81E931ED600F68CA5 /* oppseudo_mov.cpp */,
 				8725B0A91E931ED600F68CA5 /* oppseudo_pc.cpp */,
@@ -573,9 +550,7 @@
 				94790CDC14C0C46900B30798 /* apu.cpp */,
 				94790CDD14C0C46900B30798 /* apu.h */,
 				8725B0891E931ED600F68CA5 /* bapu */,
-				94790CE214C0C46900B30798 /* hermite_resampler.h */,
 				94790CE514C0C46900B30798 /* resampler.h */,
-				94790CE614C0C46900B30798 /* ring_buffer.h */,
 			);
 			name = apu;
 			path = src/apu;
@@ -609,12 +584,11 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 0830;
 			};
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "SNES9x" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
@@ -665,7 +639,6 @@
 				826C1B1F0F420C2200FB9014 /* SNESGameCore.mm in Sources */,
 				94790D7A14C0C46900B30798 /* apu.cpp in Sources */,
 				8725B0B91E933E1B00F68CA5 /* sdsp.cpp in Sources */,
-				8725B0BA1E933E1E00F68CA5 /* SPC_DSP.cpp in Sources */,
 				8725B0BB1E933E2B00F68CA5 /* smp.cpp in Sources */,
 				8725B0BC1E933E2D00F68CA5 /* smp_state.cpp in Sources */,
 				8769DC9D20D19CDC005ABC18 /* bml.cpp in Sources */,
@@ -700,6 +673,7 @@
 				94790DA714C0C46900B30798 /* netplay.cpp in Sources */,
 				94790DA814C0C46900B30798 /* obc1.cpp in Sources */,
 				94790DA914C0C46900B30798 /* ppu.cpp in Sources */,
+				8F6CC7A029FD51E2006C7D59 /* fscompat.cpp in Sources */,
 				87431C061B02F20700F82158 /* stream.cpp in Sources */,
 				94790DAB14C0C46900B30798 /* sa1.cpp in Sources */,
 				94790DAC14C0C46900B30798 /* sa1cpu.cpp in Sources */,
@@ -716,6 +690,9 @@
 				94790DB714C0C46900B30798 /* spc7110.cpp in Sources */,
 				94790DBA14C0C46900B30798 /* srtc.cpp in Sources */,
 				94790DBC14C0C46900B30798 /* tile.cpp in Sources */,
+				87709EED294EDD590084AEE0 /* tileimpl-h2x1.cpp in Sources */,
+				87709EEC294EDD590084AEE0 /* tileimpl-n1x1.cpp in Sources */,
+				87709EEE294EDD590084AEE0 /* tileimpl-n2x1.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -733,7 +710,7 @@
 		089C167DFE841241C02AAC07 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				089C167EFE841241C02AAC07 /* English */,
+				089C167EFE841241C02AAC07 /* en */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -745,6 +722,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				HEADER_SEARCH_PATHS = (
@@ -774,6 +752,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_STRICT_ALIASING = YES;
@@ -831,6 +810,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2018, OpenEmu Team
+ Copyright (c) 2022, OpenEmu Team


 Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,7 @@
 {
    uint16_t *_indirectVideoBuffer;
    uint16_t *_soundBuffer;
+    uint16_t *_soundBufferCurrent;
    NSURL    *_romURL;
    NSMutableDictionary<NSString *, NSNumber *> *_cheatList;
 }
@@ -95,29 +96,32 @@ static __weak SNESGameCore *_current;
    Settings.SuperScopeMaster       = true;
    Settings.MultiPlayer5Master     = true;
    Settings.JustifierMaster        = true;
-    Settings.SixteenBitSound        = true;
-    Settings.Stereo                 = true;
+    Settings.SoundSync              = false;
    Settings.SoundPlaybackRate      = SAMPLERATE;
    Settings.SoundInputRate         = 32040;
-    Settings.SupportHiRes           = true;
+    Settings.DynamicRateControl     = false;
+    Settings.DynamicRateLimit       = 5;
    Settings.Transparency           = true;
-    Settings.HDMATimingHack         = 100;
-    Settings.BlockInvalidVRAMAccessMaster = true; // disabling may fix some homebrew or other games
-    GFX.InfoString                  = NULL;
+    GFX.InfoString.clear();
    GFX.InfoStringTimeout           = 0;
    Settings.DontSaveOopsSnapshot   = true;
    Settings.NoPatch                = true;
    Settings.AutoSaveDelay          = 0;
-    Settings.SuperFXClockMultiplier = 100;
-    Settings.MaxSpriteTilesPerLine  = 34;
+    // Hack
    Settings.InterpolationMethod    = DSP_INTERPOLATION_GAUSSIAN;
    Settings.OneClockCycle          = ONE_CYCLE;
    Settings.OneSlowClockCycle      = SLOW_ONE_CYCLE;
    Settings.TwoClockCycles         = TWO_CYCLES;
+    Settings.SuperFXClockMultiplier = 100;
+    Settings.OverclockMode          = 0;
+    Settings.SeparateEchoBuffer     = false;
+    Settings.DisableGameSpecificHacks = false;
+    Settings.BlockInvalidVRAMAccessMaster = true; // disabling may fix some homebrew or ROM hacks
+    Settings.HDMATimingHack         = 100;
+    Settings.MaxSpriteTilesPerLine  = 34;

    _indirectVideoBuffer = (uint16_t *)malloc(MAX_SNES_WIDTH * MAX_SNES_HEIGHT * sizeof(uint16_t));

-    GFX.Pitch = 512 * 2;
    GFX.Screen = _indirectVideoBuffer;

    S9xUnmapAllControls();
@@ -130,10 +134,9 @@ static __weak SNESGameCore *_current;
        return NO;
    }

-    /* buffer_ms : buffer size given in millisecond
-     lag_ms    : allowable time-lag given in millisecond
-     S9xInitSound(macSoundBuffer_ms, macSoundLagEnable ? macSoundBuffer_ms / 2 : 0); */
-    if(!S9xInitSound(100, 0))
+    // TODO investigate this, all sound-related settings, SAMPLERATE, SIZESOUNDBUFFER after latest APU changes
+    // audio is no longer perfect again e.g. crackling/popping (underruns) in SD3 intro
+    if(!S9xInitSound(100))
        NSLog(@"[Snes9x] Couldn't init sound");
    
    S9xSetSamplesAvailableCallback(FinalizeSamplesAudioCallback, (__bridge void *)self);
@@ -164,7 +167,9 @@ static __weak SNESGameCore *_current;
                    NSLocalizedRecoverySuggestionErrorKey : @"To run this Satellaview game you need: \"BS-X.bin\"\n\nObtain this file, drag and drop onto the game library window and try again.\n\nFor more information visit: https://github.com/OpenEmu/OpenEmu/wiki/User-guide:-BIOS-files"
                    }];

-                *error = outErr;
+                if (error) {
+                    *error = outErr;
+                }
                return NO;
            }
        }
@@ -637,7 +642,10 @@ static __weak SNESGameCore *_current;
 - (void)executeFrame
 {
    IPPU.RenderThisFrame = true;
+    _soundBufferCurrent = _soundBuffer;
    S9xMainLoop();
+    NSUInteger samples = _soundBufferCurrent - _soundBuffer;
+    [[self audioBufferAtIndex:0] write:_soundBuffer maxLength:samples * 2];
 }

 - (void)setupEmulation
@@ -656,7 +664,7 @@ static __weak SNESGameCore *_current;
 - (void)stopEmulation
 {
    // Save SRAM
-    NSURL *url = [NSURL fileURLWithPath:@(Memory.ROMFilename)];
+    NSURL *url = [NSURL fileURLWithPath:@(Memory.ROMFilename.c_str())];
    NSString *extensionlessFilename = url.lastPathComponent.stringByDeletingPathExtension;
    NSURL *batterySavesDirectory = [NSURL fileURLWithPath:self.batterySavesDirectoryPath];
    NSURL *saveFileURL = [batterySavesDirectory URLByAppendingPathComponent:[extensionlessFilename stringByAppendingPathExtension:@"sav"]];
@@ -713,15 +721,14 @@ static void FinalizeSamplesAudioCallback(void *context)

 - (void)finalizeAudioSamples
 {
-    S9xFinalizeSamples();
    int samples = S9xGetSampleCount();
-    S9xMixSamples((uint8_t *)_soundBuffer, samples);
-    [[self ringBufferAtIndex:0] write:_soundBuffer maxLength:samples * 2];
+    S9xMixSamples((uint8_t *)_soundBufferCurrent, samples);
+    _soundBufferCurrent += samples;
 }

 - (double)audioSampleRate
 {
-    return 32040;
+    return SAMPLERATE;
 }

 - (NSUInteger)channelCount
@@ -898,7 +905,7 @@ NSString *SNESEmulatorKeys[] = { @"Up", @"Down", @"Left", @"Right", @"A", @"B",
                const char *cheatCode = [singleCode stringByReplacingOccurrencesOfString:@":" withString:@""].UTF8String;

                S9xAddCheatGroup("OpenEmu", cheatCode);
-                S9xEnableCheatGroup(Cheat.g.size () - 1);
+                S9xEnableCheatGroup(Cheat.group.size() - 1);
            }
        }
    }
@@ -926,42 +933,7 @@ void S9xMessage(int type, int number, const char *message)
    NSLog(@"[Snes9x] %s", message);
 }

-void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext)
-{
-    // This function is mostly used for various Snes9x generated snapshots (functionality that belongs in the frontend instead), but defined anyway
-    NSString *nsPath = @(path);
-
-    drive[0] = '\0';
-
-    NSString *extension = nsPath.pathExtension;
-    NSArray *components = nsPath.pathComponents;
-    NSArray *dirComponents = [nsPath.pathComponents subarrayWithRange:NSMakeRange(0, components.count - 1)];
-    NSString *fileName = [nsPath.lastPathComponent stringByDeletingPathExtension];
-    NSString *directory = [NSString pathWithComponents:dirComponents];
-
-    strcpy(dir, directory.UTF8String);
-    strcpy(fname, fileName.UTF8String);
-    strcpy(ext, extension.UTF8String);
-}
-
-void _makepath(char *path, const char *drive, const char *dir, const char *fname, const char *ext)
-{
-    // This function is mostly used for Snes9x internal soft patching, but defined anyway
-#pragma unused (drive)
-
-    NSString *directory = @(dir);
-    NSString *fileName = @(fname);
-    NSString *extension = @(ext);
-
-    fileName = [fileName stringByAppendingPathExtension:extension];
-
-    NSString *fullPath = [directory stringByAppendingPathComponent:fileName];
-    NSURL *fullURL = [NSURL fileURLWithPath:fullPath];
-
-    strcpy(path, fullURL.fileSystemRepresentation);
-}
-
-const char *S9xGetDirectory(enum s9x_getdirtype dirtype)
+std::string S9xGetDirectory(enum s9x_getdirtype dirtype)
 {
    // We don't seem to use this function, but defined anyway
    NSURL *batterySavesDirectory = [NSURL fileURLWithPath:_current.batterySavesDirectoryPath];
@@ -973,7 +945,7 @@ const char *S9xGetDirectory(enum s9x_getdirtype dirtype)
        case SRAM_DIR:          return batterySavesDirectory.fileSystemRepresentation;  break;
        case BIOS_DIR:          return biosDirectoryURL.fileSystemRepresentation;   break;
        case SAT_DIR:           return biosDirectoryURL.fileSystemRepresentation;   break;
-        default:                return NULL;    break;
+        default:                return "";    break;
    }
 }

@@ -1010,35 +982,14 @@ unsigned char S9xContinueUpdate(int width, int height)
    return true;
 }

-const char *S9xBasename(const char *filename)
-{
-    // Called by S9xFreezeGame/S9xUnfreezeGame -- useless for us
-    return NULL;
-}
-
 const char *S9xStringInput(const char *message)
 {
    return NULL;
 }

-const char *S9xChooseMovieFilename(bool8 read_only)
+std::string S9xGetFilenameInc(std::string, enum s9x_getdirtype)
 {
-    return NULL;
-}
-
-const char *S9xChooseFilename(bool8 read_only)
-{
-    return NULL;
-}
-
-const char *S9xGetFilename(const char *extension, enum s9x_getdirtype dirtype)
-{
-    return NULL;
-}
-
-const char *S9xGetFilenameInc(const char *, enum s9x_getdirtype)
-{
-    return NULL;
+    return "";
 }

 bool S9xPollButton(uint32 id, bool *pressed)
@@ -1076,10 +1027,6 @@ void S9xHandlePortCommand(s9xcommand_t cmd, int16 data1, int16 data2)
 {
 }

-void S9xSetPalette()
-{
-}
-
 void S9xExtraUsage()
 {
 }
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _65C816_H_
 #define _65C816_H_
@@ -1,6 +1,172 @@
  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 - 2023  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,
+                             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)
+
+  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)
+
+  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 - 2023  BearOso
+
+  Win32 GUI code
+  (c) Copyright 2003 - 2006  blip,
+                             funkyass,
+                             Matthew Kendora,
+                             Nach,
+                             nitsuja
+  (c) Copyright 2009 - 2023  OV2
+
+  Original Mac OS GUI code
+  (c) Copyright 1998 - 2001  John Stiles
+  (c) Copyright 2001 - 2011  zones
+  New MacOS GUI code
+  (c) Copyright 2022 - 2023  Michael Donald Buckley
+
+  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
+  individual files.
+
+
  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
@@ -24,13 +190,11 @@
  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
- - GTK port: dual licensed as LGPL, see gtk/doc/LICENSE
 - snes_ntsc: LGPL, see filter/snes_ntsc-license.txt
 - xBRZ: GPLv3, see filter/xbrz-license.txt
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _APU_H_
 #define _APU_H_
@@ -210,14 +24,13 @@ void S9xAPUExecute (void);
 void S9xAPUEndScanline (void);
 void S9xAPUSetReferenceTime (int32);
 void S9xAPUTimingSetSpeedup (int);
-void S9xAPUAllowTimeOverflow (bool);
 void S9xAPULoadState (uint8 *);
 void S9xAPULoadBlarggState(uint8 *oldblock);
 void S9xAPUSaveState (uint8 *);
 void S9xDumpSPCSnapshot (void);
 bool8 S9xSPCDump (const char *);

-bool8 S9xInitSound (int, int);
+bool8 S9xInitSound (int);
 bool8 S9xOpenSoundDevice (void);

 bool8 S9xSyncSound (void);
@@ -225,7 +38,6 @@ int S9xGetSampleCount (void);
 void S9xSetSoundControl (uint8);
 void S9xSetSoundMute (bool8);
 void S9xLandSamples (void);
-void S9xFinalizeSamples (void);
 void S9xClearSamples (void);
 bool8 S9xMixSamples (uint8 *, int);
 void S9xSetSamplesAvailableCallback (apu_callback, void *);
@@ -55,16 +55,30 @@ static BOOST::uint8_t const initial_regs [SPC_DSP::register_count] =

 // Access global DSP register
 #define REG(n)      m.regs [r_##n]
+#define XREG(n)     m.external_regs [r_##n]

 // Access voice DSP register
 #define VREG(r,n)   r [v_##n]
+#define XVREG(r,n)  (m.external_regs + (r - m.regs))[v_##n]

 #define WRITE_SAMPLES( l, r, out ) \
 {\
 	out [0] = l;\
 	out [1] = r;\
 	out += 2;\
-}\
+}
+
+#define SPC_DSP_OUT_HOOK(l, r)  \
+    {                           \
+        resampler->push_sample(l, r);  \
+        if (Settings.MSU1)      \
+            S9xMSU1Generate(2); \
+    }
+
+void SPC_DSP::set_output( Resampler *resampler )
+{
+	this->resampler = resampler;
+}

 void SPC_DSP::set_output( sample_t* out, int size )
 {
@@ -739,7 +753,7 @@ MISC_CLOCK( 30 )

 inline VOICE_CLOCK( V1 )
 {
-	m.t_dir_addr = m.t_dir * 0x100 + m.t_srcn * 4;
+	m.t_dir_addr = (m.t_dir * 0x100 + m.t_srcn * 4) & 0xffff;
 	m.t_srcn = VREG(v->regs,srcn);
 }
 inline VOICE_CLOCK( V2 )
@@ -915,6 +929,7 @@ inline VOICE_CLOCK( V7 )
 {
 	// Update ENDX
 	REG(endx) = m.endx_buf;
+	XREG(endx) = m.endx_buf;

 	m.envx_buf = v->t_envx_out;
 }
@@ -922,11 +937,13 @@ inline VOICE_CLOCK( V8 )
 {
 	// Update OUTX
 	VREG(v->regs,outx) = m.outx_buf;
+	XVREG(v->regs,outx) = m.outx_buf;
 }
 inline VOICE_CLOCK( V9 )
 {
 	// Update ENVX
 	VREG(v->regs,envx) = m.envx_buf;
+	XVREG(v->regs,envx) = m.envx_buf;
 }

 // Most voices do all these in one clock, so make a handy composite
@@ -947,7 +964,7 @@ VOICE_CLOCK(V9_V6_V3) { voice_V9(v); voice_V6(v+1); voice_V3(v+2); }
 //// Echo

 // Current echo buffer pointer for left/right channel
-#define ECHO_PTR( ch )      (&m.ram [m.t_echo_ptr + ch * 2])
+#define ECHO_PTR( ch )      ((Settings.SeparateEchoBuffer) ? (&m.separate_echo_buffer [m.t_echo_ptr + ch * 2]) : (&m.ram [m.t_echo_ptr + ch * 2]))

 // Sample in echo history buffer, where 0 is the oldest
 #define ECHO_FIR( i )       (m.echo_hist_pos [i])
@@ -1209,6 +1226,8 @@ void SPC_DSP::soft_reset_common()
 	m.echo_offset        = 0;
 	m.phase              = 0;

+    memset(m.separate_echo_buffer, 0, 0x10000);
+
 	init_counter();

 	for (int i = 0; i < voice_count; i++)
@@ -1223,7 +1242,9 @@ void SPC_DSP::soft_reset()

 void SPC_DSP::load( uint8_t const regs [register_count] )
 {
-	memcpy( m.regs, regs, sizeof m.regs );
+	memcpy( m.external_regs, regs, sizeof m.regs );
+	memset( m.regs, 0, sizeof m.regs);
+	m.regs[r_flg] = 0xE0;
 	memset( &m.regs [register_count], 0, offsetof (state_t,ram) - register_count );

 	// Internal state
@@ -1384,6 +1405,7 @@ void SPC_DSP::copy_state( unsigned char** io, copy_func_t copy )
 	SPC_COPY( uint16_t, m.t_echo_ptr );
 	SPC_COPY(  uint8_t, m.t_looped );

+	copier.copy(m.external_regs, register_count);
 	copier.extra();
 }
 #endif
@@ -22,6 +22,8 @@ public:
 	typedef short sample_t;
 	void set_output( sample_t* out, int out_size );

+	void set_output( Resampler* resampler );
+
 	// Number of samples written to output since it was last set, always
 	// a multiple of 2. Undefined if more samples were generated than
 	// output buffer could hold.
@@ -135,6 +137,8 @@ public:
 private:
 	enum { brr_block_size = 9 };

+	Resampler *resampler;
+
 	struct state_t
 	{
 		uint8_t regs [register_count];
@@ -193,10 +197,15 @@ private:
 		// non-emulation state
 		uint8_t* ram; // 64K shared RAM between DSP and SMP
 		int mute_mask;
+
 		sample_t* out;
 		sample_t* out_end;
 		sample_t* out_begin;
 		sample_t extra [extra_size];
+
+        uint8_t separate_echo_buffer [0x10000];
+		uint8_t external_regs [register_count];
+
 	};
 	state_t m;

@@ -253,7 +262,7 @@ inline int SPC_DSP::sample_count() const { return m.out - m.out_begin; }
 inline int SPC_DSP::read( int addr ) const
 {
 	assert( (unsigned) addr < register_count );
-	return m.regs [addr];
+	return m.external_regs [addr];
 }

 inline void SPC_DSP::write( int addr, int data )
@@ -261,6 +270,7 @@ inline void SPC_DSP::write( int addr, int data )
 	assert( (unsigned) addr < register_count );

 	m.regs [addr] = (uint8_t) data;
+	m.external_regs [addr] = (uint8_t) data;
 	switch ( addr & 0x0F )
 	{
 	case v_envx:
@@ -3,14 +3,8 @@ void SMP::tick() {
  timer1.tick();
  timer2.tick();

-#ifndef SNES9X
-  clock += cycle_step_cpu;
-  dsp.clock -= 24;
-  synchronize_dsp();
-#else
  clock++;
  dsp.clock++;
-#endif
 }

 void SMP::tick(unsigned clocks) {
@@ -23,9 +17,7 @@ void SMP::tick(unsigned clocks) {
 }

 void SMP::op_io() {
-  #if defined(CYCLE_ACCURATE)
  tick();
-  #endif
 }

 void SMP::op_io(unsigned clocks) {
@@ -33,33 +25,36 @@ void SMP::op_io(unsigned clocks) {
 }

 uint8 SMP::op_read(uint16 addr) {
-  #if defined(CYCLE_ACCURATE)
  tick();
-  #endif
  if((addr & 0xfff0) == 0x00f0) return mmio_read(addr);
  if(addr >= 0xffc0 && status.iplrom_enable) return iplrom[addr & 0x3f];
  return apuram[addr];
 }

 void SMP::op_write(uint16 addr, uint8 data) {
-  #if defined(CYCLE_ACCURATE)
  tick();
-  #endif
  if((addr & 0xfff0) == 0x00f0) mmio_write(addr, data);
  apuram[addr] = data;  //all writes go to RAM, even MMIO writes
 }

+uint8 SMP::op_readstack()
+{
+  tick();
+  return apuram[0x0100 | ++regs.sp];
+}
+
+void SMP::op_writestack(uint8 data)
+{
+  tick();
+  apuram[0x0100 | regs.sp--] = data;
+}
+
 void SMP::op_step() {
  #define op_readpc() op_read(regs.pc++)
  #define op_readdp(addr) op_read((regs.p.p << 8) + ((addr) & 0xff))
  #define op_writedp(addr, data) op_write((regs.p.p << 8) + ((addr) & 0xff), data)
  #define op_readaddr(addr) op_read(addr)
  #define op_writeaddr(addr, data) op_write(addr, data)
-  #define op_readstack() op_read(0x0100 | ++regs.sp)
-  #define op_writestack(data) op_write(0x0100 | regs.sp--, data)
-
-  #if defined(CYCLE_ACCURATE)
-  #if defined(PSEUDO_CYCLE)

  if(opcode_cycle == 0)
  {
@@ -73,7 +68,6 @@ void SMP::op_step() {
    opcode_number = op_readpc();
  }

-
  switch(opcode_number) {
    #include "core/oppseudo_misc.cpp"
    #include "core/oppseudo_mov.cpp"
@@ -81,72 +75,4 @@ void SMP::op_step() {
    #include "core/oppseudo_read.cpp"
    #include "core/oppseudo_rmw.cpp"
  }
-
-  #else
-
-  if(opcode_cycle == 0) {
-    opcode_number = op_readpc();
-    opcode_cycle++;
-  } else switch(opcode_number) {
-    #include "core/opcycle_misc.cpp"
-    #include "core/opcycle_mov.cpp"
-    #include "core/opcycle_pc.cpp"
-    #include "core/opcycle_read.cpp"
-    #include "core/opcycle_rmw.cpp"
-  }
-
-  #endif // defined(PSEUDO_CYCLE)
-  #else
-
-  unsigned opcode = op_readpc();
-  switch(opcode) {
-    #include "core/op_misc.cpp"
-    #include "core/op_mov.cpp"
-    #include "core/op_pc.cpp"
-    #include "core/op_read.cpp"
-    #include "core/op_rmw.cpp"
-  }
-
-  //TODO: untaken branches should consume less cycles
-
-  timer0.tick(cycle_count_table[opcode]);
-  timer1.tick(cycle_count_table[opcode]);
-  timer2.tick(cycle_count_table[opcode]);
-
-#ifndef SNES9X
-  clock += cycle_table_cpu[opcode];
-  dsp.clock -= cycle_table_dsp[opcode];
-  synchronize_dsp();
-#else
-  clock += cycle_count_table[opcode];
-  dsp.clock += cycle_count_table[opcode];
-#endif
-
-  #endif // defined(CYCLE_ACCURATE)
 }
-
-const unsigned SMP::cycle_count_table[256] = {
-  #define c 12
-//0 1 2 3   4 5 6 7   8 9 A B   C D E F
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,4,6,8,  //0
-  4,8,4,7,  4,5,5,6,  5,5,6,5,  2,2,4,6,  //1
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,4,7,4,  //2
-  4,8,4,7,  4,5,5,6,  5,5,6,5,  2,2,3,8,  //3
-
-  2,8,4,7,  3,4,3,6,  2,6,4,4,  5,4,6,6,  //4
-  4,8,4,7,  4,5,5,6,  5,5,4,5,  2,2,4,3,  //5
-  2,8,4,7,  3,4,3,6,  2,6,4,4,  5,4,7,5,  //6
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,3,6,  //7
-
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,2,4,5,  //8
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,c,5,  //9
-  3,8,4,7,  3,4,3,6,  2,6,4,4,  5,2,4,4,  //A
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,3,4,  //B
-
-  3,8,4,7,  4,5,4,7,  2,5,6,4,  5,2,4,9,  //C
-  4,8,4,7,  5,6,6,7,  4,5,5,5,  2,2,8,3,  //D
-  2,8,4,7,  3,4,3,6,  2,4,5,3,  4,3,4,1,  //E
-  4,8,4,7,  4,5,5,6,  3,4,5,4,  2,2,6,1,  //F
-
-  #undef c
-};
@@ -1 +0,0 @@
-g++-4.5 -std=gnu++0x -I../../../.. -o generate generate.cpp
@@ -1,154 +0,0 @@
-#include <nall/file.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-using namespace nall;
-
-static bool cycle_accurate;
-
-struct opcode_t {
-  string name;
-  lstring args;
-  unsigned opcode;
-};
-
-void generate(const char *sourceFilename, const char *targetFilename) {
-  file fp;
-  fp.open(targetFilename, file::mode::write);
-
-  string filedata;
-  filedata.readfile(sourceFilename);
-  filedata.replace("\r", "");
-
-  lstring block;
-  block.split("\n\n", filedata);
-
-  foreach(data, block) {
-    lstring lines;
-    lines.split("\n", data);
-
-    linear_vector<opcode_t> array;
-
-    unsigned sourceStart = 0;
-    foreach(line, lines, currentLine) {
-      line.transform("()", "``");
-      lstring part;
-      part.split("`", line);
-      lstring arguments;
-      arguments.split(", ", part[1]);
-
-      opcode_t opcode;
-      opcode.name = part[0];
-      opcode.args = arguments;
-      opcode.opcode = hex(arguments[0]);
-      array.append(opcode);
-
-      line.rtrim<1>(",");
-      if(line.endswith(" {")) {
-        line.rtrim<1>("{ ");
-        sourceStart = currentLine + 1;
-        break;
-      }
-    }
-
-    if(cycle_accurate == false) {
-      foreach(opcode, array) {
-        fp.print("case 0x", hex<2>(opcode.opcode), ": {\n");
-
-        for(unsigned n = sourceStart; n < lines.size(); n++) {
-          if(lines[n] == "}") break;
-
-          string output;
-
-          if(lines[n].beginswith("  ")) {
-            output = lines[n];
-          } else {
-            lstring part;
-            part.split<1>(":", lines[n]);
-            output = { "  ", part[1] };
-          }
-
-          output.replace("$1", opcode.args[1]);
-          output.replace("$2", opcode.args[2]);
-          output.replace("$3", opcode.args[3]);
-          output.replace("$4", opcode.args[4]);
-          output.replace("$5", opcode.args[5]);
-          output.replace("$6", opcode.args[6]);
-          output.replace("$7", opcode.args[7]);
-          output.replace("$8", opcode.args[8]);
-          output.replace("end;", "break;");
-
-          fp.print(output, "\n");
-        }
-
-        fp.print("  break;\n");
-        fp.print("}\n\n");
-      }
-    } else {
-      foreach(opcode, array) {
-        fp.print("case 0x", hex<2>(opcode.opcode), ": {\n");
-        fp.print("  switch(opcode_cycle++) {\n");
-
-        for(unsigned n = sourceStart; n < lines.size(); n++) {
-          if(lines[n] == "}") break;
-
-          bool nextLineEndsCycle = false;
-          if(lines[n + 1] == "}") nextLineEndsCycle = true;
-          if(lines[n + 1].beginswith("  ") == false) nextLineEndsCycle = true;
-
-          string output;
-
-          if(lines[n].beginswith("  ")) {
-            output = { "  ", lines[n] };
-          } else {
-            lstring part;
-            part.split<1>(":", lines[n]);
-            fp.print("  case ", (unsigned)decimal(part[0]), ":\n");
-            output = { "    ", part[1] };
-          }
-
-          output.replace("$1", opcode.args[1]);
-          output.replace("$2", opcode.args[2]);
-          output.replace("$3", opcode.args[3]);
-          output.replace("$4", opcode.args[4]);
-          output.replace("$5", opcode.args[5]);
-          output.replace("$6", opcode.args[6]);
-          output.replace("$7", opcode.args[7]);
-          output.replace("$8", opcode.args[8]);
-          output.replace("end;", "{ opcode_cycle = 0; break; }");
-
-          fp.print(output, "\n");
-          if(nextLineEndsCycle) {
-            if(lines[n + 1].beginswith("}")) {
-              fp.print("    opcode_cycle = 0;\n");
-            }
-            fp.print("    break;\n");
-          }
-        }
-
-        fp.print("  }\n");
-        fp.print("  break;\n");
-        fp.print("}\n\n");
-      }
-    }
-  }
-
-  fp.close();
-}
-
-int main() {
-  cycle_accurate = false;
-  generate("op_misc.b", "op_misc.cpp");
-  generate("op_mov.b",  "op_mov.cpp" );
-  generate("op_pc.b",   "op_pc.cpp" );
-  generate("op_read.b", "op_read.cpp");
-  generate("op_rmw.b",  "op_rmw.cpp" );
-
-  cycle_accurate = true;
-  generate("op_misc.b", "opcycle_misc.cpp");
-  generate("op_mov.b",  "opcycle_mov.cpp" );
-  generate("op_pc.b",   "opcycle_pc.cpp" );
-  generate("op_read.b", "opcycle_read.cpp");
-  generate("op_rmw.b",  "opcycle_rmw.cpp" );
-
-  return 0;
-}
@@ -1,163 +0,0 @@
-nop(0x00) {
-1:op_io();
-}
-
-sleep(0xef),
-stop(0xff) {
-1:op_io();
-2:op_io();
-  regs.pc--;
-}
-
-xcn(0x9f) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-  regs.a = (regs.a >> 4) | (regs.a << 4);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-daa(0xdf) {
-1:op_io();
-2:op_io();
-  if(regs.p.c || (regs.a) > 0x99) {
-    regs.a += 0x60;
-    regs.p.c = 1;
-  }
-  if(regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a += 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-das(0xbe) {
-1:op_io();
-2:op_io();
-  if(!regs.p.c || (regs.a) > 0x99) {
-    regs.a -= 0x60;
-    regs.p.c = 0;
-  }
-  if(!regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a -= 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-clrc(0x60, regs.p.c = 0),
-clrp(0x20, regs.p.p = 0),
-setc(0x80, regs.p.c = 1),
-setp(0x40, regs.p.p = 1) {
-1:op_io();
-  $1;
-}
-
-clrv(0xe0) {
-1:op_io();
-  regs.p.v = 0;
-  regs.p.h = 0;
-}
-
-notc(0xed) {
-1:op_io();
-2:op_io();
-  regs.p.c = !regs.p.c;
-}
-
-ei(0xa0, 1),
-di(0xc0, 0) {
-1:op_io();
-2:op_io();
-  regs.p.i = $1;
-}
-
-set0_dp(0x02, rd |=  0x01),
-clr0_dp(0x12, rd &= ~0x01),
-set1_dp(0x22, rd |=  0x02),
-clr1_dp(0x32, rd &= ~0x02),
-set2_dp(0x42, rd |=  0x04),
-clr2_dp(0x52, rd &= ~0x04),
-set3_dp(0x62, rd |=  0x08),
-clr3_dp(0x72, rd &= ~0x08),
-set4_dp(0x82, rd |=  0x10),
-clr4_dp(0x92, rd &= ~0x10),
-set5_dp(0xa2, rd |=  0x20),
-clr5_dp(0xb2, rd &= ~0x20),
-set6_dp(0xc2, rd |=  0x40),
-clr6_dp(0xd2, rd &= ~0x40),
-set7_dp(0xe2, rd |=  0x80),
-clr7_dp(0xf2, rd &= ~0x80) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-3:$1;
-  op_writedp(dp, rd);
-}
-
-push_a(0x2d, a),
-push_x(0x4d, x),
-push_y(0x6d, y),
-push_p(0x0d, p) {
-1:op_io();
-2:op_io();
-3:op_writestack(regs.$1);
-}
-
-pop_a(0xae, a),
-pop_x(0xce, x),
-pop_y(0xee, y),
-pop_p(0x8e, p) {
-1:op_io();
-2:op_io();
-3:regs.$1 = op_readstack();
-}
-
-mul_ya(0xcf) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_io();
-7:op_io();
-8:op_io();
-  ya = regs.y * regs.a;
-  regs.a = ya;
-  regs.y = ya >> 8;
-  //result is set based on y (high-byte) only
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-}
-
-div_ya_x(0x9e) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_io();
-7:op_io();
-8:op_io();
-9:op_io();
-10:op_io();
-11:op_io();
-  ya = regs.ya;
-  //overflow set if quotient >= 256
-  regs.p.v = !!(regs.y >= regs.x);
-  regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-  if(regs.y < (regs.x << 1)) {
-    //if quotient is <= 511 (will fit into 9-bit result)
-    regs.a = ya / regs.x;
-    regs.y = ya % regs.x;
-  } else {
-    //otherwise, the quotient won't fit into regs.p.v + regs.a
-    //this emulates the odd behavior of the S-SMP in this case
-    regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-    regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-  }
-  //result is set based on a (quotient) only
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
@@ -1,346 +0,0 @@
-case 0x00: {
-  op_io();
-  break;
-}
-
-case 0xef: {
-  op_io();
-  op_io();
-  regs.pc--;
-  break;
-}
-
-case 0xff: {
-  op_io();
-  op_io();
-  regs.pc--;
-  break;
-}
-
-case 0x9f: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  regs.a = (regs.a >> 4) | (regs.a << 4);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xdf: {
-  op_io();
-  op_io();
-  if(regs.p.c || (regs.a) > 0x99) {
-    regs.a += 0x60;
-    regs.p.c = 1;
-  }
-  if(regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a += 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xbe: {
-  op_io();
-  op_io();
-  if(!regs.p.c || (regs.a) > 0x99) {
-    regs.a -= 0x60;
-    regs.p.c = 0;
-  }
-  if(!regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a -= 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0x60: {
-  op_io();
-  regs.p.c = 0;
-  break;
-}
-
-case 0x20: {
-  op_io();
-  regs.p.p = 0;
-  break;
-}
-
-case 0x80: {
-  op_io();
-  regs.p.c = 1;
-  break;
-}
-
-case 0x40: {
-  op_io();
-  regs.p.p = 1;
-  break;
-}
-
-case 0xe0: {
-  op_io();
-  regs.p.v = 0;
-  regs.p.h = 0;
-  break;
-}
-
-case 0xed: {
-  op_io();
-  op_io();
-  regs.p.c = !regs.p.c;
-  break;
-}
-
-case 0xa0: {
-  op_io();
-  op_io();
-  regs.p.i = 1;
-  break;
-}
-
-case 0xc0: {
-  op_io();
-  op_io();
-  regs.p.i = 0;
-  break;
-}
-
-case 0x02: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x01;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x12: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x01;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x22: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x02;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x32: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x02;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x42: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x04;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x52: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x04;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x62: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x08;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x72: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x08;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x82: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x10;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x92: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x10;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xa2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x20;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xb2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x20;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xc2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x40;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xd2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x40;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xe2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x80;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xf2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x80;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x2d: {
-  op_io();
-  op_io();
-  op_writestack(regs.a);
-  break;
-}
-
-case 0x4d: {
-  op_io();
-  op_io();
-  op_writestack(regs.x);
-  break;
-}
-
-case 0x6d: {
-  op_io();
-  op_io();
-  op_writestack(regs.y);
-  break;
-}
-
-case 0x0d: {
-  op_io();
-  op_io();
-  op_writestack(regs.p);
-  break;
-}
-
-case 0xae: {
-  op_io();
-  op_io();
-  regs.a = op_readstack();
-  break;
-}
-
-case 0xce: {
-  op_io();
-  op_io();
-  regs.x = op_readstack();
-  break;
-}
-
-case 0xee: {
-  op_io();
-  op_io();
-  regs.y = op_readstack();
-  break;
-}
-
-case 0x8e: {
-  op_io();
-  op_io();
-  regs.p = op_readstack();
-  break;
-}
-
-case 0xcf: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  ya = regs.y * regs.a;
-  regs.a = ya;
-  regs.y = ya >> 8;
-  //result is set based on y (high-byte) only
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0x9e: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  ya = regs.ya;
-  //overflow set if quotient >= 256
-  regs.p.v = !!(regs.y >= regs.x);
-  regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-  if(regs.y < (regs.x << 1)) {
-    //if quotient is <= 511 (will fit into 9-bit result)
-    regs.a = ya / regs.x;
-    regs.y = ya % regs.x;
-  } else {
-    //otherwise, the quotient won't fit into regs.p.v + regs.a
-    //this emulates the odd behavior of the S-SMP in this case
-    regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-    regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-  }
-  //result is set based on a (quotient) only
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
@@ -1,217 +0,0 @@
-mov_a_x(0x7d, a, x),
-mov_a_y(0xdd, a, y),
-mov_x_a(0x5d, x, a),
-mov_y_a(0xfd, y, a),
-mov_x_sp(0x9d, x, sp) {
-1:op_io();
-  regs.$1 = regs.$2;
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_sp_x(0xbd, sp, x) {
-1:op_io();
-  regs.$1 = regs.$2;
-}
-
-mov_a_const(0xe8, a),
-mov_x_const(0xcd, x),
-mov_y_const(0x8d, y) {
-1:regs.$1 = op_readpc();
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_ix(0xe6) {
-1:op_io();
-2:regs.a = op_readdp(regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_ixinc(0xbf) {
-1:op_io();
-2:regs.a = op_readdp(regs.x++);
-3:op_io();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_dp(0xe4, a),
-mov_x_dp(0xf8, x),
-mov_y_dp(0xeb, y) {
-1:sp = op_readpc();
-2:regs.$1 = op_readdp(sp);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_dpx(0xf4, a, x),
-mov_x_dpy(0xf9, x, y),
-mov_y_dpx(0xfb, y, x) {
-1:sp = op_readpc();
-2:op_io();
-3:regs.$1 = op_readdp(sp + regs.$2);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_addr(0xe5, a),
-mov_x_addr(0xe9, x),
-mov_y_addr(0xec, y) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:regs.$1 = op_readaddr(sp);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_addrx(0xf5, x),
-mov_a_addry(0xf6, y) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:op_io();
-4:regs.a = op_readaddr(sp + regs.$1);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_idpx(0xe7) {
-1:dp = op_readpc() + regs.x;
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_idpy(0xf7) {
-1:dp = op_readpc();
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_dp_dp(0xfa) {
-1:sp = op_readpc();
-2:rd = op_readdp(sp);
-3:dp = op_readpc();
-4:op_writedp(dp, rd);
-}
-
-mov_dp_const(0x8f) {
-1:rd = op_readpc();
-2:dp = op_readpc();
-3:op_readdp(dp);
-4:op_writedp(dp, rd);
-}
-
-mov_ix_a(0xc6) {
-1:op_io();
-2:op_readdp(regs.x);
-3:op_writedp(regs.x, regs.a);
-}
-
-mov_ixinc_a(0xaf) {
-1:op_io();
-2:op_io();
-3:op_writedp(regs.x++, regs.a);
-}
-
-mov_dp_a(0xc4, a),
-mov_dp_x(0xd8, x),
-mov_dp_y(0xcb, y) {
-1:dp = op_readpc();
-2:op_readdp(dp);
-3:op_writedp(dp, regs.$1);
-}
-
-mov_dpx_a(0xd4, x, a),
-mov_dpy_x(0xd9, y, x),
-mov_dpx_y(0xdb, x, y) {
-1:dp  = op_readpc();
-2:op_io();
-  dp += regs.$1;
-3:op_readdp(dp);
-4:op_writedp(dp, regs.$2);
-}
-
-mov_addr_a(0xc5, a),
-mov_addr_x(0xc9, x),
-mov_addr_y(0xcc, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_readaddr(dp);
-4:op_writeaddr(dp, regs.$1);
-}
-
-mov_addrx_a(0xd5, x),
-mov_addry_a(0xd6, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-  dp += regs.$1;
-4:op_readaddr(dp);
-5:op_writeaddr(dp, regs.a);
-}
-
-mov_idpx_a(0xc7) {
-1:sp  = op_readpc();
-2:op_io();
-  sp += regs.x;
-3:dp  = op_readdp(sp);
-4:dp |= op_readdp(sp + 1) << 8;
-5:op_readaddr(dp);
-6:op_writeaddr(dp, regs.a);
-}
-
-mov_idpy_a(0xd7) {
-1:sp  = op_readpc();
-2:dp  = op_readdp(sp);
-3:dp |= op_readdp(sp + 1) << 8;
-4:op_io();
-  dp += regs.y;
-5:op_readaddr(dp);
-6:op_writeaddr(dp, regs.a);
-}
-
-movw_ya_dp(0xba) {
-1:sp = op_readpc();
-2:regs.a = op_readdp(sp);
-3:op_io();
-4:regs.y = op_readdp(sp + 1);
-  regs.p.n = !!(regs.ya & 0x8000);
-  regs.p.z = (regs.ya == 0);
-}
-
-movw_dp_ya(0xda) {
-1:dp = op_readpc();
-2:op_readdp(dp);
-3:op_writedp(dp,     regs.a);
-4:op_writedp(dp + 1, regs.y);
-}
-
-mov1_c_bit(0xaa) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:bit = sp >> 13;
-  sp &= 0x1fff;
-  rd = op_readaddr(sp);
-  regs.p.c = !!(rd & (1 << bit));
-}
-
-mov1_bit_c(0xca) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  if(regs.p.c)rd |=  (1 << bit);
-  else        rd &= ~(1 << bit);
-4:op_io();
-5:op_writeaddr(dp, rd);
-}
@@ -1,389 +0,0 @@
-case 0x7d: {
-  op_io();
-  regs.a = regs.x;
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xdd: {
-  op_io();
-  regs.a = regs.y;
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0x5d: {
-  op_io();
-  regs.x = regs.a;
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xfd: {
-  op_io();
-  regs.y = regs.a;
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0x9d: {
-  op_io();
-  regs.x = regs.sp;
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xbd: {
-  op_io();
-  regs.sp = regs.x;
-  break;
-}
-
-case 0xe8: {
-  regs.a = op_readpc();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xcd: {
-  regs.x = op_readpc();
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0x8d: {
-  regs.y = op_readpc();
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xe6: {
-  op_io();
-  regs.a = op_readdp(regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xbf: {
-  op_io();
-  regs.a = op_readdp(regs.x++);
-  op_io();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe4: {
-  sp = op_readpc();
-  regs.a = op_readdp(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf8: {
-  sp = op_readpc();
-  regs.x = op_readdp(sp);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xeb: {
-  sp = op_readpc();
-  regs.y = op_readdp(sp);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xf4: {
-  sp = op_readpc();
-  op_io();
-  regs.a = op_readdp(sp + regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf9: {
-  sp = op_readpc();
-  op_io();
-  regs.x = op_readdp(sp + regs.y);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xfb: {
-  sp = op_readpc();
-  op_io();
-  regs.y = op_readdp(sp + regs.x);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xe5: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe9: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.x = op_readaddr(sp);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xec: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.y = op_readaddr(sp);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xf5: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  op_io();
-  regs.a = op_readaddr(sp + regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf6: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  op_io();
-  regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe7: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf7: {
-  dp = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xfa: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x8f: {
-  rd = op_readpc();
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xc6: {
-  op_io();
-  op_readdp(regs.x);
-  op_writedp(regs.x, regs.a);
-  break;
-}
-
-case 0xaf: {
-  op_io();
-  op_io();
-  op_writedp(regs.x++, regs.a);
-  break;
-}
-
-case 0xc4: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.a);
-  break;
-}
-
-case 0xd8: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.x);
-  break;
-}
-
-case 0xcb: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.y);
-  break;
-}
-
-case 0xd4: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.x;
-  op_readdp(dp);
-  op_writedp(dp, regs.a);
-  break;
-}
-
-case 0xd9: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.y;
-  op_readdp(dp);
-  op_writedp(dp, regs.x);
-  break;
-}
-
-case 0xdb: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.x;
-  op_readdp(dp);
-  op_writedp(dp, regs.y);
-  break;
-}
-
-case 0xc5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xc9: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.x);
-  break;
-}
-
-case 0xcc: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.y);
-  break;
-}
-
-case 0xd5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.x;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xd6: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.y;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xc7: {
-  sp  = op_readpc();
-  op_io();
-  sp += regs.x;
-  dp  = op_readdp(sp);
-  dp |= op_readdp(sp + 1) << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xd7: {
-  sp  = op_readpc();
-  dp  = op_readdp(sp);
-  dp |= op_readdp(sp + 1) << 8;
-  op_io();
-  dp += regs.y;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xba: {
-  sp = op_readpc();
-  regs.a = op_readdp(sp);
-  op_io();
-  regs.y = op_readdp(sp + 1);
-  regs.p.n = !!(regs.ya & 0x8000);
-  regs.p.z = (regs.ya == 0);
-  break;
-}
-
-case 0xda: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp,     regs.a);
-  op_writedp(dp + 1, regs.y);
-  break;
-}
-
-case 0xaa: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  bit = sp >> 13;
-  sp &= 0x1fff;
-  rd = op_readaddr(sp);
-  regs.p.c = !!(rd & (1 << bit));
-  break;
-}
-
-case 0xca: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  if(regs.p.c)rd |=  (1 << bit);
-  else        rd &= ~(1 << bit);
-  op_io();
-  op_writeaddr(dp, rd);
-  break;
-}
-
@@ -1,179 +0,0 @@
-bra(0x2f, 0),
-beq(0xf0, !regs.p.z),
-bne(0xd0, regs.p.z),
-bcs(0xb0, !regs.p.c),
-bcc(0x90, regs.p.c),
-bvs(0x70, !regs.p.v),
-bvc(0x50, regs.p.v),
-bmi(0x30, !regs.p.n),
-bpl(0x10, regs.p.n) {
-1:rd = op_readpc();
-  if($1)end;
-2:op_io();
-3:op_io();
-  regs.pc += (int8)rd;
-}
-
-bbs0(0x03, 0x01, !=),
-bbc0(0x13, 0x01, ==),
-bbs1(0x23, 0x02, !=),
-bbc1(0x33, 0x02, ==),
-bbs2(0x43, 0x04, !=),
-bbc2(0x53, 0x04, ==),
-bbs3(0x63, 0x08, !=),
-bbc3(0x73, 0x08, ==),
-bbs4(0x83, 0x10, !=),
-bbc4(0x93, 0x10, ==),
-bbs5(0xa3, 0x20, !=),
-bbc5(0xb3, 0x20, ==),
-bbs6(0xc3, 0x40, !=),
-bbc6(0xd3, 0x40, ==),
-bbs7(0xe3, 0x80, !=),
-bbc7(0xf3, 0x80, ==) {
-1:dp = op_readpc();
-2:sp = op_readdp(dp);
-3:rd = op_readpc();
-4:op_io();
-  if((sp & $1) $2 $1)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-cbne_dp(0x2e) {
-1:dp = op_readpc();
-2:sp = op_readdp(dp);
-3:rd = op_readpc();
-4:op_io();
-  if(regs.a == sp)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-cbne_dpx(0xde) {
-1:dp = op_readpc();
-2:op_io();
-3:sp = op_readdp(dp + regs.x);
-4:rd = op_readpc();
-5:op_io();
-  if(regs.a == sp)end;
-6:op_io();
-7:op_io();
-  regs.pc += (int8)rd;
-}
-
-dbnz_dp(0x6e) {
-1:dp = op_readpc();
-2:wr = op_readdp(dp);
-3:op_writedp(dp, --wr);
-4:rd = op_readpc();
-  if(wr == 0x00)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-dbnz_y(0xfe) {
-1:rd = op_readpc();
-2:op_io();
-  regs.y--;
-3:op_io();
-  if(regs.y == 0x00)end;
-4:op_io();
-5:op_io();
-  regs.pc += (int8)rd;
-}
-
-jmp_addr(0x5f) {
-1:rd  = op_readpc();
-2:rd |= op_readpc() << 8;
-  regs.pc = rd;
-}
-
-jmp_iaddrx(0x1f) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-  dp += regs.x;
-4:rd  = op_readaddr(dp);
-5:rd |= op_readaddr(dp + 1) << 8;
-  regs.pc = rd;
-}
-
-call(0x3f) {
-1:rd  = op_readpc();
-2:rd |= op_readpc() << 8;
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_writestack(regs.pc >> 8);
-7:op_writestack(regs.pc);
-  regs.pc = rd;
-}
-
-pcall(0x4f) {
-1:rd = op_readpc();
-2:op_io();
-3:op_io();
-4:op_writestack(regs.pc >> 8);
-5:op_writestack(regs.pc);
-  regs.pc = 0xff00 | rd;
-}
-
-tcall_0(0x01, 0),
-tcall_1(0x11, 1),
-tcall_2(0x21, 2),
-tcall_3(0x31, 3),
-tcall_4(0x41, 4),
-tcall_5(0x51, 5),
-tcall_6(0x61, 6),
-tcall_7(0x71, 7),
-tcall_8(0x81, 8),
-tcall_9(0x91, 9),
-tcall_10(0xa1, 10),
-tcall_11(0xb1, 11),
-tcall_12(0xc1, 12),
-tcall_13(0xd1, 13),
-tcall_14(0xe1, 14),
-tcall_15(0xf1, 15) {
-1:dp = 0xffde - ($1 << 1);
-  rd  = op_readaddr(dp);
-2:rd |= op_readaddr(dp + 1) << 8;
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_writestack(regs.pc >> 8);
-7:op_writestack(regs.pc);
-  regs.pc = rd;
-}
-
-brk(0x0f) {
-1:rd  = op_readaddr(0xffde);
-2:rd |= op_readaddr(0xffdf) << 8;
-3:op_io();
-4:op_io();
-5:op_writestack(regs.pc >> 8);
-6:op_writestack(regs.pc);
-7:op_writestack(regs.p);
-  regs.pc = rd;
-  regs.p.b = 1;
-  regs.p.i = 0;
-}
-
-ret(0x6f) {
-1:rd  = op_readstack();
-2:rd |= op_readstack() << 8;
-3:op_io();
-4:op_io();
-  regs.pc = rd;
-}
-
-reti(0x7f) {
-1:regs.p = op_readstack();
-2:rd  = op_readstack();
-3:rd |= op_readstack() << 8;
-4:op_io();
-5:op_io();
-  regs.pc = rd;
-}
@@ -1,603 +0,0 @@
-case 0x2f: {
-  rd = op_readpc();
-  if(0)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xf0: {
-  rd = op_readpc();
-  if(!regs.p.z)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xd0: {
-  rd = op_readpc();
-  if(regs.p.z)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xb0: {
-  rd = op_readpc();
-  if(!regs.p.c)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x90: {
-  rd = op_readpc();
-  if(regs.p.c)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x70: {
-  rd = op_readpc();
-  if(!regs.p.v)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x50: {
-  rd = op_readpc();
-  if(regs.p.v)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x30: {
-  rd = op_readpc();
-  if(!regs.p.n)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x10: {
-  rd = op_readpc();
-  if(regs.p.n)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x03: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x01) != 0x01)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x13: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x01) == 0x01)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x23: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x02) != 0x02)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x33: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x02) == 0x02)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x43: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x04) != 0x04)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x53: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x04) == 0x04)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x63: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x08) != 0x08)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x73: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x08) == 0x08)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x83: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x10) != 0x10)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x93: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x10) == 0x10)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xa3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x20) != 0x20)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xb3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x20) == 0x20)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xc3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x40) != 0x40)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xd3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x40) == 0x40)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xe3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x80) != 0x80)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xf3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x80) == 0x80)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x2e: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if(regs.a == sp)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xde: {
-  dp = op_readpc();
-  op_io();
-  sp = op_readdp(dp + regs.x);
-  rd = op_readpc();
-  op_io();
-  if(regs.a == sp)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x6e: {
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  op_writedp(dp, --wr);
-  rd = op_readpc();
-  if(wr == 0x00)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xfe: {
-  rd = op_readpc();
-  op_io();
-  regs.y--;
-  op_io();
-  if(regs.y == 0x00)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x5f: {
-  rd  = op_readpc();
-  rd |= op_readpc() << 8;
-  regs.pc = rd;
-  break;
-}
-
-case 0x1f: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.x;
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  regs.pc = rd;
-  break;
-}
-
-case 0x3f: {
-  rd  = op_readpc();
-  rd |= op_readpc() << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x4f: {
-  rd = op_readpc();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = 0xff00 | rd;
-  break;
-}
-
-case 0x01: {
-  dp = 0xffde - (0 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x11: {
-  dp = 0xffde - (1 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x21: {
-  dp = 0xffde - (2 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x31: {
-  dp = 0xffde - (3 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x41: {
-  dp = 0xffde - (4 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x51: {
-  dp = 0xffde - (5 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x61: {
-  dp = 0xffde - (6 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x71: {
-  dp = 0xffde - (7 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x81: {
-  dp = 0xffde - (8 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x91: {
-  dp = 0xffde - (9 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xa1: {
-  dp = 0xffde - (10 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xb1: {
-  dp = 0xffde - (11 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xc1: {
-  dp = 0xffde - (12 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xd1: {
-  dp = 0xffde - (13 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xe1: {
-  dp = 0xffde - (14 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xf1: {
-  dp = 0xffde - (15 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x0f: {
-  rd  = op_readaddr(0xffde);
-  rd |= op_readaddr(0xffdf) << 8;
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  op_writestack(regs.p);
-  regs.pc = rd;
-  regs.p.b = 1;
-  regs.p.i = 0;
-  break;
-}
-
-case 0x6f: {
-  rd  = op_readstack();
-  rd |= op_readstack() << 8;
-  op_io();
-  op_io();
-  regs.pc = rd;
-  break;
-}
-
-case 0x7f: {
-  regs.p = op_readstack();
-  rd  = op_readstack();
-  rd |= op_readstack() << 8;
-  op_io();
-  op_io();
-  regs.pc = rd;
-  break;
-}
-
@@ -1,205 +0,0 @@
-adc_a_const(0x88, adc, a),
-and_a_const(0x28, and, a),
-cmp_a_const(0x68, cmp, a),
-cmp_x_const(0xc8, cmp, x),
-cmp_y_const(0xad, cmp, y),
-eor_a_const(0x48, eor, a),
-or_a_const(0x08, or, a),
-sbc_a_const(0xa8, sbc, a) {
-1:rd = op_readpc();
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_ix(0x86, adc),
-and_a_ix(0x26, and),
-cmp_a_ix(0x66, cmp),
-eor_a_ix(0x46, eor),
-or_a_ix(0x06, or),
-sbc_a_ix(0xa6, sbc) {
-1:op_io();
-2:rd = op_readdp(regs.x);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_dp(0x84, adc, a),
-and_a_dp(0x24, and, a),
-cmp_a_dp(0x64, cmp, a),
-cmp_x_dp(0x3e, cmp, x),
-cmp_y_dp(0x7e, cmp, y),
-eor_a_dp(0x44, eor, a),
-or_a_dp(0x04, or, a),
-sbc_a_dp(0xa4, sbc, a) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_dpx(0x94, adc),
-and_a_dpx(0x34, and),
-cmp_a_dpx(0x74, cmp),
-eor_a_dpx(0x54, eor),
-or_a_dpx(0x14, or),
-sbc_a_dpx(0xb4, sbc) {
-1:dp = op_readpc();
-2:op_io();
-3:rd = op_readdp(dp + regs.x);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_addr(0x85, adc, a),
-and_a_addr(0x25, and, a),
-cmp_a_addr(0x65, cmp, a),
-cmp_x_addr(0x1e, cmp, x),
-cmp_y_addr(0x5e, cmp, y),
-eor_a_addr(0x45, eor, a),
-or_a_addr(0x05, or, a),
-sbc_a_addr(0xa5, sbc, a) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_addrx(0x95, adc, x),
-adc_a_addry(0x96, adc, y),
-and_a_addrx(0x35, and, x),
-and_a_addry(0x36, and, y),
-cmp_a_addrx(0x75, cmp, x),
-cmp_a_addry(0x76, cmp, y),
-eor_a_addrx(0x55, eor, x),
-eor_a_addry(0x56, eor, y),
-or_a_addrx(0x15, or, x),
-or_a_addry(0x16, or, y),
-sbc_a_addrx(0xb5, sbc, x),
-sbc_a_addry(0xb6, sbc, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-4:rd = op_readaddr(dp + regs.$2);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_idpx(0x87, adc),
-and_a_idpx(0x27, and),
-cmp_a_idpx(0x67, cmp),
-eor_a_idpx(0x47, eor),
-or_a_idpx(0x07, or),
-sbc_a_idpx(0xa7, sbc) {
-1:dp = op_readpc() + regs.x;
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:rd = op_readaddr(sp);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_idpy(0x97, adc),
-and_a_idpy(0x37, and),
-cmp_a_idpy(0x77, cmp),
-eor_a_idpy(0x57, eor),
-or_a_idpy(0x17, or),
-sbc_a_idpy(0xb7, sbc) {
-1:dp  = op_readpc();
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:rd = op_readaddr(sp + regs.y);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_ix_iy(0x99, adc, 1),
-and_ix_iy(0x39, and, 1),
-cmp_ix_iy(0x79, cmp, 0),
-eor_ix_iy(0x59, eor, 1),
-or_ix_iy(0x19, or, 1),
-sbc_ix_iy(0xb9, sbc, 1) {
-1:op_io();
-2:rd = op_readdp(regs.y);
-3:wr = op_readdp(regs.x);
-  wr = op_$1(wr, rd);
-4:($2) ? op_writedp(regs.x, wr) : op_io();
-}
-
-adc_dp_dp(0x89, adc, 1),
-and_dp_dp(0x29, and, 1),
-cmp_dp_dp(0x69, cmp, 0),
-eor_dp_dp(0x49, eor, 1),
-or_dp_dp(0x09, or, 1),
-sbc_dp_dp(0xa9, sbc, 1) {
-1:sp = op_readpc();
-2:rd = op_readdp(sp);
-3:dp = op_readpc();
-4:wr = op_readdp(dp);
-5:wr = op_$1(wr, rd);
-  ($2) ? op_writedp(dp, wr) : op_io();
-}
-
-adc_dp_const(0x98, adc, 1),
-and_dp_const(0x38, and, 1),
-cmp_dp_const(0x78, cmp, 0),
-eor_dp_const(0x58, eor, 1),
-or_dp_const(0x18, or, 1),
-sbc_dp_const(0xb8, sbc, 1) {
-1:rd = op_readpc();
-2:dp = op_readpc();
-3:wr = op_readdp(dp);
-4:wr = op_$1(wr, rd);
-  ($2) ? op_writedp(dp, wr) : op_io();
-}
-
-addw_ya_dp(0x7a, addw),
-subw_ya_dp(0x9a, subw) {
-1:dp  = op_readpc();
-2:rd  = op_readdp(dp);
-3:op_io();
-4:rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_$1(regs.ya, rd);
-}
-
-cmpw_ya_dp(0x5a) {
-1:dp  = op_readpc();
-2:rd  = op_readdp(dp);
-3:rd |= op_readdp(dp + 1) << 8;
-  op_cmpw(regs.ya, rd);
-}
-
-and1_bit(0x4a, !!),
-and1_notbit(0x6a, !) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & $1(rd & (1 << bit));
-}
-
-eor1_bit(0x8a) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-4:op_io();
-  regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-}
-
-not1_bit(0xea) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  rd ^= (1 << bit);
-4:op_writeaddr(dp, rd);
-}
-
-or1_bit(0x0a, !!),
-or1_notbit(0x2a, !) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-4:op_io();
-  regs.p.c = regs.p.c | $1(rd & (1 << bit));
-}
@@ -1,744 +0,0 @@
-case 0x88: {
-  rd = op_readpc();
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x28: {
-  rd = op_readpc();
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x68: {
-  rd = op_readpc();
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0xc8: {
-  rd = op_readpc();
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0xad: {
-  rd = op_readpc();
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x48: {
-  rd = op_readpc();
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x08: {
-  rd = op_readpc();
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa8: {
-  rd = op_readpc();
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x86: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x26: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x66: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x46: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x06: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa6: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x84: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x24: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x64: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x3e: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0x7e: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x44: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x04: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa4: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x94: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x34: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x74: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x54: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x14: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb4: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x85: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x25: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x65: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x1e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0x5e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x45: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x05: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x95: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x96: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x35: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x36: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x75: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x76: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x55: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x56: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x15: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0x16: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0xb6: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x87: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x27: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x67: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x47: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x07: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa7: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x97: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x37: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x77: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x57: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x17: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb7: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x99: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x39: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x79: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x59: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x19: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0xb9: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x89: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x29: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x69: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x49: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x09: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0xa9: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x98: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x38: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x78: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x58: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x18: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0xb8: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x7a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  op_io();
-  rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_addw(regs.ya, rd);
-  break;
-}
-
-case 0x9a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  op_io();
-  rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_subw(regs.ya, rd);
-  break;
-}
-
-case 0x5a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  rd |= op_readdp(dp + 1) << 8;
-  op_cmpw(regs.ya, rd);
-  break;
-}
-
-case 0x4a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & !!(rd & (1 << bit));
-  break;
-}
-
-case 0x6a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & !(rd & (1 << bit));
-  break;
-}
-
-case 0x8a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-  break;
-}
-
-case 0xea: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  rd ^= (1 << bit);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c | !!(rd & (1 << bit));
-  break;
-}
-
-case 0x2a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c | !(rd & (1 << bit));
-  break;
-}
-
@@ -1,74 +0,0 @@
-inc_a(0xbc, inc, a),
-inc_x(0x3d, inc, x),
-inc_y(0xfc, inc, y),
-dec_a(0x9c, dec, a),
-dec_x(0x1d, dec, x),
-dec_y(0xdc, dec, y),
-asl_a(0x1c, asl, a),
-lsr_a(0x5c, lsr, a),
-rol_a(0x3c, rol, a),
-ror_a(0x7c, ror, a) {
-1:op_io();
-  regs.$2 = op_$1(regs.$2);
-}
-
-inc_dp(0xab, inc),
-dec_dp(0x8b, dec),
-asl_dp(0x0b, asl),
-lsr_dp(0x4b, lsr),
-rol_dp(0x2b, rol),
-ror_dp(0x6b, ror) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-3:rd = op_$1(rd);
-  op_writedp(dp, rd);
-}
-
-inc_dpx(0xbb, inc),
-dec_dpx(0x9b, dec),
-asl_dpx(0x1b, asl),
-lsr_dpx(0x5b, lsr),
-rol_dpx(0x3b, rol),
-ror_dpx(0x7b, ror) {
-1:dp = op_readpc();
-2:op_io();
-3:rd = op_readdp(dp + regs.x);
-4:rd = op_$1(rd);
-  op_writedp(dp + regs.x, rd);
-}
-
-inc_addr(0xac, inc),
-dec_addr(0x8c, dec),
-asl_addr(0x0c, asl),
-lsr_addr(0x4c, lsr),
-rol_addr(0x2c, rol),
-ror_addr(0x6c, ror) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-4:rd = op_$1(rd);
-  op_writeaddr(dp, rd);
-}
-
-tset_addr_a(0x0e, |),
-tclr_addr_a(0x4e, &~) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-4:op_readaddr(dp);
-5:op_writeaddr(dp, rd $1 regs.a);
-}
-
-incw_dp(0x3a, ++),
-decw_dp(0x1a, --) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-  rd$1;
-3:op_writedp(dp++, rd);
-4:rd += op_readdp(dp) << 8;
-5:op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-}
@@ -1,262 +0,0 @@
-case 0xbc: {
-  op_io();
-  regs.a = op_inc(regs.a);
-  break;
-}
-
-case 0x3d: {
-  op_io();
-  regs.x = op_inc(regs.x);
-  break;
-}
-
-case 0xfc: {
-  op_io();
-  regs.y = op_inc(regs.y);
-  break;
-}
-
-case 0x9c: {
-  op_io();
-  regs.a = op_dec(regs.a);
-  break;
-}
-
-case 0x1d: {
-  op_io();
-  regs.x = op_dec(regs.x);
-  break;
-}
-
-case 0xdc: {
-  op_io();
-  regs.y = op_dec(regs.y);
-  break;
-}
-
-case 0x1c: {
-  op_io();
-  regs.a = op_asl(regs.a);
-  break;
-}
-
-case 0x5c: {
-  op_io();
-  regs.a = op_lsr(regs.a);
-  break;
-}
-
-case 0x3c: {
-  op_io();
-  regs.a = op_rol(regs.a);
-  break;
-}
-
-case 0x7c: {
-  op_io();
-  regs.a = op_ror(regs.a);
-  break;
-}
-
-case 0xab: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_inc(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x8b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_dec(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x0b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_asl(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x4b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_lsr(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x2b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_rol(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x6b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_ror(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xbb: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_inc(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x9b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_dec(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x1b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_asl(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x5b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_lsr(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x3b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_rol(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x7b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_ror(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0xac: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_inc(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x8c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_dec(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_asl(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x4c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_lsr(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x2c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_rol(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x6c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_ror(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-  op_readaddr(dp);
-  op_writeaddr(dp, rd | regs.a);
-  break;
-}
-
-case 0x4e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-  op_readaddr(dp);
-  op_writeaddr(dp, rd &~ regs.a);
-  break;
-}
-
-case 0x3a: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd++;
-  op_writedp(dp++, rd);
-  rd += op_readdp(dp) << 8;
-  op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-  break;
-}
-
-case 0x1a: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd--;
-  op_writedp(dp++, rd);
-  rd += op_readdp(dp) << 8;
-  op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-  break;
-}
-
@@ -1,696 +0,0 @@
-case 0x00: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xef: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.pc--;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xff: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.pc--;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9f: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    regs.a = (regs.a >> 4) | (regs.a << 4);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    if(regs.p.c || (regs.a) > 0x99) {
-      regs.a += 0x60;
-      regs.p.c = 1;
-    }
-    if(regs.p.h || (regs.a & 15) > 0x09) {
-      regs.a += 0x06;
-    }
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbe: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    if(!regs.p.c || (regs.a) > 0x99) {
-      regs.a -= 0x60;
-      regs.p.c = 0;
-    }
-    if(!regs.p.h || (regs.a & 15) > 0x09) {
-      regs.a -= 0x06;
-    }
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x60: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.c = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x20: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.p = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x80: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.c = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x40: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.p = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.v = 0;
-    regs.p.h = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xed: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.c = !regs.p.c;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.i = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.i = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x02: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x01;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x12: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x01;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x22: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x02;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x32: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x02;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x42: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x04;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x52: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x04;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x62: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x08;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x72: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x08;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x82: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x10;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x92: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x10;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x20;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x20;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x40;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x40;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x80;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x80;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.p);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xae: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.a = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xce: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.x = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xee: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.y = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8e: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.p = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    break;
-  case 7:
-    op_io();
-    break;
-  case 8:
-    op_io();
-    ya = regs.y * regs.a;
-    regs.a = ya;
-    regs.y = ya >> 8;
-    //result is set based on y (high-byte) only
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9e: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    break;
-  case 7:
-    op_io();
-    break;
-  case 8:
-    op_io();
-    break;
-  case 9:
-    op_io();
-    break;
-  case 10:
-    op_io();
-    break;
-  case 11:
-    op_io();
-    ya = regs.ya;
-    //overflow set if quotient >= 256
-    regs.p.v = !!(regs.y >= regs.x);
-    regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-    if(regs.y < (regs.x << 1)) {
-      //if quotient is <= 511 (will fit into 9-bit result)
-      regs.a = ya / regs.x;
-      regs.y = ya % regs.x;
-    } else {
-      //otherwise, the quotient won't fit into regs.p.v + regs.a
-      //this emulates the odd behavior of the S-SMP in this case
-      regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-      regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-    }
-    //result is set based on a (quotient) only
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
@@ -1,806 +0,0 @@
-case 0x7d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = regs.x;
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = regs.y;
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = regs.a;
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = regs.a;
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = regs.sp;
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.sp = regs.x;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe8: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.a = op_readpc();
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcd: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.x = op_readpc();
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8d: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.y = op_readpc();
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe6: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    regs.a = op_readdp(regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    regs.a = op_readdp(regs.x++);
-    break;
-  case 3:
-    op_io();
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe4: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.a = op_readdp(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf8: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.x = op_readdp(sp);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xeb: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.y = op_readdp(sp);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf4: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.a = op_readdp(sp + regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf9: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.x = op_readdp(sp + regs.y);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfb: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.y = op_readdp(sp + regs.x);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe5: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.a = op_readaddr(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe9: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.x = op_readaddr(sp);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xec: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.y = op_readaddr(sp);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf5: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.a = op_readaddr(sp + regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf6: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.a = op_readaddr(sp + regs.y);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    regs.a = op_readaddr(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    regs.a = op_readaddr(sp + regs.y);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfa: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc6: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_readdp(regs.x);
-    break;
-  case 3:
-    op_writedp(regs.x, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xaf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writedp(regs.x++, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd8: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.x;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd9: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.y;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.x;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc9: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcc: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    dp += regs.x;
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd6: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    dp += regs.y;
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc7: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    sp += regs.x;
-    break;
-  case 3:
-    dp  = op_readdp(sp);
-    break;
-  case 4:
-    dp |= op_readdp(sp + 1) << 8;
-    break;
-  case 5:
-    op_readaddr(dp);
-    break;
-  case 6:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd7: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    dp  = op_readdp(sp);
-    break;
-  case 3:
-    dp |= op_readdp(sp + 1) << 8;
-    break;
-  case 4:
-    op_io();
-    dp += regs.y;
-    break;
-  case 5:
-    op_readaddr(dp);
-    break;
-  case 6:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xba: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.a = op_readdp(sp);
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.y = op_readdp(sp + 1);
-    regs.p.n = !!(regs.ya & 0x8000);
-    regs.p.z = (regs.ya == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xda: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp,     regs.a);
-    break;
-  case 4:
-    op_writedp(dp + 1, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xaa: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = sp >> 13;
-    sp &= 0x1fff;
-    rd = op_readaddr(sp);
-    regs.p.c = !!(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xca: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    if(regs.p.c)rd |=  (1 << bit);
-    else        rd &= ~(1 << bit);
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
@@ -1,550 +0,0 @@
-case 0xbc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_inc(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = op_inc(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = op_inc(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_dec(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = op_dec(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = op_dec(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_asl(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_lsr(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_rol(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_ror(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xab: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_inc(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_dec(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_asl(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_lsr(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_rol(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_ror(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_inc(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_dec(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_asl(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_lsr(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_rol(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_ror(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xac: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_inc(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_dec(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_asl(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_lsr(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_rol(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_ror(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.p.n = !!((regs.a - rd) & 0x80);
-    regs.p.z = ((regs.a - rd) == 0);
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, rd | regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.p.n = !!((regs.a - rd) & 0x80);
-    regs.p.z = ((regs.a - rd) == 0);
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, rd &~ regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    rd++;
-    break;
-  case 3:
-    op_writedp(dp++, rd);
-    break;
-  case 4:
-    rd += op_readdp(dp) << 8;
-    break;
-  case 5:
-    op_writedp(dp, rd >> 8);
-    regs.p.n = !!(rd & 0x8000);
-    regs.p.z = (rd == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    rd--;
-    break;
-  case 3:
-    op_writedp(dp++, rd);
-    break;
-  case 4:
-    rd += op_readdp(dp) << 8;
-    break;
-  case 5:
-    op_writedp(dp, rd >> 8);
-    regs.p.n = !!(rd & 0x8000);
-    regs.p.z = (rd == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
@@ -19,7 +19,6 @@ unsigned SMP::mmio_read(unsigned addr) {
  case 0xf5:
  case 0xf6:
  case 0xf7:
-    synchronize_cpu();
    return cpu.port_read(addr);

  case 0xf8:
@@ -58,7 +57,6 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
    status.iplrom_enable = data & 0x80;

    if(data & 0x30) {
-      synchronize_cpu();
      if(data & 0x20) {
        cpu.port_write(3, 0x00);
        cpu.port_write(2, 0x00);
@@ -102,7 +100,6 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
  case 0xf5:
  case 0xf6:
  case 0xf7:
-    synchronize_cpu();
    port_write(addr, data);
    break;

@@ -125,6 +122,5 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
  case 0xfc:
    timer2.target = data;
    break;
-
  }
 }
@@ -1,6 +1,3 @@
-#define CYCLE_ACCURATE
-#define PSEUDO_CYCLE
-
 #ifdef DEBUGGER
 #include "../../../snes9x.h"
 #include "../../../debug.h"
@@ -12,63 +9,29 @@ char tmp[1024];
 #define SMP_CPP
 namespace SNES {

-// TODO: reactivate once APU debugger works again
 #ifdef DEBUGGER
-//  #include "debugger/debugger.cpp"
-  #include "debugger/disassembler.cpp"
-  SMP smp;
-#else
-  SMP smp;
+#include "debugger/disassembler.cpp"
 #endif

+SMP smp;
+
 #include "algorithms.cpp"
 #include "core.cpp"
 #include "iplrom.cpp"
 #include "memory.cpp"
 #include "timing.cpp"

-void SMP::synchronize_cpu() {
-#ifndef SNES9X
-  if(CPU::Threaded == true) {
-  //if(clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(cpu.thread);
-  } else {
-    while(clock >= 0) cpu.enter();
-  }
-#endif
-}
-
-void SMP::synchronize_dsp() {
-#ifndef SNES9X
-  if(DSP::Threaded == true) {
-  //if(dsp.clock < 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(dsp.thread);
-  } else {
-    while(dsp.clock < 0) dsp.enter();
-  }
-#endif
-}
-
 void SMP::enter() {
  while(clock < 0) op_step();
 }

 void SMP::power() {
-#ifndef SNES9X
-  Processor::frequency = system.apu_frequency();
-#endif
-
  Processor::clock = 0;

  timer0.target = 0;
  timer1.target = 0;
  timer2.target = 0;

-  for(unsigned n = 0; n < 256; n++) {
-    cycle_table_dsp[n] = (cycle_count_table[n] * 24);
-    cycle_table_cpu[n] = (cycle_count_table[n] * 24) * cpu.frequency;
-  }
-
-  cycle_step_cpu = 24 * cpu.frequency;
-
  reset();
 }

@@ -102,58 +65,6 @@ void SMP::reset() {
  timer0.stage3_ticks = timer1.stage3_ticks = timer2.stage3_ticks = 0;
 }

-#ifndef SNES9X
-void SMP::serialize(serializer &s) {
-  Processor::serialize(s);
-
-  s.array(apuram, 64 * 1024);
-
-  s.integer(opcode_number);
-  s.integer(opcode_cycle);
-
-  s.integer(regs.pc);
-  s.integer(regs.sp);
-  s.integer(regs.a);
-  s.integer(regs.x);
-  s.integer(regs.y);
-
-  s.integer(regs.p.n);
-  s.integer(regs.p.v);
-  s.integer(regs.p.p);
-  s.integer(regs.p.b);
-  s.integer(regs.p.h);
-  s.integer(regs.p.i);
-  s.integer(regs.p.z);
-  s.integer(regs.p.c);
-
-  s.integer(status.iplrom_enable);
-
-  s.integer(status.dsp_addr);
-
-  s.integer(status.ram00f8);
-  s.integer(status.ram00f9);
-
-  s.integer(timer0.enable);
-  s.integer(timer0.target);
-  s.integer(timer0.stage1_ticks);
-  s.integer(timer0.stage2_ticks);
-  s.integer(timer0.stage3_ticks);
-
-  s.integer(timer1.enable);
-  s.integer(timer1.target);
-  s.integer(timer1.stage1_ticks);
-  s.integer(timer1.stage2_ticks);
-  s.integer(timer1.stage3_ticks);
-
-  s.integer(timer2.enable);
-  s.integer(timer2.target);
-
-  s.integer(timer2.stage1_ticks);
-  s.integer(timer2.stage2_ticks);
-  s.integer(timer2.stage3_ticks);
-}
-#endif
-
 SMP::SMP() {
  apuram = new uint8[64 * 1024];
 }
@@ -3,10 +3,6 @@ public:
  static const uint8 iplrom[64];
  uint8 *apuram;

-  enum { Threaded = false };
-  alwaysinline void synchronize_cpu();
-  alwaysinline void synchronize_dsp();
-
  unsigned port_read(unsigned port);
  void port_write(unsigned port, unsigned data);

@@ -17,13 +13,9 @@ public:
  void power();
  void reset();

-#ifndef SNES9X
-  void serialize(serializer&);
-#else
  void load_state(uint8 **);
  void save_state(uint8 **);
  void save_spc (uint8 *);
-#endif
  SMP();
  ~SMP();

@@ -102,6 +94,8 @@ public:
  debugvirtual alwaysinline uint8 op_read(uint16 addr);
  debugvirtual alwaysinline void op_write(uint16 addr, uint8 data);
  debugvirtual alwaysinline void op_step();
+  alwaysinline void op_writestack(uint8 data);
+  alwaysinline uint8 op_readstack();
  static const unsigned cycle_count_table[256];
  uint64 cycle_table_cpu[256];
  unsigned cycle_table_dsp[256];
@@ -129,10 +123,4 @@ public:
 #endif
 };

-// TODO: reactivate once APU debugger works again
-#if 0 // DEBUGGER
-  #include "debugger/debugger.hpp"
-  extern SMPDebugger smp;
-#else
-  extern SMP smp;
-#endif
+extern SMP smp;
@@ -194,4 +194,4 @@ void SMP::load_state(uint8 **block) {
  *block = ptr;
 }

-} /* namespace SNES */
+} // namespace SNES
@@ -2,19 +2,8 @@
 #define __SNES_HPP

 #include "../../../snes9x.h"
-
-#define SNES9X
-
-#if defined(__GNUC__)
-  #define inline        inline
-  #define alwaysinline  inline __attribute__((always_inline))
-#elif defined(_MSC_VER)
-  #define inline        inline
-  #define alwaysinline  inline __forceinline
-#else
-  #define inline        inline
-  #define alwaysinline  inline
-#endif
+#include "../../resampler.h"
+#include "../../../msu1.h"

 #define debugvirtual

@@ -33,8 +22,6 @@ struct Processor
 class CPU
 {
 public:
-    enum { Threaded = false };
-    int frequency;
    uint8 registers[4];

    inline void reset ()
@@ -55,6 +42,6 @@ public:

 extern CPU cpu;

-} /* namespace SNES */
+} // namespace SNES

 #endif
@@ -1,141 +0,0 @@
-/* Simple resampler based on bsnes's ruby audio library */
-
-#ifndef __HERMITE_RESAMPLER_H
-#define __HERMITE_RESAMPLER_H
-
-#include "resampler.h"
-#include <assert.h>
-
-#undef CLAMP
-#undef SHORT_CLAMP
-#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-#define SHORT_CLAMP(n) ((short) CLAMP((n), -32768, 32767))
-
-class HermiteResampler : public Resampler
-{
-    protected:
-
-        float r_step;
-        float r_frac;
-        int   r_left[4], r_right[4];
-
-        static inline float
-        hermite (float mu1, float a, float b, float c, float d)
-        {
-            float mu2, mu3, m0, m1, a0, a1, a2, a3;
-
-            mu2 = mu1 * mu1;
-            mu3 = mu2 * mu1;
-
-            m0 = (c - a) * 0.5;
-            m1 = (d - b) * 0.5;
-
-            a0 = +2 * mu3 - 3 * mu2 + 1;
-            a1 =      mu3 - 2 * mu2 + mu1;
-            a2 =      mu3 -     mu2;
-            a3 = -2 * mu3 + 3 * mu2;
-
-            return (a0 * b) + (a1 * m0) + (a2 * m1) + (a3 * c);
-        }
-
-    public:
-        HermiteResampler (int num_samples) : Resampler (num_samples)
-        {
-            clear ();
-        }
-
-        ~HermiteResampler ()
-        {
-        }
-
-        void
-        time_ratio (double ratio)
-        {
-            r_step = ratio;
-        }
-
-        void
-        clear (void)
-        {
-            ring_buffer::clear ();
-            r_frac = 1.0;
-            r_left [0] = r_left [1] = r_left [2] = r_left [3] = 0;
-            r_right[0] = r_right[1] = r_right[2] = r_right[3] = 0;
-        }
-
-        void
-        read (short *data, int num_samples)
-        {
-            //If we are outputting the exact same ratio as the input, pull directly from the input buffer
-            if (r_step == 1.0)
-            {
-                ring_buffer::pull((unsigned char*)data, num_samples * sizeof(short));
-                return;
-            }
-
-            assert((num_samples & 1) == 0); // resampler always processes both stereo samples
-            int i_position = start >> 1;
-            int max_samples = buffer_size >> 1;
-            short *internal_buffer = (short *) buffer;
-            int o_position = 0;
-            int consumed = 0;
-
-            while (o_position < num_samples && consumed < buffer_size)
-            {
-                int s_left = internal_buffer[i_position];
-                int s_right = internal_buffer[i_position + 1];
-                float hermite_val[2];
-
-                while (r_frac <= 1.0 && o_position < num_samples)
-                {
-                    hermite_val[0] = hermite (r_frac, r_left [0], r_left [1], r_left [2], r_left [3]);
-                    hermite_val[1] = hermite (r_frac, r_right[0], r_right[1], r_right[2], r_right[3]);
-                    data[o_position]     = SHORT_CLAMP (hermite_val[0]);
-                    data[o_position + 1] = SHORT_CLAMP (hermite_val[1]);
-
-                    o_position += 2;
-
-                    r_frac += r_step;
-                }
-
-                if (r_frac > 1.0)
-                {
-                    r_left [0] = r_left [1];
-                    r_left [1] = r_left [2];
-                    r_left [2] = r_left [3];
-                    r_left [3] = s_left;
-
-                    r_right[0] = r_right[1];
-                    r_right[1] = r_right[2];
-                    r_right[2] = r_right[3];
-                    r_right[3] = s_right;
-
-                    r_frac -= 1.0;
-
-                    i_position += 2;
-                    if (i_position >= max_samples)
-                        i_position -= max_samples;
-                    consumed += 2;
-                }
-            }
-
-            size -= consumed << 1;
-            start += consumed << 1;
-            if (start >= buffer_size)
-                start -= buffer_size;
-        }
-
-        inline int
-        avail (void)
-        {
-            //If we are outputting the exact same ratio as the input, find out directly from the input buffer
-            if (r_step == 1.0)
-            {
-                return (ring_buffer::space_filled() + sizeof(short) - 1) / sizeof(short);
-            }
-
-            return (int) floor (((size >> 2) - r_frac) / r_step) * 2;
-        }
-};
-
-#endif /* __HERMITE_RESAMPLER_H */
@@ -1,60 +1,231 @@
-/* Simple resampler based on bsnes's ruby audio library */
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

-#ifndef __RESAMPLER_H
-#define __RESAMPLER_H
+#ifndef __NEW_RESAMPLER_H
+#define __NEW_RESAMPLER_H

-#include "ring_buffer.h"
+#include <cstring>
+#include <cassert>
+#if __cplusplus >= 201103L
+#include <cstdint>
+#else
+#include <stdint.h>
+#endif
+#include <cmath>

-class Resampler : public ring_buffer
+class Resampler
 {
-    public:
-        virtual void clear (void)        = 0;
-        virtual void time_ratio (double) = 0;
-        virtual void read (short *, int) = 0;
-        virtual int  avail (void)        = 0;
+  public:
+    int size;
+    int buffer_size;
+    int start;
+    int16_t *buffer;

-        Resampler (int num_samples) : ring_buffer (num_samples << 1)
+    float r_step;
+    float r_frac;
+    int   r_left[4], r_right[4];
+
+    static inline int16_t short_clamp(int n)
+    {
+        return (int16_t)(((int16_t)n != n) ? (n >> 31) ^ 0x7fff : n);
+    }
+
+    static inline int min(int a, int b)
+    {
+        return ((a) < (b) ? (a) : (b));
+    }
+
+    static inline float hermite(float mu1, float a, float b, float c, float d)
+    {
+        float mu2, mu3, m0, m1, a0, a1, a2, a3;
+
+        mu2 = mu1 * mu1;
+        mu3 = mu2 * mu1;
+
+        m0 = (c - a) * 0.5;
+        m1 = (d - b) * 0.5;
+
+        a0 = +2 * mu3 - 3 * mu2 + 1;
+        a1 = mu3 - 2 * mu2 + mu1;
+        a2 = mu3 - mu2;
+        a3 = -2 * mu3 + 3 * mu2;
+
+        return (a0 * b) + (a1 * m0) + (a2 * m1) + (a3 * c);
+    }
+
+    Resampler()
+    {
+        this->buffer_size = 0;
+        buffer = NULL;
+        r_step = 1.0;
+    }
+
+    Resampler(int num_samples)
+    {
+        buffer = NULL;
+        resize(num_samples);
+        r_step = 1.0;
+    }
+
+    ~Resampler()
+    {
+        delete[] buffer;
+        buffer = NULL;
+    }
+
+    inline void time_ratio(double ratio)
+    {
+        r_step = ratio;
+    }
+
+    inline void clear(void)
+    {
+        if (!buffer)
+            return;
+
+        start = 0;
+        size = 0;
+        memset(buffer, 0, buffer_size * 2);
+
+        r_frac = 0.0;
+        r_left[0] = r_left[1] = r_left[2] = r_left[3] = 0;
+        r_right[0] = r_right[1] = r_right[2] = r_right[3] = 0;
+    }
+
+    inline bool pull(int16_t *dst, int num_samples)
+    {
+        if (space_filled() < num_samples)
+            return false;
+
+        memcpy(dst, buffer + start, min(num_samples, buffer_size - start) * 2);
+
+        if (num_samples > (buffer_size - start))
+            memcpy(dst + (buffer_size - start), buffer, (num_samples - (buffer_size - start)) * 2);
+
+        start = (start + num_samples) % buffer_size;
+        size -= num_samples;
+
+        return true;
+    }
+
+    inline void push_sample(int16_t l, int16_t r)
+    {
+        if (space_empty() >= 2)
        {
+            int end = start + size;
+            if (end >= buffer_size)
+                end -= buffer_size;
+            buffer[end] = l;
+            buffer[end + 1] = r;
+            size += 2;
+        }
+    }
+
+    inline bool push(int16_t *src, int num_samples)
+    {
+        if (space_empty() < num_samples)
+            return false;
+
+        int end = start + size;
+        if (end > buffer_size)
+            end -= buffer_size;
+        int first_write_size = min(num_samples, buffer_size - end);
+
+        memcpy(buffer + end, src, first_write_size * 2);
+
+        if (num_samples > first_write_size)
+            memcpy(buffer, src + first_write_size, (num_samples - first_write_size) * 2);
+
+        size += num_samples;
+
+        return true;
+    }
+
+    void read(int16_t *data, int num_samples)
+    {
+        //If we are outputting the exact same ratio as the input, pull directly from the input buffer
+        if (r_step == 1.0)
+        {
+            pull(data, num_samples);
+            return;
        }

-        virtual ~Resampler ()
+        assert((num_samples & 1) == 0); // resampler always processes both stereo samples
+        int o_position = 0;
+
+        while (o_position < num_samples && size > 0)
        {
+            int s_left = buffer[start];
+            int s_right = buffer[start + 1];
+            int hermite_val[2];
+
+            while (r_frac <= 1.0 && o_position < num_samples)
+            {
+                hermite_val[0] = (int)hermite(r_frac, (float)r_left[0], (float)r_left[1], (float)r_left[2], (float)r_left[3]);
+                hermite_val[1] = (int)hermite(r_frac, (float)r_right[0], (float)r_right[1], (float)r_right[2], (float)r_right[3]);
+                data[o_position] = short_clamp(hermite_val[0]);
+                data[o_position + 1] = short_clamp(hermite_val[1]);
+
+                o_position += 2;
+
+                r_frac += r_step;
+            }
+
+            if (r_frac > 1.0)
+            {
+                r_left[0] = r_left[1];
+                r_left[1] = r_left[2];
+                r_left[2] = r_left[3];
+                r_left[3] = s_left;
+
+                r_right[0] = r_right[1];
+                r_right[1] = r_right[2];
+                r_right[2] = r_right[3];
+                r_right[3] = s_right;
+
+                r_frac -= 1.0;
+
+                start += 2;
+                if (start >= buffer_size)
+                    start -= buffer_size;
+                size -= 2;
+            }
        }
+    }

-        inline bool
-        push (short *src, int num_samples)
-        {
-            if (max_write () < num_samples)
-                return false;
+    inline int space_empty(void) const
+    {
+        return buffer_size - size;
+    }

-            !num_samples || ring_buffer::push ((unsigned char *) src, num_samples << 1);
+    inline int space_filled(void) const
+    {
+        return size;
+    }

-            return true;
-        }
-
-        inline int
-        space_empty (void) const
-        {
-            return buffer_size - size;
-        }
-
-        inline int
-        space_filled (void) const
-        {
+    inline int avail(void)
+    {
+        //If we are outputting the exact same ratio as the input, find out directly from the input buffer
+        if (r_step == 1.0)
            return size;
-        }

-        inline int
-        max_write (void) const
-        {
-            return space_empty () >> 1;
-        }
+        return (int)trunc(((size >> 1) - r_frac) / r_step) * 2;
+    }

-        inline void
-        resize (int num_samples)
-        {
-            ring_buffer::resize (num_samples << 1);
-        }
+    void resize(int num_samples)
+    {
+        if (buffer)
+            delete[] buffer;
+        // Only allow even buffer sizes
+        if (num_samples & 1)
+            num_samples++;
+        buffer_size = num_samples;
+        buffer = new int16_t[buffer_size];
+        clear();
+    }
 };

-#endif /* __RESAMPLER_H */
+#endif /* __NEW_RESAMPLER_H */
@@ -1,111 +0,0 @@
-/* Simple byte-based ring buffer. Licensed under public domain (C) BearOso. */
-
-#ifndef __RING_BUFFER_H
-#define __RING_BUFFER_H
-
-#include <string.h>
-
-#undef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
-class ring_buffer
-{
-protected:
-    int size;
-    int buffer_size;
-    int start;
-    unsigned char *buffer;
-
-public:
-    ring_buffer (int buffer_size)
-    {
-        this->buffer_size = buffer_size;
-        buffer = new unsigned char[this->buffer_size];
-        memset (buffer, 0, this->buffer_size);
-
-        size = 0;
-        start = 0;
-    }
-
-    ~ring_buffer (void)
-    {
-        delete[] buffer;
-    }
-
-    bool
-    push (unsigned char *src, int bytes)
-    {
-        if (space_empty () < bytes)
-            return false;
-
-        int end = (start + size) % buffer_size;
-        int first_write_size = MIN (bytes, buffer_size - end);
-
-        memcpy (buffer + end, src, first_write_size);
-
-        if (bytes > first_write_size)
-            memcpy (buffer, src + first_write_size, bytes - first_write_size);
-
-        size += bytes;
-
-        return true;
-    }
-
-    bool
-    pull (unsigned char *dst, int bytes)
-    {
-        if (space_filled () < bytes)
-            return false;
-
-        memcpy (dst, buffer + start, MIN (bytes, buffer_size - start));
-
-        if (bytes > (buffer_size - start))
-            memcpy (dst + (buffer_size - start), buffer, bytes - (buffer_size - start));
-
-        start = (start + bytes) % buffer_size;
-        size -= bytes;
-
-        return true;
-    }
-
-    inline int
-    space_empty (void) const
-    {
-        return buffer_size - size;
-    }
-
-    inline int
-    space_filled (void) const
-    {
-        return size;
-    }
-
-    void
-    clear (void)
-    {
-        start = 0;
-        size = 0;
-        memset (buffer, 0, buffer_size);
-    }
-
-    void
-    resize (int size)
-    {
-        delete[] buffer;
-        buffer_size = size;
-        buffer = new unsigned char[buffer_size];
-        memset (buffer, 0, this->buffer_size);
-
-        this->size = 0;
-        start = 0;
-    }
-
-    inline void
-    cache_silence (void)
-    {
-        clear ();
-        size = buffer_size;
-    }
-};
-
-#endif
@@ -1,35 +1,16 @@
 #include <vector>
-#include <string.h>
+#include <iostream>
+#include <fstream>
+#include <stack>
 #include <stdio.h>

 #include "port.h"
 #include "bml.h"

-static char *strndup_p(char *str, int len)
+bml_node::bml_node()
 {
-    char *buffer;
-    int n;
-
-    buffer = (char *) malloc (len + 1);
-
-    if (buffer)
-    {
-        for (n = 0; ((n < len) && (str[n] != 0)); n++) buffer[n] = str[n];
-        buffer[n] = '\0';
-    }
-
-    return buffer;
-}
-
-static inline bml_node *bml_node_new (void)
-{
-    bml_node *node = new bml_node;
-
-    node->data = NULL;
-    node->name = NULL;
-    node->depth = -1;
-
-    return node;
+    type = CHILD;
+    depth = -1;
 }

 static inline int islf(char c)
@@ -42,6 +23,11 @@ static inline int isblank(char c)
    return (c == ' ' || c == '\t');
 }

+static inline int isblankorlf(char c)
+{
+    return (islf(c) || isblank(c));
+}
+
 static inline int isalnum(char c)
 {
    return ((c >= 'a' && c <= 'z') ||
@@ -49,340 +35,257 @@ static inline int isalnum(char c)
            (c >= '0' && c <= '9'));
 }

-static inline int bml_valid (char c)
+static inline int bml_valid(char c)
 {
-    return (isalnum (c) || c == '-');
+    return (isalnum(c) || c == '-');
 }

-static char *strndup_trim (char *str, int len)
+static std::string trim(std::string str)
 {
    int start;
    int end;
-
-    for (start = 0; str[start] && start != len && isblank (str[start]); start++) {}
-    if (!str[start] || start >= len)
-        return strdup ("");
-
-    for (end = len - 1; isblank (str[end]) || str[end] == '\n' || str[end] == '\r'; end--) {}
-
-    return strndup_p (str + start, end - start + 1);
+    for (start = 0; str[start] && start != (int)str.length() && isblank(str[start]); start++) {}
+    if (start >= (int)str.length())
+        return std::string("");
+    for (end = str.length() - 1; isblankorlf(str[end]); end--) {}
+    return str.substr(start, end - start + 1);
 }

-static inline unsigned int bml_read_depth (char *data)
+static std::string trimcomments(std::string str)
 {
-    unsigned int depth;
-    for (depth = 0; isblank (data[depth]); depth++) {}
-    return depth;
+    int end = str.length();
+    size_t comment = str.find("//");
+    if (comment != std::string::npos)
+        end = comment;
+
+    for (int i = end - 1; i >= 0; i--)
+    {
+        if (!isblankorlf(str[i]))
+        {
+            end = i + 1;
+            break;
+        }
+    }
+
+    return str.substr(0, end);
 }

-static void bml_parse_depth (bml_node *node, char **data)
+static inline int bml_read_depth(std::string &data)
 {
-    unsigned int depth = bml_read_depth (*data);
-    *data += depth;
-    node->depth = depth;
+    size_t depth;
+    for (depth = 0; isblank(data[depth]) && depth < data.length(); depth++) {}
+    return depth == data.length() ? -1 : depth;
 }

-static void bml_parse_name (bml_node *node, char **data)
+static void bml_parse_depth(bml_node &node, std::string &line)
+{
+    unsigned int depth = bml_read_depth(line);
+    line.erase(0, depth);
+    node.depth = depth;
+}
+
+static void bml_parse_name(bml_node &node, std::string &line)
 {
    int len;

-    for (len = 0; bml_valid(*(*data + len)); len++) {};
+    for (len = 0; bml_valid(line[len]); len++) {};

-    node->name = strndup_trim (*data, len);
-    *data += len;
+    node.name = trim(line.substr(0, len));
+    line.erase(0, len);
 }

-static void bml_parse_data (bml_node *node, char **data)
+static void bml_parse_data(bml_node &node, std::string &line)
 {
-    char *p = *data;
    int len;

-    if (p[0] == '=' && p[1] == '\"')
+    if (line[0] == '=' && line[1] == '\"')
    {
        len = 2;
-        while (p[len] && p[len] != '\"' && !islf (p[len]))
+        while (line[len] && line[len] != '\"' && !islf(line[len]))
            len++;
-        if (p[len] != '\"')
+        if (line[len] != '\"')
            return;

-        node->data = strndup_p (p + 2, len - 2);
-        *data += len + 1;
+        node.data = line.substr(2, len - 2);
+        line.erase(0, len + 1);
    }
-    else if (*p == '=')
+    else if (line[0] == '=')
    {
        len = 1;
-        while (p[len] && !islf (p[len]) && p[len] != '"' && p[len] != ' ')
+        while (line[len] && !islf(line[len]) && line[len] != '"' && line[len] != ' ')
            len++;
-        if (p[len] == '\"')
+        if (line[len] == '\"')
            return;
-        node->data = strndup_trim (p + 1, len - 1);
-        *data += len;
+        node.data = line.substr(1, len - 1);
+        line.erase(0, len);
    }
-    else if (*p == ':')
+    else if (line[0] == ':')
    {
        len = 1;
-        while (p[len] && !islf (p[len]))
+        while (line[len] && !islf(line[len]))
            len++;
-        node->data = strndup_trim (p + 1, len - 1);
-        *data += len;
+        node.data = trim(line.substr(1, len - 1));
+        line.erase(0, len);
    }

    return;
 }

-static void bml_skip_empty (char **data)
+static std::string bml_read_line(std::ifstream &fd)
 {
-    char *p = *data;
+    std::string line;

-    while (*p)
+    while (fd)
    {
-        for (; *p && isblank (*p) ; p++) {}
-
-        if (!islf(p[0]) && (p[0] != '/' && p[1] != '/'))
-            return;
-
-        /* Skip comment data */
-        while (*p && *p != '\r' && *p != '\n')
-            p++;
-
-        /* If we found new-line, try to skip more */
-        if (*p)
+        std::getline(fd, line);
+        line = trimcomments(line);
+        if (!line.empty())
        {
-            p++;
-            *data = p;
+            return line;
        }
    }
+
+    return std::string("");
 }

-static char *bml_read_line (char **data)
+static void bml_parse_attr(bml_node &node, std::string &line)
 {
-    char *line;
-    char *p;
-
-    bml_skip_empty (data);
-
-    line = *data;
-
-    if (line == NULL || *line == '\0')
-        return NULL;
-
-    p = strpbrk (line, "\r\n\0");
-
-    if (p == NULL)
-        return NULL;
-
-    if (islf (*p))
-    {
-        *p = '\0';
-        p++;
-    }
-
-    *data = p;
-
-    return line;
-}
-
-static void bml_parse_attr (bml_node *node, char **data)
-{
-    char *p = *data;
-    bml_node *n;
    int len;

-    while (*p && !islf (*p))
+    while (line.length() > 0)
    {
-        if (*p != ' ')
+        if (!isblank(line[0]))
            return;

-        while (isblank (*p))
-            p++;
-        if (p[0] == '/' && p[1] == '/')
-            break;
+        while (isblank(line[0]))
+            line.erase(0, 1);

-        n = bml_node_new ();
+        bml_node n;
        len = 0;
-        while (bml_valid (p[len]))
-           len++;
+        while (bml_valid(line[len]))
+            len++;
        if (len == 0)
            return;
-        n->name = strndup_trim (p, len);
-        p += len;
-        bml_parse_data (n, &p);
-        n->depth = bml_attr_type;
-        node->child.push_back (n);
+        n.name = trim(line.substr(0, len));
+        line.erase(0, len);
+        bml_parse_data(n, line);
+        n.depth = node.depth + 1;
+        n.type = bml_node::ATTRIBUTE;
+        node.child.push_back(n);
    }
-
-    *data = p;
 }

-static int contains_space (char *str)
+static int contains_space(const char *str)
 {
    for (int i = 0; str[i]; i++)
    {
-        if (isblank (str[i]))
+        if (isblank(str[i]))
            return 1;
    }

    return 0;
 }

-static void bml_print_node (bml_node *node, int depth)
+static void bml_print_node(bml_node &node, int depth)
 {
    int i;

-    if (!node)
-        return;
-
    for (i = 0; i < depth * 2; i++)
    {
-        printf (" ");
+        printf(" ");
    }

-    if (node->name)
-        printf ("%s", node->name);
+    if (!node.name.empty())
+        printf("%s", node.name.c_str());

-    if (node->data)
+    if (!node.data.empty())
    {
-        if (contains_space (node->data))
-            printf ("=\"%s\"", node->data);
+        if (contains_space(node.data.c_str()))
+            printf("=\"%s\"", node.data.c_str());
        else
-            printf (": %s", node->data);
+            printf(": %s", node.data.c_str());
    }
-    for (i = 0; i < (int) node->child.size () && node->child[i]->depth == bml_attr_type; i++)
+    for (i = 0; i < (int)node.child.size() && node.child[i].type == bml_node::ATTRIBUTE; i++)
    {
-        if (node->child[i]->name)
+        if (!node.child[i].name.empty())
        {
-            printf (" %s", node->child[i]->name);
-            if (node->child[i]->data)
+            printf(" %s", node.child[i].name.c_str());
+            if (!node.child[i].data.empty())
            {
-                if (contains_space (node->child[i]->data))
-                    printf ("=\"%s\"", node->child[i]->data);
+                if (contains_space(node.child[i].data.c_str()))
+                    printf("=\"%s\"", node.child[i].data.c_str());
                else
-                    printf ("=%s", node->child[i]->data);
+                    printf("=%s", node.child[i].data.c_str());
            }
        }
    }

    if (depth >= 0)
-        printf ("\n");
+        printf("\n");

-    for (; i < (int) node->child.size(); i++)
+    for (; i < (int)node.child.size(); i++)
    {
-        bml_print_node (node->child[i], depth + 1);
+        bml_print_node(node.child[i], depth + 1);
    }

    if (depth == 0)
-        printf ("\n");
+        printf("\n");
 }

-void bml_print_node (bml_node *node)
+void bml_node::print()
 {
-    bml_print_node (node, -1);
+    bml_print_node(*this, -1);
 }

-static bml_node *bml_parse_node (char **doc)
+void bml_node::parse(std::ifstream &fd)
 {
-    char *line;
-    bml_node *node = NULL;
+    std::stack<bml_node *> nodestack;
+    nodestack.push(this);

-    if ((line = bml_read_line (doc)))
+    while (fd)
    {
-        node = bml_node_new ();
+        bml_node newnode;
+        std::string line = bml_read_line(fd);
+        if (line.empty())
+            return;

-        bml_parse_depth (node, &line);
-        bml_parse_name  (node, &line);
-        bml_parse_data  (node, &line);
-        bml_parse_attr  (node, &line);
-    }
-    else
-        return NULL;
+        int line_depth = bml_read_depth(line);
+        while (line_depth <= nodestack.top()->depth && nodestack.size() > 1)
+            nodestack.pop();

-    bml_skip_empty (doc);
-    while (*doc && (int) bml_read_depth (*doc) > node->depth)
-    {
-        bml_node *child = bml_parse_node (doc);
+        bml_parse_depth(newnode, line);
+        bml_parse_name(newnode, line);
+        bml_parse_data(newnode, line);
+        bml_parse_attr(newnode, line);

-        if (child)
-            node->child.push_back (child);
-
-        bml_skip_empty (doc);
-    }
-
-    return node;
-}
-
-void bml_free_node (bml_node *node)
-{
-    delete[] (node->name);
-    delete[] (node->data);
-
-    for (unsigned int i = 0; i < node->child.size(); i++)
-    {
-        bml_free_node (node->child[i]);
-        delete node->child[i];
+        nodestack.top()->child.push_back(newnode);
+        nodestack.push(&nodestack.top()->child.back());
    }

    return;
 }

-bml_node *bml_parse (char **doc)
-{
-    bml_node *root = NULL;
-    bml_node *node = NULL;
-    char *ptr = *doc;
-
-    root = bml_node_new ();
-
-    while ((node = bml_parse_node (&ptr)))
-    {
-        root->child.push_back (node);
-    }
-
-    if (!root->child.size())
-    {
-        delete root;
-        root = NULL;
-    }
-
-    return root;
-}
-
-bml_node *bml_find_sub (bml_node *n, const char *name)
+bml_node *bml_node::find_subnode(std::string name)
 {
    unsigned int i;

-    for (i = 0; i < n->child.size (); i++)
+    for (i = 0; i < child.size(); i++)
    {
-        if (!strcasecmp (n->child[i]->name, name))
-            return n->child[i];
+        if (name.compare(child[i].name) == 0)
+            return &child[i];
    }

    return NULL;
 }

-bml_node *bml_parse_file (const char *filename)
+bool bml_node::parse_file(std::string filename)
 {
-    FILE *file = NULL;
-    char *buffer = NULL;
-    int file_size = 0;
-    bml_node *node = NULL;
-
-    file = fopen (filename, "rb");
+    std::ifstream file(filename.c_str(), std::ios_base::binary);

    if (!file)
-        return NULL;
+        return false;

-    fseek (file, 0, SEEK_END);
-    file_size = ftell (file);
-    fseek (file, 0, SEEK_SET);
+    parse(file);

-    buffer = new char[file_size + 1];
-    fread (buffer, file_size, 1, file);
-    buffer[file_size] = '\0';
-
-    fclose (file);
-
-    node = bml_parse (&buffer);
-    delete[] buffer;
-
-    return node;
+    return true;
 }
@@ -1,31 +1,27 @@
 #ifndef __BML_H
 #define __BML_H
 #include <vector>
+#include <string>
+#include <fstream>

-const int bml_attr_type = -2;
-
-typedef struct bml_node
+struct bml_node
 {
-    char *name;
-    char *data;
+    enum node_type {
+        CHILD,
+        ATTRIBUTE
+    };

+    bml_node();
+    bool parse_file(std::string filename);
+    void parse(std::ifstream &fd);
+    bml_node *find_subnode(std::string name);
+    void print();
+
+    std::string name;
+    std::string data;
    int depth;
-
-    std::vector<bml_node *> child;
-
-} bml_node;
-
-bml_node *bml_find_sub (bml_node *node, const char *name);
-
-bml_node *bml_parse_file (const char *filename);
-
-/* Parse character array into BML tree. Destructive to input. */
-bml_node *bml_parse (char **buffer);
-
-/* Recursively free bml_node and substructures */
-void bml_free_node (bml_node *);
-
-/* Print node structure to stdout */
-void bml_print_node (bml_node *);
+    std::vector<bml_node> child;
+    node_type type;
+};

 #endif
@@ -1,193 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 // Dreamer Nom wrote:
 // Large thanks to John Weidman for all his initial research
@@ -243,6 +58,7 @@ static const uint8	flashcard[20] =
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };

+#if 0
 static const uint8	init2192[32] =	// FIXME
 {
 	00, 00, 00, 00, 00,		// unknown
@@ -254,6 +70,7 @@ static const uint8	init2192[32] =	// FIXME
 	10, 10, 10, 10, 10,		// dummy
 	00, 00, 00, 00, 00, 00, 00, 00, 00
 };
+#endif

 static bool8	FlashMode;
 static uint32	FlashSize;
@@ -921,16 +738,14 @@ void S9xBSXSetStream1 (uint8 count)
 	if (BSX.sat_stream1.is_open())
 		BSX.sat_stream1.close(); //If Stream already opened for one file: Close it.

-	char path[PATH_MAX + 1], name[PATH_MAX + 1];
+	std::string path = S9xGetDirectory(SAT_DIR) + SLASH_STR;

-	strcpy(path, S9xGetDirectory(SAT_DIR));
-	strcat(path, SLASH_STR);
-
-	snprintf(name, PATH_MAX + 1, "BSX%04X-%d.bin", (BSX.PPU[0x2188 - BSXPPUBASE] | (BSX.PPU[0x2189 - BSXPPUBASE] * 256)), count); //BSXHHHH-DDD.bin
-	strcat(path, name);
+	char name[PATH_MAX];
+	snprintf(name, PATH_MAX, "BSX%04X-%d.bin", (BSX.PPU[0x2188 - BSXPPUBASE] | (BSX.PPU[0x2189 - BSXPPUBASE] * 256)), count); //BSXHHHH-DDD.bin
+	path += name;

 	BSX.sat_stream1.clear();
-	BSX.sat_stream1.open(path, std::ios::in | std::ios::binary);
+	BSX.sat_stream1.open(path.c_str(), std::ios::in | std::ios::binary);
 	if (BSX.sat_stream1.good())
 	{
 		BSX.sat_stream1.seekg(0, BSX.sat_stream1.end);
@@ -953,16 +768,15 @@ void S9xBSXSetStream2 (uint8 count)
 	if (BSX.sat_stream2.is_open())
 		BSX.sat_stream2.close(); //If Stream already opened for one file: Close it.

-	char path[PATH_MAX + 1], name[PATH_MAX + 1];

-	strcpy(path, S9xGetDirectory(SAT_DIR));
-	strcat(path, SLASH_STR);
+	std::string path = S9xGetDirectory(SAT_DIR) + SLASH_STR;

-	snprintf(name, PATH_MAX + 1, "BSX%04X-%d.bin", (BSX.PPU[0x218E - BSXPPUBASE] | (BSX.PPU[0x218F - BSXPPUBASE] * 256)), count); //BSXHHHH-DDD.bin
-	strcat(path, name);
+	char name[PATH_MAX];
+	snprintf(name, PATH_MAX, "BSX%04X-%d.bin", (BSX.PPU[0x218E - BSXPPUBASE] | (BSX.PPU[0x218F - BSXPPUBASE] * 256)), count); //BSXHHHH-DDD.bin
+	path += name;

 	BSX.sat_stream2.clear();
-	BSX.sat_stream2.open(path, std::ios::in | std::ios::binary);
+	BSX.sat_stream2.open(path.c_str(), std::ios::in | std::ios::binary);
 	if (BSX.sat_stream2.good())
 	{
 		BSX.sat_stream2.seekg(0, BSX.sat_stream2.end);
@@ -1390,20 +1204,15 @@ uint8 * S9xGetBasePointerBSX (uint32 address)
 static bool8 BSX_LoadBIOS (void)
 {
 	FILE	*fp;
-	char	path[PATH_MAX + 1], name[PATH_MAX + 1];
 	bool8	r = FALSE;

-	strcpy(path, S9xGetDirectory(BIOS_DIR));
-	strcat(path, SLASH_STR);
-	strcpy(name, path);
-	strcat(name, "BS-X.bin");
+	std::string name = S9xGetDirectory(BIOS_DIR) + SLASH_STR + "BS-X.bin";

-	fp = fopen(name, "rb");
+	fp = fopen(name.c_str(), "rb");
 	if (!fp)
 	{
-		strcpy(name, path);
-		strcat(name, "BS-X.bios");
-		fp = fopen(name, "rb");
+		name = S9xGetDirectory(BIOS_DIR) + SLASH_STR + "BS-X.bios";
+		fp = fopen(name.c_str(), "rb");
 	}

 	if (fp)
@@ -1438,7 +1247,7 @@ void S9xInitBSX (void)
 {
 	Settings.BS = FALSE;

-    if (is_BSX_BIOS(Memory.ROM,Memory.CalculatedSize))
+	if (is_BSX_BIOS(Memory.ROM,Memory.CalculatedSize))
 	{
 		// BS-X itself

@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _BSX_H_
 #define _BSX_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include <math.h>
 #include "snes9x.h"
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _C4_H_
 #define _C4_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include <math.h>
 #include "snes9x.h"
@@ -1207,11 +1021,11 @@ void S9xSetC4 (uint8 byte, uint16 Address)
 					if (Memory.C4RAM[0x1f4d] != 0x0e)
 						printf("$7f4d=%02x, expected 0e for command 54 %02x\n", Memory.C4RAM[0x1f4d], Memory.C4RAM[0x1f4d]);
 				#endif
-					int64   b = (int64) READ_3WORD(Memory.C4RAM + 0x1f80);
-					int64   c = b << 40;
-					int64	a = SAR(c, 30);
-					a = SAR(c, 10);
+					int64 a = (int64)READ_3WORD(Memory.C4RAM + 0x1f80);
+					a |= 0xffffffffff000000 * ((a >> 23) & 1);
+					//printf("%08X%08X\n", (uint32) (a>>32), (uint32) (a&0xFFFFFFFF));
 					a *= a;
+					//printf("%08X%08X\n", (uint32) (a>>32), (uint32) (a&0xFFFFFFFF));
 					WRITE_3WORD(Memory.C4RAM + 0x1f83, a);
 					WRITE_3WORD(Memory.C4RAM + 0x1f86, (a >> 24));
 					break;
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include <ctype.h>
 #include "snes9x.h"
@@ -223,116 +37,10 @@
 	 (s) == S9X_24_BITS ? (((int32) ((*((m) + (o)) + (*((m) + (o) + 1) << 8) + (*((m) + (o) + 2) << 16)) << 8)) >> 8): \
                           ((int32)  (*((m) + (o)) + (*((m) + (o) + 1) << 8) + (*((m) + (o) + 2) << 16) + (*((m) + (o) + 3) << 24))))

-static bool8 S9xAllHex (const char *, int);
-
-
-static bool8 S9xAllHex (const char *code, int len)
-{
-	for (int i = 0; i < len; i++)
-		if ((code[i] < '0' || code[i] > '9') && (code[i] < 'a' || code[i] > 'f') && (code[i] < 'A' || code[i] > 'F'))
-			return (FALSE);
-
-	return (TRUE);
-}
-
-const char * S9xProActionReplayToRaw (const char *code, uint32 &address, uint8 &byte)
-{
-	uint32	data = 0;
-
-	if (strlen(code) != 8 || !S9xAllHex(code, 8) || sscanf(code, "%x", &data) != 1)
-		return ("Invalid Pro Action Replay code - should be 8 hex digits in length.");
-
-	address = data >> 8;
-	byte = (uint8) data;
-
-	return (NULL);
-}
-
-const char * S9xGoldFingerToRaw (const char *code, uint32 &address, bool8 &sram, uint8 &num_bytes, uint8 bytes[3])
-{
-	char	tmp[15];
-	int		i;
-
-	if (strlen(code) != 14)
-		return ("Invalid Gold Finger code - should be 14 hex digits in length.");
-
-	strncpy(tmp, code, 5);
-	tmp[5] = 0;
-	if (sscanf(tmp, "%x", &address) != 1)
-		return ("Invalid Gold Finger code.");
-
-	// Correct GoldFinger Address
-	address = (address & 0x7FFF) | ((address & 0x7F8000) << 1) | 0x8000;
-
-	for (i = 0; i < 3; i++)
-	{
-		unsigned int	byte;
-
-		strncpy(tmp, code + 5 + i * 2, 2);
-		tmp[2] = 0;
-		if (sscanf(tmp, "%x", &byte) != 1)
-			break;
-		bytes[i] = (uint8) byte;
-	}
-
-	num_bytes = i;
-	sram = code[13] == '1';
-
-	return (NULL);
-}
-
-const char * S9xGameGenieToRaw (const char *code, uint32 &address, uint8 &byte)
-{
-	char	new_code[12];
-
-	if (strlen(code) != 9 || *(code + 4) != '-' || !S9xAllHex(code, 4) || !S9xAllHex(code + 5, 4))
-		return ("Invalid Game Genie(tm) code - should be 'xxxx-xxxx'.");
-
-	strcpy(new_code, "0x");
-	strncpy(new_code + 2, code, 4);
-	strcpy(new_code + 6, code + 5);
-
-	static const char	*real_hex  = "0123456789ABCDEF";
-	static const char	*genie_hex = "DF4709156BC8A23E";
-
-	for (int i = 2; i < 10; i++)
-	{
-		if (islower(new_code[i]))
-			new_code[i] = toupper(new_code[i]);
-
-		int j;
-		for (j = 0; j < 16; j++)
-		{
-			if (new_code[i] == genie_hex[j])
-			{
-				new_code[i] = real_hex[j];
-				break;
-			}
-		}
-
-		if (j == 16)
-			return ("Invalid hex-character in Game Genie(tm) code.");
-	}
-
-	uint32	data = 0;
-	sscanf(new_code, "%x", &data);
-	byte = (uint8) (data >> 24);
-	address = data & 0xffffff;
-	address = ((address & 0x003c00) << 10) +
-			  ((address & 0x00003c) << 14) +
-			  ((address & 0xf00000) >>  8) +
-			  ((address & 0x000003) << 10) +
-			  ((address & 0x00c000) >>  6) +
-			  ((address & 0x0f0000) >> 12) +
-			  ((address & 0x0003c0) >>  6);
-
-	return (NULL);
-}
-
 void S9xStartCheatSearch (SCheatData *d)
 {
 	memmove(d->CWRAM, d->RAM, 0x20000);
-	memmove(d->CSRAM, d->SRAM, 0x10000);
+	memmove(d->CSRAM, d->SRAM, 0x80000);
 	memmove(d->CIRAM, &d->FillRAM[0x3000], 0x2000);
 	memset((char *) d->ALL_BITS, 0xff, 0x32000 >> 3);
 }
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CHEATS_H_
 #define _CHEATS_H_
@@ -209,17 +23,17 @@ struct SCheat

 struct SCheatGroup
 {
-	char *name;
+	std::string name;
 	bool8 enabled;
-	std::vector<struct SCheat> c;
+	std::vector<struct SCheat> cheat;
 };

 struct SCheatData
 {
-	std::vector<struct SCheatGroup> g;
+	std::vector<struct SCheatGroup> group;
 	bool8	enabled;
 	uint8	CWRAM[0x20000];
-	uint8	CSRAM[0x10000];
+	uint8	CSRAM[0x80000];
 	uint8	CIRAM[0x2000];
 	uint8	*RAM;
 	uint8	*FillRAM;
@@ -259,20 +73,20 @@ typedef enum
 extern SCheatData	Cheat;
 extern Watch		watches[16];

-int S9xAddCheatGroup (const char *name, const char *cheat);
-int S9xModifyCheatGroup (uint32 index, const char *name, const char *cheat);
-void S9xEnableCheatGroup (uint32 index);
-void S9xDisableCheatGroup (uint32 index);
-void S9xDeleteCheats (void);
-char *S9xCheatGroupToText (uint32 index);
-void S9xDeleteCheatGroup (uint32 index);
-bool8 S9xLoadCheatFile (const char *filename);
-bool8 S9xSaveCheatFile (const char *filename);
-void S9xUpdateCheatsInMemory (void);
-int S9xImportCheatsFromDatabase(const char *filename);
-void S9xCheatsDisable (void);
-void S9xCheatsEnable (void);
-char *S9xCheatValidate (char *cheat);
+int S9xAddCheatGroup(const std::string &name, const std::string &cheat);
+int S9xModifyCheatGroup(uint32 index, const std::string &name, const std::string &cheat);
+void S9xEnableCheatGroup(uint32 index);
+void S9xDisableCheatGroup(uint32 index);
+void S9xDeleteCheats(void);
+std::string S9xCheatGroupToText(uint32 index);
+void S9xDeleteCheatGroup(uint32 index);
+bool8 S9xLoadCheatFile(const std::string &filename);
+bool8 S9xSaveCheatFile(const std::string &filename);
+void S9xUpdateCheatsInMemory(void);
+int S9xImportCheatsFromDatabase(const std::string &filename);
+void S9xCheatsDisable(void);
+void S9xCheatsEnable(void);
+std::string S9xCheatValidate(const std::string &cheat);

 void S9xInitCheatData (void);
 void S9xInitWatchedAddress (void);
@@ -282,8 +96,4 @@ void S9xSearchForValue (SCheatData *, S9xCheatComparisonType, S9xCheatDataSize,
 void S9xSearchForAddress (SCheatData *, S9xCheatComparisonType, S9xCheatDataSize, uint32, bool8);
 void S9xOutputCheatSearchResults (SCheatData *);

-const char * S9xGameGenieToRaw (const char *, uint32 &, uint8 &);
-const char * S9xProActionReplayToRaw (const char *, uint32 &, uint8 &);
-const char * S9xGoldFingerToRaw (const char *, uint32 &, bool8 &, uint8 &, uint8 bytes[3]);
-
 #endif
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -0,0 +1,67 @@
+#include <cstring>
+#include "port.h"
+
+void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext)
+{
+    char *slash = strrchr((char *)path, SLASH_CHAR);
+    char *dot = strrchr((char *)path, '.');
+
+    *drive = '\0';
+
+    if (dot && slash && dot < slash)
+    {
+        dot = 0;
+    }
+
+    if (!slash)
+    {
+        *dir = '\0';
+        strcpy(fname, path);
+
+        if (dot)
+        {
+            fname[dot - path] = '\0';
+            strcpy(ext, dot + 1);
+        }
+        else
+        {
+            *ext = '\0';
+        }
+    }
+    else
+    {
+        strcpy(dir, path);
+        dir[slash - path] = '\0';
+        strcpy(fname, slash + 1);
+
+        if (dot)
+        {
+            fname[(dot - slash) - 1] = '\0';
+            strcpy(ext, dot + 1);
+        }
+        else
+        {
+            *ext = '\0';
+        }
+    }
+}
+
+void _makepath(char *path, const char *drive, const char *dir, const char *fname, const char *ext)
+{
+    if (dir && *dir)
+    {
+        strcpy(path, dir);
+        strcat(path, "/");
+    }
+    else
+        *path = '\0';
+
+    strcat(path, fname);
+
+    if (ext && *ext)
+    {
+        if (*ext != '.')
+            strcat(path, ".");
+        strcat(path, ext);
+    }
+}
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include <stdio.h>
 #include <time.h>
@@ -638,7 +452,7 @@ void ConfigFile::ClearLines()
    }
 }

-bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
+bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const{
 	if(curConfigFile && a.section!=b.section){
 		const int sva = curConfigFile->GetSectionSize(a.section);
 		const int svb = curConfigFile->GetSectionSize(b.section);
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CONFIG_H_
 #define _CONFIG_H_
@@ -276,7 +90,7 @@ class ConfigFile {
 		mutable bool used;

        struct section_then_key_less {
-            bool operator()(const ConfigEntry &a, const ConfigEntry &b);
+            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
        };

        struct key_less {
@@ -287,8 +101,8 @@ class ConfigFile {
        };

        struct line_less {
-            bool operator()(const ConfigEntry &a, const ConfigEntry &b){
-				if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
+            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
+                if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
                if(b.line<0) return true;
                if(a.line<0) return false;
                return a.line<b.line;
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include <map>
 #include <set>
@@ -514,14 +328,12 @@ static void DoGunLatch (int x, int y)

 	if (x > 295)
 		x = 295;
-	else
-	if (x < 40)
+	else if (x < 40)
 		x = 40;

 	if (y > PPU.ScreenHeight - 1)
 		y = PPU.ScreenHeight - 1;
-	else
-	if (y < 0)
+	else if (y < 0)
 		y = 0;

 	PPU.GunVLatch = (uint16) (y + 1);
@@ -1350,8 +1162,7 @@ s9xcommand_t S9xGetCommandT (const char *name)

 	if (!strcmp(name, "None"))
 		cmd.type = S9xNoMapping;
-	else
-	if (!strncmp(name, "Joypad", 6))
+	else if (!strncmp(name, "Joypad", 6))
 	{
 		if (name[6] < '1' || name[6] > '8' || name[7] != ' ')
 			return (cmd);
@@ -1362,24 +1173,15 @@ s9xcommand_t S9xGetCommandT (const char *name)
 			s = name + 13;

 			if (!strncmp(s, "Left/Right ", 11))	{ j = 0; i = 0; s += 11; }
-			else
-			if (!strncmp(s, "Right/Left ", 11))	{ j = 0; i = 1; s += 11; }
-			else
-			if (!strncmp(s, "Up/Down ",     8))	{ j = 1; i = 0; s +=  8; }
-			else
-			if (!strncmp(s, "Down/Up ",     8))	{ j = 1; i = 1; s +=  8; }
-			else
-			if (!strncmp(s, "Y/A ",         4))	{ j = 2; i = 0; s +=  4; }
-			else
-			if (!strncmp(s, "A/Y ",         4))	{ j = 2; i = 1; s +=  4; }
-			else
-			if (!strncmp(s, "X/B ",         4))	{ j = 3; i = 0; s +=  4; }
-			else
-			if (!strncmp(s, "B/X ",         4))	{ j = 3; i = 1; s +=  4; }
-			else
-			if (!strncmp(s, "L/R ",         4))	{ j = 4; i = 0; s +=  4; }
-			else
-			if (!strncmp(s, "R/L ",         4))	{ j = 4; i = 1; s +=  4; }
+			else if (!strncmp(s, "Right/Left ", 11))	{ j = 0; i = 1; s += 11; }
+			else if (!strncmp(s, "Up/Down ",     8))	{ j = 1; i = 0; s +=  8; }
+			else if (!strncmp(s, "Down/Up ",     8))	{ j = 1; i = 1; s +=  8; }
+			else if (!strncmp(s, "Y/A ",         4))	{ j = 2; i = 0; s +=  4; }
+			else if (!strncmp(s, "A/Y ",         4))	{ j = 2; i = 1; s +=  4; }
+			else if (!strncmp(s, "X/B ",         4))	{ j = 3; i = 0; s +=  4; }
+			else if (!strncmp(s, "B/X ",         4))	{ j = 3; i = 1; s +=  4; }
+			else if (!strncmp(s, "L/R ",         4))	{ j = 4; i = 0; s +=  4; }
+			else if (!strncmp(s, "R/L ",         4))	{ j = 4; i = 1; s +=  4; }
 			else
 				return (cmd);

@@ -1560,8 +1362,7 @@ s9xcommand_t S9xGetCommandT (const char *name)

 		if (*s == 'h')
 			cmd.axis.pointer.HV = 0;
-		else
-		if (*s == 'v')
+		else if (*s == 'v')
 			cmd.axis.pointer.HV = 1;
 		else
 			return (cmd);
@@ -1709,8 +1510,7 @@ s9xcommand_t S9xGetCommandT (const char *name)

 				j = i;
 			}
-			else
-			if (name[i] == ',')
+			else if (name[i] == ',')
 			{
 				free(c);
 				return (cmd);
@@ -1723,8 +1523,7 @@ s9xcommand_t S9xGetCommandT (const char *name)
 				{
 					if (name[i] == '+')
 						press = 1;
-					else
-					if (name[i] == '-')
+					else if (name[i] == '-')
 						press = 2;
 					else
 					{
@@ -2193,14 +1992,12 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 					uint16	x = r; r = st; st = x;
 					x = s; s = t; t = x;
 				}
-				else
-				if (cmd.button.joypad.turbo)
+				else if (cmd.button.joypad.turbo)
 				{
 					uint16	x = r; r = t; t = x;
 					x = s; s = st; st = x;
 				}
-				else
-				if (cmd.button.joypad.sticky)
+				else if (cmd.button.joypad.sticky)
 				{
 					uint16	x = r; r = s; s = x;
 					x = t; t = st; st = x;
@@ -2455,25 +2252,19 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 						break;

 					case LoadFreezeFile:
-						S9xUnfreezeGame(S9xChooseFilename(TRUE));
 						break;

 					case SaveFreezeFile:
-						S9xFreezeGame(S9xChooseFilename(FALSE));
 						break;

 					case LoadOopsFile:
 					{
-						char	filename[PATH_MAX + 1];
-						char	drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
+						std::string filename = S9xGetFilename("oops", SNAPSHOT_DIR);

-						_splitpath(Memory.ROMFilename, drive, dir, def, ext);
-						snprintf(filename, PATH_MAX + 1, "%s%s%s.%.*s", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, _MAX_EXT - 1, "oops");
-
-						if (S9xUnfreezeGame(filename))
+						if (S9xUnfreezeGame(filename.c_str()))
 						{
-							snprintf(buf, 256, "%s.%.*s loaded", def, _MAX_EXT - 1, "oops");
-							S9xSetInfoString (buf);
+							snprintf(buf, 256, "%.240s.oops loaded", S9xBasename(Memory.ROMFilename).c_str());
+							S9xSetInfoString(buf);
 						}
 						else
 							S9xMessage(S9X_ERROR, S9X_FREEZE_FILE_NOT_FOUND, "Oops file not found");
@@ -2501,15 +2292,15 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 					case QuickLoad009:
 					case QuickLoad010:
 					{
-						char	filename[PATH_MAX + 1];
-						char	drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
+						std::string ext = std::to_string(i - QuickLoad000);
+						while (ext.length() < 3)
+							ext = '0' + ext;

-						_splitpath(Memory.ROMFilename, drive, dir, def, ext);
-						snprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickLoad000);
+						auto filename = S9xGetFilename(ext, SNAPSHOT_DIR);

-						if (S9xUnfreezeGame(filename))
+						if (S9xUnfreezeGame(filename.c_str()))
 						{
-							snprintf(buf, 256, "%s.%03d loaded", def, i - QuickLoad000);
+							snprintf(buf, 256, "Quick save-state %s loaded", ext.c_str());
 							S9xSetInfoString(buf);
 						}
 						else
@@ -2530,16 +2321,16 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 					case QuickSave009:
 					case QuickSave010:
 					{
-						char	filename[PATH_MAX + 1];
-						char	drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
+						std::string ext = std::to_string(i - QuickLoad000);
+						while (ext.length() < 3)
+							ext = '0' + ext;

-						_splitpath(Memory.ROMFilename, drive, dir, def, ext);
-						snprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickSave000);
+						auto filename = S9xGetFilename(ext, SNAPSHOT_DIR);

-						snprintf(buf, 256, "%s.%03d saved", def, i - QuickSave000);
+						snprintf(buf, 256, "Quick save-state %s saved", ext.c_str());
 						S9xSetInfoString(buf);

-						S9xFreezeGame(filename);
+						S9xFreezeGame(filename.c_str());
 						break;
 					}

@@ -2600,15 +2391,15 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 						break;

 					case BeginRecordingMovie:
-						if (S9xMovieActive())
-							S9xMovieStop(FALSE);
-						S9xMovieCreate(S9xChooseMovieFilename(FALSE), 0xFF, MOVIE_OPT_FROM_RESET, NULL, 0);
+						// if (S9xMovieActive())
+						// 	S9xMovieStop(FALSE);
+						// S9xMovieCreate(S9xChooseMovieFilename(FALSE), 0xFF, MOVIE_OPT_FROM_RESET, NULL, 0);
 						break;

 					case LoadMovie:
-						if (S9xMovieActive())
-							S9xMovieStop(FALSE);
-						S9xMovieOpen(S9xChooseMovieFilename(TRUE), FALSE);
+						// if (S9xMovieActive())
+						// 	S9xMovieStop(FALSE);
+						// S9xMovieOpen(S9xChooseMovieFilename(TRUE), FALSE);
 						break;

 					case EndRecordingMovie:
@@ -2629,6 +2420,17 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 							break;
 						}

+#ifdef NETPLAY_SUPPORT
+						if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code
+							if (Settings.NetPlayServer) {
+								S9xNPSendJoypadSwap();
+							} else {
+								S9xSetInfoString("Netplay Client cannot swap pads.");
+								break;
+							}
+						}
+#endif
+
 						newcontrollers[1] = curcontrollers[0];
 						newcontrollers[0] = curcontrollers[1];

@@ -2909,7 +2711,7 @@ static void do_polling (int mp)
 		{
 			case MAP_BUTTON:
 			{
-				bool	pressed;
+				bool	pressed = false;
 				if (S9xPollButton(*itr, &pressed))
 					S9xReportButton(*itr, pressed);
 				break;
@@ -2917,7 +2719,7 @@ static void do_polling (int mp)

 			case MAP_AXIS:
 			{
-				int16	value;
+				int16	value = 0;
 				if (S9xPollAxis(*itr, &value))
 					S9xReportAxis(*itr, value);
 				break;
@@ -2925,7 +2727,7 @@ static void do_polling (int mp)

 			case MAP_POINTER:
 			{
-				int16	x, y;
+				int16	x = 0, y = 0;
 				if (S9xPollPointer(*itr, &x, &y))
 					S9xReportPointer(*itr, x, y);
 				break;
@@ -2948,14 +2750,12 @@ static void UpdatePolledMouse (int i)
 		mouse[i - MOUSE0].delta_x = 0xff;
 		mouse[i - MOUSE0].old_x -= 127;
 	}
-	else
-	if (j < 0)
+	else if (j < 0)
 	{
 		mouse[i - MOUSE0].delta_x = 0x80 | -j;
 		mouse[i - MOUSE0].old_x = mouse[i - MOUSE0].cur_x;
 	}
-	else
-	if (j > 127)
+	else if (j > 127)
 	{
 		mouse[i - MOUSE0].delta_x = 0x7f;
 		mouse[i - MOUSE0].old_x += 127;
@@ -2973,14 +2773,12 @@ static void UpdatePolledMouse (int i)
 		mouse[i - MOUSE0].delta_y = 0xff;
 		mouse[i - MOUSE0].old_y -= 127;
 	}
-	else
-	if (j < 0)
+	else if (j < 0)
 	{
 		mouse[i - MOUSE0].delta_y = 0x80 | -j;
 		mouse[i - MOUSE0].old_y = mouse[i - MOUSE0].cur_y;
 	}
-	else
-	if (j > 127)
+	else if (j > 127)
 	{
 		mouse[i - MOUSE0].delta_y = 0x7f;
 		mouse[i - MOUSE0].old_y += 127;
@@ -3442,8 +3240,7 @@ void S9xControlEOF (void)
 			pseudopointer[n].x += pseudopointer[n].H_adj;
 			if (pseudopointer[n].x < 0)
 				pseudopointer[n].x = 0;
-			else
-			if (pseudopointer[n].x > 255)
+			else if (pseudopointer[n].x > 255)
 				pseudopointer[n].x = 255;

 			if (pseudopointer[n].H_var)
@@ -3466,8 +3263,7 @@ void S9xControlEOF (void)
 			pseudopointer[n].y += pseudopointer[n].V_adj;
 			if (pseudopointer[n].y < 0)
 				pseudopointer[n].y = 0;
-			else
-			if (pseudopointer[n].y > PPU.ScreenHeight - 1)
+			else if (pseudopointer[n].y > PPU.ScreenHeight - 1)
 				pseudopointer[n].y = PPU.ScreenHeight - 1;

 			if (pseudopointer[n].V_var)
@@ -3507,8 +3303,6 @@ void S9xControlEOF (void)

 	do_polling(POLL_ALL);

-	S9xMovieUpdate();
-
 	pad_read_last = pad_read;
 	pad_read      = false;
 }
@@ -3692,11 +3486,17 @@ void S9xControlPreSaveState (struct SControlSnapshot *s)
 		for (int k = 0; k < 2; k++)
 			COPY(mp5[j].pads[k]);

+	assert(i == sizeof(s->internal));
+
+	#undef COPY
+	#define COPY(x)	{ memcpy((char *) s->internal_macs + i, &(x), sizeof(x)); i += sizeof(x); }
+	i = 0;
+
 	COPY(macsrifle.x);
 	COPY(macsrifle.y);
 	COPY(macsrifle.buttons);

-	assert(i == sizeof(s->internal) + sizeof(s->internal_macs));
+	assert(i == sizeof(s->internal_macs));

 #undef COPY

@@ -3771,11 +3571,15 @@ void S9xControlPostLoadState (struct SControlSnapshot *s)

 		if (s->ver > 3)
 		{
+			#undef COPY
+			#define COPY(x)	{ memcpy(&(x), (char *) s->internal_macs + i, sizeof(x)); i += sizeof(x); }
+			i = 0;
+
 			COPY(macsrifle.x);
 			COPY(macsrifle.y);
 			COPY(macsrifle.buttons);

-			assert(i == sizeof(s->internal) + sizeof(s->internal_macs));
+			assert(i == sizeof(s->internal_macs));
 		}

 	#undef COPY
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CONTROLS_H_
 #define _CONTROLS_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -199,7 +13,6 @@
 #include "srtc.h"
 #include "snapshot.h"
 #include "cheats.h"
-#include "logger.h"
 #ifdef DEBUGGER
 #include "debug.h"
 #endif
@@ -262,7 +75,6 @@ static void S9xSoftResetCPU (void)
 	SetFlags(MemoryFlag | IndexFlag | IRQ | Emulation);
 	ClearFlags(Decimal);

-	Timings.InterlaceField = FALSE;
 	Timings.H_Max = Timings.H_Max_Master;
 	Timings.V_Max = Timings.V_Max_Master;
 	Timings.NMITriggerPos = 0xffff;
@@ -285,10 +97,9 @@ static void S9xSoftResetCPU (void)
 void S9xReset (void)
 {
 	S9xResetSaveTimer(FALSE);
-	S9xResetLogger();

-	memset(Memory.RAM, 0x55, 0x20000);
-	memset(Memory.VRAM, 0x00, 0x10000);
+	memset(Memory.RAM, 0x55, sizeof(Memory.RAM));
+	memset(Memory.VRAM, 0x00, sizeof(Memory.VRAM));
 	memset(Memory.FillRAM, 0, 0x8000);

 	S9xResetBSX();
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CPUADDR_H_
 #define _CPUADDR_H_
@@ -699,7 +513,6 @@ static inline uint32 StackRelativeIndirectIndexed (AccessMode a)		// (d,S),Y
 	if (a & READ)
 		OpenBus = (uint8) (addr >> 8);
 	addr = (addr + Registers.Y.W + ICPU.ShiftedDB) & 0xffffff;
-	AddCycles(ONE_CYCLE);

 	return (addr);
 }
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -197,6 +11,7 @@
 #include "apu/apu.h"
 #include "fxemu.h"
 #include "snapshot.h"
+#include "movie.h"
 #ifdef DEBUGGER
 #include "debug.h"
 #include "missing.h"
@@ -204,19 +19,29 @@

 static inline void S9xReschedule (void);

-
 void S9xMainLoop (void)
 {
 	#define CHECK_FOR_IRQ_CHANGE() \
 	if (Timings.IRQFlagChanging) \
 	{ \
-		if (Timings.IRQFlagChanging == IRQ_CLEAR_FLAG) \
+		if (Timings.IRQFlagChanging & IRQ_TRIGGER_NMI) \
+		{ \
+			CPU.NMIPending = TRUE; \
+			Timings.NMITriggerPos = CPU.Cycles + 6; \
+		} \
+		if (Timings.IRQFlagChanging & IRQ_CLEAR_FLAG) \
 			ClearIRQ(); \
-		else if (Timings.IRQFlagChanging == IRQ_SET_FLAG) \
+		else if (Timings.IRQFlagChanging & IRQ_SET_FLAG) \
 			SetIRQ(); \
 		Timings.IRQFlagChanging = IRQ_NONE; \
 	}

+	if (CPU.Flags & SCAN_KEYS_FLAG)
+	{
+		CPU.Flags &= ~SCAN_KEYS_FLAG;
+		S9xMovieUpdate();
+	}
+
 	for (;;)
 	{
 		if (CPU.NMIPending)
@@ -306,10 +131,12 @@ void S9xMainLoop (void)
 	#endif

 		if (CPU.Flags & SCAN_KEYS_FLAG)
+		{
 			break;
+		}

-		register uint8				Op;
-		register struct	SOpcodes	*Opcodes;
+		uint8				Op;
+		struct	SOpcodes	*Opcodes;

 		if (CPU.PCBase)
 		{
@@ -341,15 +168,6 @@ void S9xMainLoop (void)
 	}

 	S9xPackStatus();
-
-	if (CPU.Flags & SCAN_KEYS_FLAG)
-	{
-	#ifdef DEBUGGER
-		if (!(CPU.Flags & FRAME_ADVANCE_FLAG))
-	#endif
-		S9xSyncSpeed();
-		CPU.Flags &= ~SCAN_KEYS_FLAG;
-	}
 }

 static inline void S9xReschedule (void)
@@ -444,11 +262,13 @@ void S9xDoHEventProcessing (void)
 				Timings.NextIRQTimer -= Timings.H_Max;
 			S9xAPUSetReferenceTime(CPU.Cycles);

+			if (Settings.SA1)
+				SA1.Cycles -= Timings.H_Max * 3;
+
 			CPU.V_Counter++;
 			if (CPU.V_Counter >= Timings.V_Max)	// V ranges from 0 to Timings.V_Max - 1
 			{
 				CPU.V_Counter = 0;
-				Timings.InterlaceField ^= 1;

 				// From byuu:
 				// [NTSC]
@@ -457,7 +277,7 @@ void S9xDoHEventProcessing (void)
 				// [PAL] <PAL info is unverified on hardware>
 				// interlace mode has 625 scanlines: 313 on the even frame, and 312 on the odd.
 				// non-interlace mode has 624 scanlines: 312 scanlines on both even and odd frames.
-				if (IPPU.Interlace && !Timings.InterlaceField)
+				if (IPPU.Interlace && S9xInterlaceField())
 					Timings.V_Max = Timings.V_Max_Master + 1;	// 263 (NTSC), 313?(PAL)
 				else
 					Timings.V_Max = Timings.V_Max_Master;		// 262 (NTSC), 312?(PAL)
@@ -478,14 +298,14 @@ void S9xDoHEventProcessing (void)
 			// In interlace mode, there are always 341 dots per scanline. Even frames have 263 scanlines,
 			// and odd frames have 262 scanlines.
 			// Interlace mode scanline 240 on odd frames is not missing a dot.
-			if (CPU.V_Counter == 240 && !IPPU.Interlace && Timings.InterlaceField)	// V=240
+			if (CPU.V_Counter == 240 && !IPPU.Interlace && S9xInterlaceField())	// V=240
 				Timings.H_Max = Timings.H_Max_Master - ONE_DOT_CYCLE;	// HC=1360
 			else
 				Timings.H_Max = Timings.H_Max_Master;					// HC=1364

 			if (Model->_5A22 == 2)
 			{
-				if (CPU.V_Counter != 240 || IPPU.Interlace || !Timings.InterlaceField)	// V=240
+				if (CPU.V_Counter != 240 || IPPU.Interlace || !S9xInterlaceField())	// V=240
 				{
 					if (Timings.WRAMRefreshPos == SNES_WRAM_REFRESH_HC_v2 - ONE_DOT_CYCLE)	// HC=534
 						Timings.WRAMRefreshPos = SNES_WRAM_REFRESH_HC_v2;					// HC=538
@@ -499,6 +319,12 @@ void S9xDoHEventProcessing (void)
 			if (CPU.V_Counter == PPU.ScreenHeight + FIRST_VISIBLE_LINE)	// VBlank starts from V=225(240).
 			{
 				S9xEndScreenRefresh();
+				#ifdef DEBUGGER
+					if (!(CPU.Flags & FRAME_ADVANCE_FLAG))
+				#endif
+				{
+					S9xSyncSpeed();
+				}

 				CPU.Flags |= SCAN_KEYS_FLAG;

@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CPUEXEC_H_
 #define _CPUEXEC_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CPUMACRO_H_
 #define _CPUMACRO_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -1592,11 +1406,13 @@ bOP(70Slow, RelativeSlow,  CheckOverflow(), 0, CheckEmulation())
 static void Op82 (void)
 {
 	S9xSetPCBase(ICPU.ShiftedPB + RelativeLong(JUMP));
+	AddCycles(ONE_CYCLE);
 }

 static void Op82Slow (void)
 {
 	S9xSetPCBase(ICPU.ShiftedPB + RelativeLongSlow(JUMP));
+	AddCycles(ONE_CYCLE);
 }

 /* Flag Instructions ******************************************************* */
@@ -1638,7 +1454,7 @@ static void Op58 (void)
 	AddCycles(ONE_CYCLE);

 #ifndef SA1_OPCODES
-	Timings.IRQFlagChanging = IRQ_CLEAR_FLAG;
+	Timings.IRQFlagChanging |= IRQ_CLEAR_FLAG;
 #else
 	ClearIRQ();
 #endif
@@ -1650,7 +1466,7 @@ static void Op78 (void)
 	AddCycles(ONE_CYCLE);

 #ifndef SA1_OPCODES
-	Timings.IRQFlagChanging = IRQ_SET_FLAG;
+	Timings.IRQFlagChanging |= IRQ_SET_FLAG;
 #else
 	SetIRQ();
 #endif
@@ -2797,13 +2613,13 @@ void S9xOpcode_IRQ (void)

 	#ifdef SA1_OPCODES
 		OpenBus = Memory.FillRAM[0x2208];
-		AddCycles(2 * SLOW_ONE_CYCLE);
+		AddCycles(2 * ONE_CYCLE);
 		S9xSA1SetPCBase(Memory.FillRAM[0x2207] | (Memory.FillRAM[0x2208] << 8));
 	#else
 		if (Settings.SA1 && (Memory.FillRAM[0x2209] & 0x40))
 		{
 			OpenBus = Memory.FillRAM[0x220f];
-			AddCycles(2 * SLOW_ONE_CYCLE);
+			AddCycles(2 * ONE_CYCLE);
 			S9xSetPCBase(Memory.FillRAM[0x220e] | (Memory.FillRAM[0x220f] << 8));
 		}
 		else
@@ -2825,13 +2641,13 @@ void S9xOpcode_IRQ (void)

 	#ifdef SA1_OPCODES
 		OpenBus = Memory.FillRAM[0x2208];
-		AddCycles(2 * SLOW_ONE_CYCLE);
+		AddCycles(2 * ONE_CYCLE);
 		S9xSA1SetPCBase(Memory.FillRAM[0x2207] | (Memory.FillRAM[0x2208] << 8));
 	#else
 		if (Settings.SA1 && (Memory.FillRAM[0x2209] & 0x40))
 		{
 			OpenBus = Memory.FillRAM[0x220f];
-			AddCycles(2 * SLOW_ONE_CYCLE);
+			AddCycles(2 * ONE_CYCLE);
 			S9xSetPCBase(Memory.FillRAM[0x220e] | (Memory.FillRAM[0x220f] << 8));
 		}
 		else
@@ -2872,13 +2688,13 @@ void S9xOpcode_NMI (void)

 	#ifdef SA1_OPCODES
 		OpenBus = Memory.FillRAM[0x2206];
-		AddCycles(2 * SLOW_ONE_CYCLE);
+		AddCycles(2 * ONE_CYCLE);
 		S9xSA1SetPCBase(Memory.FillRAM[0x2205] | (Memory.FillRAM[0x2206] << 8));
 	#else
 		if (Settings.SA1 && (Memory.FillRAM[0x2209] & 0x10))
 		{
 			OpenBus = Memory.FillRAM[0x220d];
-			AddCycles(2 * SLOW_ONE_CYCLE);
+			AddCycles(2 * ONE_CYCLE);
 			S9xSetPCBase(Memory.FillRAM[0x220c] | (Memory.FillRAM[0x220d] << 8));
 		}
 		else
@@ -2900,13 +2716,13 @@ void S9xOpcode_NMI (void)

 	#ifdef SA1_OPCODES
 		OpenBus = Memory.FillRAM[0x2206];
-		AddCycles(2 * SLOW_ONE_CYCLE);
+		AddCycles(2 * ONE_CYCLE);
 		S9xSA1SetPCBase(Memory.FillRAM[0x2205] | (Memory.FillRAM[0x2206] << 8));
 	#else
 		if (Settings.SA1 && (Memory.FillRAM[0x2209] & 0x10))
 		{
 			OpenBus = Memory.FillRAM[0x220d];
-			AddCycles(2 * SLOW_ONE_CYCLE);
+			AddCycles(2 * ONE_CYCLE);
 			S9xSetPCBase(Memory.FillRAM[0x220c] | (Memory.FillRAM[0x220d] << 8));
 		}
 		else
@@ -2965,21 +2781,33 @@ static void Op02 (void)
 static void OpDC (void)
 {
 	S9xSetPCBase(AbsoluteIndirectLong(JUMP));
+#ifdef SA1_OPCODES
+	AddCycles(ONE_CYCLE);
+#endif
 }

 static void OpDCSlow (void)
 {
 	S9xSetPCBase(AbsoluteIndirectLongSlow(JUMP));
+#ifdef SA1_OPCODES
+	AddCycles(ONE_CYCLE);
+#endif
 }

 static void Op5C (void)
 {
 	S9xSetPCBase(AbsoluteLong(JUMP));
+#ifdef SA1_OPCODES
+	AddCycles(ONE_CYCLE);
+#endif
 }

 static void Op5CSlow (void)
 {
 	S9xSetPCBase(AbsoluteLongSlow(JUMP));
+#ifdef SA1_OPCODES
+	AddCycles(ONE_CYCLE);
+#endif
 }

 /* JMP ********************************************************************* */
@@ -3021,6 +2849,7 @@ static void Op22E1 (void)
 	// Note: JSL is a new instruction,
 	// and so doesn't respect the emu-mode stack bounds.
 	uint32	addr = AbsoluteLong(JSR);
+	AddCycles(ONE_CYCLE);
 	PushB(Registers.PB);
 	PushW(Registers.PCw - 1);
 	Registers.SH = 1;
@@ -3030,6 +2859,7 @@ static void Op22E1 (void)
 static void Op22E0 (void)
 {
 	uint32	addr = AbsoluteLong(JSR);
+	AddCycles(ONE_CYCLE);
 	PushB(Registers.PB);
 	PushW(Registers.PCw - 1);
 	S9xSetPCBase(addr);
@@ -3038,6 +2868,7 @@ static void Op22E0 (void)
 static void Op22Slow (void)
 {
 	uint32	addr = AbsoluteLongSlow(JSR);
+	AddCycles(ONE_CYCLE);
 	PushB(Registers.PB);
 	PushW(Registers.PCw - 1);
 	if (CheckEmulation())
@@ -3555,16 +3386,19 @@ static void Op42 (void)
 	#endif

 		case 0x42: // "WDM" = Snapshot
-			char	filename[PATH_MAX + 1], drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[PATH_MAX + 1], ext[_MAX_EXT + 1];
+        {
+            char	tmp[PATH_MAX + 1];
+            SplitPath split = splitpath(Memory.ROMFilename);

-			_splitpath(Memory.ROMFilename, drive, dir, def, ext);
-			snprintf(filename, PATH_MAX, "%s%s%s-%06X.wdm", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, Registers.PBPC & 0xffffff);
-			sprintf(def, "WDM Snapshot at $%02X:%04X: %s", Registers.PB, Registers.PCw, filename);
-			S9xMessage(S9X_DEBUG, S9X_DEBUG_OUTPUT, def);
-			S9xFreezeGame(filename);
+            snprintf(tmp, PATH_MAX, "%s-%06X", split.stem.c_str(), Registers.PBPC & 0xffffff);
+            std::string filename = makepath(split.dir, S9xGetDirectory(SNAPSHOT_DIR), tmp, ".wdm");

-			break;
+            sprintf(tmp, "WDM Snapshot at $%02X:%04X: %s", Registers.PB, Registers.PCw, filename.c_str());
+            S9xMessage(S9X_DEBUG, S9X_DEBUG_OUTPUT, tmp);
+            S9xFreezeGame(filename.c_str());

+            break;
+        }
 		default:
 			break;
 	}
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CPUOPS_H_
 #define _CPUOPS_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifdef HAVE_LIBPNG
 #include <png.h>
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _CROSSHAIRS_H_
 #define _CROSSHAIRS_H_
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifdef DEBUGGER

@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifdef DEBUGGER

@@ -1,218 +1,14 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _DISPLAY_H_
 #define _DISPLAY_H_

 #include "snes9x.h"

-enum s9x_getdirtype
-{
-	DEFAULT_DIR = 0,
-	HOME_DIR,
-	ROMFILENAME_DIR,
-	ROM_DIR,
-	SRAM_DIR,
-	SNAPSHOT_DIR,
-	SCREENSHOT_DIR,
-	SPC_DIR,
-	CHEAT_DIR,
-	PATCH_DIR,
-	BIOS_DIR,
-	LOG_DIR,
-	SAT_DIR,
-	LAST_DIR
-};
-
 void S9xUsage (void);
 char * S9xParseArgs (char **, int);
 void S9xParseArgsForCheats (char **, int);
@@ -226,16 +22,10 @@ void S9xInitDisplay (int, char **);
 void S9xDeinitDisplay (void);
 void S9xTextMode (void);
 void S9xGraphicsMode (void);
-void S9xSetPalette (void);
 void S9xToggleSoundChannel (int);
 bool8 S9xOpenSnapshotFile (const char *, bool8, STREAM *);
 void S9xCloseSnapshotFile (STREAM);
 const char * S9xStringInput (const char *);
-const char * S9xGetDirectory (enum s9x_getdirtype);
-const char * S9xGetFilename (const char *, enum s9x_getdirtype);
-const char * S9xGetFilenameInc (const char *, enum s9x_getdirtype);
-const char * S9xChooseFilename (bool8);
-const char * S9xBasename (const char *);

 // Routines the port has to implement if it uses command-line

@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _DMA_H_
 #define _DMA_H_
@@ -1,3 +1,184 @@
+Snes9x 1.62
+- Fixed SA1 division with negative dividend again. (Atari2)
+- Fixed timing on several instructions. (pi1541)
+- MSU1 audio with no loop point will not repeat from start.
+- Modernized some old memory-related code.
+- Fixed a desynchronization in interlaced modes and reporting.
+- Remove SA1 access to WRAM.
+- Added second set of registers between S-DSP and S-SMP. Fixes
+  PAL version of Virtual Bart.
+
+Gtk + Windows:
+- Added a Vulkan graphics output method. Similar to OpenGL, this
+  can use libretro's slang shaders.
+- Changed the automatic frame skip throttle to take place immediately
+  before showing the frame, making VRR work better.
+- Add menu item to clear recent files entries.
+- Add fixed window size changes up to 10x.
+
+Windows:
+- Improved the shader parameters dialog with sliders and resize.
+- Allow disabling adding registry entries. Deletes any existing
+  entries when the option is disabled.
+
+Gtk:
+- Switched to CMake for build system. Removed meson.
+- Fixed some keys not working with modifiers. (Gutawer)
+- Removed graphics options most people won't understand or need.
+- Improved wayland support. Handle fractional DPI properly.
+
+Snes9x 1.61
+- Restructured tile.cpp tile renderer from heavy macros into C++
+  templates, significantly lowering compile time. (yoffy)
+- MichaelBuckley provided a brand new MacOS port that is completely
+  rewritten based on newer, supported APIs.
+- Fixed an out-of-bound memory access in sound DSP. (Sour, byuu)
+- Revert default SFX2 clock speed increase.
+- Added a render position hack. Fixes glitches in several games.
+- Allow an SRAM mapping up to 128KB.
+
+Win32:
+- Apply turbo mode volume when rewinding.
+- Added menu entry to load oops files, and an option to confirm before
+  saving or loading states.
+- Fixed sound volume resetting when sound reinitializes.
+- Added a save-state preview dialog.
+- Added save banks for up to 100 states
+- Added support for relative-style save slots
+- Fixed blargg rf filter.
+- Show command line options on -h and /?
+
+Gtk:
+- Added an option to show time. (taimoorgit)
+- Use a submodule for glslang, because it doesn't guarantee API stability.
+- Switched to GTK's C++ interface, gtkmm3. This effectively drops
+  GTK+ 2.0 support.
+- Joysticks can now be hotplugged. (jraby)
+
+Unix:
+- Added audio output threading. (yoffy)
+- Added screensaver prevention on joystick use. (greg-kennedy)
+- Fix YUY2 conversion. (greg-kennedy)
+- Add alsa output support. (cjacker)
+- Add I420 conversion. (cjacker)
+
+Snes9x 1.60
+- Fixed subscreen blending with master brightness < 100%.
+- Fixed NMI timing when toggling enable bit. Fixes Chou Aniki--hack removed.
+- Reverted an IPL map optimization that misses a weird edge case that caused
+  The Great Battle III to lock up.
+- Clamp MSU1 addition to max amplitude instead of wrapping. Proper MSU1 tracks
+  will not be affected by this.
+- Save mipmap_input parameter with customized GLSL and slang shaders.
+- Actually use mipmap_input parameter.
+- Optimized subscreen math with help from Dwedit.
+- Revert to measured APU clock speed instead of nominal speed. Fixes An
+  American Tail.
+- Fixed broken BPS patch support. (ArtiiP)
+- Fixed MSU1 track restarting on load state.
+
+Win32:
+- Changed window flags to allow NVIDIA cards to auto-enable exclusive
+  fullscreen mode in OpenGL.
+- Added a hidden option "DWMSync" that allows OpenGL to sync to the window
+  manager while in windowed or borderless windowed mode.
+- The automatic frame skip option no longer limits to 59.94Hz.
+- Fixed bad icon scaling.
+- Added a hacks dialog to enable settings for older hacks to run.
+
+libretro:
+- Added ability to use Satellaview data in same directory as ROM.
+- Fixed deviation from proper libretro spec.
+- Added option to use the software NTSC filter. (stellarporter)
+
+GTK:
+- Added icons to the entries to clear binding assignments.
+- Fixed overlap in xBRZ multithreading.
+- Changed glFenceSync option to an OML_sync option that works better.
+- Fixed accumulation of partial pixel data on mouse motion when we update the
+  mouse position more than once per frame.
+- Allow one key to be bound to many controller buttons on the same controller.
+- Force menu and button icons.
+- Add the view menu to right-click when SNES mouse isn't used.
+- Remove unused status bar option.
+- Startup background can be changed in snes9x.conf.
+- Improved PortAudio driver.
+
+Unix:
+- Fixed sound output that broke with APU refactor.
+
+Snes9x 1.59.2
+- Fix out-of-bounds access on APU memory.
+
+Snes9x 1.59.1
+- Fix sound core breakage.
+
+Snes9x 1.59
+- Count clock cycles to synchronize SA1 with S-CPU properly. Based mostly on
+  work by Vitor Vilela.
+- Only allow instant IRQ when toggling IRQ. Fixes WWF - Wrestlemania.
+- Refactored APU output code to buffer less on the client side. Removed 8-bit,
+  Mono, and Reverse Stereo options.
+- Consistently handle interlacing when we skip frames.
+- Changed APU clock to reflect nominal values for original hardware.
+- Fix C4 square instruction regression.
+
+Win32:
+- Don't display Joypad 2 pressed keys if disabled.
+- Add support for libretro ".slang" shaders to OpenGL driver.
+- Removed glitch-prone DirectSound audio driver in favor of a generic Wave Out
+  driver.
+- Moved sound sync to drivers to be more reactive. This makes sound sync and
+  dynamic resampling work more reliably.
+- Cleaned up dialog boxes to be more consistently spaced.
+- Fixed TVMode filter in Direct3D and OpenGL modes.
+- Fixed an interaction slowdown with OpenGL and Blargg NTSC filters.
+
+libretro:
+- Fix multiline cheats.
+
+GTK+:
+- Switch from autotools to Meson build system.
+- Readd glFinish option as alternative to glFenceSync.
+- Fix size fallthrough with xBRZ filter.
+- Fix loading of key bindings with spaces in them and modifier keys used alone.
+- Add support for libretro ".slang" shaders to OpenGL driver.
+- Use a cleaner onscreen font.
+- Trap errors to allow OpenGL <= 2.1 to run again.
+- Break display settings up to make it easier to access hardware accel section.
+
+
+Snes9x 1.58
+- Move the LICENSE file to the base directory and use a stub
+  in all the source files referring to it.
+- Adjust Chou Aniki timing hack.
+- Use 1-based numbering when displaying pressed keys.
+- Hide controller port if disabled when displaying keys.
+- Fix movie playback. (OV2, BearOso)
+
+ libretro:
+- Fix interlaced modes when overscan crop is enabled.
+- Allow overriding -flto. (orbea)
+
+ GTK+:
+- Use shared snes_ntsc implementation.
+- Remove extra LGPL licensing to avoid confusion.
+- Don't translate config file entries. Fixes breakage on
+  non-C languages.
+- Fix issue where config file doesn't contain all configurable
+  entries.
+- Remove config options for Netplay, Joystick, and JMA. SDL 2.0
+  is now mandatory.
+- Updated gettext and removed intltool. update-po should now catch
+  all translatable strings.
+- If available, reduce input lag option will now use fences instead
+  of glFinish to prevent hogging the CPU.
+- Onscreen text can be variable width and will show up in some more
+  cases now.
+
+ Win32:
+- Add audio device selection (XAudio2 only)
+
 Snes9x 1.57
 - Various seta010 emulation fixes.                          (kps501)
 - Pass blargg OAM tests with proper write behavior.         (BearOso)
@@ -191,7 +372,7 @@ Snes9x 1.55
 - Added support for the MSU-1 coprocessor.                  (qwertymodo)
 - Added support for MSU-1 distribution pack.                (qwertymodo)
 - Added support for BS-X Satellaview memory packs and data  (LuigiBlood)
-  files.                                                    
+  files.
 - Improved BS-X memory mapping accuracy.                    (LuigiBlood)
 - Fixed APU error causing issues with some games.           (byuu, qwertymodo)
 - Added option to ignore patch checksums.                   (qwertymodo)
@@ -307,20 +488,20 @@ Snes9x 1.53
 - Mac  : Fixed gliches in open/save dialogs on 10.6.        (zones)
 - Mac  : Fixed display configuration in windowed mode.      (zones)
 - Unix : Fixed segfault and hang-up with -DNOSOUND.         (zones)
- GTK+ : Added ability to set specific folders for SRAM, 
+- GTK+ : Added ability to set specific folders for SRAM,
  patches, snapshots, etc.                                  (BearOso)
 - GTK+ : Fixed many permissions issues with config folders. (BearOso)
- GTK+ : Updated compatibility with latest GTK+ and 
+- GTK+ : Updated compatibility with latest GTK+ and
  GtkBuilder. Added experimental support for GTK+ 3.x.      (BearOso)
- GTK+ : Updated software output to use cairo and added the 
+- GTK+ : Updated software output to use cairo and added the
  ability to use bilinear-filtering with it.                (BearOso)
 - GTK+ : Fixed issues where cheats wouldn't stay enabled.   (BearOso)
 - GTK+ : Fixed focus issue when there is no window manager. (BearOso)
- GTK+ : Fixed X Visual incompatibilities and expose 
+- GTK+ : Fixed X Visual incompatibilities and expose
  problems in the Xv and OpenGL outputs.                    (BearOso)
 - GTK+ : Fixed vsync with new X Server and NVIDIA drivers.  (BearOso)
 - GTK+ : Added "Reduce input lag" option to OpenGL output.  (BearOso)
- GTK+ : Added a visual indication of the expected video 
+- GTK+ : Added a visual indication of the expected video
  refresh rate for the currently selected sound input rate. (BearOso)

 Snes9x 1.52
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library 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 library 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 library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
@@ -12,8 +12,7 @@
 	<body>
 		<h1 style="text-align:center">How to Port Snes9x to a New Platform</h1>
 		<div style="text-align:right">
-			Version: 1.53<br>
-			(c) Copyright 1998 Gary Henderson
+			Version: 1.61<br>
 		</div>
 		<h2>Introduction</h2>
 		<p>
@@ -33,7 +32,7 @@
 			A 16-bit color (two bytes per pixel) or deeper display, at least 512*478 pixels in resolution. Pixel format conversion may be required before you place the rendered SNES screen on to the display.
 		</p>
 		<p>
-			Sound output requires spooling 8-bit or 16-bit, mono or stereo digital sound data to the host sound system. Some ports can use interrupts or callbacks from the sound system to know when more sound data is required, most other ports have to periodically poll the host sound system to see if more data is required; if it is then the sound mixing code is called to fill the sound buffer with SNES sound data, which then can be passed on to the host sound system. Sound data is generated as an array of bytes (<code>uint8</code>) for 8-bit sound or shorts (<code>int16</code>) for 16-bit data. Stereo sound data generates twice as many samples, with each channel's samples interleaved, first left's then right's.
+			Snes9x outputs 16-bit stereo digital sound data. Ports may convert it from there to 8-bit or mono. Some ports can use interrupts or callbacks from the sound system to know when more sound data is required, most other ports have to periodically poll the host sound system to see if more data is required; if it is then the sound mixing code is called to fill the sound buffer with SNES sound data, which then can be passed on to the host sound system. Sound data is generated as an array of bytes (<code>uint8</code>) for 8-bit sound or shorts (<code>int16</code>) for 16-bit data. Stereo sound data generates twice as many samples, with each channel's samples interleaved, first left's then right's.
 		</p>
 		<p>
 			For the user to be able to control and play SNES games, some form of input device is required, a joypad or keyboard, for example. The real SNES can have 2 eight-button digital joypads connected to it or 5 joypads when an optional multi-player adaptor is connected, although most games only require a single joypad. Access to all eight buttons and the direction pad, of course, are usually required by most games. Snes9x does emulate the multi-player adaptor hardware, if you were wondering, but its still up to you to provide the emulation of the individual joypads.
@@ -104,13 +103,13 @@
 			<code>S9xMapButton(k1P_A_Button, s9xcommand_t cmd = S9xGetCommandT(&quot;Joypad1 A&quot;), false);</code>
 		</p>
 		<p>
-			In your main emulation loop, after <code>S9xMainLoop</code> function is called, check your system's keyboard/joypad, and call <code>S9xReportButton</code> function to report the states of the SNES joypad buttons to Snes9x.
+			In your main emulation loop, before <code>S9xMainLoop</code> function is called, check your system's keyboard/joypad, and call <code>S9xReportButton</code> function to report the states of the SNES joypad buttons to Snes9x. Checking and reporting input immediately before <code>S9xMainLoop</code> is preferred to minimize input latency.
 		</p>
 		<p>
 			<code>void MyMainLoop (void)<br>
 			{<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;S9xMainLoop();<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;MyReportButttons();<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;S9xMainLoop();<br>
 			}</code>
 		</p>
 		<p>
@@ -179,10 +178,10 @@
 		<p>
 			Deallocates the allocations made by <code>S9xInitAPU</code> function.
 		</p>
-		<h3><code>bool8 S9xInitSound (int buffer_ms, int lag_ms)</code></h3>
+		<h3><code>bool8 S9xInitSound (int buffer_ms)</code></h3>
 		<p>
-			Allocates memory for mixing and queueing SNES sound data, does more sound code initialization and opens the host system's sound device by calling <code>S9xOpenSoundDevice</code>, a function you must provide. Before calling this function you must set up <code>Settings.SoundSync</code>, <code>Settings.SixteenBitSound</code>, <code>Settings.SoundPlaybackRate</code>, <code>Settings.SoundInputRate</code> (see section below) and <code>Settings.Stereo</code>.<br>
-			<code>buffer_ms</code>, given in milliseconds, is the memory buffer size for queueing sound data. <code>lag_ms</code> is allowable latency between when a sample is queued and when it is pulled in <code>S9xMixSamples</code>. Set <code>lag_ms</code> to zero if you have your own latency handling code in your port.
+			Allocates memory for mixing and queueing SNES sound data, does more sound code initialization and opens the host system's sound device by calling <code>S9xOpenSoundDevice</code>, a function you must provide. Before calling this function you must set up <code>Settings.SoundSync</code>, <code>Settings.SoundPlaybackRate</code>, and <code>Settings.SoundInputRate</code>. (see section below)<br>
+			<code>buffer_ms</code>, given in milliseconds, is the memory buffer size for queueing sound data. Leave this at 0 to use the suggested default.<br>
 		</p>
 		<h3><code>void S9xReset (void)</code></h3>
 		<p>
@@ -215,8 +214,8 @@
 		</p>
 		<h3><code>void S9xMixSamples (uint8 *buffer, int sample_count)</code></h3>
 		<p>
-			Call this function from your host sound system handling code to fill <code>buffer</code> with ready-mixed SNES sound data. If 16-bit sound mode is chosen, then the buffer will be filled with an array of <code>sample_count</code> <code>int16</code>, otherwise an array of <code>sample_count</code> <code>uint8</code>. If stereo sound generation is selected the buffer is filled with the same number of samples, but in pairs, first a left channel sample followed by the right channel sample.<br>
-			If there are less queued samples than you request by <code>sample_count</code>, the function fills <code>buffer</code> with silent sound data and returns <code>false</code>. To avoid this shortage of queued samples, request larger buffer size when calling <code>S9xInitSound</code>, and handle sound latency safely.
+			Call this function from your host sound system handling code to fill <code>buffer</code> with ready-mixed SNES sound data. The buffer will be filled with an array of <code>sample_count</code> <code>int16</code>. Samples are in pairs, first a left channel sample followed by the right channel sample.<br>
+			If there are fewer queued samples than you request by <code>sample_count</code>, the function fills <code>buffer</code> with silent sound data and returns <code>false</code>.
 		</p>
 		<h3><code>int S9xGetSampleCount (void)</code></h3>
 		<p>
@@ -224,16 +223,16 @@
 		</p>
 		<h3><code>void S9xSetSamplesAvailableCallback (void (*) samples_available (void *), void *data)</code></h3>
 		<p>
-			Call this function to set up a callback that is run when sound samples are made available. <code>samples_available</code> is a function you provide that returns <code>void</code> and takes a pointer as an argument. <code>data</code> is a pointer that you may wish to pass to your callback or can be <code>NULL</code>. If you choose to provide a callback, you must call the provided <code>S9xFinalizeSamples</code> function inside it to actually buffer the samples. If you are using a callback-oriented sound API, it is recommended to set up a function that locks a common mutex during the calls to <code>S9xFinalizeSamples</code> and <code>S9xMixSamples</code> to prevent them from running at the same time and corrupting the sound buffer.<br>
-			If you wish to disable a callback you have set up or need to temporarily shut down your sound system, you may pass <code>NULL</code> for both arguments to revert to the built-in version.
+			Call this function to set up a callback that is run when sound samples are made available. <code>samples_available</code> is a function you provide that returns <code>void</code> and takes a pointer as an argument. <code>data</code> is a pointer that you may wish to pass to your callback or can be <code>NULL</code>. Inside this function is the only time that it is safe to access Snes9x's sound data. Ideally, all samples reported available will be removed from Snes9x's buffer when this function is called and moved to either the sound driver output or a separate buffer that can be locked in a thread-safe fashion. If you are using a callback-oriented sound API, it is recommended to set up a separate buffer that can accumulate at least enough samples to fulfill more than one host sound driver callback request.<br>
+			If you wish to disable a callback you have set up or need to temporarily shut down your sound system, you may pass <code>NULL</code> for both arguments.
 		</p>
 		<h3><code>bool8 S9xSyncSound (void)</code></h3>
 		<p>
-			Call this function to synchronize the sound buffers to the game state. If Snes9x is generating too much sound data, or a buffer-overrun is likely, this function will return <code>false</code>. In this case, you may wish to wait until your host sound system uses the available samples, and <code>S9xSyncSound</code> returns <code>true</code> before continuing to execute <code>S9xMainLoop</code>.
+			Call this function to synchronize the sound buffers to the game state. This will call the <code>samples_available</code> function to try and move sound data out of Snes9x. If Snes9x is unable to make enough space to accumulate the sound data for a whole video frame, this function will return <code>false</code>. In this case, you may wish to wait until your host sound system uses the available samples, and <code>S9xSyncSound</code> returns <code>true</code> before continuing to execute <code>S9xMainLoop</code>.
 		</p>
 		<h3><code>bool8 S9xSetSoundMute (bool8 mute)</code></h3>
 		<p>
-			Call with a <code>true</code> parameter to prevent <code>S9xMixSamples</code> function from processing SNES sample data and instead just filling the return buffer with silent sound data. Useful if your sound system is interrupt or callback driven and the game has been paused either directly or indirectly because the user interacting with the emulator's user interface in some way.
+			Call with a <code>true</code> parameter to cause the <code>S9xMixSamples</code> to fill the output buffer with silence, instead of filling the output buffer with sound data. Useful if your sound system is interrupt or callback driven and the game has been paused either directly or indirectly because the user is interacting with the emulator's user interface in some way.
 		</p>
 		<h3><code>bool8 S9xFreezeGame (const char *filepath)</code></h3>
 		<p>
@@ -299,14 +298,6 @@
 		<p>
 			Called when Snes9x wants to know the directory <code>dirtype</code>.
 		</p>
-		<h3><code>const char *S9xChooseFilename (bool8 read_only)</code></h3>
-		<p>
-			If your port can match Snes9x's built-in <code>LoadFreezeFile</code>/<code>SaveFreezeFile</code> command (see <code>controls.cpp</code>), you may choose to use this function. Otherwise return <code>NULL</code>.
-		</p>
-		<h3><code>const char *S9xChooseMovieFilename (bool8 read_only)</code></h3>
-		<p>
-			If your port can match Snes9x's built-in <code>BeginRecordingMovie</code>/<code>LoadMovie</code> command (see <code>controls.cpp</code>), you may choose to use this function. Otherwise return <code>NULL</code>.
-		</p>
 		<h3><code>const char *S9xBasename (const char *path)</code></h3>
 		<p>
 			Called when Snes9x wants to know the name of the ROM image. Typically, extract the filename from <code>path</code> and return it.
@@ -319,10 +310,6 @@
 		<p>
 			If your port can match Snes9x's built-in <code>SoundChannelXXX</code> command (see <code>controls.cpp</code>), you may choose to use this function. Otherwise return <code>NULL</code>. Basically, turn on/off the sound channel <code>c</code> (0-7), and turn on all channels if <code>c</code> is 8.
 		</p>
-		<h3><code>void S9xSetPalette (void)</code></h3>
-		<p>
-			Called when the SNES color palette has changed. Use this function if your system should change its color palette to match the SNES's. Otherwise let it empty.
-		</p>
 		<h3><code>void S9xSyncSpeed (void)</code></h3>
 		<p>
 			Called at the end of <code>S9xMainLoop</code> function, when emulating one frame has been done. You should adjust the frame rate in this function.
@@ -348,10 +335,8 @@
 			Settings.MultiPlayer5Master = true;<br>
 			Settings.FrameTimePAL = 20000;<br>
 			Settings.FrameTimeNTSC = 16667;<br>
-			Settings.SixteenBitSound = true;<br>
-			Settings.Stereo = true;<br>
-			Settings.SoundPlaybackRate = 32000;<br>
-			Settings.SoundInputRate = 32000;<br>
+			Settings.SoundPlaybackRate = 32040;<br>
+			Settings.SoundInputRate = 31947;<br>
 			Settings.SupportHiRes = true;<br>
 			Settings.Transparency = true;<br>
 			Settings.AutoDisplayMessages = true;<br>
@@ -361,11 +346,24 @@
 		</code></p>
 		<h3><code>Settings.SoundInputRate</code></h3>
 		<p>
-			Adjusts the sound rate through resampling. For every <code>Settings.SoundInputRate</code> samples generated by the SNES, <code>Settings.SoundPlaybackRate</code> samples will be produced.<br>
-			The sound generation rate on a SNES is directly proportional to the video output rate. Displays that synchronize with the vertical refresh but have a slightly lower refresh-rate than the emulated system can experience sound drop-outs. It may be beneficial to provide an option for users to configure <code>Settings.SoundInputRate</code> to suit their own systems. Setting <code>Settings.SoundInputRate</code> to a value that matches the actual output rate (i.e. 31977hz for 59.96hz) or lower will allow the users to eliminate crackling. A range of 31000hz to 33000hz should be inclusive enough for all displays. Use of this setting paired with the <code>S9xSyncSound</code> function can eliminate sound discontinuity.
+			Adjusts the sound rate through resampling. For every <code>Settings.SoundInputRate</code> samples generated by the SNES, <code>Settings.SoundPlaybackRate</code> samples will be produced.
+		</p>
+		<p>
+			On a NTSC SNES, the video refresh rate is usually 60.09881Hz, while the audio output is 32040Hz. This means for every video frame displayed, 532.4565 sound frames are produced. A modern computer display or television will usually provide one of two video rates, 60.00Hz exactly or 59.94Hz to support broadcast television. The sound output, however, is usually fixed at exact values like 32000Hz, 44100Hz, or 48000Hz. This means that the closest video-to-sound ratio we can achieve, with 60.00Hz and 32000Hz, is 1.0/533.3333. This discrepancy means if we wait for vertical sync and update once per refresh, we will experience a sound deficit of 0.87 samples every frame, eventually causing a sound underrun and producing audio problems. <br>
+		</p>
+		<p>
+			Settings.SoundInputRate can be set to a value such that the ratio with the video rate matches the SNES output. A 60.00Hz display, for example, should be set to 60.00 / 60.09881 * 32040, which is about 31987. The Snes9x resampler will then stretch the sound samples to fit this ratio. It may be beneficial to provide an option for users to configure <code>Settings.SoundInputRate</code> to suit their own systems. Setting <code>Settings.SoundInputRate</code> to a value that matches the actual output rate (i.e. 31915hz for 59.94Hz) or lower will allow the users to eliminate crackling. A range of 31000hz to 33000hz should be inclusive enough for all displays. Use of this setting paired with the <code>S9xSyncSound</code> function can eliminate sound discontinuity. However, this concept is difficult for most users to understand. If possible, read the display's refresh rate and automatically calculate the appropriate input rate by default. In practice, few displays exceed a target of 60.00Hz, so a good default would be no greater than 31950Hz, but probably lower.
+		</p>
+		<h3><code>Settings.DynamicRateControl</code> and <code>S9xUpdateDynamicRate(int numerator, int denominator)</code></h3>
+		<p>
+			To eliminate buffer overflows and underflows, dynamic rate control can be implemented and used. While this can accommodate for Settings.SoundInputRate not being set correctly, it works better the closer that value is to ideal.
+		</p>
+		<p>
+			To implement, set <code>Settings.DynamicRateControl</code> to <code>true</code>. At the beginning of your <code>samples_available</code> callback, check the hardware output buffer's fill level. Report the amount of free space in the buffer as a fraction of total buffer size to <code>S9xUpdateDynamicRate</code>, and Snes9x will try and keep the buffer close to 50% full. To tune this, <code>Settings.DynamicRateLimit</code> can be changed. A larger value will increase the range of frequencies it can use, but will also cause more noticeable pitch changes.
 		</p>
 		<div style="text-align:right; margin-top:3em">
-			Updated most recently by: 2011/1/16 zones
+			Original document (c) Copyright 1998 Gary Henderson;
+Updated most recently by: 2019/2/26 BearOso
 		</div>
 	</body>
 </html>
@@ -1,8 +1,8 @@
-These are all the known ports of Snes9X to other consoles/handhelds/etc as of
-2011/08/28. They are all supported and welcomed on the official Snes9X site.
+These are all the known ports of Snes9x to other consoles/handhelds/etc as of
+2011/08/28. They are all supported and welcomed on the official Snes9x site.

-**If you know of anyone who is currently working on a port of Snes9X, or if you
-have some interest in making a port, please have them go to the Snes9X forums
+**If you know of anyone who is currently working on a port of Snes9x, or if you
+have some interest in making a port, please have them go to the Snes9x forums
 (http://www.snes9x.com/phpbb2/) and have them register an account there. After
 that, speak to Ryan and/or Jerremy so you can be let into the devs area and the
 git so you can have access to the most current code, collaborate with the other
@@ -10,7 +10,7 @@ developers, make the port officialized, etc.**

 Ports and how to get them running are as follows:

-*PSP Version of Snes9X*
+*PSP Version of Snes9x*
 Name: Snes9X Euphoria
 Latest version: R5 Beta
 Homepage/forum: http://code.google.com/p/snes9x-euphoria/
@@ -48,7 +48,7 @@ Note: as of right now, there is no one to maintain the PSP port; I am leaving
 these instructions up just in case someone wants to take it over, and you can
 use these tips to get other homebrews going.

-*Wii/Gamecube version of Snes9X*
+*Wii/Gamecube version of Snes9x*
 Name: Snes9X GX
 Latest Version: 4.2.8
 Homepage/forum: http://code.google.com/p/snes9x-gx
@@ -74,7 +74,7 @@ installer from the Homebrew Channel, and you'll be good to go!

 Gamecube: You might need a modchip.

-*Android and iOS (Apple iPhone/iPod Touch) version of Snes9X*
+*Android and iOS (Apple iPhone/iPod Touch) version of Snes9x*
 Name: Snes9X EX
 Latest Version: 1.4.2 (iOS); 1.4.7.1 (Android)
 Homepage/forum: http://www.explusalpha.com/home/snes9x-ex
@@ -101,7 +101,7 @@ Hint: a more detailed description of copying your ROMs/saves/etc over to the
 iOS device can be found here:
 http://snes9x.com/phpbb2/viewtopic.php?t=5107

-*PS3 version of Snes9X*
+*PS3 version of Snes9x*
 Name: Snes9X PS3
 Latest Version: 4.4.9
 Homepage/forum: https://code.google.com/p/snes9x-ps3/ (although for some
@@ -118,7 +118,7 @@ upgrade or downgrade your PS3’s firmware as needed). After that, it should be
 as simple as copy the emulator, ROMs, saves, etc over to the PS3 and it should
 work :)

-*X-Box Version of Snes9X*
+*X-Box Version of Snes9x*
 Name: Snes9xbox
 Latest Version: V2 (V3 should be out soon)
 Homepage/forum: http://forums.xbox-scene.com/index.php?showforum=96
@@ -132,4 +132,4 @@ Really, it's not hard. Read the readme, and use a softmod or modchip and a
 replacement dashboard. After that's installed, it should be as simple as
 copying over the emulator, ROMs, saves, etc to the X-Box and it should work.

-Updated most recently by: 2011/11/2 adventure_of_link
+Updated most recently by: 2011/11/2 adventure_of_link
@@ -1,188 +0,0 @@
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
@@ -1,238 +0,0 @@
-#-----------------------------------------
-# snes9x.conf : Snes9x Configuration file
-#-----------------------------------------
-
-[ROM]
-# Filename = 
-LoROM = FALSE
-HiROM = FALSE
-PAL = FALSE
-NTSC = FALSE
-# Header = TRUE/FALSE to ForceHeader or ForceNoHeader
-# Interleaved = TRUE/FALSE to ForceInterleaved or ForceNoInterleaved
-Interleaved2 = FALSE
-InterleaveGD24 = FALSE
-Cheat = FALSE
-Patch = TRUE
-
-[Sound]
-Sync = FALSE
-16BitSound = TRUE
-Stereo = TRUE
-ReverseStereo = FALSE
-Rate = 32000
-InputRate = 32000
-Mute = FALSE
-
-[Display]
-HiRes = TRUE
-Transparency = TRUE
-GraphicWindows = TRUE
-DisplayFrameRate = FALSE
-DisplayWatchedAddresses = FALSE
-DisplayInput = FALSE
-DisplayFrameCount = FALSE
-MessagesInImage = TRUE
-MessageDisplayTime = 120
-
-[Settings]
-BSXBootup = FALSE
-# FrameTime = 
-FrameSkip = Auto
-TurboMode = FALSE
-TurboFrameSkip = 15
-MovieTruncateAtEnd = FALSE
-MovieNotifyIgnored = FALSE
-WrongMovieStateProtection = TRUE
-StretchScreenshots = 1
-SnapshotScreenshots = TRUE
-DontSaveOopsSnapshot = FALSE
-AutoSaveDelay = 0
-
-[Controls]
-MouseMaster = TRUE
-SuperscopeMaster = TRUE
-JustifierMaster = TRUE
-MP5Master = TRUE
-AllowLeftRight = FALSE
-Port1 = pad1
-Port2 = none
-Mouse1Crosshair = 1 White/Black
-Mouse2Crosshair = 1 White/Black
-SuperscopeCrosshair = 2 White/Black
-Justifier1Crosshair = 4 Blue/Black
-Justifier2Crosshair = 4 MagicPink/Black
-
-[Hack]
-EnableGameSpecificHacks = TRUE
-AllowInvalidVRAMAccess = FALSE
-SpeedHacks = FALSE
-HDMATiming = 100
-
-[Netplay]
-Enable = FALSE
-Port = 6096
-Server = ""
-
-[DEBUG]
-Debugger = FALSE
-Trace = FALSE
-
-[Unix]
-# BaseDir = ~/.snes9x
-# SnapshotFilename = 
-# PlayMovieFilename = 
-# RecordMovieFilename = 
-EnableGamePad = TRUE
-PadDevice1 = (null)
-PadDevice2 = (null)
-PadDevice3 = (null)
-PadDevice4 = (null)
-PadDevice5 = (null)
-PadDevice6 = (null)
-PadDevice7 = (null)
-PadDevice8 = (null)
-ThreadSound = FALSE
-SoundBufferSize = 100
-SoundFragmentSize = 2048
-# SoundDevice = 
-ClearAllControls = FALSE
-
-[Unix/X11]
-SetKeyRepeat = TRUE
-VideoMode = 1
-
-[Unix/X11 Controls]
-J00:Axis1 = Joypad1 Axis Up/Down T=50%
-J00:Axis0 = Joypad1 Axis Left/Right T=50%
-J00:B1 = Joypad1 A
-J00:B2 = Joypad1 B
-J00:B0 = Joypad1 X
-J00:B3 = Joypad1 Y
-J00:B6 = Joypad1 L
-J00:B7 = Joypad1 R
-J00:B8 = Joypad1 Select
-J00:B11 = Joypad1 Start
-K00:u = Joypad1 Up
-K00:Up = Joypad1 Up
-K00:j = Joypad1 Down
-K00:n = Joypad1 Down
-K00:Down = Joypad1 Down
-K00:h = Joypad1 Left
-K00:Left = Joypad1 Left
-K00:k = Joypad1 Right
-K00:Right = Joypad1 Right
-K00:d = Joypad1 A
-K00:S+d = Joypad1 ToggleTurbo A
-K00:C+d = Joypad1 ToggleSticky A
-K00:c = Joypad1 B
-K00:S+c = Joypad1 ToggleTurbo B
-K00:C+c = Joypad1 ToggleSticky B
-K00:s = Joypad1 X
-K00:S+s = Joypad1 ToggleTurbo X
-K00:C+s = Joypad1 ToggleSticky X
-K00:x = Joypad1 Y
-K00:S+x = Joypad1 ToggleTurbo Y
-K00:C+x = Joypad1 ToggleSticky Y
-K00:a = Joypad1 L
-K00:v = Joypad1 L
-K00:S+a = Joypad1 ToggleTurbo L
-K00:S+v = Joypad1 ToggleTurbo L
-K00:C+a = Joypad1 ToggleSticky L
-K00:C+v = Joypad1 ToggleSticky L
-K00:z = Joypad1 R
-K00:S+z = Joypad1 ToggleTurbo R
-K00:C+z = Joypad1 ToggleSticky R
-K00:space = Joypad1 Select
-K00:Return = Joypad1 Start
-K00:KP_Up = Joypad2 Up
-K00:KP_Down = Joypad2 Down
-K00:KP_Left = Joypad2 Left
-K00:KP_Right = Joypad2 Right
-K00:Prior = Joypad2 A
-K00:Next = Joypad2 B
-K00:Home = Joypad2 X
-K00:End = Joypad2 Y
-K00:Insert = Joypad2 L
-K00:Delete = Joypad2 R
-K00:KP_Add = Joypad2 Select
-K00:KP_Enter = Joypad2 Start
-K00:Escape = ExitEmu
-K00:Pause = Pause
-K00:Scroll_Lock = Pause
-K00:CS+Escape = Reset
-K00:S+Escape = SoftReset
-K00:F12 = SaveFreezeFile
-K00:A+F3 = SaveFreezeFile
-K00:C+F3 = SaveFreezeFile
-K00:F11 = LoadFreezeFile
-K00:A+F2 = LoadFreezeFile
-K00:C+F2 = LoadFreezeFile
-K00:S+F1 = QuickSave000
-K00:S+F2 = QuickSave001
-K00:S+F3 = QuickSave002
-K00:S+F4 = QuickSave003
-K00:S+F5 = QuickSave004
-K00:S+F6 = QuickSave005
-K00:S+F7 = QuickSave006
-K00:S+F8 = QuickSave007
-K00:S+F9 = QuickSave008
-K00:F1 = QuickLoad000
-K00:F2 = QuickLoad001
-K00:F3 = QuickLoad002
-K00:F4 = QuickLoad003
-K00:F5 = QuickLoad004
-K00:F6 = QuickLoad005
-K00:F7 = QuickLoad006
-K00:F8 = QuickLoad007
-K00:F9 = QuickLoad008
-K00:F10 = LoadOopsFile
-K00:A+F1 = SaveSPC
-K00:C+F1 = SaveSPC
-K00:Print = Screenshot
-K00:S+1 = BeginRecordingMovie
-K00:S+2 = EndRecordingMovie
-K00:S+3 = LoadMovie
-K00:Tab = EmuTurbo
-K00:S+Tab = ToggleEmuTurbo
-K00:equal = IncFrameRate
-K00:minus = DecFrameRate
-K00:S+equal = IncFrameTime
-K00:S+minus = DecFrameTime
-K00:A+equal = IncEmuTurbo
-K00:A+minus = DecEmuTurbo
-K00:C+equal = IncTurboSpeed
-K00:C+minus = DecTurboSpeed
-K00:6 = SwapJoypads
-K00:A+F4 = SoundChannel0
-K00:C+F4 = SoundChannel0
-K00:A+F5 = SoundChannel1
-K00:C+F5 = SoundChannel1
-K00:A+F6 = SoundChannel2
-K00:C+F6 = SoundChannel2
-K00:A+F7 = SoundChannel3
-K00:C+F7 = SoundChannel3
-K00:A+F8 = SoundChannel4
-K00:C+F8 = SoundChannel4
-K00:A+F9 = SoundChannel5
-K00:C+F9 = SoundChannel5
-K00:A+F10 = SoundChannel6
-K00:C+F10 = SoundChannel6
-K00:A+F11 = SoundChannel7
-K00:C+F11 = SoundChannel7
-K00:A+F12 = SoundChannelsOn
-K00:C+F12 = SoundChannelsOn
-K00:1 = ToggleBG0
-K00:2 = ToggleBG1
-K00:3 = ToggleBG2
-K00:4 = ToggleBG3
-K00:5 = ToggleSprites
-K00:9 = ToggleTransparency
-K00:BackSpace = ClipWindows
-K00:A+Escape = Debugger
-M00:Pointer = Pointer Mouse1+Superscope+Justifier1
-M00:B0 = {Mouse1 L,Superscope Fire,Justifier1 Trigger}
-M00:B2 = {Mouse1 R,Superscope Cursor,Justifier1 Start}
-M00:B1 = {Justifier1 AimOffscreen Trigger,Superscope AimOffscreen}
-K00:grave = Superscope ToggleTurbo
-K00:slash = Superscope Pause
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #ifndef _DSP1_H_
 #define _DSP1_H_
@@ -1,193 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 /*
 Copyright (C) 1997-2006 ZSNES Team ( zsKnight, _Demo_, pagefault, Nach )
@@ -501,11 +316,17 @@ static void DSP1_Inverse (int16 Coefficient, int16 Exponent, int16 *iCoefficient
 		}

 		// Step Three: Normalize
+#ifdef __GNUC__
+		const int shift = __builtin_clz(Coefficient) - (8 * sizeof(int) - 15);
+		Coefficient <<= shift;
+		Exponent -= shift;
+#else
 		while (Coefficient < 0x4000)
 		{
 			Coefficient <<= 1;
 			Exponent--;
 		}
+#endif

 		// Step Four: Special Case
 		if (Coefficient == 0x4000)
@@ -583,9 +404,18 @@ static int16 DSP1_Cos (int16 Angle)

 static void DSP1_Normalize (int16 m, int16 *Coefficient, int16 *Exponent)
 {
-	int16	i = 0x4000;
 	int16	e = 0;

+#ifdef __GNUC__
+	int16	n = m < 0 ? ~m : m;
+
+	if (n == 0)
+		e = 15;
+	else
+		e = __builtin_clz(n) - (8 * sizeof(int) - 15);
+#else
+	int16	i = 0x4000;
+
 	if (m < 0)
 	{
 		while ((m & i) && i)
@@ -602,6 +432,7 @@ static void DSP1_Normalize (int16 m, int16 *Coefficient, int16 *Exponent)
 			e++;
 		}
 	}
+#endif

 	if (e > 0)
 		*Coefficient = m * DSP1ROM[0x21 + e] << 1;
@@ -615,9 +446,18 @@ static void DSP1_NormalizeDouble (int32 Product, int16 *Coefficient, int16 *Expo
 {
 	int16	n = Product & 0x7fff;
 	int16	m = Product >> 15;
-	int16	i = 0x4000;
 	int16	e = 0;

+#ifdef __GNUC__
+	int16	t = m < 0 ? ~m : m;
+
+	if (t == 0)
+		e = 15;
+	else
+		e = __builtin_clz(t) - (8 * sizeof(int) - 15);
+#else
+	int16	i = 0x4000;
+
 	if (m < 0)
 	{
 		while ((m & i) && i)
@@ -634,6 +474,7 @@ static void DSP1_NormalizeDouble (int32 Product, int16 *Coefficient, int16 *Expo
 			e++;
 		}
 	}
+#endif

 	if (e > 0)
 	{
@@ -643,6 +484,14 @@ static void DSP1_NormalizeDouble (int32 Product, int16 *Coefficient, int16 *Expo
 			*Coefficient += n * DSP1ROM[0x0040 - e] >> 15;
 		else
 		{
+#ifdef __GNUC__
+			t = m < 0 ? ~(n | 0x8000) : n;
+
+			if (t == 0)
+				e += 15;
+			else
+				e += __builtin_clz(t) - (8 * sizeof(int) - 15);
+#else
 			i = 0x4000;

 			if (m < 0)
@@ -661,6 +510,7 @@ static void DSP1_NormalizeDouble (int32 Product, int16 *Coefficient, int16 *Expo
 					e++;
 				}
 			}
+#endif

 			if (e > 15)
 				*Coefficient = n * DSP1ROM[0x0012 + e] << 1;
@@ -707,7 +557,7 @@ static void DSP1_Op0C (void)

 static void DSP1_Parameter (int16 Fx, int16 Fy, int16 Fz, int16 Lfe, int16 Les, int16 Aas, int16 Azs, int16 *Vof, int16 *Vva, int16 *Cx, int16 *Cy)
 {
-	const int16	MaxAZS_Exp[16] =
+	static const int16	MaxAZS_Exp[16] =
 	{
 		0x38b4, 0x38b7, 0x38ba, 0x38be, 0x38c0, 0x38c4, 0x38c7, 0x38ca,
 		0x38ce,	0x38d0, 0x38d4, 0x38d7, 0x38da, 0x38dd, 0x38e0, 0x38e4
@@ -1416,187 +1266,163 @@ void DSP1SetByte (uint8 byte, uint16 address)
 							break;

 						case 0x00: // Multiple
-							DSP1.Op00Multiplicand = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op00Multiplier   = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
+							DSP1.Op00Multiplicand = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op00Multiplier   = (int16) READ_WORD(&DSP1.parameters[2]);

 							DSP1_Op00();

 							DSP1.out_count = 2;
-							DSP1.output[0] =  DSP1.Op00Result       & 0xFF;
-							DSP1.output[1] = (DSP1.Op00Result >> 8) & 0xFF;
+							WRITE_WORD(&DSP1.output[0], DSP1.Op00Result);
 							break;

 						case 0x20: // Multiple
-							DSP1.Op20Multiplicand = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op20Multiplier   = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
+							DSP1.Op20Multiplicand = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op20Multiplier   = (int16) READ_WORD(&DSP1.parameters[2]);

 							DSP1_Op20();

 							DSP1.out_count = 2;
-							DSP1.output[0] =  DSP1.Op20Result       & 0xFF;
-							DSP1.output[1] = (DSP1.Op20Result >> 8) & 0xFF;
+							WRITE_WORD(&DSP1.output[0], DSP1.Op20Result);
 							break;

 						case 0x30:
 						case 0x10: // Inverse
-							DSP1.Op10Coefficient = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op10Exponent    = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
+							DSP1.Op10Coefficient = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op10Exponent    = (int16) READ_WORD(&DSP1.parameters[2]);

 							DSP1_Op10();

 							DSP1.out_count = 4;
-							DSP1.output[0] = (uint8) ( ((int16) DSP1.Op10CoefficientR)       & 0xFF);
-							DSP1.output[1] = (uint8) ((((int16) DSP1.Op10CoefficientR) >> 8) & 0xFF);
-							DSP1.output[2] = (uint8) ( ((int16) DSP1.Op10ExponentR   )       & 0xFF);
-							DSP1.output[3] = (uint8) ((((int16) DSP1.Op10ExponentR   ) >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op10CoefficientR);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op10ExponentR);
 							break;

 						case 0x24:
 						case 0x04: // Sin and Cos of angle
-							DSP1.Op04Angle  = (int16)  (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op04Radius = (uint16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
+							DSP1.Op04Angle  = (int16)  READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op04Radius = (uint16) READ_WORD(&DSP1.parameters[2]);

 							DSP1_Op04();

 							DSP1.out_count = 4;
-							DSP1.output[0] = (uint8)  (DSP1.Op04Sin       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op04Sin >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op04Cos       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op04Cos >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op04Sin);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op04Cos);
 							break;

 						case 0x08: // Radius
-							DSP1.Op08X = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op08Y = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op08Z = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op08X = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op08Y = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op08Z = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op08();

 							DSP1.out_count = 4;
-							DSP1.output[0] = (uint8) ( ((int16) DSP1.Op08Ll)       & 0xFF);
-							DSP1.output[1] = (uint8) ((((int16) DSP1.Op08Ll) >> 8) & 0xFF);
-							DSP1.output[2] = (uint8) ( ((int16) DSP1.Op08Lh)       & 0xFF);
-							DSP1.output[3] = (uint8) ((((int16) DSP1.Op08Lh) >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op08Ll);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op08Lh);
 							break;

 						case 0x18: // Range

-							DSP1.Op18X = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op18Y = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op18Z = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
-							DSP1.Op18R = (int16) (DSP1.parameters[6] | (DSP1.parameters[7] << 8));
+							DSP1.Op18X = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op18Y = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op18Z = (int16) READ_WORD(&DSP1.parameters[4]);
+							DSP1.Op18R = (int16) READ_WORD(&DSP1.parameters[6]);

 							DSP1_Op18();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op18D       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op18D >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op18D);
 							break;

 						case 0x38: // Range

-							DSP1.Op38X = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op38Y = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op38Z = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
-							DSP1.Op38R = (int16) (DSP1.parameters[6] | (DSP1.parameters[7] << 8));
+							DSP1.Op38X = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op38Y = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op38Z = (int16) READ_WORD(&DSP1.parameters[4]);
+							DSP1.Op38R = (int16) READ_WORD(&DSP1.parameters[6]);

 							DSP1_Op38();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op38D       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op38D >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op38D);
 							break;

 						case 0x28: // Distance (vector length)
-							DSP1.Op28X = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op28Y = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op28Z = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op28X = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op28Y = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op28Z = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op28();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op28R       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op28R >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op28R);
 							break;

 						case 0x2c:
 						case 0x0c: // Rotate (2D rotate)
-							DSP1.Op0CA  = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op0CX1 = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op0CY1 = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op0CA  = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op0CX1 = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op0CY1 = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op0C();

 							DSP1.out_count = 4;
-							DSP1.output[0] = (uint8)  (DSP1.Op0CX2       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op0CX2 >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op0CY2       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op0CY2 >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0CX2);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op0CY2);
 							break;

 						case 0x3c:
 						case 0x1c: // Polar (3D rotate)
-							DSP1.Op1CZ   = (DSP1.parameters[ 0] | (DSP1.parameters[ 1] << 8));
+							DSP1.Op1CZ   = READ_WORD(&DSP1.parameters[ 0]);
 							//MK: reversed X and Y on neviksti and John's advice.
-							DSP1.Op1CY   = (DSP1.parameters[ 2] | (DSP1.parameters[ 3] << 8));
-							DSP1.Op1CX   = (DSP1.parameters[ 4] | (DSP1.parameters[ 5] << 8));
-							DSP1.Op1CXBR = (DSP1.parameters[ 6] | (DSP1.parameters[ 7] << 8));
-							DSP1.Op1CYBR = (DSP1.parameters[ 8] | (DSP1.parameters[ 9] << 8));
-							DSP1.Op1CZBR = (DSP1.parameters[10] | (DSP1.parameters[11] << 8));
+							DSP1.Op1CY   = READ_WORD(&DSP1.parameters[ 2]);
+							DSP1.Op1CX   = READ_WORD(&DSP1.parameters[ 4]);
+							DSP1.Op1CXBR = READ_WORD(&DSP1.parameters[ 6]);
+							DSP1.Op1CYBR = READ_WORD(&DSP1.parameters[ 8]);
+							DSP1.Op1CZBR = READ_WORD(&DSP1.parameters[10]);

 							DSP1_Op1C();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op1CXAR       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op1CXAR >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op1CYAR       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op1CYAR >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op1CZAR       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op1CZAR >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op1CXAR);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op1CYAR);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op1CZAR);
 							break;

 						case 0x32:
 						case 0x22:
 						case 0x12:
 						case 0x02: // Parameter (Projection)
-							DSP1.Op02FX  = (int16)  (DSP1.parameters[ 0] | (DSP1.parameters[ 1] << 8));
-							DSP1.Op02FY  = (int16)  (DSP1.parameters[ 2] | (DSP1.parameters[ 3] << 8));
-							DSP1.Op02FZ  = (int16)  (DSP1.parameters[ 4] | (DSP1.parameters[ 5] << 8));
-							DSP1.Op02LFE = (int16)  (DSP1.parameters[ 6] | (DSP1.parameters[ 7] << 8));
-							DSP1.Op02LES = (int16)  (DSP1.parameters[ 8] | (DSP1.parameters[ 9] << 8));
-							DSP1.Op02AAS = (uint16) (DSP1.parameters[10] | (DSP1.parameters[11] << 8));
-							DSP1.Op02AZS = (uint16) (DSP1.parameters[12] | (DSP1.parameters[13] << 8));
+							DSP1.Op02FX  = (int16)  READ_WORD(&DSP1.parameters[ 0]);
+							DSP1.Op02FY  = (int16)  READ_WORD(&DSP1.parameters[ 2]);
+							DSP1.Op02FZ  = (int16)  READ_WORD(&DSP1.parameters[ 4]);
+							DSP1.Op02LFE = (int16)  READ_WORD(&DSP1.parameters[ 6]);
+							DSP1.Op02LES = (int16)  READ_WORD(&DSP1.parameters[ 8]);
+							DSP1.Op02AAS = (uint16) READ_WORD(&DSP1.parameters[10]);
+							DSP1.Op02AZS = (uint16) READ_WORD(&DSP1.parameters[12]);

 							DSP1_Op02();

 							DSP1.out_count = 8;
-							DSP1.output[0] = (uint8)  (DSP1.Op02VOF       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op02VOF >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op02VVA       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op02VVA >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op02CX        & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op02CX  >> 8) & 0xFF);
-							DSP1.output[6] = (uint8)  (DSP1.Op02CY        & 0xFF);
-							DSP1.output[7] = (uint8) ((DSP1.Op02CY  >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op02VOF);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op02VVA);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op02CX);
+							WRITE_WORD(&DSP1.output[6], DSP1.Op02CY);
 							break;

 						case 0x3a:
 						case 0x2a:
 						case 0x1a: // Raster mode 7 matrix data
 						case 0x0a:
-							DSP1.Op0AVS = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
+							DSP1.Op0AVS = (int16) READ_WORD(&DSP1.parameters[0]);

 							DSP1_Op0A();

 							DSP1.out_count = 8;
-							DSP1.output[0] = (uint8)  (DSP1.Op0AA       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op0AA >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op0AB       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op0AB >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op0AC       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op0AC >> 8) & 0xFF);
-							DSP1.output[6] = (uint8)  (DSP1.Op0AD       & 0xFF);
-							DSP1.output[7] = (uint8) ((DSP1.Op0AD >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0AA);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op0AB);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op0AC);
+							WRITE_WORD(&DSP1.output[6], DSP1.Op0AD);
 							DSP1.in_index  = 0;
 							break;

@@ -1604,35 +1430,30 @@ void DSP1SetByte (uint8 byte, uint16 address)
 						case 0x26:
 						case 0x36:
 						case 0x06: // Project object
-							DSP1.Op06X = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op06Y = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op06Z = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op06X = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op06Y = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op06Z = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op06();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op06H       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op06H >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op06V       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op06V >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op06M       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op06M >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op06H);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op06V);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op06M);
 							break;

 						case 0x1e:
 						case 0x2e:
 						case 0x3e:
 						case 0x0e: // Target
-							DSP1.Op0EH = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op0EV = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
+							DSP1.Op0EH = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op0EV = (int16) READ_WORD(&DSP1.parameters[2]);

 							DSP1_Op0E();

 							DSP1.out_count = 4;
-							DSP1.output[0] = (uint8)  (DSP1.Op0EX       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op0EX >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op0EY       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op0EY >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0EX);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op0EY);
 							break;

 							// Extra commands used by Pilot Wings
@@ -1640,30 +1461,30 @@ void DSP1SetByte (uint8 byte, uint16 address)
 						case 0x35:
 						case 0x31:
 						case 0x01: // Set attitude matrix A
-							DSP1.Op01m  = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op01Zr = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op01Yr = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
-							DSP1.Op01Xr = (int16) (DSP1.parameters[6] | (DSP1.parameters[7] << 8));
+							DSP1.Op01m  = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op01Zr = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op01Yr = (int16) READ_WORD(&DSP1.parameters[4]);
+							DSP1.Op01Xr = (int16) READ_WORD(&DSP1.parameters[6]);

 							DSP1_Op01();
 							break;

 						case 0x15:
 						case 0x11: // Set attitude matrix B
-							DSP1.Op11m  = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op11Zr = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op11Yr = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
-							DSP1.Op11Xr = (int16) (DSP1.parameters[7] | (DSP1.parameters[7] << 8));
+							DSP1.Op11m  = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op11Zr = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op11Yr = (int16) READ_WORD(&DSP1.parameters[4]);
+							DSP1.Op11Xr = (int16) READ_WORD(&DSP1.parameters[6]);

 							DSP1_Op11();
 							break;

 						case 0x25:
 						case 0x21: // Set attitude matrix C
-							DSP1.Op21m  = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op21Zr = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op21Yr = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
-							DSP1.Op21Xr = (int16) (DSP1.parameters[6] | (DSP1.parameters[7] << 8));
+							DSP1.Op21m  = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op21Zr = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op21Yr = (int16) READ_WORD(&DSP1.parameters[4]);
+							DSP1.Op21Xr = (int16) READ_WORD(&DSP1.parameters[6]);

 							DSP1_Op21();
 							break;
@@ -1672,182 +1493,156 @@ void DSP1SetByte (uint8 byte, uint16 address)
 						case 0x39:
 						case 0x3d:
 						case 0x0d: // Objective matrix A
-							DSP1.Op0DX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op0DY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op0DZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op0DX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op0DY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op0DZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op0D();

 							DSP1.out_count = 6;
-							DSP1.output [0] = (uint8)  (DSP1.Op0DF       & 0xFF);
-							DSP1.output [1] = (uint8) ((DSP1.Op0DF >> 8) & 0xFF);
-							DSP1.output [2] = (uint8)  (DSP1.Op0DL       & 0xFF);
-							DSP1.output [3] = (uint8) ((DSP1.Op0DL >> 8) & 0xFF);
-							DSP1.output [4] = (uint8)  (DSP1.Op0DU       & 0xFF);
-							DSP1.output [5] = (uint8) ((DSP1.Op0DU >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0DF);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op0DL);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op0DU);
 							break;

 						case 0x19:
 						case 0x1d: // Objective matrix B
-							DSP1.Op1DX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op1DY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op1DZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op1DX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op1DY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op1DZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op1D();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op1DF       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op1DF >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op1DL       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op1DL >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op1DU       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op1DU >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op1DF);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op1DL);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op1DU);
 							break;

 						case 0x29:
 						case 0x2d: // Objective matrix C
-							DSP1.Op2DX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op2DY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op2DZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op2DX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op2DY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op2DZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op2D();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op2DF       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op2DF >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op2DL       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op2DL >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op2DU       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op2DU >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op2DF);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op2DL);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op2DU);
 							break;

 						case 0x33:
 						case 0x03: // Subjective matrix A
-							DSP1.Op03F = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op03L = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op03U = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op03F = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op03L = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op03U = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op03();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op03X       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op03X >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op03Y       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op03Y >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op03Z       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op03Z >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op03X);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op03Y);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op03Z);
 							break;

 						case 0x13: // Subjective matrix B
-							DSP1.Op13F = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op13L = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op13U = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op13F = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op13L = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op13U = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op13();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op13X       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op13X >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op13Y       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op13Y >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op13Z       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op13Z >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op13X);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op13Y);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op13Z);
 							break;

 						case 0x23: // Subjective matrix C
-							DSP1.Op23F = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op23L = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op23U = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op23F = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op23L = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op23U = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op23();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op23X       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op23X >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op23Y       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op23Y >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op23Z       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op23Z >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op23X);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op23Y);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op23Z);
 							break;

 						case 0x3b:
 						case 0x0b:
-							DSP1.Op0BX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op0BY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op0BZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op0BX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op0BY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op0BZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op0B();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op0BS       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op0BS >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0BS);
 							break;

 						case 0x1b:
-							DSP1.Op1BX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op1BY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op1BZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op1BX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op1BY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op1BZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op1B();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op1BS       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op1BS >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op1BS);
 							break;

 						case 0x2b:
-							DSP1.Op2BX = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
-							DSP1.Op2BY = (int16) (DSP1.parameters[2] | (DSP1.parameters[3] << 8));
-							DSP1.Op2BZ = (int16) (DSP1.parameters[4] | (DSP1.parameters[5] << 8));
+							DSP1.Op2BX = (int16) READ_WORD(&DSP1.parameters[0]);
+							DSP1.Op2BY = (int16) READ_WORD(&DSP1.parameters[2]);
+							DSP1.Op2BZ = (int16) READ_WORD(&DSP1.parameters[4]);

 							DSP1_Op2B();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op2BS       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op2BS >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op2BS);
 							break;

 						case 0x34:
 						case 0x14:
-							DSP1.Op14Zr = (int16) (DSP1.parameters[ 0] | (DSP1.parameters[ 1] << 8));
-							DSP1.Op14Xr = (int16) (DSP1.parameters[ 2] | (DSP1.parameters[ 3] << 8));
-							DSP1.Op14Yr = (int16) (DSP1.parameters[ 4] | (DSP1.parameters[ 5] << 8));
-							DSP1.Op14U  = (int16) (DSP1.parameters[ 6] | (DSP1.parameters[ 7] << 8));
-							DSP1.Op14F  = (int16) (DSP1.parameters[ 8] | (DSP1.parameters[ 9] << 8));
-							DSP1.Op14L  = (int16) (DSP1.parameters[10] | (DSP1.parameters[11] << 8));
+							DSP1.Op14Zr = (int16) READ_WORD(&DSP1.parameters[ 0]);
+							DSP1.Op14Xr = (int16) READ_WORD(&DSP1.parameters[ 2]);
+							DSP1.Op14Yr = (int16) READ_WORD(&DSP1.parameters[ 4]);
+							DSP1.Op14U  = (int16) READ_WORD(&DSP1.parameters[ 6]);
+							DSP1.Op14F  = (int16) READ_WORD(&DSP1.parameters[ 8]);
+							DSP1.Op14L  = (int16) READ_WORD(&DSP1.parameters[10]);

 							DSP1_Op14();

 							DSP1.out_count = 6;
-							DSP1.output[0] = (uint8)  (DSP1.Op14Zrr       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op14Zrr >> 8) & 0xFF);
-							DSP1.output[2] = (uint8)  (DSP1.Op14Xrr       & 0xFF);
-							DSP1.output[3] = (uint8) ((DSP1.Op14Xrr >> 8) & 0xFF);
-							DSP1.output[4] = (uint8)  (DSP1.Op14Yrr       & 0xFF);
-							DSP1.output[5] = (uint8) ((DSP1.Op14Yrr >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op14Zrr);
+							WRITE_WORD(&DSP1.output[2], DSP1.Op14Xrr);
+							WRITE_WORD(&DSP1.output[4], DSP1.Op14Yrr);
 							break;

 						case 0x27:
 						case 0x2F:
-							DSP1.Op2FUnknown = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
+							DSP1.Op2FUnknown = (int16) READ_WORD(&DSP1.parameters[0]);

 							DSP1_Op2F();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op2FSize       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op2FSize >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op2FSize);
 							break;


 						case 0x07:
 						case 0x0F:
-							DSP1.Op0FRamsize = (int16) (DSP1.parameters[0] | (DSP1.parameters[1] << 8));
+							DSP1.Op0FRamsize = (int16) READ_WORD(&DSP1.parameters[0]);

 							DSP1_Op0F();

 							DSP1.out_count = 2;
-							DSP1.output[0] = (uint8)  (DSP1.Op0FPass       & 0xFF);
-							DSP1.output[1] = (uint8) ((DSP1.Op0FPass >> 8) & 0xFF);
+							WRITE_WORD(&DSP1.output[0], DSP1.Op0FPass);
 							break;

 						default:
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -1,194 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
-
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 #include "snes9x.h"
 #include "memmap.h"
@@ -1115,12 +929,12 @@ static void DSP3_OP1E_D (int16 move, int16 *lo, int16 *hi)

 static void DSP3_OP1E_D1 (int16 move, int16 *lo, int16 *hi)
 {
-	const uint16	HiAdd[] =
+	static const uint16	HiAdd[] =
 	{
 		0x00, 0xFF, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0xFF, 0x00
 	};

-	const uint16	LoAdd[] =
+	static const uint16	LoAdd[] =
 	{
 		0x00, 0x00, 0x01, 0x01, 0x00, 0xFF, 0xFF, 0x00
 	};
@@ -1,193 +1,8 @@
-/***********************************************************************************
-  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 - 2018  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,
-                             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)
-
-  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)
-
-  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 - 2018  BearOso
-
-  Win32 GUI code
-  (c) Copyright 2003 - 2006  blip,
-                             funkyass,
-                             Matthew Kendora,
-                             Nach,
-                             nitsuja
-  (c) Copyright 2009 - 2018  OV2
-
-  Mac OS GUI code
-  (c) Copyright 1998 - 2001  John Stiles
-  (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
-  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.
- ***********************************************************************************/
+/*****************************************************************************\
+     Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+                This file is licensed under the Snes9x License.
+   For further information, consult the LICENSE file in the root directory.
+\*****************************************************************************/

 /*
  Due recognition and credit are given on Overload's DSP website.
@@ -275,7 +90,7 @@ static int32 DSP4_READ_DWORD (void)
 static int16 DSP4_Inverse (int16 value)
 {
 	// Attention: This lookup table is not verified
-	const uint16	div_lut[64] =
+	static const uint16	div_lut[64] =
 	{
 		0x0000, 0x8000, 0x4000, 0x2aaa, 0x2000, 0x1999, 0x1555, 0x1249,
 		0x1000, 0x0e38, 0x0ccc, 0x0ba2, 0x0aaa, 0x09d8, 0x0924, 0x0888,
@@ -1265,7 +1080,7 @@ static void DSP4_OP09 (void)

 static void DSP4_OP0A (int16 n2, int16 *o1, int16 *o2, int16 *o3, int16 *o4)
 {
-	const uint16	OP0A_Values[16] =
+	static const uint16	OP0A_Values[16] =
 	{
 		0x0000, 0x0030, 0x0060, 0x0090, 0x00c0, 0x00f0, 0x0120, 0x0150,
 		0xfe80, 0xfeb0, 0xfee0, 0xff10, 0xff40, 0xff70, 0xffa0, 0xffd0
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
clobber	6b1495d48b	Merge pull request #8 from ShutOstrich/master Update to Snes9x 1.62.3	2023-04-29 20:53:21 -06:00
ShutOstrich	c0e0b5580c	Update to Snes9x 1.62.3	2023-04-30 00:32:42 +02:00
clobber	d2dc097eff	Restore OpenEmu workarounds from commits `622eb6ab8a` & `c6c5306cbd`	2022-12-18 22:49:29 -07:00
clobber	4fad1f3005	Update to Snes9x 1.61	2022-12-18 01:01:46 -07:00
clobber	b10c052626	Remove executable flag from source files.	2022-12-17 22:03:45 -07:00
C.W. Betts	652dd3ec0a	Fix some static analyzer warnings about null dereferencing an error pointer. Other Static analysis warnings.	2021-02-20 02:54:09 -07:00
C.W. Betts	f31480c0be	Poke the plists: get the development language from Xcode build.	2020-10-01 01:51:37 -06:00
C.W. Betts	61284bed2b	Fix locations of the system plugin headers. Minor Xcode maintenance.	2020-10-01 01:26:41 -06:00
Stuart Carnie	869c2f6680	fix: Remove VALID_ARCH restriction to allow universal support	2020-07-06 17:42:38 -07:00
C.W. Betts	7b86e8c494	Update language resources. This quiets warnings in newer Xcode releases. Also update framework locations.	2020-01-07 16:43:54 -07:00
Stuart Carnie	1f4dce126a	fix: aggregate samples, single call -[OEAudioBuffer write:maxLength:]	2019-06-08 10:36:07 -07:00
clobber	47c6fddd11	Restore OpenEmu workarounds from commits `622eb6ab8a` & `c6c5306cbd`	2019-06-05 17:59:22 -05:00
clobber	1b71833d93	Update to Snes9x 1.60	2019-06-05 16:59:44 -05:00
clobber	288a3d2ef0	Update to Snes9x 1.59.2	2019-06-05 15:02:04 -05:00
clobber	ecb8e35a77	Update to Snes9x 1.59.1	2019-06-05 14:55:06 -05:00
clobber	519b96caad	Update to Snes9x 1.59	2019-06-05 14:45:06 -05:00
clobber	be5906a418	Update to Snes9x 1.58	2019-06-05 12:36:05 -05:00
				`@@ -0,0 +1,2 @@`
				`/* Localized versions of Info.plist keys */`
				`@@ -1 +0,0 @@`
				`g++-4.5 -std=gnu++0x -I../../../.. -o generate generate.cpp`