authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-27 09:46:39-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-01-27 09:46:39-05:00
log4591389497b9bb362cb9385506b6cdc629eae8ea
tree2ee2be50f33cb13f7631193160767686b114a02f
parentd5c2a20d8e2a8c694127fffbe0d1a19f5eaaf92f
parent7336b750bd5e3c271a654e6d44d572cf0427a0b1
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4300 from LemonBoy/debug-windows

More debug fixes - This time Windows gets a treat

1 files changed, 2 insertions(+), 2 deletions(-)

lib/std/debug.zig+2-2
...@@ -360,7 +360,7 @@ pub fn writeCurrentStackTraceWindows(...@@ -360,7 +360,7 @@ pub fn writeCurrentStackTraceWindows(
360 return;360 return;
361 } else 0;361 } else 0;
362 for (addrs[start_i..]) |addr| {362 for (addrs[start_i..]) |addr| {
363 try printSourceAtAddress(debug_info, out_stream, addr, tty_config);363 try printSourceAtAddress(debug_info, out_stream, addr - 1, tty_config);
364 }364 }
365}365}
366366
...@@ -412,7 +412,7 @@ fn printSourceAtAddressWindows(...@@ -412,7 +412,7 @@ fn printSourceAtAddressWindows(
412 if (prefix.RecordLen < 2)412 if (prefix.RecordLen < 2)
413 return error.InvalidDebugInfo;413 return error.InvalidDebugInfo;
414 switch (prefix.RecordKind) {414 switch (prefix.RecordKind) {
415 pdb.SymbolKind.S_LPROC32 => {415 .S_LPROC32, .S_GPROC32 => {
416 const proc_sym = @ptrCast(*pdb.ProcSym, &mod.symbols[symbol_i + @sizeOf(pdb.RecordPrefix)]);416 const proc_sym = @ptrCast(*pdb.ProcSym, &mod.symbols[symbol_i + @sizeOf(pdb.RecordPrefix)]);
417 const vaddr_start = coff_section.header.virtual_address + proc_sym.CodeOffset;417 const vaddr_start = coff_section.header.virtual_address + proc_sym.CodeOffset;
418 const vaddr_end = vaddr_start + proc_sym.CodeSize;418 const vaddr_end = vaddr_start + proc_sym.CodeSize;