mirror of https://github.com/RPCS3/rpcs3.git
Update LLVM (10)
This commit is contained in:
parent
d53d7bb598
commit
6e19881b82
|
@ -26,7 +26,7 @@ if(WITH_LLVM)
|
||||||
set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
|
set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
|
||||||
|
|
||||||
# now tries to find LLVM again
|
# now tries to find LLVM again
|
||||||
find_package(LLVM 9.0 CONFIG)
|
find_package(LLVM 10.0 CONFIG)
|
||||||
if(NOT LLVM_FOUND)
|
if(NOT LLVM_FOUND)
|
||||||
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
|
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
|
||||||
endif()
|
endif()
|
||||||
|
@ -39,7 +39,7 @@ if(WITH_LLVM)
|
||||||
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
|
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(LLVM 9.0 CONFIG)
|
find_package(LLVM 10.0 CONFIG)
|
||||||
|
|
||||||
if (NOT LLVM_FOUND)
|
if (NOT LLVM_FOUND)
|
||||||
if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 9)
|
if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 9)
|
||||||
|
|
|
@ -603,12 +603,12 @@ struct EventListener : llvm::JITEventListener
|
||||||
for (auto it = obj.section_begin(), end = obj.section_end(); it != end; ++it)
|
for (auto it = obj.section_begin(), end = obj.section_end(); it != end; ++it)
|
||||||
{
|
{
|
||||||
llvm::StringRef name;
|
llvm::StringRef name;
|
||||||
it->getName(name);
|
name = it->getName().get();
|
||||||
|
|
||||||
if (name == ".pdata")
|
if (name == ".pdata")
|
||||||
{
|
{
|
||||||
llvm::StringRef data;
|
llvm::StringRef data;
|
||||||
it->getContents(data);
|
data = it->getContents().get();
|
||||||
|
|
||||||
std::vector<RUNTIME_FUNCTION> rfs(data.size() / sizeof(RUNTIME_FUNCTION));
|
std::vector<RUNTIME_FUNCTION> rfs(data.size() / sizeof(RUNTIME_FUNCTION));
|
||||||
|
|
||||||
|
|
2
llvm
2
llvm
|
@ -1 +1 @@
|
||||||
Subproject commit b860b5e8f4ee90d6eb567d83ce8ed1a3e71e496f
|
Subproject commit e33e0b724a3d1040d756c5f415701bd8723e85f1
|
|
@ -2802,4 +2802,16 @@ public:
|
||||||
llvm::Constant* make_const_vector(T, llvm::Type*);
|
llvm::Constant* make_const_vector(T, llvm::Type*);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Format llvm::SizeType
|
||||||
|
template <>
|
||||||
|
struct fmt_unveil<llvm::TypeSize, void>
|
||||||
|
{
|
||||||
|
using type = std::size_t;
|
||||||
|
|
||||||
|
static inline std::size_t get(const llvm::TypeSize& arg)
|
||||||
|
{
|
||||||
|
return arg;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4353,12 +4353,12 @@ void PPUTranslator::SetVr(u32 vr, Value* value)
|
||||||
if (type->getScalarType()->isIntegerTy(1))
|
if (type->getScalarType()->isIntegerTy(1))
|
||||||
{
|
{
|
||||||
// Sign-extend bool values
|
// Sign-extend bool values
|
||||||
value = SExt(value, ScaleType(type, 7 - s32(std::log2(size))));
|
value = SExt(value, ScaleType(type, 7 - s32(std::log2(+size))));
|
||||||
}
|
}
|
||||||
else if (size == 256 || size == 512)
|
else if (size == 256 || size == 512)
|
||||||
{
|
{
|
||||||
// Truncate big vectors
|
// Truncate big vectors
|
||||||
value = Trunc(value, ScaleType(type, 7 - s32(std::log2(size))));
|
value = Trunc(value, ScaleType(type, 7 - s32(std::log2(+size))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<Lib>
|
<Lib>
|
||||||
<AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug - LLVM'">..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug - LLVM'">..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
|
||||||
<AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release - LLVM'">..\llvm_build\Release\lib</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release - LLVM'">..\llvm_build\Release\lib</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib;LLVMPasses.lib;LLVMIRReader.lib;LLVMLinker.lib;LLVMAsmParser.lib;LLVMX86AsmParser.lib;LLVMDemangle.lib;LLVMDebugInfoDWARF.lib;LLVMRemarks.lib</AdditionalDependencies>
|
<AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib;LLVMPasses.lib;LLVMIRReader.lib;LLVMLinker.lib;LLVMAsmParser.lib;LLVMX86AsmParser.lib;LLVMDemangle.lib;LLVMDebugInfoDWARF.lib;LLVMRemarks.lib;LLVMBitstreamReader.lib;LLVMTextAPI.lib</AdditionalDependencies>
|
||||||
</Lib>
|
</Lib>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
|
Loading…
Reference in New Issue