espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-29 08:24:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Nick Clifton
2000-07-17 20:59:47 +00:00
parent 7168a814a6
commit 8098403c53
2 changed files with 78 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gas/ChangeLog
View File

@ -1,3 +1,7 @@
2000-07-17 Kazu Hirata <kazu@hxi.com>
* config/tc-w65.c: Fix formatting.
2000-07-17 Frank Ch. Eigler <fche@redhat.com> 2000-07-17 Frank Ch. Eigler <fche@redhat.com>
* expr.c (operand): Permit %bin literals if LITERAL_PREFIXPERCENT_BIN * expr.c (operand): Permit %bin literals if LITERAL_PREFIXPERCENT_BIN

150
gas/config/tc-w65.c
View File

@ -18,10 +18,7 @@
Software Foundation, 59 Temple Place - Suite 330, Boston, MA Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */ 02111-1307, USA. */
/* /* Written By Steve Chamberlain <sac@cygnus.com>. */
Written By Steve Chamberlain
sac@cygnus.com
*/
#include <stdio.h> #include <stdio.h>
#include "as.h" #include "as.h"
@ -37,10 +34,10 @@ const char line_comment_chars[] = "!#";
/* This table describes all the machine specific pseudo-ops the assembler /* This table describes all the machine specific pseudo-ops the assembler
has to support. The fields are: has to support. The fields are:
pseudo-op name without dot pseudo-op name without dot
function to call to execute this pseudo-op function to call to execute this pseudo-op
Integer arg to pass to the function Integer arg to pass to the function */
*/
#define OP_BCC 0x90 #define OP_BCC 0x90
#define OP_BCS 0xB0 #define OP_BCS 0xB0
@ -63,12 +60,12 @@ const pseudo_typeS md_pseudo_table[] =
{0, 0, 0} {0, 0, 0}
}; };
void cons (); void cons ();
void s_align_bytes (); void s_align_bytes ();
#if 0
/*int md_reloc_size; */ int md_reloc_size;
#endif
static int relax; /* set if -relax seen */ static int relax; /* set if -relax seen */
@ -79,16 +76,11 @@ const char EXP_CHARS[] = "eE";
/* or 0d1.2345e12 */ /* or 0d1.2345e12 */
const char FLT_CHARS[] = "rRsSfFdDxXpP"; const char FLT_CHARS[] = "rRsSfFdDxXpP";
static struct hash_control *opcode_hash_control; /* Opcode mnemonics */ static struct hash_control *opcode_hash_control; /* Opcode mnemonics */
int M; /* M flag */ int M; /* M flag */
int X; /* X flag */ int X; /* X flag */
#define C(a,b) ENCODE_RELAX(a,b) #define C(a,b) ENCODE_RELAX(a,b)
#define ENCODE_RELAX(what,length) (((what) << 2) + (length)) #define ENCODE_RELAX(what,length) (((what) << 2) + (length))
@ -110,11 +102,9 @@ int X; /* X flag */
relax_typeS md_relax_table[C (END, 0)]; relax_typeS md_relax_table[C (END, 0)];
/* /* This function is called once, at assembler startup time. This
This function is called once, at assembler startup time. This should should set up all the tables, etc that the MD part of the assembler
set up all the tables, etc that the MD part of the assembler needs needs. */
*/
void void
s_longa (xmode) s_longa (xmode)
@ -136,6 +126,7 @@ s_longa (xmode)
as_bad (_("need on or off.")); as_bad (_("need on or off."));
demand_empty_rest_of_line (); demand_empty_rest_of_line ();
} }
void void
md_begin () md_begin ()
{ {
@ -145,7 +136,7 @@ md_begin ()
opcode_hash_control = hash_new (); opcode_hash_control = hash_new ();
/* Insert unique names into hash table */ /* Insert unique names into hash table. */
for (opcode = optable; opcode->name; opcode++) for (opcode = optable; opcode->name; opcode++)
{ {
if (strcmp (prev_name, opcode->name)) if (strcmp (prev_name, opcode->name))
@ -156,12 +147,11 @@ md_begin ()
else else
{ {
/* Make all the opcodes with the same name point to the same /* Make all the opcodes with the same name point to the same
string */ string. */
opcode->name = prev_name; opcode->name = prev_name;
} }
} }
/* Initialize the relax table. We use a local variable to avoid /* Initialize the relax table. We use a local variable to avoid
warnings about modifying a supposedly const data structure. */ warnings about modifying a supposedly const data structure. */
table = (relax_typeS *) md_relax_table; table = (relax_typeS *) md_relax_table;
@ -191,7 +181,6 @@ md_begin ()
static expressionS immediate; /* absolute expression */ static expressionS immediate; /* absolute expression */
static expressionS immediate1; /* absolute expression */ static expressionS immediate1; /* absolute expression */
static symbolS * static symbolS *
dot () dot ()
{ {
@ -210,6 +199,7 @@ dot ()
int expr_size; int expr_size;
int expr_shift; int expr_shift;
int tc_cons_reloc; int tc_cons_reloc;
void void
w65_expression (dest, bytes) w65_expression (dest, bytes)
expressionS *dest; expressionS *dest;
@ -241,8 +231,8 @@ w65_expression (dest, bytes)
} }
int amode; int amode;
static
char * static char *
parse_exp (s, bytes) parse_exp (s, bytes)
char *s; char *s;
int bytes; int bytes;
@ -260,15 +250,14 @@ parse_exp (s, bytes)
return new; return new;
} }
static char *
static
char *
get_operands (info, ptr) get_operands (info, ptr)
struct opinfo *info; struct opinfo *info;
char *ptr; char *ptr;
{ {
register int override_len = 0; register int override_len = 0;
register int bytes = 0; register int bytes = 0;
while (*ptr == ' ') while (*ptr == ' ')
ptr++; ptr++;
@ -429,7 +418,8 @@ get_operands (info, ptr)
bytes = 2; bytes = 2;
} }
} }
else if (ptr[0] == 's' && ptr[1] == ')' && ptr[2] == ',' && ptr[3] == 'y') else if (ptr[0] == 's' && ptr[1] == ')'
&& ptr[2] == ',' && ptr[3] == 'y')
{ {
amode = ADDR_STACK_REL_INDX_IDX; amode = ADDR_STACK_REL_INDX_IDX;
bytes = 1; bytes = 1;
@ -460,7 +450,6 @@ get_operands (info, ptr)
} }
} }
} }
else if (ptr[0] == '[') else if (ptr[0] == '[')
{ {
@ -482,9 +471,8 @@ get_operands (info, ptr)
amode = ADDR_ABS_IND_LONG; amode = ADDR_ABS_IND_LONG;
} }
else else
{ {
bytes = 1; bytes = 1;
amode = ADDR_DIR_IND_LONG; amode = ADDR_DIR_IND_LONG;
} }
} }
@ -578,7 +566,7 @@ get_operands (info, ptr)
if (amode == ADDR_DIR) if (amode == ADDR_DIR)
tc_cons_reloc = R_W65_DP; tc_cons_reloc = R_W65_DP;
else else
tc_cons_reloc = R_W65_ABS8; tc_cons_reloc = R_W65_ABS8;
break; break;
case 1: case 1:
tc_cons_reloc = R_W65_ABS8S8; tc_cons_reloc = R_W65_ABS8S8;
@ -607,11 +595,9 @@ tc_cons_reloc = R_W65_ABS8;
/* Passed a pointer to a list of opcodes which use different /* Passed a pointer to a list of opcodes which use different
addressing modes, return the opcode which matches the opcodes addressing modes, return the opcode which matches the opcodes
provided provided. */
*/
static static struct opinfo *
struct opinfo *
get_specific (opcode) get_specific (opcode)
struct opinfo *opcode; struct opinfo *opcode;
{ {
@ -640,11 +626,10 @@ check (operand, low, high)
return operand->X_add_number; return operand->X_add_number;
} }
static int log2[] = { 0, 0, 1, 0, 2 };
static int log2[] =
{0, 0, 1, 0, 2};
/* Now we know what sort of opcodes it is, let's build the bytes. */ /* Now we know what sort of opcodes it is, let's build the bytes. */
static void static void
build_Mytes (opcode) build_Mytes (opcode)
struct opinfo *opcode; struct opinfo *opcode;
@ -661,7 +646,8 @@ build_Mytes (opcode)
else if (opcode->amode == ADDR_PC_REL) else if (opcode->amode == ADDR_PC_REL)
{ {
int type; int type;
/* This is a relaxable insn, so we do some special handling */
/* This is a relaxable insn, so we do some special handling. */
type = opcode->val == OP_BRA ? UNCOND_BRANCH : COND_BRANCH; type = opcode->val == OP_BRA ? UNCOND_BRANCH : COND_BRANCH;
output = frag_var (rs_machine_dependent, output = frag_var (rs_machine_dependent,
md_relax_table[C (type, WORD_DISP)].rlx_length, md_relax_table[C (type, WORD_DISP)].rlx_length,
@ -678,21 +664,17 @@ build_Mytes (opcode)
GETINFO (size, type, pcrel); GETINFO (size, type, pcrel);
} }
/* If something special was done in the /* If something special was done in the expression modify the
expression modify the reloc type */ reloc type. */
if (tc_cons_reloc) if (tc_cons_reloc)
{
type = tc_cons_reloc; type = tc_cons_reloc;
}
/* 1 byte for the opcode + the bytes for the addrmode. */
/* 1 byte for the opcode + the bytes for the addrmode */
output = frag_more (size + 1); output = frag_more (size + 1);
if (opcode->amode == ADDR_BLOCK_MOVE) if (opcode->amode == ADDR_BLOCK_MOVE)
{ {
/* Two relocs for this one */ /* Two relocs for this one. */
fix_new_exp (frag_now, fix_new_exp (frag_now,
output + 1 - frag_now->fr_literal, output + 1 - frag_now->fr_literal,
1, 1,
@ -723,10 +705,9 @@ build_Mytes (opcode)
output[0] = opcode->val; output[0] = opcode->val;
} }
/* This is the guts of the machine-dependent assembler. STR points to a /* This is the guts of the machine-dependent assembler. STR points to
machine dependent instruction. This function is supposed to emit a machine dependent instruction. This function is supposed to emit
the frags/bytes it assembles to. the frags/bytes it assembles to. */
*/
void void
md_assemble (str) md_assemble (str)
@ -768,8 +749,7 @@ md_assemble (str)
if (opcode == 0) 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 (1); char *where = frag_more (1);
@ -782,7 +762,6 @@ md_assemble (str)
build_Mytes (opcode); build_Mytes (opcode);
} }
void void
tc_crawl_symbol_chain (headers) tc_crawl_symbol_chain (headers)
object_headers *headers; object_headers *headers;
@ -804,14 +783,15 @@ tc_headers_hook (headers)
printf (_("call to tc_headers_hook \n")); printf (_("call to tc_headers_hook \n"));
} }
/* Various routines to kill one day */ /* Various routines to kill one day. */
/* Equal to MAX_PRECISION in atof-ieee.c */ /* Equal to MAX_PRECISION in atof-ieee.c. */
#define MAX_LITTLENUMS 6 #define MAX_LITTLENUMS 6
/* Turn a string in input_line_pointer into a floating point constant of type /* Turn a string in input_line_pointer into a floating point constant
type, and store the appropriate bytes in *litP. The number of LITTLENUMS of type TYPE, and store the appropriate bytes in *LITP. The number
emitted is stored in *sizeP . An error message is returned, or NULL on OK. of LITTLENUMS emitted is stored in *SIZEP. An error message is
*/ returned, or NULL on OK. */
char * char *
md_atof (type, litP, sizeP) md_atof (type, litP, sizeP)
char type; char type;
@ -868,10 +848,9 @@ md_atof (type, litP, sizeP)
} }
int int
md_parse_option (c,a) md_parse_option (c, a)
int c; int c;
char *a; char *a;
{ {
return 1; return 1;
} }
@ -883,9 +862,9 @@ tc_Nout_fix_to_chars ()
abort (); abort ();
} }
/* /* Called after relaxing, change the frags so they know how big they
called after relaxing, change the frags so they know how big they are are. */
*/
void void
md_convert_frag (headers, seg, fragP) md_convert_frag (headers, seg, fragP)
object_headers *headers; object_headers *headers;
@ -894,7 +873,8 @@ md_convert_frag (headers, seg, fragP)
{ {
int disp_size = 0; int disp_size = 0;
int inst_size = 0; int inst_size = 0;
unsigned char *buffer = (unsigned char *) (fragP->fr_fix + fragP->fr_literal); unsigned char *buffer =
(unsigned char *) (fragP->fr_fix + fragP->fr_literal);
switch (fragP->fr_subtype) switch (fragP->fr_subtype)
{ {
@ -904,7 +884,7 @@ md_convert_frag (headers, seg, fragP)
inst_size = 1; inst_size = 1;
break; break;
/* cond branches to a known 16 bit displacement */ /* Conditional branches to a known 16 bit displacement. */
case C (COND_BRANCH, WORD_DISP): case C (COND_BRANCH, WORD_DISP):
switch (buffer[0]) switch (buffer[0])
{ {
@ -930,7 +910,7 @@ md_convert_frag (headers, seg, fragP)
} }
break; break;
case C (UNCOND_BRANCH, WORD_DISP): case C (UNCOND_BRANCH, WORD_DISP):
/* Unconditional branches to a known 16 bit displacement */ /* Unconditional branches to a known 16 bit displacement. */
switch (buffer[0]) switch (buffer[0])
{ {
@ -943,7 +923,7 @@ md_convert_frag (headers, seg, fragP)
abort (); abort ();
} }
break; break;
/* got to create a branch over a reloc here */ /* Got to create a branch over a reloc here. */
case C (COND_BRANCH, UNDEF_WORD_DISP): case C (COND_BRANCH, UNDEF_WORD_DISP):
buffer[0] ^= 0x20; /* invert test */ buffer[0] ^= 0x20; /* invert test */
buffer[1] = 3; buffer[1] = 3;
@ -981,8 +961,9 @@ md_convert_frag (headers, seg, fragP)
} }
if (inst_size) if (inst_size)
{ {
/* Get the address of the end of the instruction */ /* Get the address of the end of the instruction. */
int next_inst = fragP->fr_fix + fragP->fr_address + disp_size + inst_size; int next_inst = (fragP->fr_fix + fragP->fr_address
+ disp_size + inst_size);
int targ_addr = (S_GET_VALUE (fragP->fr_symbol) + int targ_addr = (S_GET_VALUE (fragP->fr_symbol) +
fragP->fr_offset); fragP->fr_offset);
int disp = targ_addr - next_inst; int disp = targ_addr - next_inst;
@ -993,7 +974,6 @@ md_convert_frag (headers, seg, fragP)
} }
} }
valueT valueT
md_section_align (seg, size) md_section_align (seg, size)
segT seg; segT seg;
@ -1001,7 +981,6 @@ md_section_align (seg, size)
{ {
return ((size + (1 << section_alignment[(int) seg]) - 1) return ((size + (1 << section_alignment[(int) seg]) - 1)
& (-1 << section_alignment[(int) seg])); & (-1 << section_alignment[(int) seg]));
} }
void void
@ -1160,14 +1139,9 @@ tc_coff_sizemachdep (frag)
return md_relax_table[frag->fr_subtype].rlx_length; return md_relax_table[frag->fr_subtype].rlx_length;
} }
/* Called just before address relaxation, return the length by which a
fragment must grow to reach it's destination. */
/*
called just before address relaxation, return the length
by which a fragment must grow to reach it's destination
*/
int int
md_estimate_size_before_relax (fragP, segment_type) md_estimate_size_before_relax (fragP, segment_type)
register fragS *fragP; register fragS *fragP;
@ -1181,17 +1155,18 @@ md_estimate_size_before_relax (fragP, segment_type)
abort (); abort ();
case C (COND_BRANCH, UNDEF_BYTE_DISP): case C (COND_BRANCH, UNDEF_BYTE_DISP):
case C (UNCOND_BRANCH, UNDEF_BYTE_DISP): case C (UNCOND_BRANCH, UNDEF_BYTE_DISP):
/* used to be a branch to somewhere which was unknown */ /* Used to be a branch to somewhere which was unknown. */
if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type) if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type)
{ {
/* Got a symbol and it's defined in this segment, become byte /* Got a symbol and it's defined in this segment, become byte
sized - maybe it will fix up */ sized - maybe it will fix up. */
fragP->fr_subtype = C (what, BYTE_DISP); fragP->fr_subtype = C (what, BYTE_DISP);
fragP->fr_var = md_relax_table[C (what, BYTE_DISP)].rlx_length; fragP->fr_var = md_relax_table[C (what, BYTE_DISP)].rlx_length;
} }
else else
{ {
/* Its got a segment, but its not ours, so it will always be long */ /* Its got a segment, but its not ours, so it will always be
long. */
fragP->fr_subtype = C (what, UNDEF_WORD_DISP); fragP->fr_subtype = C (what, UNDEF_WORD_DISP);
fragP->fr_var = md_relax_table[C (what, WORD_DISP)].rlx_length; fragP->fr_var = md_relax_table[C (what, WORD_DISP)].rlx_length;
return md_relax_table[C (what, WORD_DISP)].rlx_length; return md_relax_table[C (what, WORD_DISP)].rlx_length;
@ -1200,8 +1175,6 @@ md_estimate_size_before_relax (fragP, segment_type)
return fragP->fr_var; return fragP->fr_var;
} }
CONST char *md_shortopts = ""; CONST char *md_shortopts = "";
struct option md_longopts[] = { struct option md_longopts[] = {
#define OPTION_RELAX (OPTION_MD_BASE) #define OPTION_RELAX (OPTION_MD_BASE)
@ -1212,7 +1185,6 @@ void
md_show_usage (stream) md_show_usage (stream)
FILE *stream; FILE *stream;
{ {
} }
size_t md_longopts_size = sizeof(md_longopts); size_t md_longopts_size = sizeof (md_longopts);