Browse Source

fix qt, opcodes

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2755/head
crueter 5 months ago
parent
commit
edb05ed17c
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 2
      src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.cpp
  2. 2
      src/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.cpp
  3. 2
      src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp
  4. 2
      src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp
  5. 11
      src/qt_common/util/content.cpp

2
src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.cpp

@ -238,7 +238,7 @@ EmittedBlockInfo EmitArm64(oaknut::CodeGenerator& code, IR::Block block, const E
#undef A32OPC
#undef A64OPC
default:
ASSERT_FALSE("Invalid opcode: {}", inst->GetOpcode());
ASSERT_FALSE("Invalid opcode: {:x}", std::size_t(inst->GetOpcode()));
break;
}

2
src/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64.cpp

@ -140,7 +140,7 @@ EmittedBlockInfo EmitRV64(biscuit::Assembler& as, IR::Block block, const EmitCon
#undef A32OPC
#undef A64OPC
default:
ASSERT_FALSE("Invalid opcode: {}", inst->GetOpcode());
ASSERT_FALSE("Invalid opcode: {:x}", std::size_t(inst->GetOpcode()));
break;
}
}

2
src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp

@ -145,7 +145,7 @@ A32EmitX64::BlockDescriptor A32EmitX64::Emit(IR::Block& block) {
#undef OPCODE
#undef A32OPC
#undef A64OPC
default: [[unlikely]] ASSERT_FALSE("Invalid opcode: {}", std::size_t(inst->GetOpcode()));
default: [[unlikely]] ASSERT_FALSE("Invalid opcode: {:x}", std::size_t(inst->GetOpcode()));
}
reg_alloc.EndOfAllocScope();
func(reg_alloc);

2
src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp

@ -130,7 +130,7 @@ A64EmitX64::BlockDescriptor A64EmitX64::Emit(IR::Block& block) noexcept {
#undef A32OPC
#undef A64OPC
default: [[unlikely]] {
ASSERT_MSG(false, "Invalid opcode: {}", std::size_t(opcode));
ASSERT_MSG(false, "Invalid opcode: {:x}", std::size_t(opcode));
goto finish_this_inst;
}
}

11
src/qt_common/util/content.cpp

@ -415,10 +415,8 @@ void ExportDataDir(FrontendCommon::DataManager::DataDir data_dir,
QGuiApplication::processEvents();
auto progress_callback = [=](size_t total_size, size_t processed_size) {
QMetaObject::invokeMethod(progress,
&QtProgressDialog::setValue,
static_cast<int>((processed_size * 100) / total_size));
QMetaObject::invokeMethod(progress, "setValue", Qt::DirectConnection,
Q_ARG(int, static_cast<int>((processed_size * 100) / total_size)));
return !progress->wasCanceled();
};
@ -501,9 +499,8 @@ void ImportDataDir(FrontendCommon::DataManager::DataDir data_dir,
QObject::connect(delete_watcher, &QFutureWatcher<bool>::finished, rootObject, [=]() {
auto progress_callback = [=](size_t total_size, size_t processed_size) {
QMetaObject::invokeMethod(progress,
&QtProgressDialog::setValue,
static_cast<int>((processed_size * 100) / total_size));
QMetaObject::invokeMethod(progress, "setValue", Qt::DirectConnection,
Q_ARG(int, static_cast<int>((processed_size * 100) / total_size)));
return !progress->wasCanceled();
};

Loading…
Cancel
Save