From 70d6ecf3bf23fe901a2e52e645e200e4f49c3006 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 23 Jun 2000 05:44:30 +0000 Subject: [PATCH] Kazu Hirata's formatting and comment typo fixes. --- gas/ChangeLog | 4 + gas/config/tc-h8300.c | 198 ++++++++++++++++-------------------------- 2 files changed, 80 insertions(+), 122 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index d66e9ce6ae3..d463a9aef2d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2000-06-22 Kazu Hirata + + * config/tc-h8300.c: Fix formatting and comment typos. + 2000-06-22 Timothy Wall * config/tc-ia64.c (note_register_values): Move premature QP diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c index 3a9462383ca..ab9f7337cae 100644 --- a/gas/config/tc-h8300.c +++ b/gas/config/tc-h8300.c @@ -19,7 +19,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - /* Written By Steve Chamberlain sac@cygnus.com @@ -54,7 +53,6 @@ int Smode; #define DSYMMODE (Hmode ? L_24 : L_16) int bsize = L_8; /* default branch displacement */ - void h8300hmode () { @@ -68,6 +66,7 @@ h8300smode () Smode = 1; Hmode = 1; } + void sbranch (size) int size; @@ -75,14 +74,14 @@ sbranch (size) bsize = size; } -static void pint () +static void +pint () { cons (Hmode ? 4 : 2); } const pseudo_typeS md_pseudo_table[] = { - {"h8300h", h8300hmode, 0}, {"h8300s", h8300smode, 0}, {"sbranch", sbranch, L_8}, @@ -111,12 +110,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP"; static struct hash_control *opcode_hash_control; /* Opcode mnemonics */ -/* - This function is called once, at assembler startup time. This should - set up all the tables, etc that the MD part of the assembler needs - */ - - +/* This function is called once, at assembler startup time. This + should set up all the tables, etc. that the MD part of the assembler + needs. */ void md_begin () { @@ -130,8 +126,7 @@ md_begin () for (opcode = h8_opcodes; opcode->name; opcode++) { /* Strip off any . part when inserting the opcode and only enter - unique codes into the hash table - */ + unique codes into the hash table. */ char *src = opcode->name; unsigned int len = strlen (src); char *dst = malloc (len + 1); @@ -157,12 +152,12 @@ md_begin () } opcode->idx = idx; - - /* Find the number of operands */ + /* Find the number of operands. */ opcode->noperands = 0; while (opcode->args.nib[opcode->noperands] != E) opcode->noperands++; - /* Find the length of the opcode in bytes */ + + /* Find the length of the opcode in bytes. */ opcode->length = 0; while (opcode->data.nib[opcode->length * 2] != E) opcode->length++; @@ -171,17 +166,16 @@ md_begin () linkrelax = 1; } - struct h8_exp { char *e_beg; char *e_end; expressionS e_exp; }; + int dispreg; int opsize; /* Set when a register size is seen */ - struct h8_op { op_type mode; @@ -212,10 +206,10 @@ parse_reg (src, mode, reg, direction) char *end; int len; - /* Cribbed from get_symbol_end(). */ + /* Cribbed from get_symbol_end. */ if (!is_name_beginner (*src) || *src == '\001') return 0; - end = src+1; + end = src + 1; while (is_part_of_name (*end) || *end == '\001') end++; len = end - src; @@ -293,7 +287,7 @@ parse_reg (src, mode, reg, direction) static char * parse_exp (s, op) char *s; - expressionS * op; + expressionS *op; { char *save = input_line_pointer; char *new; @@ -321,7 +315,7 @@ skip_colonthing (ptr, exp, mode) { ptr++; /* ff fill any 8 bit quantity */ - /* exp->X_add_number -= 0x100;*/ + /* exp->X_add_number -= 0x100; */ *mode |= L_8; } else @@ -352,12 +346,12 @@ skip_colonthing (ptr, exp, mode) @(exp[:16], Rn) Register indirect with displacement @Rn+ @-Rn - @aa:8 absolute 8 bit - @aa:16 absolute 16 bit + @aa:8 absolute 8 bit + @aa:16 absolute 16 bit @aa absolute 16 bit #xx[:size] immediate data - @(exp:[8], pc) pc rel + @(exp:[8], pc) pc rel @@aa[:8] memory indirect */ @@ -373,7 +367,7 @@ colonmod24 (op, src) if (!mode) { - /* Choose a default mode */ + /* Choose a default mode. */ if (op->exp.X_add_number < -32768 || op->exp.X_add_number > 32767) { @@ -393,7 +387,6 @@ colonmod24 (op, src) } - static void get_operand (ptr, op, dst, direction) char **ptr; @@ -410,8 +403,8 @@ get_operand (ptr, op, dst, direction) /* Gross. Gross. ldm and stm have a format not easily handled by get_operand. We deal with it explicitly here. */ - if (src[0] == 'e' && src[1] == 'r' && isdigit(src[2]) - && src[3] == '-' && src[4] == 'e' && src[5] == 'r' && isdigit(src[6])) + if (src[0] == 'e' && src[1] == 'r' && isdigit (src[2]) + && src[3] == '-' && src[4] == 'e' && src[5] == 'r' && isdigit (src[6])) { int low, high; @@ -462,29 +455,24 @@ get_operand (ptr, op, dst, direction) op->mode = MEMIND; return; - } - if (*src == '-') { src++; len = parse_reg (src, &mode, &num, direction); if (len == 0) { - /* Oops, not a reg after all, must be ordinary exp */ + /* Oops, not a reg after all, must be ordinary exp. */ src--; - /* must be a symbol */ + /* Must be a symbol. */ op->mode = ABS | PSIZE | direction; *ptr = skip_colonthing (parse_exp (src, &op->exp), &op->exp, &op->mode); return; - - } - if ((mode & SIZE) != PSIZE) as_bad (_("Wrong size pointer register for architecture.")); op->mode = RDDEC; @@ -494,11 +482,10 @@ get_operand (ptr, op, dst, direction) } if (*src == '(') { - /* Disp */ + /* Disp. */ src++; - /* Start off assuming a 16 bit offset */ - + /* Start off assuming a 16 bit offset. */ src = parse_exp (src, &op->exp); @@ -577,7 +564,6 @@ get_operand (ptr, op, dst, direction) } } - if (*src == '#') { src++; @@ -624,9 +610,7 @@ get_operand (ptr, op, dst, direction) } } - -static -char * +static char * get_operands (noperands, op_end, operand) unsigned int noperands; char *op_end; @@ -653,8 +637,8 @@ get_operands (noperands, op_end, operand) { operand[1].mode = 0; } - break; + case 2: ptr++; get_operand (&ptr, operand + 0, 0, SRC); @@ -667,16 +651,13 @@ get_operands (noperands, op_end, operand) abort (); } - return ptr; } /* Passed a pointer to a list of opcodes which use different addressing modes, return the opcode which matches the opcodes - provided - */ -static -struct h8_opcode * + provided. */ +static struct h8_opcode * get_specific (opcode, operands, size) struct h8_opcode *opcode; struct h8_op *operands; @@ -732,7 +713,7 @@ get_specific (opcode, operands, size) opsize = op & SIZE; - /* The size of the reg is v important */ + /* The size of the reg is v important. */ if ((op & SIZE) != (x & SIZE)) found = 0; } @@ -740,7 +721,7 @@ get_specific (opcode, operands, size) { operands[i].mode &= ~ABS; operands[i].mode |= ABSJMP; - /* But it may not be 24 bits long */ + /* But it may not be 24 bits long. */ if (!Hmode) { operands[i].mode &= ~SIZE; @@ -749,11 +730,11 @@ get_specific (opcode, operands, size) } else if ((op & (KBIT | DBIT)) && (x & IMM)) { - /* This is ok if the immediate value is sensible */ + /* This is ok if the immediate value is sensible. */ } else if (op & PCREL) { - /* The size of the displacement is important */ + /* The size of the displacement is important. */ if ((op & SIZE) != (x & SIZE)) found = 0; } @@ -767,10 +748,10 @@ get_specific (opcode, operands, size) x |= L_32; } /* Promote an L8 to L_16 if it makes us match. */ - if (op & ABS && op & L_8 && op & DISP) + if (op & ABS && op & L_8 && op & DISP) { if (x & L_16) - found= 1; + found = 1; } else if ((x & SIZE) != 0 && ((op & SIZE) != (x & SIZE))) @@ -783,7 +764,7 @@ get_specific (opcode, operands, size) else if ((op & MODE) != (x & MODE)) { found = 0; - } + } } } } @@ -802,29 +783,28 @@ check_operand (operand, width, string) if (operand->exp.X_add_symbol == 0 && operand->exp.X_op_symbol == 0) { + /* No symbol involved, let's look at offset, it's dangerous if + any of the high bits are not 0 or ff's, find out by oring or + anding with the width and seeing if the answer is 0 or all + fs. */ - /* No symbol involved, let's look at offset, it's dangerous if any of - the high bits are not 0 or ff's, find out by oring or anding with - the width and seeing if the answer is 0 or all fs*/ - if ((operand->exp.X_add_number & ~width) != 0 && (operand->exp.X_add_number | width) != (~0)) { - if (width == 255 + if (width == 255 && (operand->exp.X_add_number & 0xff00) == 0xff00) { /* Just ignore this one - which happens when trying to fit a 16 bit address truncated into an 8 bit address of something like bset. */ } - else + else { as_warn (_("operand %s0x%lx out of range."), string, (unsigned long) operand->exp.X_add_number); } } } - } /* RELAXMODE has one of 3 values: @@ -847,7 +827,6 @@ do_a_fix_imm (offset, operand, relaxmode) int size; int where; - char *t = operand->mode & IMM ? "#" : "@"; if (operand->exp.X_add_symbol == 0) @@ -880,7 +859,7 @@ do_a_fix_imm (offset, operand, relaxmode) break; case L_32: - /* This should be done with bfd */ + /* This should be done with bfd. */ bytes[0] = operand->exp.X_add_number >> 24; bytes[1] = operand->exp.X_add_number >> 16; bytes[2] = operand->exp.X_add_number >> 8; @@ -892,13 +871,11 @@ do_a_fix_imm (offset, operand, relaxmode) } break; } - } else { switch (operand->mode & SIZE) { - case L_24: case L_32: size = 4; @@ -911,7 +888,7 @@ do_a_fix_imm (offset, operand, relaxmode) idx = R_RELLONG; break; default: - as_bad(_("Can't work out size of operand.\n")); + as_bad (_("Can't work out size of operand.\n")); case L_16: size = 2; where = 0; @@ -937,11 +914,9 @@ do_a_fix_imm (offset, operand, relaxmode) 0, idx); } - } -/* Now we know what sort of opcodes it is, lets build the bytes - - */ +/* Now we know what sort of opcodes it is, let's build the bytes. */ static void build_bytes (this_try, operand) struct h8_opcode *this_try; @@ -977,7 +952,6 @@ build_bytes (this_try, operand) } else { - if (c & (REG | IND | INC | DEC)) { nib = operand[d].reg; @@ -986,7 +960,7 @@ build_bytes (this_try, operand) { nib = dispreg; } - else if (c & ABS ) + else if (c & ABS) { operand[d].mode = c; absat = nibble_count / 2; @@ -1036,7 +1010,7 @@ build_bytes (this_try, operand) as_bad (_("Need #1 or #2 here")); break; } - /* stop it making a fix */ + /* Stop it making a fix. */ operand[0].mode = 0; } @@ -1083,7 +1057,7 @@ build_bytes (this_try, operand) if (strcmp (this_try->name, "mov.b") == 0) movb = 1; - /* output any fixes */ + /* Output any fixes. */ for (i = 0; i < 2; i++) { int x = operand[i].mode; @@ -1126,7 +1100,6 @@ build_bytes (this_try, operand) } else if (x & MEMIND) { - check_operand (operand + i, 0xff, "@@"); fix_new_exp (frag_now, output - frag_now->fr_literal + 1, @@ -1137,7 +1110,7 @@ build_bytes (this_try, operand) } else if (x & ABSJMP) { - /* This jmp may be a jump or a branch */ + /* This jmp may be a jump or a branch. */ check_operand (operand + i, Hmode ? 0xffffff : 0xffff, "@"); if (operand[i].exp.X_add_number & 1) @@ -1146,7 +1119,7 @@ build_bytes (this_try, operand) (unsigned long) operand->exp.X_add_number); } if (!Hmode) - operand[i].exp.X_add_number = + operand[i].exp.X_add_number = ((operand[i].exp.X_add_number & 0xffff) ^ 0x8000) - 0x8000; fix_new_exp (frag_now, output - frag_now->fr_literal, @@ -1156,27 +1129,23 @@ build_bytes (this_try, operand) R_JMPL1); } } - } -/* - try and give an intelligent error message for common and simple to - detect errors - */ - +/* Try to give an intelligent error message for common and simple to + detect errors. */ static void clever_message (opcode, operand) struct h8_opcode *opcode; struct h8_op *operand; { - /* Find out if there was more than one possible opccode */ + /* Find out if there was more than one possible opcode. */ if ((opcode + 1)->idx != opcode->idx) { unsigned int argn; - /* Only one opcode of this flavour, try and guess which operand - didn't match */ + /* Only one opcode of this flavour, try to guess which operand + didn't match. */ for (argn = 0; argn < opcode->noperands; argn++) { switch (opcode->args.nib[argn]) @@ -1191,7 +1160,6 @@ clever_message (opcode, operand) break; case RS8: - if (operand[argn].mode != RS8) { as_bad (_("source operand must be 8 bit register")); @@ -1214,7 +1182,6 @@ clever_message (opcode, operand) } break; - case ABS16SRC: if (operand[argn].mode != ABS16SRC) { @@ -1229,13 +1196,9 @@ clever_message (opcode, operand) as_bad (_("invalid operands")); } -/* This is the guts of the machine-dependent assembler. STR points to a - machine dependent instruction. This funciton is supposed to emit - the frags/bytes it assembles to. - */ - - - +/* This is the guts of the machine-dependent assembler. STR points to + a machine dependent instruction. This function is supposed to emit + the frags/bytes it assembles. */ void md_assemble (str) char *str; @@ -1250,11 +1213,11 @@ md_assemble (str) char c; int size; - /* Drop leading whitespace */ + /* Drop leading whitespace. */ while (*str == ' ') str++; - /* find the op code end */ + /* Find the op code end. */ for (op_start = op_end = str; *op_end != 0 && *op_end != ' '; op_end++) @@ -1268,8 +1231,6 @@ md_assemble (str) } } - ; - if (op_end == op_start) { as_bad (_("can't find opcode ")); @@ -1287,7 +1248,7 @@ md_assemble (str) return; } - /* We use to set input_line_pointer to the result of get_operands, + /* We used to set input_line_pointer to the result of get_operands, but that is wrong. Our caller assumes we don't change it. */ (void) get_operands (opcode->noperands, op_end, operand); @@ -1316,7 +1277,7 @@ md_assemble (str) if (opcode == 0) { - /* Couldn't find an opcode which matched the operands */ + /* Couldn't find an opcode which matched the operands. */ char *where = frag_more (2); where[0] = 0x0; @@ -1334,12 +1295,11 @@ md_assemble (str) } build_bytes (opcode, operand); - } void tc_crawl_symbol_chain (headers) - object_headers * headers ATTRIBUTE_UNUSED; + object_headers *headers ATTRIBUTE_UNUSED; { printf (_("call to tc_crawl_symbol_chain \n")); } @@ -1353,7 +1313,7 @@ md_undefined_symbol (name) void tc_headers_hook (headers) - object_headers * headers ATTRIBUTE_UNUSED; + object_headers *headers ATTRIBUTE_UNUSED; { printf (_("call to tc_headers_hook \n")); } @@ -1362,10 +1322,10 @@ tc_headers_hook (headers) /* Equal to MAX_PRECISION in atof-ieee.c */ #define MAX_LITTLENUMS 6 -/* Turn a string in input_line_pointer into a floating point constant of type - type, and store the appropriate bytes in *litP. The number of LITTLENUMS - emitted is stored in *sizeP . An error message is returned, or NULL on OK. - */ +/* Turn a string in input_line_pointer into a floating point constant + of type TYPE, and store the appropriate bytes in *LITP. The number + of LITTLENUMS emitted is stored in *SIZEP . An error message is + returned, or NULL on OK. */ char * md_atof (type, litP, sizeP) char type; @@ -1425,7 +1385,8 @@ CONST char *md_shortopts = ""; struct option md_longopts[] = { {NULL, no_argument, NULL, 0} }; -size_t md_longopts_size = sizeof(md_longopts); + +size_t md_longopts_size = sizeof (md_longopts); int md_parse_option (c, arg) @@ -1458,13 +1419,13 @@ md_convert_frag (headers, seg, fragP) abort (); } -valueT +valueT md_section_align (seg, size) segT seg; valueT size; { - return ((size + (1 << section_alignment[(int) seg]) - 1) & (-1 << section_alignment[(int) seg])); - + return ((size + (1 << section_alignment[(int) seg]) - 1) + & (-1 << section_alignment[(int) seg])); } void @@ -1503,8 +1464,7 @@ md_estimate_size_before_relax (fragP, segment_type) abort (); } -/* Put number into target byte order */ - +/* Put number into target byte order. */ void md_number_to_chars (ptr, use, nbytes) char *ptr; @@ -1513,6 +1473,7 @@ md_number_to_chars (ptr, use, nbytes) { number_to_chars_bigendian (ptr, use, nbytes); } + long md_pcrel_from (fixP) fixS *fixP ATTRIBUTE_UNUSED; @@ -1520,7 +1481,6 @@ md_pcrel_from (fixP) abort (); } - void tc_reloc_mangle (fix_ptr, intr, base) fixS *fix_ptr; @@ -1533,7 +1493,7 @@ tc_reloc_mangle (fix_ptr, intr, base) symbol_ptr = fix_ptr->fx_addsy; /* If this relocation is attached to a symbol then it's ok - to output it */ + to output it. */ if (fix_ptr->fx_r_type == TC_CONS_RELOC) { /* cons likes to create reloc32's whatever the size of the reloc.. @@ -1551,9 +1511,7 @@ tc_reloc_mangle (fix_ptr, intr, base) break; default: abort (); - } - } else { @@ -1584,8 +1542,4 @@ tc_reloc_mangle (fix_ptr, intr, base) } else intr->r_symndx = -1; - - } - -/* end of tc-h8300.c */ -- 2.30.2