From a5c311ca767b8e291e5f9a62c6a13e964bbd56ed Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 13 Dec 2006 18:26:30 +0000 Subject: [PATCH] 2006-12-13 H.J. Lu * config/tc-i386.c (match_template): Use a for loop to set operand_types array. --- gas/ChangeLog | 5 +++++ gas/config/tc-i386.c | 15 ++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 94357ae4dfa..49e2e4e8f55 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2006-12-13 H.J. Lu + + * config/tc-i386.c (match_template): Use a for loop to set + operand_types array. + 2006-12-13 H.J. Lu PR gas/3712 diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 01f56b09688..fc1f707bbe2 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -2573,6 +2573,7 @@ match_template () int suffix_check; unsigned int operand_types [MAX_OPERANDS]; int addr_prefix_disp; + unsigned int j; #if MAX_OPERANDS != 4 # error "MAX_OPERANDS must be 4." @@ -2596,10 +2597,8 @@ match_template () overlap2 = 0; overlap3 = 0; found_reverse_match = 0; - operand_types [0] = 0; - operand_types [1] = 0; - operand_types [2] = 0; - operand_types [3] = 0; + for (j = 0; j < MAX_OPERANDS; j++) + operand_types [j] = 0; addr_prefix_disp = -1; suffix_check = (i.suffix == BYTE_MNEM_SUFFIX ? No_bSuf @@ -2628,10 +2627,8 @@ match_template () && (t->opcode_modifier & IgnoreSize))) continue; - operand_types [0] = t->operand_types [0]; - operand_types [1] = t->operand_types [1]; - operand_types [2] = t->operand_types [2]; - operand_types [3] = t->operand_types [3]; + for (j = 0; j < MAX_OPERANDS; j++) + operand_types [j] = t->operand_types [j]; /* In general, don't allow 64-bit operands in 32-bit mode. */ if (i.suffix == QWORD_MNEM_SUFFIX @@ -2659,7 +2656,7 @@ match_template () into Disp32/Disp16/Disp32 operand. */ if (i.prefix[ADDR_PREFIX] != 0) { - unsigned int j, DispOn = 0, DispOff = 0; + unsigned int DispOn = 0, DispOff = 0; switch (flag_code) { -- 2.30.2