From 63421d411bc6581fabf81c7a723c71f38a28b5d4 Mon Sep 17 00:00:00 2001 From: g0me3 Date: Wed, 7 Aug 2019 01:17:57 +0300 Subject: [PATCH 1/2] vrc5 extended ppu rendering simulation fix --- src/boards/vrc5.cpp | 2 +- src/pputile.inc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/boards/vrc5.cpp b/src/boards/vrc5.cpp index 6bdecc0f..4dc903eb 100644 --- a/src/boards/vrc5.cpp +++ b/src/boards/vrc5.cpp @@ -184,7 +184,7 @@ static DECLFR(QTAiRead) { // uint8 res2 = ((regs[0xD] & 1) << 7) | ((regs[0xC] & 0x1F) << 2) | (regs[0xB] & 3); uint8 tabl = conv_tbl[(regs[0xC] >> 5) & 3][(regs[0xD] & 0x7F) >> 4]; - uint8 res1 = 0x40 | (tabl & 0x3F) | ((regs[0xD] >> 1) & 7); + uint8 res1 = 0x40 | (tabl & 0x3F) | ((regs[0xD] >> 1) & 7) | ((regs[0xB] & 4) << 5); uint8 res2 = ((regs[0xD] & 1) << 7) | ((regs[0xC] & 0x1F) << 2) | (regs[0xB] & 3); if (tabl & 0x40) diff --git a/src/pputile.inc b/src/pputile.inc index c4f5431f..86fea166 100644 --- a/src/pputile.inc +++ b/src/pputile.inc @@ -115,12 +115,20 @@ pshift[1] <<= 8; pshift[1] |= C[0]; } #else + #ifdef PPU_VRC5FETCH + pshift[0] |= C[0]; + if(tmpd & 0x40) + pshift[1] |= (tmpd & 0x80) ? 0xFF : 0x00; + else + pshift[1] |= C[8]; + #else if(ScreenON) RENDER_LOGP(C); pshift[0] |= C[0]; if(ScreenON) RENDER_LOGP(C + 8); pshift[1] |= C[8]; + #endif #endif if ((RefreshAddr & 0x1f) == 0x1f) From 878245fedf028f8c9373be128dbea01f65d4a8b7 Mon Sep 17 00:00:00 2001 From: deep-thought Date: Tue, 10 Sep 2019 17:05:22 -0600 Subject: [PATCH 2/2] Altered SCons build scripts to work with Python 3. --- SConstruct | 42 +++++++++++++++++++++--------------------- src/SConscript | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/SConstruct b/SConstruct index fef50583..a400ebb7 100644 --- a/SConstruct +++ b/SConstruct @@ -47,30 +47,30 @@ if platform.system == "ppc": env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare']) env.Append(CXXFLAGS = ['-std=c++0x']) -if os.environ.has_key('PLATFORM'): +if 'PLATFORM' in os.environ: env.Replace(PLATFORM = os.environ['PLATFORM']) -if os.environ.has_key('CC'): +if 'CC' in os.environ: env.Replace(CC = os.environ['CC']) -if os.environ.has_key('CXX'): +if 'CXX' in os.environ: env.Replace(CXX = os.environ['CXX']) -if os.environ.has_key('WINDRES'): +if 'WINDRES' in os.environ: env.Replace(WINDRES = os.environ['WINDRES']) -if os.environ.has_key('CFLAGS'): +if 'CFLAGS' in os.environ: env.Append(CCFLAGS = os.environ['CFLAGS'].split()) -if os.environ.has_key('CXXFLAGS'): +if 'CXXFLAGS' in os.environ: env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split()) -if os.environ.has_key('CPPFLAGS'): +if 'CPPFLAGS' in os.environ: env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) -if os.environ.has_key('LDFLAGS'): +if 'LDFLAGS' in os.environ: env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) -if os.environ.has_key('PKG_CONFIG_PATH'): +if 'PKG_CONFIG_PATH' in os.environ: env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] -if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin': +if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin': env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig" -if os.environ.has_key('PKG_CONFIG_LIBDIR'): +if 'PKG_CONFIG_LIBDIR' in os.environ: env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR'] -print "platform: ", env['PLATFORM'] +print("platform: ", env['PLATFORM']) # compile with clang if env['CLANG']: @@ -104,18 +104,18 @@ else: assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib" if env['SDL2']: if not conf.CheckLib('SDL2'): - print 'Did not find libSDL2 or SDL2.lib, exiting!' + print('Did not find libSDL2 or SDL2.lib, exiting!') Exit(1) env.Append(CPPDEFINES=["_SDL2"]) env.ParseConfig('pkg-config sdl2 --cflags --libs') else: if not conf.CheckLib('SDL'): - print 'Did not find libSDL or SDL.lib, exiting!' + print('Did not find libSDL or SDL.lib, exiting!') Exit(1) env.ParseConfig('sdl-config --cflags --libs') if env['GTK']: if not conf.CheckLib('gtk-x11-2.0'): - print 'Could not find libgtk-2.0, exiting!' + print('Could not find libgtk-2.0, exiting!') Exit(1) # Add compiler and linker flags from pkg-config config_string = 'pkg-config --cflags --libs gtk+-2.0' @@ -157,13 +157,13 @@ else: lua_link_flags = "-llua" lua_include_dir = "/usr/include/lua" - if os.environ.has_key('LUA_LINKFLAGS'): + if 'LUA_LINKFLAGS' in os.environ: lua_link_flags = os.environ['LUA_LINKFLAGS'] - if os.environ.has_key('LUA_INCDIR'): + if 'LUA_INCDIR' in os.environ: lua_include_dir = os.environ['LUA_INCDIR'] if not lua_link_flags or not lua_include_dir: - print 'Could not find liblua, exiting!' + print('Could not find liblua, exiting!') Exit(1) env.Append(LINKFLAGS = lua_link_flags.split()) @@ -179,7 +179,7 @@ else: gd = conf.CheckLib('gd', autoadd=1) if gd == 0: env['LOGO'] = 0 - print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.' + print('Did not find libgd, you won\'t be able to create a logo screen for your avis.') if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1): conf.env.Append(CCFLAGS = "-DOPENGL") @@ -193,8 +193,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32': if env['FRAMESKIP']: env.Append(CPPDEFINES = ['FRAMESKIP']) -print "base CPPDEFINES:",env['CPPDEFINES'] -print "base CCFLAGS:",env['CCFLAGS'] +print("base CPPDEFINES:",env['CPPDEFINES']) +print("base CCFLAGS:",env['CCFLAGS']) if env['DEBUG']: env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0']) diff --git a/src/SConscript b/src/SConscript index 4713e155..20011465 100644 --- a/src/SConscript +++ b/src/SConscript @@ -33,7 +33,7 @@ else: platform_files = SConscript('drivers/sdl/SConscript') file_list.append(platform_files) -print env['LINKFLAGS'] +print(env['LINKFLAGS']) if env['PLATFORM'] == 'win32': fceux = env.Program('fceux.exe', file_list)