OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Undo some formatting fixes

This commit is contained in:
Nick Clifton 2000-08-02 01:00:15 +00:00
parent 2efaf10b6d
commit d78c7dcade
2 changed files with 401 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gas/ChangeLog
View File

@ -1,6 +1,7 @@
2000-08-01 Nick Clifton <nickc@cygnus.com>
* config/tc-arm.c (do_mrs): Fix skip fo 'cpsr_all' flag.
Undo some formatting fixes.
2000-08-01 Kazu Hirata <kazu@hxi.com>

133
gas/config/tc-arm.c
View File

@ -255,11 +255,8 @@ static CONST struct asm_cond conds[] =
the set_bits: */
struct asm_flg
{
/* Basic flag string. */
CONST char *template;
/* Bits to set. */
unsigned long set_bits;
CONST char * template; /* Basic flag string. */
unsigned long set_bits; /* Bits to set. */
};
static CONST struct asm_flg s_flag[] =
@ -1087,7 +1084,8 @@ static int my_get_expression PARAMS ((expressionS *, char **));
CONST pseudo_typeS md_pseudo_table[] =
{
{ "req", s_req, 0 }, /* Never called becasue '.req' does not start line. */
/* Never called becasue '.req' does not start line. */
{ "req", s_req, 0 },
{ "bss", s_bss, 0 },
{ "align", s_align, 0 },
{ "arm", s_arm, 0 },
@ -1197,24 +1195,15 @@ add_to_lit_pool ()
static void
symbol_locate (symbolP, name, segment, valu, frag)
symbolS * symbolP;
/* It is copied, the caller can modify. */
CONST char *name;
/* Segment identifier (SEG_<something>). */
segT segment;
/* Symbol value. */
valueT valu;
/* Associated fragment. */
fragS *frag;
CONST char * name; /* It is copied, the caller can modify. */
segT segment; /* Segment identifier (SEG_<something>). */
valueT valu; /* Symbol value. */
fragS * frag; /* Associated fragment. */
{
unsigned int name_length;
char * preserved_copy_of_name;
/* +1 for \0. */
name_length = strlen (name) + 1;
name_length = strlen (name) + 1; /* +1 for \0. */
obstack_grow (&notes, name, name_length);
preserved_copy_of_name = obstack_finish (&notes);
#ifdef STRIP_UNDERSCORE
@ -1269,8 +1258,7 @@ validate_immediate (val)
for (i = 0; i < 32; i += 2)
if ((a = rotate_left (val, i)) <= 0xff)
/* 12-bit pack: [shift-cnt,const]. */
return a | (i << 7);
return a | (i << 7); /* 12-bit pack: [shift-cnt,const]. */
return FAIL;
}
@ -1438,7 +1426,6 @@ s_force_thumb (ignore)
This is used by gcc/config/arm/lib1funcs.asm for example
to compile interworking support functions even if the
target processor should not support interworking. */
if (! thumb_mode)
{
thumb_mode = 2;
@ -1478,8 +1465,9 @@ s_thumb_set (equiv)
register char * end_name;
register symbolS * symbolP;
/* Especial apologies for the random logic: This just grew, and
could be parsed much more simply! Dean in haste. */
/* Especial apologies for the random logic:
This just grew, and could be parsed much more simply!
Dean - in haste. */
name = input_line_pointer;
delim = get_symbol_end ();
end_name = input_line_pointer;
@ -1516,6 +1504,7 @@ s_thumb_set (equiv)
{
extern struct list_info_struct * listing_tail;
fragS * dummy_frag = (fragS *) xmalloc (sizeof (fragS));
memset (dummy_frag, 0, sizeof (fragS));
dummy_frag->fr_type = rs_fill;
dummy_frag->line = listing_tail;
@ -1611,6 +1600,7 @@ opcode_select (width)
{
if (! (cpu_variant & ARM_THUMB))
as_bad (_("selected processor does not support THUMB opcodes"));
thumb_mode = 1;
/* No need to force the alignment, since we will have been
coming from ARM mode, which is word-aligned. */
@ -1623,9 +1613,12 @@ opcode_select (width)
{
if ((cpu_variant & ARM_ANY) == ARM_THUMB)
as_bad (_("selected processor does not support ARM opcodes"));
thumb_mode = 0;
if (!need_pass_2)
frag_align (2, 0, 0);
record_alignment (now_seg, 1);
}
break;
@ -1703,8 +1696,8 @@ skip_past_comma (str)
/* A standard register must be given at this point.
SHIFT is the place to put it in inst.instruction.
Restore input start point on err.
Return the reg#, or FAIL. */
Restores input start point on error.
Returns the reg#, or FAIL. */
static int
reg_required_here (str, shift)
@ -2201,8 +2194,7 @@ do_msr (str, flags)
UMULL RdLo, RdHi, Rm, Rs
SMULL RdLo, RdHi, Rm, Rs
UMLAL RdLo, RdHi, Rm, Rs
SMLAL RdLo, RdHi, Rm, Rs
*/
SMLAL RdLo, RdHi, Rm, Rs. */
static void
do_mull (str, flags)
@ -2370,7 +2362,7 @@ do_mla (str, flags)
return;
}
/* Return the index into fp_values of a floating point number,
/* Returns the index into fp_values of a floating point number,
or -1 if not in the table. */
static int
@ -2554,6 +2546,7 @@ decode_shift (str, unrestrict)
{
inst.error = NULL;
p ++;
if (my_get_expression (& inst.reloc.exp, & p))
return FAIL;
@ -2569,8 +2562,8 @@ decode_shift (str, unrestrict)
return FAIL;
}
/* Shifts of zero should be converted to lsl (which is
zero). */
/* Shifts of zero should be converted to lsl
(which is zero). */
if (num == 0)
{
* str = p;
@ -2590,6 +2583,7 @@ decode_shift (str, unrestrict)
inst.reloc.type = BFD_RELOC_ARM_SHIFT_IMM;
inst.reloc.pc_rel = 0;
inst.instruction |= shft->value;
* str = p;
return SUCCESS;
}
@ -2608,15 +2602,14 @@ decode_shift (str, unrestrict)
}
/* Do those data_ops which can take a negative immediate constant
by altering the instuction. A bit of a hack really. */
/* MOV <-> MVN
by altering the instuction. A bit of a hack really.
MOV <-> MVN
AND <-> BIC
ADC <-> SBC
by inverting the second operand, and
ADD <-> SUB
CMP <-> CMN
by negating the second operand.
*/
by negating the second operand. */
static int
negate_data_op (instruction, value)
@ -2764,7 +2757,7 @@ data_op2 (str)
if (value == FAIL)
{
/* Can't be done. Perhaps the code reads something like
"add Rd, Rn, #-n", where "sub Rd, Rn, #n" would be ok. */
"add Rd, Rn, #-n", where "sub Rd, Rn, #n" would be OK. */
if ((value = negate_data_op (&inst.instruction,
inst.reloc.exp.X_add_number))
== FAIL)
@ -4447,7 +4440,6 @@ thumb_shift (str, shift)
{
/* Value isn't known yet, create a dummy reloc and let reloc
hacking fix it up. */
inst.reloc.type = BFD_RELOC_ARM_THUMB_SHIFT;
}
else
@ -6259,6 +6251,7 @@ tc_gen_reloc (section, fixp)
default:
{
char * type;
switch (fixp->fx_r_type)
{
case BFD_RELOC_ARM_IMMEDIATE: type = "IMMEDIATE"; break;
@ -6485,7 +6478,8 @@ md_assemble (str)
if (cond)
{
if (cond->value == 0xf0000000)
as_tsktsk (_("Warning: Use of the 'nv' conditional is deprecated\n"));
as_tsktsk (
_("Warning: Use of the 'nv' conditional is deprecated\n"));
cond_code = cond->value;
r += 2;
@ -6638,34 +6632,33 @@ md_assemble (str)
}
/* md_parse_option
* Invocation line includes a switch not recognized by the base assembler.
* See if it's a processor-specific option. These are:
* Cpu variants, the arm part is optional:
* -m[arm]1 Currently not supported.
* -m[arm]2, -m[arm]250 Arm 2 and Arm 250 processor
* -m[arm]3 Arm 3 processor
* -m[arm]6[xx], Arm 6 processors
* -m[arm]7[xx][t][[d]m] Arm 7 processors
* -m[arm]8[10] Arm 8 processors
* -m[arm]9[20][tdmi] Arm 9 processors
* -mstrongarm[110[0]] StrongARM processors
* -m[arm]v[2345[t]] Arm architectures
* -mall All (except the ARM1)
* FP variants:
* -mfpa10, -mfpa11 FPA10 and 11 co-processor instructions
* -mfpe-old (No float load/store multiples)
* -mno-fpu Disable all floating point instructions
* Run-time endian selection:
* -EB big endian cpu
* -EL little endian cpu
* ARM Procedure Calling Standard:
* -mapcs-32 32 bit APCS
* -mapcs-26 26 bit APCS
* -mapcs-float Pass floats in float regs
* -mapcs-reentrant Position independent code
* -mthumb-interwork Code supports Arm/Thumb interworking
* -moabi Old ELF ABI
*/
Invocation line includes a switch not recognized by the base assembler.
See if it's a processor-specific option. These are:
Cpu variants, the arm part is optional:
-m[arm]1 Currently not supported.
-m[arm]2, -m[arm]250 Arm 2 and Arm 250 processor
-m[arm]3 Arm 3 processor
-m[arm]6[xx], Arm 6 processors
-m[arm]7[xx][t][[d]m] Arm 7 processors
-m[arm]8[10] Arm 8 processors
-m[arm]9[20][tdmi] Arm 9 processors
-mstrongarm[110[0]] StrongARM processors
-m[arm]v[2345[t]] Arm architectures
-mall All (except the ARM1)
FP variants:
-mfpa10, -mfpa11 FPA10 and 11 co-processor instructions
-mfpe-old (No float load/store multiples)
-mno-fpu Disable all floating point instructions
Run-time endian selection:
-EB big endian cpu
-EL little endian cpu
ARM Procedure Calling Standard:
-mapcs-32 32 bit APCS
-mapcs-26 26 bit APCS
-mapcs-float Pass floats in float regs
-mapcs-reentrant Position independent code
-mthumb-interwork Code supports Arm/Thumb interworking
-moabi Old ELF ABI */
CONST char * md_shortopts = "m:k";
@ -7195,8 +7188,7 @@ arm_adjust_symtab ()
{
/* Mark the symbol as a Thumb function. */
if ( S_GET_STORAGE_CLASS (sym) == C_STAT
/* This can happen! */
|| S_GET_STORAGE_CLASS (sym) == C_LABEL)
|| S_GET_STORAGE_CLASS (sym) == C_LABEL) /* This can happen! */
S_SET_STORAGE_CLASS (sym, C_THUMBSTATFUNC);
else if (S_GET_STORAGE_CLASS (sym) == C_EXT)
@ -7205,8 +7197,7 @@ arm_adjust_symtab ()
as_bad (_("%s: unexpected function type: %d"),
S_GET_NAME (sym), S_GET_STORAGE_CLASS (sym));
}
else
switch (S_GET_STORAGE_CLASS (sym))
else switch (S_GET_STORAGE_CLASS (sym))
{
case C_EXT:
S_SET_STORAGE_CLASS (sym, C_THUMBEXT);