Skip to content

Added support for diffing specific symbols in .o files #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adubbz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added support for diffing specific symbols in .o files #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c897ff7
Added support for diffing specific symbols in .o files
Adubbz Apr 21, 2024
25ff60f
Adjust name to —objsym
Adubbz Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ def complete_symbol(
help="""Diff .o files rather than a whole binary. This makes it possible to
see symbol names. (Recommended)""",
)
parser.add_argument(
"--objsym",
dest="diff_obj_symbol",
metavar="SYMBOL",
help="""Diff a specific function in two .o files, both non-stripped.""",
)
parser.add_argument(
"-f",
"--file",
Expand Down Expand Up @@ -1522,7 +1528,7 @@ def dump_elf(


def dump_objfile(
start: str, end: Optional[str], config: Config, project: ProjectSettings
start: str, end: Optional[str], diff_obj_symbol: str, config: Config, project: ProjectSettings
) -> Tuple[str, ObjdumpCommand, ObjdumpCommand]:
if config.base_shift:
fail("--base-shift not compatible with -o")
Expand Down Expand Up @@ -1550,6 +1556,8 @@ def dump_objfile(

if project.disassemble_all:
disassemble_flag = "-D"
elif diff_obj_symbol:
disassemble_flag = f"--disassemble={diff_obj_symbol}"
else:
disassemble_flag = "-d"

Expand Down Expand Up @@ -3772,7 +3780,7 @@ def main() -> None:
)
elif config.diff_obj:
make_target, basecmd, mycmd = dump_objfile(
args.start, args.end, config, project
args.start, args.end, args.diff_obj_symbol, config, project
)
else:
make_target, basecmd, mycmd = dump_binary(args.start, args.end, config, project)
Expand Down