mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disas-objdump: Pass --adjust-vma to objdump

Browse Source 
This gives the dumped blob its correct address during disassembly,
which makes pc-relative insns much easier to interpret.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Richard Henderson 2013-08-16 23:29:47 -07:00 committed by Edgar E. Iglesias
parent 8dc6d24091
commit 42eed424e1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/disas-objdump.pl
View File

@ -29,7 +29,7 @@ sub mkobjcommand ($$) {
my ($cmd, $mach) = @_; my ($cmd, $mach) = @_;
return 0 if !$mach; return 0 if !$mach;
$cmd = $aobjdump if !$cmd; $cmd = $aobjdump if !$cmd;
return "$cmd -m $mach --disassemble-all -b binary $outname"; return "$cmd -m $mach --disassemble-all -b binary";
} }
$objdump[1] = mkobjcommand($hobjdump, $hmachine); $objdump[1] = mkobjcommand($hobjdump, $hmachine);
@ -38,6 +38,7 @@ $objdump[2] = mkobjcommand($tobjdump, $tmachine);
# Zero-initialize current dumping state. # Zero-initialize current dumping state.
my $mem = ""; my $mem = "";
my $inobjd = 0; my $inobjd = 0;
my $vma = 0;
sub objcommand { sub objcommand {
my $ret = $objdump[$inobjd]; my $ret = $objdump[$inobjd];
@ -50,7 +51,7 @@ sub objcommand {
} }
while (<>) { while (<>) {
# Collect the data from the relevant OBJD-* lines. # Collect the data from the relevant OBJD-* lines ...
if (/^OBJD-H: /) { if (/^OBJD-H: /) {
die "Internal error" if $inobjd == 2; die "Internal error" if $inobjd == 2;
$mem = $mem . pack("H*", substr($_, 8, -1)); $mem = $mem . pack("H*", substr($_, 8, -1));
@ -68,8 +69,12 @@ while (<>) {
truncate $outh, 0; truncate $outh, 0;
syswrite $outh, $mem; syswrite $outh, $mem;
my $cmd = objcommand();
$cmd = $cmd . " --adjust-vma=" . $vma if $vma;
$cmd = $cmd . " " . $outname;
# Pipe from objdump... # Pipe from objdump...
open IN, "-|", objcommand(); open IN, "-|", $cmd;
# ... copying all but the first 7 lines of boilerplate to our stdout. # ... copying all but the first 7 lines of boilerplate to our stdout.
my $i = 0; my $i = 0;
@ -81,6 +86,13 @@ while (<>) {
$mem = ""; $mem = "";
$inobjd = 0; $inobjd = 0;
$vma = 0;
}
# The line before "OBJD-*" will be of the form "0x<hex>+: +\n".
# Extract the value for passing to --adjust-vma.
elsif (/^(0x[0-9a-fA-F]+):\s*$/) {
$vma = $1;
print;
} else { } else {
print; print;
} }