Skip to content

Commit

Permalink
Merge branch 'master' into func-hash
Browse files Browse the repository at this point in the history
  • Loading branch information
elad335 authored Jan 23, 2025
2 parents 024b255 + 448666c commit 4f0c090
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
17 changes: 17 additions & 0 deletions rpcs3/Emu/System.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@

#include "Emu/RSX/GSRender.h"

#ifdef LLVM_AVAILABLE
#include "llvm/Config/llvm-config.h"
#endif

LOG_CHANNEL(sys_log, "SYS");

// Preallocate 32 MiB
Expand Down Expand Up @@ -345,6 +349,19 @@ extern void dump_executable(std::span<const u8> data, const ppu_module<lv2_obj>*

void Emulator::Init()
{
// Log LLVM version
if (static bool logged_llvm = false; !logged_llvm)
{
#ifndef LLVM_AVAILABLE
sys_log.always()("LLVM version: Compiled without LLVM");
#elif defined (LLVM_VERSION_STRING)
sys_log.always()("LLVM version: %s", LLVM_VERSION_STRING);
#else
sys_log.always()("LLVM version: Unknown");
#endif
logged_llvm = true;
}

jit_runtime::initialize();

const std::string emu_dir = rpcs3::utils::get_emu_dir();
Expand Down
1 change: 1 addition & 0 deletions rpcs3/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@ int main(int argc, char** argv)
logs::stored_message qt{(strcmp(QT_VERSION_STR, qVersion()) != 0) ? sys_log.error : sys_log.notice};
qt.text = fmt::format("Qt version: Compiled against Qt %s | Run-time uses Qt %s", QT_VERSION_STR, qVersion());

// Write current time
logs::stored_message time{sys_log.always()};
time.text = fmt::format("Current Time: %s", std::chrono::system_clock::now());

Expand Down

0 comments on commit 4f0c090

Please sign in to comment.