Skip to content

Commit

Permalink
x86: Don't use POSIX character classes in gen-insn-attr-x86.awk
Browse files Browse the repository at this point in the history
Not all awk implementations (including the default awk in Ubuntu 9.10)
support POSIX character classes.  Since x86-opcode-map.txt is plain
ASCII, we can just use explicit ranges for lower case, alphabetic, and
alphanumeric characters instead.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
LKML-Reference: <adabphy750b.fsf@roland-alpha.cisco.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Roland Dreier authored and H. Peter Anvin committed Dec 17, 2009
1 parent c051346 commit 4beb3d6
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/x86/tools/gen-insn-attr-x86.awk
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

# Awk implementation sanity check
function check_awk_implement() {
if (!match("abc", "[[:lower:]]+"))
return "Your awk doesn't support charactor-class."
if (sprintf("%x", 0) != "0")
return "Your awk has a printf-format problem."
return ""
Expand Down Expand Up @@ -44,12 +42,12 @@ BEGIN {
delete gtable
delete atable

opnd_expr = "^[[:alpha:]/]"
opnd_expr = "^[A-Za-z/]"
ext_expr = "^\\("
sep_expr = "^\\|$"
group_expr = "^Grp[[:alnum:]]+"
group_expr = "^Grp[0-9A-Za-z]+"

imm_expr = "^[IJAO][[:lower:]]"
imm_expr = "^[IJAO][a-z]"
imm_flag["Ib"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
imm_flag["Jb"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
imm_flag["Iw"] = "INAT_MAKE_IMM(INAT_IMM_WORD)"
Expand All @@ -62,7 +60,7 @@ BEGIN {
imm_flag["Ob"] = "INAT_MOFFSET"
imm_flag["Ov"] = "INAT_MOFFSET"

modrm_expr = "^([CDEGMNPQRSUVW/][[:lower:]]+|NTA|T[012])"
modrm_expr = "^([CDEGMNPQRSUVW/][a-z]+|NTA|T[012])"
force64_expr = "\\([df]64\\)"
rex_expr = "^REX(\\.[XRWB]+)*"
fpu_expr = "^ESC" # TODO
Expand Down

0 comments on commit 4beb3d6

Please sign in to comment.