6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2026-04-21 17:16:35 +00:00
Code Issues Projects Releases Wiki Activity

GSL was too problematic when used with GCC. Removed.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2017-11-20 19:17:49 +00:00
parent 67c27d4a3e
commit c513f0cab1
25 changed files with 109 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Bus.cpp
+3 -1
View File
@@ -1,6 +1,8 @@
#include "stdafx.h"
#include "Bus.h"
#include "EightBitCompilerDefinitions.h"
EightBit::register16_t& EightBit::Bus::ADDRESS() {
return m_address;
}
@@ -70,5 +72,5 @@ void EightBit::Bus::write(register16_t address, uint8_t value) {
uint8_t& EightBit::Bus::reference() {
bool rom;
auto& value = reference(ADDRESS().word, rom);
return GSL_LIKELY(!rom) ? referenceDATA(value) : placeDATA(value);
return LIKELY(!rom) ? referenceDATA(value) : placeDATA(value);
}
src/EightBit.vcxproj
+5 -4
View File
@@ -70,16 +70,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>..\inc;..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<IncludePath>..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>..\inc;..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<IncludePath>..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>..\inc;..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<IncludePath>..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>..\inc;..\libraries\GSL\include;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<IncludePath>..\inc;C:\Libraries\boost_1_65_1;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -151,6 +151,7 @@
<ClInclude Include="..\inc\Rom.h" />
<ClInclude Include="..\inc\Signal.h" />
<ClInclude Include="..\inc\TestHarness.h" />
<ClInclude Include="EightBitCompilerDefinitions.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
src/EightBit.vcxproj.filters
+3
View File
@@ -47,6 +47,9 @@
<ClInclude Include="..\inc\Register.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="EightBitCompilerDefinitions.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
src/Processor.cpp
+2 -2
View File
@@ -15,7 +15,7 @@ void EightBit::Processor::initialise() {
int EightBit::Processor::run(int limit) {
int current = 0;
while (GSL_LIKELY(powered()) && current < limit) {
while (LIKELY(powered()) && current < limit) {
current += singleStep();
}
return current;
@@ -35,7 +35,7 @@ void EightBit::Processor::fetchWord(register16_t& output) {
}
int EightBit::Processor::fetchExecute() {
if (GSL_LIKELY(powered()))
if (LIKELY(powered()))
return execute(fetchByte());
return 0;
}
src/stdafx.h
-2
View File
@@ -19,5 +19,3 @@
#else
#include <x86intrin.h>
#endif
#include <gsl/gsl>