adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Fix kprobes build with non-gawk awk

Browse source 
The instruction attribute table generator fails when run by mawk
or original-awk:

 $ mawk -f arch/x86/tools/gen-insn-attr-x86.awk \
	arch/x86/lib/x86-opcode-map.txt > /dev/null
 Semantic error at 240: Second IMM error
 $ echo $?
 1

Line 240 contains "c8: ENTER Iw,Ib", which indicates that this
instruction has two immediate operands, the second of which is
one byte.  The script loops through the immediate operands using
a for loop.

Unfortunately, there is no guarantee in awk that a for (variable
in array) loop will return the indices in increasing order.
Internally, both original-awk and mawk iterate over a hash table
for this purpose, and both implementations happen to produce the
index 2 before 1.  The supposed second immediate operand is more
than one byte wide, producing the error.

So loop over the indices in increasing order instead.  As a
side-effect, with mawk this means the silly two-entry hash table
never has to be built.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by Masami Hiramatsu <mhiramat@redhat.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091213220437.GA27718@progeny.tock>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jonathan Nieder 2009-12-13 16:04:38 -06:00 committed by Ingo Molnar
parent bf08b3b1a1
commit 23637568ad
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/tools/gen-insn-attr-x86.awk
View file

@ -226,12 +226,12 @@ function add_flags(old,new) {
} }
# convert operands to flags. # convert operands to flags.
function convert_operands(opnd, i,imm,mod) function convert_operands(count,opnd, i,j,imm,mod)
{ {
imm = null imm = null
mod = null mod = null
for (i in opnd) { for (j = 1; j <= count; j++) {
i = opnd[i] i = opnd[j]
if (match(i, imm_expr) == 1) { if (match(i, imm_expr) == 1) {
if (!imm_flag[i]) if (!imm_flag[i])
semantic_error("Unknown imm opnd: " i) semantic_error("Unknown imm opnd: " i)
@ -282,8 +282,8 @@ function convert_operands(opnd, i,imm,mod)
# parse one opcode # parse one opcode
if (match($i, opnd_expr)) { if (match($i, opnd_expr)) {
opnd = $i opnd = $i
split($(i++), opnds, ",") count = split($(i++), opnds, ",")
flags = convert_operands(opnds) flags = convert_operands(count, opnds)
} }
if (match($i, ext_expr)) if (match($i, ext_expr))
ext = $(i++) ext = $(i++)