ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 16:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change layout of Frame_Location

Browse Source
This commit is contained in:
gingerBill
2024-04-28 12:49:17 +01:00
parent 6c185a5dca
commit 0fa269811a
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/debug/trace/trace.odin
+8 -4
View File
@@ -6,11 +6,15 @@ import "base:runtime"
Frame :: distinct uintptr Frame :: distinct uintptr
MAX_FRAMES :: 64 MAX_FRAMES :: 64
Frame_Location :: runtime.Source_Code_Location Frame_Location :: struct {
using loc: runtime.Source_Code_Location,
allocator: runtime.Allocator,
}
delete_frame_location :: proc(loc: Frame_Location, allocator: runtime.Allocator) -> runtime.Allocator_Error { delete_frame_location :: proc(fl: Frame_Location) -> runtime.Allocator_Error {
delete(loc.procedure, allocator) or_return allocator := fl.allocator
delete(loc.file_path, allocator) or_return delete(fl.loc.procedure, allocator) or_return
delete(fl.loc.file_path, allocator) or_return
return nil return nil
} }
core/debug/trace/trace_windows.odin
+6 -6
View File
@@ -41,7 +41,7 @@ _frames :: proc(ctx: ^Context, skip: uint, allocator: runtime.Allocator) -> []Fr
} }
_resolve :: proc(ctx: ^Context, frame: Frame, allocator: runtime.Allocator) -> (result: runtime.Source_Code_Location) { _resolve :: proc(ctx: ^Context, frame: Frame, allocator: runtime.Allocator) -> (fl: Frame_Location) {
intrinsics.atomic_store(&ctx.in_resolve, true) intrinsics.atomic_store(&ctx.in_resolve, true)
defer intrinsics.atomic_store(&ctx.in_resolve, false) defer intrinsics.atomic_store(&ctx.in_resolve, false)
@@ -54,17 +54,17 @@ _resolve :: proc(ctx: ^Context, frame: Frame, allocator: runtime.Allocator) -> (
symbol.SizeOfStruct = size_of(symbol) symbol.SizeOfStruct = size_of(symbol)
symbol.MaxNameLen = 255 symbol.MaxNameLen = 255
if win32.SymFromAddrW(ctx.impl.hProcess, win32.DWORD64(frame), &{}, symbol) { if win32.SymFromAddrW(ctx.impl.hProcess, win32.DWORD64(frame), &{}, symbol) {
result.procedure, _ = win32.wstring_to_utf8(&symbol.Name[0], -1, allocator) fl.procedure, _ = win32.wstring_to_utf8(&symbol.Name[0], -1, allocator)
} else { } else {
result.procedure = fmt.aprintf("(procedure: 0x%x)", frame, allocator=allocator) fl.procedure = fmt.aprintf("(procedure: 0x%x)", frame, allocator=allocator)
} }
line: win32.IMAGEHLP_LINE64 line: win32.IMAGEHLP_LINE64
line.SizeOfStruct = size_of(line) line.SizeOfStruct = size_of(line)
if win32.SymGetLineFromAddrW64(ctx.impl.hProcess, win32.DWORD64(frame), &{}, &line) { if win32.SymGetLineFromAddrW64(ctx.impl.hProcess, win32.DWORD64(frame), &{}, &line) {
result.file_path, _ = win32.wstring_to_utf8(line.FileName, -1, allocator) fl.file_path, _ = win32.wstring_to_utf8(line.FileName, -1, allocator)
result.line = i32(line.LineNumber) fl.line = i32(line.LineNumber)
} }
return result return
} }