steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-29 04:01:27 +01:00
Code Issues Packages Projects Releases 67 Wiki Activity

Symbols: Add SymName function

Browse Source
This commit is contained in:
Stefanos Kornilios Misis Poiitidis committed 2022-06-24 19:38:40 +03:00
1 parent 8f578b57f2
commit ae5cfcc249
2 files changed
+24 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

External/FEXCore/Source/Interface/IR/AOTIR.cpp
Vendored
+5 -18
View File
@@ -300,9 +300,9 @@ namespace FEXCore::IR {
AOTIRCaptureCache::PreGenerateIRFetchResult AOTIRCaptureCache::PreGenerateIRFetch(uint64_t GuestRIP, FEXCore::IR::IRListView *IRList) {
auto AOTIRCacheEntry = CTX->SyscallHandler->LookupAOTIRCacheEntry(GuestRIP);
PreGenerateIRFetchResult Result{};
if (AOTIRCacheEntry.Entry) {
AOTIRCacheEntry.Entry->ContainsCode = true;
@@ -344,24 +344,11 @@ namespace FEXCore::IR {
auto map = Entry->SourcecodeMap.get();
if (map) {
auto FileBegin = GuestRIP - VAFileStart;
auto FileOffset = GuestRIP - VAFileStart;
auto Sym = map->FindSymbolMapping(FileBegin);
auto Sym = map->FindSymbolMapping(FileOffset);
std::string SymName;
if (Sym) {
auto SymOffset = FileBegin - Sym->FileGuestBegin;
if (SymOffset) {
SymName = fmt::format("{}: {}+{} @{:x}", std::filesystem::path(Entry->Filename).stem().string(), Sym->Name,
SymOffset, HostEntry);
} else {
SymName = fmt::format("{}: {} @{:x}", std::filesystem::path(Entry->Filename).stem().string(), Sym->Name,
HostEntry);
}
} else {
SymName = fmt::format("{}: +{} @{:x}", std::filesystem::path(Entry->Filename).stem().string(), FileBegin,
HostEntry);
}
std::string SymName = HLE::SourcecodeSymbolMapping::SymName(Sym, Entry->Filename, HostEntry, FileOffset);
std::vector<gdb_line_mapping> Lines;
for (const auto &GuestOpcode : DebugData->GuestOpcodes) {
External/FEXCore/include/FEXCore/HLE/SourcecodeResolver.h
Vendored
+19 -1
View File
@@ -1,9 +1,11 @@
#pragma once
#include <algorithm>
#include <optional>
#include <string>
#include <vector>
#include <memory>
#include <filesystem>
#include <fmt/format.h>
namespace FEXCore::IR {
struct AOTIRCacheEntry;
@@ -23,6 +25,22 @@ struct SourcecodeSymbolMapping {
uintptr_t FileGuestEnd;
std::string Name;
static std::string SymName(const SourcecodeSymbolMapping *Sym, const std::string &GuestFilename, uintptr_t HostEntry, uintptr_t FileBegin) {
if (Sym) {
auto SymOffset = FileBegin - Sym->FileGuestBegin;
if (SymOffset) {
return fmt::format("{}: {}+{} @{:x}", std::filesystem::path(GuestFilename).stem().string(), Sym->Name,
SymOffset, HostEntry);
} else {
return fmt::format("{}: {} @{:x}", std::filesystem::path(GuestFilename).stem().string(), Sym->Name,
HostEntry);
}
} else {
return fmt::format("{}: +{} @{:x}", std::filesystem::path(GuestFilename).stem().string(), FileBegin,
HostEntry);
}
}
};
struct SourcecodeMap {