From 3f63950a7dac2ce45648ac9cdb66ed84cace61e5 Mon Sep 17 00:00:00 2001 From: MS Date: Thu, 28 Dec 2023 18:02:02 -0500 Subject: [PATCH] Fix new/delete symbol reference (#384) --- LEGO1/library_msvc.h | 12 +++++++++++- tools/isledecomp/isledecomp/syminfo.py | 6 +----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h index d07ecef2..c46154a8 100644 --- a/LEGO1/library_msvc.h +++ b/LEGO1/library_msvc.h @@ -1,11 +1,21 @@ #ifdef 0 +// aka `operator new` // LIBRARY: ISLE 0x402f80 // LIBRARY: LEGO1 0x10086240 -// _malloc +// ??2@YAPAXI@Z +// aka `operator delete` // LIBRARY: ISLE 0x402fa0 // LIBRARY: LEGO1 0x10086260 +// ??3@YAXPAX@Z + +// LIBRARY: ISLE 0x406dd0 +// LIBRARY: LEGO1 0x1008a090 +// _malloc + +// LIBRARY: ISLE 0x406f00 +// LIBRARY: LEGO1 0x1008a1c0 // _free // LIBRARY: ISLE 0x408220 diff --git a/tools/isledecomp/isledecomp/syminfo.py b/tools/isledecomp/isledecomp/syminfo.py index 1ecf0010..8388eaa5 100644 --- a/tools/isledecomp/isledecomp/syminfo.py +++ b/tools/isledecomp/isledecomp/syminfo.py @@ -29,11 +29,7 @@ def __init__(self, pdb, sym_recompfile, sym_logger, base_dir): contrib_dict = {(s.section, s.offset): s.size for s in cv.sizerefs} for pub in cv.publics: - if ( - pub.type == "S_PUB32" - and pub.name.startswith("_") - and (pub.section, pub.offset) in contrib_dict - ): + if pub.type == "S_PUB32" and (pub.section, pub.offset) in contrib_dict: size = contrib_dict[(pub.section, pub.offset)] info = RecompiledInfo()