Skip to content

Commit be1c910

Browse files
committed
Merge pull request RPCS3#1332 from vlj/llvm-tests
Move llvm tests to VS unit testing framework
2 parents 0d6297f + 65750ae commit be1c910

11 files changed

+1183
-1229
lines changed

rpcs3-tests/ps3_ppu_llvm.cpp

+960
Large diffs are not rendered by default.

rpcs3-tests/rpcs3-tests.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4848
<LinkIncremental>true</LinkIncremental>
4949
<OutDir>$(SolutionDir)bin\</OutDir>
50+
<IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);..\llvm\include;..\llvm_build\include;$(UniversalCRT_IncludePath);..\minidx9\Include;..\minidx12\Include</IncludePath>
5051
</PropertyGroup>
5152
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5253
<LinkIncremental>true</LinkIncremental>
5354
<OutDir>$(SolutionDir)bin\</OutDir>
55+
<IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);..\llvm\include;..\llvm_build\include;$(UniversalCRT_IncludePath);..\minidx9\Include;..\minidx12\Include</IncludePath>
5456
</PropertyGroup>
5557
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5658
<ClCompile>
@@ -92,6 +94,7 @@
9294
<ClInclude Include="stdafx.h" />
9395
</ItemGroup>
9496
<ItemGroup>
97+
<ClCompile Include="ps3_ppu_llvm.cpp" />
9598
<ClCompile Include="stdafx.cpp">
9699
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
97100
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

rpcs3-tests/rpcs3-tests.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<ClCompile Include="ps3_syscall.cpp">
1515
<Filter>Source Files</Filter>
1616
</ClCompile>
17+
<ClCompile Include="ps3_ppu_llvm.cpp">
18+
<Filter>Source Files</Filter>
19+
</ClCompile>
1720
</ItemGroup>
1821
<ItemGroup>
1922
<ClInclude Include="stdafx.h">

rpcs3/Emu/Cell/PPUInterpreter.h

+3
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,13 @@ namespace ppu_recompiler_llvm {
101101
class Compiler;
102102
}
103103

104+
class ppu_llvm_test_class;
105+
104106
class PPUInterpreter : public PPUOpcodes
105107
{
106108
#ifdef PPU_LLVM_RECOMPILER
107109
friend class ppu_recompiler_llvm::Compiler;
110+
friend class ppu_llvm_test_class;
108111
#endif
109112
private:
110113
PPUThread& CPU;

0 commit comments

Comments
 (0)