Skip to content

Commit ac99b20

Browse files
oltolmelad335
oltolm
authored and
elad335
committed
llvm: fix deprecation warnings
1 parent 46cce45 commit ac99b20

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎rpcs3/Emu/CPU/CPUTranslator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ struct llvm_value_t<T*> : llvm_value_t<T>
434434

435435
static llvm::Type* get_type(llvm::LLVMContext& context)
436436
{
437-
return llvm_value_t<T>::get_type(context)->getPointerTo();
437+
return llvm::PointerType::getUnqual(context);
438438
}
439439
};
440440

‎rpcs3/Emu/Cell/PPUThread.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5760,7 +5760,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
57605760
// Define some types
57615761
const auto _func = FunctionType::get(translator.get_type<void>(), {
57625762
translator.get_type<u8*>(), // Exec base
5763-
translator.GetContextType()->getPointerTo(), // PPU context
5763+
translator.get_type<u8*>(), // PPU context
57645764
translator.get_type<u64>(), // Segment address (for PRX)
57655765
translator.get_type<u8*>(), // Memory base
57665766
translator.get_type<u64>(), // r0

‎rpcs3/Emu/Cell/PPUTranslator.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Function* PPUTranslator::GetSymbolResolver(const ppu_module<lv2_obj>& info)
340340

341341
const auto ftype = FunctionType::get(get_type<void>(), {
342342
get_type<u8*>(), // Exec base
343-
GetContextType()->getPointerTo(), // PPU context
343+
m_ir->getPtrTy(), // PPU context
344344
get_type<u64>(), // Segment address (for PRX)
345345
get_type<u8*>(), // Memory base
346346
get_type<u64>(), // r0
@@ -380,7 +380,7 @@ Function* PPUTranslator::GetSymbolResolver(const ppu_module<lv2_obj>& info)
380380
const auto addr_array = new GlobalVariable(*m_module, addr_array_type, false, GlobalValue::PrivateLinkage, ConstantDataArray::get(m_context, vec_addrs));
381381

382382
// Create an array of function pointers
383-
const auto func_table_type = ArrayType::get(ftype->getPointerTo(), functions.size());
383+
const auto func_table_type = ArrayType::get(m_ir->getPtrTy(), functions.size());
384384
const auto init_func_table = ConstantArray::get(func_table_type, functions);
385385
const auto func_table = new GlobalVariable(*m_module, func_table_type, false, GlobalVariable::PrivateLinkage, init_func_table);
386386

@@ -407,7 +407,7 @@ Function* PPUTranslator::GetSymbolResolver(const ppu_module<lv2_obj>& info)
407407
const auto func_pc = ZExt(m_ir->CreateLoad(ptr_inst->getResultElementType(), ptr_inst), get_type<u64>());
408408

409409
ptr_inst = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(func_table->getValueType(), func_table, {m_ir->getInt64(0), index_value}));
410-
assert(ptr_inst->getResultElementType() == ftype->getPointerTo());
410+
assert(ptr_inst->getResultElementType() == m_ir->getPtrTy());
411411

412412
const auto faddr = m_ir->CreateLoad(ptr_inst->getResultElementType(), ptr_inst);
413413
const auto faddr_int = m_ir->CreatePtrToInt(faddr, get_type<uptr>());
@@ -612,7 +612,7 @@ void PPUTranslator::CallFunction(u64 target, Value* indirect)
612612
const auto pos = m_ir->CreateShl(indirect, 1);
613613
const auto ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(get_type<u8>(), m_exec, pos));
614614
const auto val = m_ir->CreateLoad(get_type<u64>(), ptr);
615-
callee = FunctionCallee(type, m_ir->CreateIntToPtr(val, type->getPointerTo()));
615+
callee = FunctionCallee(type, m_ir->CreateIntToPtr(val, m_ir->getPtrTy()));
616616

617617
// Load new segment address
618618
const auto seg_base_ptr = m_ir->CreateIntToPtr(m_ir->CreateAdd(
@@ -2794,8 +2794,8 @@ void PPUTranslator::MFOCRF(ppu_opcode_t op)
27942794
else if (std::none_of(m_cr + 0, m_cr + 32, [](auto* p) { return p; }))
27952795
{
27962796
// MFCR (optimized)
2797-
Value* ln0 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 99), GetType<uptr>()), GetType<u8[16]>()->getPointerTo());
2798-
Value* ln1 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 115), GetType<uptr>()), GetType<u8[16]>()->getPointerTo());
2797+
Value* ln0 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 99), GetType<uptr>()), m_ir->getPtrTy());
2798+
Value* ln1 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 115), GetType<uptr>()), m_ir->getPtrTy());
27992799

28002800
ln0 = m_ir->CreateLoad(GetType<u8[16]>(), ln0);
28012801
ln1 = m_ir->CreateLoad(GetType<u8[16]>(), ln1);
@@ -5384,7 +5384,7 @@ MDNode* PPUTranslator::CheckBranchProbability(u32 bo)
53845384
void PPUTranslator::build_interpreter()
53855385
{
53865386
#define BUILD_VEC_INST(i) { \
5387-
m_function = llvm::cast<llvm::Function>(m_module->getOrInsertFunction("op_" #i, get_type<void>(), m_thread_type->getPointerTo()).getCallee()); \
5387+
m_function = llvm::cast<llvm::Function>(m_module->getOrInsertFunction("op_" #i, get_type<void>(), m_ir->getPtrTy()).getCallee()); \
53885388
std::fill(std::begin(m_globals), std::end(m_globals), nullptr); \
53895389
std::fill(std::begin(m_locals), std::end(m_locals), nullptr); \
53905390
IRBuilder<> irb(BasicBlock::Create(m_context, "__entry", m_function)); \

‎rpcs3/Emu/Cell/SPULLVMRecompiler.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,7 +2886,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
28862886

28872887
// Create interpreter table
28882888
const auto if_type = get_ftype<void, u8*, u8*, u32, u32, u8*, u32, u8*>();
2889-
m_function_table = new GlobalVariable(*m_module, ArrayType::get(if_type->getPointerTo(), 1ull << m_interp_magn), true, GlobalValue::InternalLinkage, nullptr);
2889+
m_function_table = new GlobalVariable(*m_module, ArrayType::get(m_ir->getPtrTy(), 1ull << m_interp_magn), true, GlobalValue::InternalLinkage, nullptr);
28902890

28912891
init_luts();
28922892

@@ -2930,7 +2930,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
29302930
m_ir->CreateStore(m_ir->CreateCall(get_intrinsic<u64>(Intrinsic::read_register), {rsp_name}), native_sp);
29312931

29322932
// Decode (shift) and load function pointer
2933-
const auto first = m_ir->CreateLoad(if_type->getPointerTo(), m_ir->CreateGEP(if_type->getPointerTo(), m_interp_table, m_ir->CreateLShr(m_interp_op, 32u - m_interp_magn)));
2933+
const auto first = m_ir->CreateLoad(m_ir->getPtrTy(), m_ir->CreateGEP(m_ir->getPtrTy(), m_interp_table, m_ir->CreateLShr(m_interp_op, 32u - m_interp_magn)));
29342934
const auto call0 = m_ir->CreateCall(if_type, first, {m_lsptr, m_thread, m_interp_pc, m_interp_op, m_interp_table, m_interp_7f0, m_interp_regs});
29352935
call0->setCallingConv(CallingConv::GHC);
29362936
m_ir->CreateRetVoid();
@@ -3074,7 +3074,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
30743074
const auto next_pc = itype & spu_itype::branch ? m_interp_pc : m_interp_pc_next;
30753075
const auto be32_op = m_ir->CreateLoad(get_type<u32>(), m_ir->CreateGEP(get_type<u8>(), m_lsptr, m_ir->CreateZExt(next_pc, get_type<u64>())));
30763076
const auto next_op = m_ir->CreateCall(get_intrinsic<u32>(Intrinsic::bswap), {be32_op});
3077-
const auto next_if = m_ir->CreateLoad(if_type->getPointerTo(), m_ir->CreateGEP(if_type->getPointerTo(), m_interp_table, m_ir->CreateLShr(next_op, 32u - m_interp_magn)));
3077+
const auto next_if = m_ir->CreateLoad(m_ir->getPtrTy(), m_ir->CreateGEP(m_ir->getPtrTy(), m_interp_table, m_ir->CreateLShr(next_op, 32u - m_interp_magn)));
30783078
llvm::cast<LoadInst>(next_if)->setVolatile(true);
30793079

30803080
if (!(itype & spu_itype::branch))
@@ -3199,7 +3199,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
31993199
}
32003200
}
32013201

3202-
m_function_table->setInitializer(ConstantArray::get(ArrayType::get(if_type->getPointerTo(), 1ull << m_interp_magn), iptrs));
3202+
m_function_table->setInitializer(ConstantArray::get(ArrayType::get(m_ir->getPtrTy(), 1ull << m_interp_magn), iptrs));
32033203
m_function_table = nullptr;
32043204

32053205
for (auto& f : *_module)
@@ -7808,7 +7808,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
78087808
m_ir->CreateStore(splat<u64[2]>(-1).eval(m_ir), m_ir->CreateGEP(get_type<u8>(), m_thread, stack0.value));
78097809
const auto targ = m_ir->CreateAdd(m_ir->CreateLShr(_ret, 32), get_segment_base());
78107810
const auto type = m_finfo->chunk->getFunctionType();
7811-
const auto fval = m_ir->CreateIntToPtr(targ, type->getPointerTo());
7811+
const auto fval = m_ir->CreateIntToPtr(targ, m_ir->getPtrTy());
78127812
tail_chunk({type, fval}, m_ir->CreateTrunc(m_ir->CreateLShr(link, 32), get_type<u32>()));
78137813
m_ir->SetInsertPoint(fail);
78147814
}

0 commit comments

Comments
 (0)