diff --git a/libretro/msvc/msvc-2010-360.sln b/libretro/msvc/msvc-2010-360.sln
new file mode 100644
index 0000000..6568be3
--- /dev/null
+++ b/libretro/msvc/msvc-2010-360.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2010-360", "msvc-2010-360\msvc-2010-360.vcxproj", "{C4D4209C-05D5-404F-8925-BD7ABA58D686}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ CodeAnalysis|Xbox 360 = CodeAnalysis|Xbox 360
+ Debug|Xbox 360 = Debug|Xbox 360
+ Profile_FastCap|Xbox 360 = Profile_FastCap|Xbox 360
+ Profile|Xbox 360 = Profile|Xbox 360
+ Release_LTCG|Xbox 360 = Release_LTCG|Xbox 360
+ Release|Xbox 360 = Release|Xbox 360
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.CodeAnalysis|Xbox 360.ActiveCfg = CodeAnalysis|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.CodeAnalysis|Xbox 360.Build.0 = CodeAnalysis|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Profile_FastCap|Xbox 360.ActiveCfg = Profile_FastCap|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Profile_FastCap|Xbox 360.Build.0 = Profile_FastCap|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Profile|Xbox 360.ActiveCfg = Profile|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Profile|Xbox 360.Build.0 = Profile|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Release_LTCG|Xbox 360.ActiveCfg = Release_LTCG|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Release_LTCG|Xbox 360.Build.0 = Release_LTCG|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}.Release|Xbox 360.Build.0 = Release|Xbox 360
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
new file mode 100644
index 0000000..fe54116
--- /dev/null
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -0,0 +1,470 @@
+
+
+
+
+ CodeAnalysis
+ Xbox 360
+
+
+ Debug
+ Xbox 360
+
+
+ Profile
+ Xbox 360
+
+
+ Profile_FastCap
+ Xbox 360
+
+
+ Release
+ Xbox 360
+
+
+ Release_LTCG
+ Xbox 360
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {C4D4209C-05D5-404F-8925-BD7ABA58D686}
+ Xbox360Proj
+
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+ NotUsing
+ Level3
+ ProgramDatabase
+ Disabled
+ false
+ true
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreadedDebug
+ _DEBUG;_XBOX;_LIB;%(PreprocessorDefinitions);NST_NO_ZLIB;_SECURE_SCL=0
+ Callcap
+ $(SolutionDir)\..\..\source;%(AdditionalIncludeDirectories)
+
+
+ true
+
+
+
+
+ NotUsing
+ Level4
+ ProgramDatabase
+ Disabled
+ false
+ true
+ AnalyzeOnly
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreadedDebug
+ _DEBUG;_XBOX;_LIB;%(PreprocessorDefinitions);NST_MSVC_OPTIMIZE;NST_NO_ZLIB;_SECURE_SCL=0
+ Callcap
+
+
+ true
+
+
+
+
+ Level3
+ NotUsing
+ Full
+ true
+ false
+ true
+ ProgramDatabase
+ Size
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreaded
+ NDEBUG;_XBOX;PROFILE;_LIB;%(PreprocessorDefinitions);NST_MSVC_OPTIMIZE;NST_NO_ZLIB;_SECURE_SCL=0
+ Callcap
+ $(SolutionDir)\..\..\source;%(AdditionalIncludeDirectories)
+
+
+ true
+ false
+ xapilib.lib;%(IgnoreSpecificDefaultLibraries)
+ true
+
+
+
+
+ Level3
+ NotUsing
+ Full
+ true
+ false
+ true
+ ProgramDatabase
+ Fastcap
+ Size
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreaded
+ NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);NST_MSVC_OPTIMIZE;NST_NO_ZLIB;_SECURE_SCL=0
+ $(SolutionDir)\..\..\source;%(AdditionalIncludeDirectories)
+
+
+ true
+ false
+ true
+
+
+
+
+ Level3
+ NotUsing
+ Full
+ true
+ true
+ ProgramDatabase
+ Size
+ false
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreaded
+ NDEBUG;_XBOX;_LIB;%(PreprocessorDefinitions);NST_NO_ZLIB;_SECURE_SCL=0
+ $(SolutionDir)\..\..\source;%(AdditionalIncludeDirectories)
+
+
+ true
+ true
+ true
+
+
+
+
+ Level3
+ NotUsing
+ Full
+ true
+ true
+ ProgramDatabase
+ Size
+ false
+ false
+ $(OutDir)$(ProjectName).pch
+ MultiThreaded
+ NDEBUG;_XBOX;LTCG;_LIB;%(PreprocessorDefinitions);NST_NO_ZLIB;_SECURE_SCL=0
+ $(SolutionDir)\..\..\source;%(AdditionalIncludeDirectories)
+
+
+ true
+ true
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
new file mode 100644
index 0000000..9a25243
--- /dev/null
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
@@ -0,0 +1,744 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {bb2769c3-f85a-46ed-b7fa-9b479cacb927}
+
+
+ {cfd4b486-09df-4d1c-8ae5-d39d256c047a}
+
+
+ {f3d53a31-83d2-40ac-8c5d-ad9324f3d392}
+
+
+ {89661cd6-755f-4ecd-89a3-ac7caf2d908c}
+
+
+ {21634da5-491c-4dd3-b53b-cc17f64c07e2}
+
+
+ {763265c6-4c2c-4a36-9561-d7bc02c13c07}
+
+
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\api
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\board
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\input
+
+
+ Source Files\core\vssystem
+
+
+ Source Files\core\vssystem
+
+
+ Source Files\core\vssystem
+
+
+ Source Files\core\vssystem
+
+
+ Source Files\libretro
+
+
+
\ No newline at end of file
diff --git a/source/core/NstCpu.cpp b/source/core/NstCpu.cpp
index 9d56d14..a3a6fad 100644
--- a/source/core/NstCpu.cpp
+++ b/source/core/NstCpu.cpp
@@ -211,10 +211,10 @@ namespace Nes
if (on)
{
- map( 0x0000, 0x07FF ).Set( &ram, &Cpu::Ram::Peek_Ram_0, &Cpu::Ram::Poke_Ram_0 );
- map( 0x0800, 0x0FFF ).Set( &ram, &Cpu::Ram::Peek_Ram_1, &Cpu::Ram::Poke_Ram_1 );
- map( 0x1000, 0x17FF ).Set( &ram, &Cpu::Ram::Peek_Ram_2, &Cpu::Ram::Poke_Ram_2 );
- map( 0x1800, 0x1FFF ).Set( &ram, &Cpu::Ram::Peek_Ram_3, &Cpu::Ram::Poke_Ram_3 );
+ map( 0x0000, 0x07FF ).Set( &ram, &Ram::Peek_Ram_0, &Ram::Poke_Ram_0 );
+ map( 0x0800, 0x0FFF ).Set( &ram, &Ram::Peek_Ram_1, &Ram::Poke_Ram_1 );
+ map( 0x1000, 0x17FF ).Set( &ram, &Ram::Peek_Ram_2, &Ram::Poke_Ram_2 );
+ map( 0x1800, 0x1FFF ).Set( &ram, &Ram::Peek_Ram_3, &Ram::Poke_Ram_3 );
map( 0x2000, 0xFFFF ).Set( this, &Cpu::Peek_Nop, &Cpu::Poke_Nop );
map( 0xFFFC ).Set( this, &Cpu::Peek_Jam_1, &Cpu::Poke_Nop );
map( 0xFFFD ).Set( this, &Cpu::Peek_Jam_2, &Cpu::Poke_Nop );
diff --git a/source/core/NstFds.cpp b/source/core/NstFds.cpp
index 38d2320..a9c8c4f 100644
--- a/source/core/NstFds.cpp
+++ b/source/core/NstFds.cpp
@@ -223,7 +223,7 @@ namespace Nes
cpu.Map( 0x4090 ).Set( this, &Fds::Peek_4090, &Fds::Poke_Nop );
cpu.Map( 0x4092 ).Set( this, &Fds::Peek_4092, &Fds::Poke_Nop );
- cpu.Map( 0x6000, 0xDFFF ).Set( &ram, &Fds::Ram::Peek_Ram, &Fds::Ram::Poke_Ram );
+ cpu.Map( 0x6000, 0xDFFF ).Set( &ram, &Ram::Peek_Ram, &Ram::Poke_Ram );
cpu.Map( 0xE000, 0xFFFF ).Set( &bios, &Bios::Peek_Rom, &Bios::Poke_Nop );
}
diff --git a/source/core/board/NstBoardJyCompany.cpp b/source/core/board/NstBoardJyCompany.cpp
index 4b5b749..f7f91e1 100644
--- a/source/core/board/NstBoardJyCompany.cpp
+++ b/source/core/board/NstBoardJyCompany.cpp
@@ -135,9 +135,9 @@ namespace Nes
for (uint i=0x5800; i < 0x6000; i += 0x4)
{
- cpu.Map( i + 0x0 ).Set( ®s, &Standard::Regs::Peek_5800, &Standard::Regs::Poke_5800 );
- cpu.Map( i + 0x1 ).Set( ®s, &Standard::Regs::Peek_5801, &Standard::Regs::Poke_5801 );
- cpu.Map( i + 0x3 ).Set( ®s, &Standard::Regs::Peek_5803, &Standard::Regs::Poke_5803 );
+ cpu.Map( i + 0x0 ).Set( ®s, &Regs::Peek_5800, &Regs::Poke_5800 );
+ cpu.Map( i + 0x1 ).Set( ®s, &Regs::Peek_5801, &Regs::Poke_5801 );
+ cpu.Map( i + 0x3 ).Set( ®s, &Regs::Peek_5803, &Regs::Poke_5803 );
}
Map( 0x6000U, 0x7FFFU, &Standard::Peek_6000 );