This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
[patch] gas/config/tc-w65.c: Fix formatting.
- To: binutils at sourceware dot cygnus dot com
- Subject: [patch] gas/config/tc-w65.c: Fix formatting.
- From: Kazu Hirata <kazu at hxi dot com>
Hi,
Attached is a patch to fix formatting of gas/config/tc-w65.c.
Thanks,
Kazu Hirata
===File ~/gnu/binutils/ChangeLog-tc-w65=====================
2000-07-11 Kazu Hirata <kazu@hxi.com>
* config/tc-w65.c: Fix formatting.
============================================================
===File ~/gnu/binutils/tc-w65.patch=========================
Index: tc-w65.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-w65.c,v
retrieving revision 1.4
diff -u -r1.4 tc-w65.c
--- tc-w65.c 2000/06/25 17:59:21 1.4
+++ tc-w65.c 2000/07/11 15:58:43
@@ -18,10 +18,7 @@
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/*
- Written By Steve Chamberlain
- sac@cygnus.com
- */
+/* Written By Steve Chamberlain <sac@cygnus.com>. */
#include <stdio.h>
#include "as.h"
@@ -37,10 +34,10 @@
/* This table describes all the machine specific pseudo-ops the assembler
has to support. The fields are:
+
pseudo-op name without dot
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_BCS 0xB0
@@ -63,12 +60,12 @@
{0, 0, 0}
};
-
void cons ();
void s_align_bytes ();
-
-/*int md_reloc_size; */
+#if 0
+int md_reloc_size;
+#endif
static int relax; /* set if -relax seen */
@@ -79,16 +76,11 @@
/* or 0d1.2345e12 */
const char FLT_CHARS[] = "rRsSfFdDxXpP";
-
-
static struct hash_control *opcode_hash_control; /* Opcode mnemonics */
int M; /* M flag */
int X; /* X flag */
-
-
-
#define C(a,b) ENCODE_RELAX(a,b)
#define ENCODE_RELAX(what,length) (((what) << 2) + (length))
@@ -109,12 +101,10 @@
#define WORD_B 32768
relax_typeS md_relax_table[C (END, 0)];
-
-/*
- 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
s_longa (xmode)
@@ -136,6 +126,7 @@
as_bad (_("need on or off."));
demand_empty_rest_of_line ();
}
+
void
md_begin ()
{
@@ -145,7 +136,7 @@
opcode_hash_control = hash_new ();
- /* Insert unique names into hash table */
+ /* Insert unique names into hash table. */
for (opcode = optable; opcode->name; opcode++)
{
if (strcmp (prev_name, opcode->name))
@@ -156,12 +147,11 @@
else
{
/* Make all the opcodes with the same name point to the same
- string */
+ string. */
opcode->name = prev_name;
}
}
-
/* Initialize the relax table. We use a local variable to avoid
warnings about modifying a supposedly const data structure. */
table = (relax_typeS *) md_relax_table;
@@ -191,7 +181,6 @@
static expressionS immediate; /* absolute expression */
static expressionS immediate1; /* absolute expression */
-
static symbolS *
dot ()
{
@@ -210,6 +199,7 @@
int expr_size;
int expr_shift;
int tc_cons_reloc;
+
void
w65_expression (dest, bytes)
expressionS *dest;
@@ -241,8 +231,8 @@
}
int amode;
-static
-char *
+
+static char *
parse_exp (s, bytes)
char *s;
int bytes;
@@ -260,15 +250,14 @@
return new;
}
-
-static
-char *
+static char *
get_operands (info, ptr)
struct opinfo *info;
char *ptr;
{
register int override_len = 0;
register int bytes = 0;
+
while (*ptr == ' ')
ptr++;
@@ -429,7 +418,8 @@
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;
bytes = 1;
@@ -460,7 +450,6 @@
}
}
-
}
else if (ptr[0] == '[')
{
@@ -476,17 +465,16 @@
}
else
{
- if (info->code == O_jmp)
+ if (info->code == O_jmp)
+ {
+ bytes = 2;
+ amode = ADDR_ABS_IND_LONG;
+ }
+ else
{
- bytes = 2;
- amode = ADDR_ABS_IND_LONG;
- }
- else
-{
- bytes = 1;
-
- amode = ADDR_DIR_IND_LONG;
- }
+ bytes = 1;
+ amode = ADDR_DIR_IND_LONG;
+ }
}
}
}
@@ -576,9 +564,9 @@
{
case 0:
if (amode == ADDR_DIR)
- tc_cons_reloc = R_W65_DP;
+ tc_cons_reloc = R_W65_DP;
else
-tc_cons_reloc = R_W65_ABS8;
+ tc_cons_reloc = R_W65_ABS8;
break;
case 1:
tc_cons_reloc = R_W65_ABS8S8;
@@ -607,11 +595,9 @@
/* Passed a pointer to a list of opcodes which use different
addressing modes, return the opcode which matches the opcodes
- provided
- */
+ provided. */
-static
-struct opinfo *
+static struct opinfo *
get_specific (opcode)
struct opinfo *opcode;
{
@@ -639,12 +625,11 @@
}
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. */
+
static void
build_Mytes (opcode)
struct opinfo *opcode;
@@ -661,7 +646,8 @@
else if (opcode->amode == ADDR_PC_REL)
{
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;
output = frag_var (rs_machine_dependent,
md_relax_table[C (type, WORD_DISP)].rlx_length,
@@ -678,21 +664,17 @@
GETINFO (size, type, pcrel);
}
- /* If something special was done in the
- expression modify the reloc type */
+ /* If something special was done in the expression modify the
+ reloc type. */
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);
if (opcode->amode == ADDR_BLOCK_MOVE)
{
- /* Two relocs for this one */
+ /* Two relocs for this one. */
fix_new_exp (frag_now,
output + 1 - frag_now->fr_literal,
1,
@@ -723,10 +705,9 @@
output[0] = opcode->val;
}
-/* 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 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 to. */
void
md_assemble (str)
@@ -768,9 +749,8 @@
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);
where[0] = 0x0;
@@ -782,7 +762,6 @@
build_Mytes (opcode);
}
-
void
tc_crawl_symbol_chain (headers)
object_headers *headers;
@@ -804,14 +783,15 @@
printf (_("call to tc_headers_hook \n"));
}
-/* Various routines to kill one day */
-/* Equal to MAX_PRECISION in atof-ieee.c */
+/* Various routines to kill one day. */
+/* 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;
@@ -868,10 +848,9 @@
}
int
-md_parse_option (c,a)
- int c;
- char *a;
-
+md_parse_option (c, a)
+ int c;
+ char *a;
{
return 1;
}
@@ -882,10 +861,10 @@
printf (_("call to tc_Nout_fix_to_chars \n"));
abort ();
}
+
+/* Called after relaxing, change the frags so they know how big they
+ are. */
-/*
-called after relaxing, change the frags so they know how big they are
-*/
void
md_convert_frag (headers, seg, fragP)
object_headers *headers;
@@ -894,7 +873,8 @@
{
int disp_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)
{
@@ -904,7 +884,7 @@
inst_size = 1;
break;
- /* cond branches to a known 16 bit displacement */
+ /* Conditional branches to a known 16 bit displacement. */
case C (COND_BRANCH, WORD_DISP):
switch (buffer[0])
{
@@ -930,7 +910,7 @@
}
break;
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])
{
@@ -943,7 +923,7 @@
abort ();
}
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):
buffer[0] ^= 0x20; /* invert test */
buffer[1] = 3;
@@ -981,8 +961,9 @@
}
if (inst_size)
{
- /* Get the address of the end of the instruction */
- int next_inst = fragP->fr_fix + fragP->fr_address + disp_size + inst_size;
+ /* Get the address of the end of the instruction. */
+ int next_inst = (fragP->fr_fix + fragP->fr_address
+ + disp_size + inst_size);
int targ_addr = (S_GET_VALUE (fragP->fr_symbol) +
fragP->fr_offset);
int disp = targ_addr - next_inst;
@@ -993,7 +974,6 @@
}
}
-
valueT
md_section_align (seg, size)
segT seg;
@@ -1001,7 +981,6 @@
{
return ((size + (1 << section_alignment[(int) seg]) - 1)
& (-1 << section_alignment[(int) seg]));
-
}
void
@@ -1080,7 +1059,7 @@
void
tc_coff_symbol_emit_hook (x)
- symbolS *x;
+ symbolS *x;
{
}
@@ -1159,15 +1138,10 @@
{
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
md_estimate_size_before_relax (fragP, segment_type)
register fragS *fragP;
@@ -1181,17 +1155,18 @@
abort ();
case C (COND_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)
{
/* 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_var = md_relax_table[C (what, BYTE_DISP)].rlx_length;
}
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_var = md_relax_table[C (what, WORD_DISP)].rlx_length;
return md_relax_table[C (what, WORD_DISP)].rlx_length;
@@ -1200,8 +1175,6 @@
return fragP->fr_var;
}
-
-
CONST char *md_shortopts = "";
struct option md_longopts[] = {
#define OPTION_RELAX (OPTION_MD_BASE)
@@ -1212,7 +1185,6 @@
md_show_usage (stream)
FILE *stream;
{
-
}
-size_t md_longopts_size = sizeof(md_longopts);
+size_t md_longopts_size = sizeof (md_longopts);
============================================================