From: Alex Dowad <alexinbeijing@gmail.com>
To: musl@lists.openwall.com
Subject: [PATCH 2/3] x86 CFI generation script recognizes when %ax, %ah, %al, etc. are overwritten
Date: Tue, 13 Oct 2015 13:28:51 +0200 [thread overview]
Message-ID: <1444735732-12265-2-git-send-email-alexinbeijing@gmail.com> (raw)
In-Reply-To: <1444735732-12265-1-git-send-email-alexinbeijing@gmail.com>
this may help a debugger to know which variable values from higher stack frames
are still available and can legitimately be printed.
thanks to R. Felker for this suggestion.
---
tools/add-cfi.i386.awk | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/tools/add-cfi.i386.awk b/tools/add-cfi.i386.awk
index bd7932f..9162e30 100644
--- a/tools/add-cfi.i386.awk
+++ b/tools/add-cfi.i386.awk
@@ -27,20 +27,29 @@ function get_const1() {
match($0, /-?(0x[0-9a-fA-F]+|[0-9]+),/)
return parse_const(substr($0, RSTART, RLENGTH-1))
}
+
+function canonicalize_reg(register) {
+ if (match(register, /^e/))
+ return register
+ else if (match(register, /[hl]$/)) # AH, AL, BH, BL, etc
+ return "e" substr(register, 1, 1) "x"
+ else # AX, BX, CX, etc
+ return "e" register
+}
function get_reg() {
# only use if you already know there is 1 and only 1 register
- match($0, /%e(ax|bx|cx|dx|si|di|bp)/)
- return substr($0, RSTART+1, 3)
+ match($0, /%e?([abcd][hlx]|si|di|bp)/)
+ return canonicalize_reg(substr($0, RSTART+1, RLENGTH-1))
}
function get_reg1() {
# for instructions with 2 operands, get 1st operand (assuming it is register)
- match($0, /%e(ax|bx|cx|dx|si|di|bp),/)
- return substr($0, RSTART+1, 3)
+ match($0, /%e?([abcd][hlx]|si|di|bp),/)
+ return canonicalize_reg(substr($0, RSTART+1, RLENGTH-2))
}
function get_reg2() {
# for instructions with 2 operands, get 2nd operand (assuming it is register)
- match($0, /,%e(ax|bx|cx|dx|si|di|bp)/)
- return substr($0, RSTART+RLENGTH-3, 3)
+ match($0, /,%e?([abcd][hlx]|si|di|bp)/)
+ return canonicalize_reg(substr($0, RSTART+2, RLENGTH-2))
}
function adjust_sp_offset(delta) {
@@ -184,14 +193,14 @@ function trashed(register) {
}
# this does NOT exhaustively check for all possible instructions which could
# overwrite a register value inherited from the caller (just the common ones)
-/mov.*,%e(ax|bx|cx|dx|si|di|bp)$/ { trashed(get_reg2()) }
-/(add|addl|sub|subl|and|or|xor|lea|sal|sar|shl|shr).*,%e(ax|bx|cx|dx|si|di|bp)$/ {
+/mov.*,%e?([abcd][hlx]|si|di|bp)$/ { trashed(get_reg2()) }
+/(add|addl|sub|subl|and|or|xor|lea|sal|sar|shl|shr).*,%e?([abcd][hlx]|si|di|bp)$/ {
trashed(get_reg2())
}
/^i?mul [^,]*$/ { trashed("eax"); trashed("edx") }
-/^i?mul.*,%e(ax|bx|cx|dx|si|di|bp)$/ { trashed(get_reg2()) }
+/^i?mul.*,%e?([abcd][hlx]|si|di|bp)$/ { trashed(get_reg2()) }
/^i?div/ { trashed("eax"); trashed("edx") }
-/(dec|inc|not|neg|pop) %e(ax|bx|cx|dx|si|di|bp)/ { trashed(get_reg()) }
+/(dec|inc|not|neg|pop) %e?([abcd][hlx]|si|di|bp)/ { trashed(get_reg()) }
/cpuid/ { trashed("eax"); trashed("ebx"); trashed("ecx"); trashed("edx") }
END {
--
2.0.0.GIT
next prev parent reply other threads:[~2015-10-13 11:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 11:28 [PATCHv3 1/3] fix matching errors for overwritten registers in x86 CFI generation script Alex Dowad
2015-10-13 11:28 ` Alex Dowad [this message]
2015-10-13 11:28 ` [PATCH 3/3] add CFI generation script for x86_64 Alex Dowad
2015-10-13 22:42 ` [PATCHv3 1/3] fix matching errors for overwritten registers in x86 CFI generation script Rich Felker
2015-10-14 10:21 ` Alex
2015-10-14 19:14 ` Rich Felker
2015-10-14 19:23 ` Alex
2015-10-14 19:27 ` Rich Felker
2015-10-14 19:44 ` Alex
2015-10-14 19:51 ` Rich Felker
2015-10-14 20:27 ` Alex
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444735732-12265-2-git-send-email-alexinbeijing@gmail.com \
--to=alexinbeijing@gmail.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).