From 86fedc1e5b9d35611c353023c407e81ae0d94a38 Mon Sep 17 00:00:00 2001 From: Hexcoder Date: Sat, 21 Mar 2026 21:46:56 +0100 Subject: [PATCH] fixes and license --- src/common/tracy_instrumentation.h | 3 +++ src/common/tracy_jit_symbols.cpp | 32 ++++++++++-------------------- src/common/tracy_jit_symbols.h | 11 ++++++---- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/common/tracy_instrumentation.h b/src/common/tracy_instrumentation.h index 1bbdd20522..98aa70a83f 100644 --- a/src/common/tracy_instrumentation.h +++ b/src/common/tracy_instrumentation.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once // Add our own tracy instrumentation macros which compile to nothing without TRACY_ENABLE diff --git a/src/common/tracy_jit_symbols.cpp b/src/common/tracy_jit_symbols.cpp index 9e10c9e294..473516a4c0 100644 --- a/src/common/tracy_jit_symbols.cpp +++ b/src/common/tracy_jit_symbols.cpp @@ -1,25 +1,15 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #include "tracy_jit_symbols.h" #if defined(TRACY_ENABLE) && defined(TRACY_HAS_USER_SYMBOLS) #include #include -#ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN -#endif -#ifndef WIN32_NOMINMAX - #define WIN32_NOMINMAX -#endif -#ifndef NOMINMAX - #define NOMINMAX -#endif -#include - namespace tracy_jit { - std::string JitCodeMap::get_exe_name () { - char name[1024]; - const auto nameLength = GetModuleFileNameA( NULL, name, sizeof( name ) ); - return " ["+std::string(name, nameLength)+"]"; + std::string JitCodeMap::get_module_name () { + return "[JIT_Code]"; } } @@ -28,7 +18,7 @@ namespace tracy { if (buf_size <= 0) return false; auto& map = tracy_jit::JitCodeMap::instance(); - return map.lookup_code_address( ptr, [name_buf, buf_size] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* exe_name) -> void { + return map.lookup_code_address( ptr, [name_buf, buf_size] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* module_name) -> void { // copy name truncated size_t safe_chars = std::min(block.name.size(), buf_size-1); memcpy(name_buf, block.name.c_str(), safe_chars); @@ -37,17 +27,17 @@ namespace tracy { } extern bool UserDecodeSymbolAddress( uint64_t ptr, CallstackSymbolData* result ) { auto& map = tracy_jit::JitCodeMap::instance(); - return map.lookup_code_address( ptr, [result] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* exe_name) -> void { + return map.lookup_code_address( ptr, [result] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* module_name) -> void { result->symAddr = block.entrypoint; // we have no source file - result->file = CopyStringFast("[unknown]"); + result->file = "[unknown]"; result->line = 0; - result->needFree = true; + result->needFree = false; } ); } extern bool UserDecodeCallstackPtr( uint64_t ptr, CallstackEntryData* result, CallstackEntry* cb_data ) { auto& map = tracy_jit::JitCodeMap::instance(); - return map.lookup_code_address( ptr, [result, cb_data] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* exe_name) -> void { + return map.lookup_code_address( ptr, [result, cb_data] (tracy_jit::JitCodeMap::JittedCodeBlock& block, char const* module_name) -> void { cb_data[0].symAddr = block.entrypoint; cb_data[0].symLen = block.size; cb_data[0].name = CopyStringFast(block.name.c_str(), block.name.size()); @@ -55,7 +45,7 @@ namespace tracy { cb_data[0].file = CopyStringFast("[unknown]"); cb_data[0].line = 0; - *result = { cb_data, 1, exe_name }; + *result = { cb_data, 1, module_name }; } ); } } diff --git a/src/common/tracy_jit_symbols.h b/src/common/tracy_jit_symbols.h index e12a1d4e8e..4cdefa3c8a 100644 --- a/src/common/tracy_jit_symbols.h +++ b/src/common/tracy_jit_symbols.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include #include @@ -78,7 +81,7 @@ public: assert(ptr >= it->second.entrypoint); if (ptr - it->second.entrypoint < it->second.size) { - set_result(it->second, exe_name.c_str()); + set_result(it->second, module_name.c_str()); return true; } return false; @@ -96,12 +99,12 @@ private: // sorted map of currently active jitted code blocks std::map sorted_blocks; std::mutex mutex; - std::string exe_name; + std::string module_name; - static std::string get_exe_name (); + static std::string get_module_name (); JitCodeMap () { - exe_name = get_exe_name(); + module_name = get_module_name(); } };