1992-02-18 11:27:34 +00:00
|
|
|
|
/* m88k.c -- Assembler for the Motorola 88000
|
|
|
|
|
Contributed by Devon Bowen of Buffalo University
|
|
|
|
|
and Torbjorn Granlund of the Swedish Institute of Computer Science.
|
1996-02-08 00:22:02 +00:00
|
|
|
|
Copyright (C) 1989, 90, 91, 92, 93, 94, 95, 1996
|
|
|
|
|
Free Software Foundation, Inc.
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
|
|
|
|
|
|
|
|
|
GAS is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 1, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GAS is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GAS; see the file COPYING. If not, write to
|
1995-07-06 21:18:08 +00:00
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "as.h"
|
1995-11-03 03:58:09 +00:00
|
|
|
|
#include "subsegs.h"
|
1993-06-10 01:33:42 +00:00
|
|
|
|
#include "m88k-opcode.h"
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
struct field_val_assoc
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
unsigned val;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct field_val_assoc cr_regs[] =
|
|
|
|
|
{
|
|
|
|
|
{"PID", 0},
|
|
|
|
|
{"PSR", 1},
|
|
|
|
|
{"EPSR", 2},
|
|
|
|
|
{"SSBR", 3},
|
|
|
|
|
{"SXIP", 4},
|
|
|
|
|
{"SNIP", 5},
|
|
|
|
|
{"SFIP", 6},
|
|
|
|
|
{"VBR", 7},
|
|
|
|
|
{"DMT0", 8},
|
|
|
|
|
{"DMD0", 9},
|
|
|
|
|
{"DMA0", 10},
|
|
|
|
|
{"DMT1", 11},
|
|
|
|
|
{"DMD1", 12},
|
|
|
|
|
{"DMA1", 13},
|
|
|
|
|
{"DMT2", 14},
|
|
|
|
|
{"DMD2", 15},
|
|
|
|
|
{"DMA2", 16},
|
|
|
|
|
{"SR0", 17},
|
|
|
|
|
{"SR1", 18},
|
|
|
|
|
{"SR2", 19},
|
|
|
|
|
{"SR3", 20},
|
|
|
|
|
|
|
|
|
|
{NULL, 0},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct field_val_assoc fcr_regs[] =
|
|
|
|
|
{
|
|
|
|
|
{"FPECR", 0},
|
|
|
|
|
{"FPHS1", 1},
|
|
|
|
|
{"FPLS1", 2},
|
|
|
|
|
{"FPHS2", 3},
|
|
|
|
|
{"FPLS2", 4},
|
|
|
|
|
{"FPPT", 5},
|
|
|
|
|
{"FPRH", 6},
|
|
|
|
|
{"FPRL", 7},
|
|
|
|
|
{"FPIT", 8},
|
|
|
|
|
|
|
|
|
|
{"FPSR", 62},
|
|
|
|
|
{"FPCR", 63},
|
|
|
|
|
|
|
|
|
|
{NULL, 0},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct field_val_assoc cmpslot[] =
|
|
|
|
|
{
|
1993-06-10 01:33:42 +00:00
|
|
|
|
/* Integer Floating point */
|
1992-11-23 20:42:33 +00:00
|
|
|
|
{"nc", 0},
|
|
|
|
|
{"cp", 1},
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{"eq", 2},
|
|
|
|
|
{"ne", 3},
|
|
|
|
|
{"gt", 4},
|
|
|
|
|
{"le", 5},
|
|
|
|
|
{"lt", 6},
|
|
|
|
|
{"ge", 7},
|
1993-06-10 01:33:42 +00:00
|
|
|
|
{"hi", 8}, {"ou", 8},
|
|
|
|
|
{"ls", 9}, {"ib", 9},
|
|
|
|
|
{"lo", 10}, {"in", 10},
|
|
|
|
|
{"hs", 11}, {"ob", 11},
|
|
|
|
|
{"be", 12}, {"ue", 12},
|
|
|
|
|
{"nb", 13}, {"lg", 13},
|
|
|
|
|
{"he", 14}, {"ug", 14},
|
|
|
|
|
{"nh", 15}, {"ule", 15},
|
|
|
|
|
{"ul", 16},
|
|
|
|
|
{"uge", 17},
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
{NULL, 0},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct field_val_assoc cndmsk[] =
|
|
|
|
|
{
|
|
|
|
|
{"gt0", 1},
|
|
|
|
|
{"eq0", 2},
|
|
|
|
|
{"ge0", 3},
|
|
|
|
|
{"lt0", 12},
|
|
|
|
|
{"ne0", 13},
|
|
|
|
|
{"le0", 14},
|
|
|
|
|
|
|
|
|
|
{NULL, 0},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct m88k_insn
|
|
|
|
|
{
|
|
|
|
|
unsigned long opcode;
|
|
|
|
|
expressionS exp;
|
|
|
|
|
enum reloc_type reloc;
|
|
|
|
|
};
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *get_bf PARAMS ((char *param, unsigned *valp));
|
|
|
|
|
static char *get_cmp PARAMS ((char *param, unsigned *valp));
|
|
|
|
|
static char *get_cnd PARAMS ((char *param, unsigned *valp));
|
|
|
|
|
static char *get_cr PARAMS ((char *param, unsigned *regnop));
|
|
|
|
|
static char *get_fcr PARAMS ((char *param, unsigned *regnop));
|
|
|
|
|
static char *get_imm16 PARAMS ((char *param, struct m88k_insn *insn));
|
|
|
|
|
static char *get_o6 PARAMS ((char *param, unsigned *valp));
|
|
|
|
|
static char *get_reg PARAMS ((char *param, unsigned *regnop, int reg_prefix));
|
|
|
|
|
static char *get_vec9 PARAMS ((char *param, unsigned *valp));
|
|
|
|
|
static char *getval PARAMS ((char *param, unsigned int *valp));
|
|
|
|
|
|
|
|
|
|
static char *get_pcr PARAMS ((char *param, struct m88k_insn *insn,
|
|
|
|
|
enum reloc_type reloc));
|
|
|
|
|
|
|
|
|
|
static int calcop PARAMS ((struct m88k_opcode *format,
|
|
|
|
|
char *param, struct m88k_insn *insn));
|
|
|
|
|
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
extern char *myname;
|
|
|
|
|
static struct hash_control *op_hash = NULL;
|
|
|
|
|
|
|
|
|
|
/* These bits should be turned off in the first address of every segment */
|
|
|
|
|
int md_seg_align = 7;
|
|
|
|
|
|
|
|
|
|
/* These chars start a comment anywhere in a source file (except inside
|
|
|
|
|
another comment */
|
1992-11-10 18:17:00 +00:00
|
|
|
|
const char comment_chars[] = ";";
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
/* These chars only start a comment at the beginning of a line. */
|
1992-11-10 18:17:00 +00:00
|
|
|
|
const char line_comment_chars[] = "#";
|
|
|
|
|
|
|
|
|
|
const char line_separator_chars[] = "";
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
/* Chars that can be used to separate mant from exp in floating point nums */
|
1992-11-10 18:17:00 +00:00
|
|
|
|
const char EXP_CHARS[] = "eE";
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
/* Chars that mean this number is a floating point constant */
|
|
|
|
|
/* as in 0f123.456 */
|
|
|
|
|
/* or 0H1.234E-12 (see exp chars above) */
|
1992-11-10 18:17:00 +00:00
|
|
|
|
const char FLT_CHARS[] = "dDfF";
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
extern void float_cons (), cons (), s_globl (), s_space (),
|
1993-03-05 17:10:02 +00:00
|
|
|
|
s_set (), s_lcomm ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
const pseudo_typeS md_pseudo_table[] =
|
|
|
|
|
{
|
1993-07-15 16:02:21 +00:00
|
|
|
|
{"align", s_align_bytes, 4},
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{"def", s_set, 0},
|
|
|
|
|
{"dfloat", float_cons, 'd'},
|
|
|
|
|
{"ffloat", float_cons, 'f'},
|
|
|
|
|
{"global", s_globl, 0},
|
1992-11-23 20:42:33 +00:00
|
|
|
|
{"half", cons, 2},
|
1993-07-15 16:02:21 +00:00
|
|
|
|
{"bss", s_lcomm, 1},
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{"string", stringer, 0},
|
1992-11-23 20:42:33 +00:00
|
|
|
|
{"word", cons, 4},
|
1993-07-23 02:55:25 +00:00
|
|
|
|
/* Force set to be treated as an instruction. */
|
|
|
|
|
{"set", NULL, 0},
|
1995-07-05 17:13:16 +00:00
|
|
|
|
{".set", s_set, 0},
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_begin ()
|
|
|
|
|
{
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
const char *retval = NULL;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
unsigned int i = 0;
|
|
|
|
|
|
|
|
|
|
/* initialize hash table */
|
|
|
|
|
|
|
|
|
|
op_hash = hash_new ();
|
|
|
|
|
|
|
|
|
|
/* loop until you see the end of the list */
|
|
|
|
|
|
|
|
|
|
while (*m88k_opcodes[i].name)
|
|
|
|
|
{
|
|
|
|
|
char *name = m88k_opcodes[i].name;
|
|
|
|
|
|
|
|
|
|
/* hash each mnemonic and record its position */
|
|
|
|
|
|
|
|
|
|
retval = hash_insert (op_hash, name, &m88k_opcodes[i]);
|
|
|
|
|
|
1993-09-28 04:47:32 +00:00
|
|
|
|
if (retval != NULL)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
as_fatal ("Can't hash instruction '%s':%s",
|
1992-11-23 20:42:33 +00:00
|
|
|
|
m88k_opcodes[i].name, retval);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
/* skip to next unique mnemonic or end of list */
|
|
|
|
|
|
|
|
|
|
for (i++; !strcmp (m88k_opcodes[i].name, name); i++)
|
|
|
|
|
;
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-06-03 17:42:27 +00:00
|
|
|
|
|
|
|
|
|
CONST char *md_shortopts = "";
|
|
|
|
|
struct option md_longopts[] = {
|
|
|
|
|
{NULL, no_argument, NULL, 0}
|
|
|
|
|
};
|
|
|
|
|
size_t md_longopts_size = sizeof(md_longopts);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
1993-07-09 18:31:36 +00:00
|
|
|
|
int
|
1994-06-03 17:42:27 +00:00
|
|
|
|
md_parse_option (c, arg)
|
|
|
|
|
int c;
|
|
|
|
|
char *arg;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
1993-07-09 18:31:36 +00:00
|
|
|
|
return 0;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
1994-06-03 17:42:27 +00:00
|
|
|
|
void
|
|
|
|
|
md_show_usage (stream)
|
|
|
|
|
FILE *stream;
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
void
|
|
|
|
|
md_assemble (op)
|
|
|
|
|
char *op;
|
|
|
|
|
{
|
|
|
|
|
char *param, *thisfrag;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
char c;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
struct m88k_opcode *format;
|
|
|
|
|
struct m88k_insn insn;
|
|
|
|
|
|
|
|
|
|
assert (op);
|
|
|
|
|
|
|
|
|
|
/* skip over instruction to find parameters */
|
|
|
|
|
|
|
|
|
|
for (param = op; *param != 0 && !isspace (*param); param++)
|
|
|
|
|
;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
c = *param;
|
|
|
|
|
*param++ = '\0';
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
/* try to find the instruction in the hash table */
|
|
|
|
|
|
|
|
|
|
if ((format = (struct m88k_opcode *) hash_find (op_hash, op)) == NULL)
|
|
|
|
|
{
|
1993-07-21 17:19:33 +00:00
|
|
|
|
as_bad ("Invalid mnemonic '%s'", op);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* try parsing this instruction into insn */
|
|
|
|
|
|
|
|
|
|
insn.exp.X_add_symbol = 0;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
insn.exp.X_op_symbol = 0;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
insn.exp.X_add_number = 0;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
insn.exp.X_op = O_illegal;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
insn.reloc = NO_RELOC;
|
|
|
|
|
|
|
|
|
|
while (!calcop (format, param, &insn))
|
|
|
|
|
{
|
|
|
|
|
/* if it doesn't parse try the next instruction */
|
|
|
|
|
|
|
|
|
|
if (!strcmp (format[0].name, format[1].name))
|
|
|
|
|
format++;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
as_fatal ("Parameter syntax error");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* grow the current frag and plop in the opcode */
|
|
|
|
|
|
|
|
|
|
thisfrag = frag_more (4);
|
|
|
|
|
md_number_to_chars (thisfrag, insn.opcode, 4);
|
|
|
|
|
|
|
|
|
|
/* if this instruction requires labels mark it for later */
|
|
|
|
|
|
|
|
|
|
switch (insn.reloc)
|
|
|
|
|
{
|
|
|
|
|
case NO_RELOC:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_LO16:
|
|
|
|
|
case RELOC_HI16:
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
fix_new_exp (frag_now,
|
|
|
|
|
thisfrag - frag_now->fr_literal + 2,
|
|
|
|
|
2,
|
|
|
|
|
&insn.exp,
|
|
|
|
|
0,
|
|
|
|
|
insn.reloc);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_IW16:
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
fix_new_exp (frag_now,
|
|
|
|
|
thisfrag - frag_now->fr_literal,
|
|
|
|
|
4,
|
|
|
|
|
&insn.exp,
|
|
|
|
|
0,
|
|
|
|
|
insn.reloc);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC16:
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
fix_new_exp (frag_now,
|
|
|
|
|
thisfrag - frag_now->fr_literal + 2,
|
|
|
|
|
2,
|
|
|
|
|
&insn.exp,
|
|
|
|
|
1,
|
|
|
|
|
insn.reloc);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC26:
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
fix_new_exp (frag_now,
|
|
|
|
|
thisfrag - frag_now->fr_literal,
|
|
|
|
|
4,
|
|
|
|
|
&insn.exp,
|
|
|
|
|
1,
|
|
|
|
|
insn.reloc);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
as_fatal ("Unknown relocation type");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static int
|
1992-02-18 11:27:34 +00:00
|
|
|
|
calcop (format, param, insn)
|
|
|
|
|
struct m88k_opcode *format;
|
|
|
|
|
char *param;
|
|
|
|
|
struct m88k_insn *insn;
|
|
|
|
|
{
|
|
|
|
|
char *fmt = format->op_spec;
|
|
|
|
|
int f;
|
|
|
|
|
unsigned val;
|
|
|
|
|
unsigned opcode;
|
1993-06-10 01:33:42 +00:00
|
|
|
|
int reg_prefix = 'r';
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
insn->opcode = format->opcode;
|
|
|
|
|
opcode = 0;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
if (param == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
f = *fmt++;
|
|
|
|
|
switch (f)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
insn->opcode |= opcode;
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
return (*param == 0 || *param == '\n');
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
if (f != *param++)
|
|
|
|
|
return 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'd':
|
1993-06-10 01:33:42 +00:00
|
|
|
|
param = get_reg (param, &val, reg_prefix);
|
|
|
|
|
reg_prefix = 'r';
|
1992-02-18 11:27:34 +00:00
|
|
|
|
opcode |= val << 21;
|
|
|
|
|
break;
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
case 'o':
|
|
|
|
|
param = get_o6 (param, &val);
|
|
|
|
|
opcode |= ((val >> 2) << 7);
|
|
|
|
|
break;
|
|
|
|
|
|
1993-06-10 01:33:42 +00:00
|
|
|
|
case 'x':
|
|
|
|
|
reg_prefix = 'x';
|
|
|
|
|
break;
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
case '1':
|
1993-06-10 01:33:42 +00:00
|
|
|
|
param = get_reg (param, &val, reg_prefix);
|
|
|
|
|
reg_prefix = 'r';
|
1992-02-18 11:27:34 +00:00
|
|
|
|
opcode |= val << 16;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '2':
|
1993-06-10 01:33:42 +00:00
|
|
|
|
param = get_reg (param, &val, reg_prefix);
|
|
|
|
|
reg_prefix = 'r';
|
1992-02-18 11:27:34 +00:00
|
|
|
|
opcode |= val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '3':
|
1993-06-10 01:33:42 +00:00
|
|
|
|
param = get_reg (param, &val, 'r');
|
1992-02-18 11:27:34 +00:00
|
|
|
|
opcode |= (val << 16) | val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'I':
|
|
|
|
|
param = get_imm16 (param, insn);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'b':
|
|
|
|
|
param = get_bf (param, &val);
|
|
|
|
|
opcode |= val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'p':
|
|
|
|
|
param = get_pcr (param, insn, RELOC_PC16);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'P':
|
|
|
|
|
param = get_pcr (param, insn, RELOC_PC26);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'B':
|
|
|
|
|
param = get_cmp (param, &val);
|
|
|
|
|
opcode |= val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'M':
|
|
|
|
|
param = get_cnd (param, &val);
|
|
|
|
|
opcode |= val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
|
param = get_cr (param, &val);
|
|
|
|
|
opcode |= val << 5;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
|
param = get_fcr (param, &val);
|
|
|
|
|
opcode |= val << 5;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'V':
|
|
|
|
|
param = get_vec9 (param, &val);
|
|
|
|
|
opcode |= val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '?':
|
|
|
|
|
/* Having this here repeats the warning somtimes.
|
|
|
|
|
But can't we stand that? */
|
|
|
|
|
as_warn ("Use of obsolete instruction");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
match_name (param, assoc_tab, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
struct field_val_assoc *assoc_tab;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
char *name;
|
|
|
|
|
int name_len;
|
|
|
|
|
|
|
|
|
|
for (i = 0;; i++)
|
|
|
|
|
{
|
|
|
|
|
name = assoc_tab[i].name;
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
name_len = strlen (name);
|
|
|
|
|
if (!strncmp (param, name, name_len))
|
|
|
|
|
{
|
|
|
|
|
*valp = assoc_tab[i].val;
|
|
|
|
|
return param + name_len;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1993-06-10 01:33:42 +00:00
|
|
|
|
get_reg (param, regnop, reg_prefix)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
char *param;
|
|
|
|
|
unsigned *regnop;
|
1993-06-10 01:33:42 +00:00
|
|
|
|
int reg_prefix;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned c;
|
|
|
|
|
unsigned regno;
|
|
|
|
|
|
|
|
|
|
c = *param++;
|
1993-06-10 01:33:42 +00:00
|
|
|
|
if (c == reg_prefix)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
regno = *param++ - '0';
|
|
|
|
|
if (regno < 10)
|
|
|
|
|
{
|
|
|
|
|
if (regno == 0)
|
|
|
|
|
{
|
|
|
|
|
*regnop = 0;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
c = *param - '0';
|
|
|
|
|
if (c < 10)
|
|
|
|
|
{
|
|
|
|
|
regno = regno * 10 + c;
|
|
|
|
|
if (c < 32)
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else if (c == 's' && param[0] == 'p')
|
|
|
|
|
{
|
|
|
|
|
*regnop = 31;
|
|
|
|
|
return param + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_imm16 (param, insn)
|
|
|
|
|
char *param;
|
|
|
|
|
struct m88k_insn *insn;
|
|
|
|
|
{
|
|
|
|
|
enum reloc_type reloc = NO_RELOC;
|
|
|
|
|
unsigned int val;
|
|
|
|
|
char *save_ptr;
|
|
|
|
|
|
|
|
|
|
if (!strncmp (param, "hi16", 4) && !isalnum (param[4]))
|
|
|
|
|
{
|
|
|
|
|
reloc = RELOC_HI16;
|
|
|
|
|
param += 4;
|
|
|
|
|
}
|
|
|
|
|
else if (!strncmp (param, "lo16", 4) && !isalnum (param[4]))
|
|
|
|
|
{
|
|
|
|
|
reloc = RELOC_LO16;
|
|
|
|
|
param += 4;
|
|
|
|
|
}
|
|
|
|
|
else if (!strncmp (param, "iw16", 4) && !isalnum (param[4]))
|
|
|
|
|
{
|
|
|
|
|
reloc = RELOC_IW16;
|
|
|
|
|
param += 4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
save_ptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
expression (&insn->exp);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
param = input_line_pointer;
|
|
|
|
|
input_line_pointer = save_ptr;
|
|
|
|
|
|
|
|
|
|
val = insn->exp.X_add_number;
|
|
|
|
|
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
if (insn->exp.X_op == O_constant)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
/* Insert the value now, and reset reloc to NO_RELOC. */
|
|
|
|
|
if (reloc == NO_RELOC)
|
|
|
|
|
{
|
|
|
|
|
/* Warn about too big expressions if not surrounded by xx16. */
|
|
|
|
|
if (val > 0xffff)
|
|
|
|
|
as_warn ("Expression truncated to 16 bits");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (reloc == RELOC_HI16)
|
|
|
|
|
val >>= 16;
|
|
|
|
|
|
|
|
|
|
insn->opcode |= val & 0xffff;
|
|
|
|
|
reloc = NO_RELOC;
|
|
|
|
|
}
|
|
|
|
|
else if (reloc == NO_RELOC)
|
|
|
|
|
/* We accept a symbol even without lo16, hi16, etc, and assume
|
|
|
|
|
lo16 was intended. */
|
|
|
|
|
reloc = RELOC_LO16;
|
|
|
|
|
|
|
|
|
|
insn->reloc = reloc;
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_pcr (param, insn, reloc)
|
|
|
|
|
char *param;
|
|
|
|
|
struct m88k_insn *insn;
|
|
|
|
|
enum reloc_type reloc;
|
|
|
|
|
{
|
|
|
|
|
char *saveptr, *saveparam;
|
|
|
|
|
|
|
|
|
|
saveptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
expression (&insn->exp);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
saveparam = input_line_pointer;
|
|
|
|
|
input_line_pointer = saveptr;
|
|
|
|
|
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
/* Botch: We should relocate now if O_constant. */
|
1992-02-18 11:27:34 +00:00
|
|
|
|
insn->reloc = reloc;
|
|
|
|
|
|
|
|
|
|
return saveparam;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_cmp (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned int val;
|
|
|
|
|
char *save_ptr;
|
|
|
|
|
|
|
|
|
|
save_ptr = param;
|
|
|
|
|
|
|
|
|
|
param = match_name (param, cmpslot, valp);
|
|
|
|
|
val = *valp;
|
|
|
|
|
|
|
|
|
|
if (param == NULL)
|
|
|
|
|
{
|
|
|
|
|
param = save_ptr;
|
|
|
|
|
|
|
|
|
|
save_ptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
val = get_absolute_expression ();
|
|
|
|
|
param = input_line_pointer;
|
|
|
|
|
input_line_pointer = save_ptr;
|
|
|
|
|
|
|
|
|
|
if (val >= 32)
|
|
|
|
|
{
|
|
|
|
|
as_warn ("Expression truncated to 5 bits");
|
|
|
|
|
val %= 32;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*valp = val << 21;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_cnd (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned int val;
|
|
|
|
|
|
|
|
|
|
if (isdigit (*param))
|
|
|
|
|
{
|
|
|
|
|
param = getval (param, &val);
|
|
|
|
|
|
|
|
|
|
if (val >= 32)
|
|
|
|
|
{
|
|
|
|
|
as_warn ("Expression truncated to 5 bits");
|
|
|
|
|
val %= 32;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (isupper (*param))
|
|
|
|
|
*param = tolower (*param);
|
|
|
|
|
|
|
|
|
|
if (isupper (param[1]))
|
|
|
|
|
param[1] = tolower (param[1]);
|
|
|
|
|
|
|
|
|
|
param = match_name (param, cndmsk, valp);
|
|
|
|
|
|
|
|
|
|
if (param == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
val = *valp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*valp = val << 21;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_bf2 (param, bc)
|
|
|
|
|
char *param;
|
|
|
|
|
int bc;
|
|
|
|
|
{
|
|
|
|
|
int depth = 0;
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
c = *param;
|
|
|
|
|
if (c == 0)
|
|
|
|
|
return param;
|
|
|
|
|
else if (c == '(')
|
|
|
|
|
depth++;
|
|
|
|
|
else if (c == ')')
|
|
|
|
|
depth--;
|
|
|
|
|
else if (c == bc && depth <= 0)
|
|
|
|
|
return param;
|
|
|
|
|
param++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_bf_offset_expression (param, offsetp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *offsetp;
|
|
|
|
|
{
|
|
|
|
|
unsigned offset;
|
|
|
|
|
|
|
|
|
|
if (isalpha (param[0]))
|
|
|
|
|
{
|
|
|
|
|
if (isupper (param[0]))
|
|
|
|
|
param[0] = tolower (param[0]);
|
|
|
|
|
if (isupper (param[1]))
|
|
|
|
|
param[1] = tolower (param[1]);
|
|
|
|
|
|
|
|
|
|
param = match_name (param, cmpslot, offsetp);
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
offset = get_absolute_expression ();
|
|
|
|
|
param = input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*offsetp = offset;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_bf (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned offset = 0;
|
|
|
|
|
unsigned width = 0;
|
|
|
|
|
char *xp;
|
|
|
|
|
char *save_ptr;
|
|
|
|
|
|
|
|
|
|
xp = get_bf2 (param, '<');
|
|
|
|
|
|
|
|
|
|
save_ptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
if (*xp == 0)
|
|
|
|
|
{
|
|
|
|
|
/* We did not find '<'. We have an offset (width implicitly 32). */
|
|
|
|
|
param = get_bf_offset_expression (param, &offset);
|
1993-06-10 01:33:42 +00:00
|
|
|
|
input_line_pointer = save_ptr;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
if (param == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*xp++ = 0; /* Overwrite the '<' */
|
|
|
|
|
param = get_bf2 (xp, '>');
|
|
|
|
|
if (*param == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
*param++ = 0; /* Overwrite the '>' */
|
|
|
|
|
|
|
|
|
|
width = get_absolute_expression ();
|
1992-11-23 20:42:33 +00:00
|
|
|
|
xp = get_bf_offset_expression (xp, &offset);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
input_line_pointer = save_ptr;
|
|
|
|
|
|
|
|
|
|
if (xp + 1 != param)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*valp = ((width % 32) << 5) | (offset % 32);
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_cr (param, regnop)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *regnop;
|
|
|
|
|
{
|
|
|
|
|
unsigned regno;
|
|
|
|
|
unsigned c;
|
|
|
|
|
|
|
|
|
|
if (!strncmp (param, "cr", 2))
|
|
|
|
|
{
|
|
|
|
|
param += 2;
|
|
|
|
|
|
|
|
|
|
regno = *param++ - '0';
|
|
|
|
|
if (regno < 10)
|
|
|
|
|
{
|
|
|
|
|
if (regno == 0)
|
|
|
|
|
{
|
|
|
|
|
*regnop = 0;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
c = *param - '0';
|
|
|
|
|
if (c < 10)
|
|
|
|
|
{
|
|
|
|
|
regno = regno * 10 + c;
|
|
|
|
|
if (c < 64)
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
param = match_name (param, cr_regs, regnop);
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_fcr (param, regnop)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *regnop;
|
|
|
|
|
{
|
|
|
|
|
unsigned regno;
|
|
|
|
|
unsigned c;
|
|
|
|
|
|
|
|
|
|
if (!strncmp (param, "fcr", 3))
|
|
|
|
|
{
|
|
|
|
|
param += 3;
|
|
|
|
|
|
|
|
|
|
regno = *param++ - '0';
|
|
|
|
|
if (regno < 10)
|
|
|
|
|
{
|
|
|
|
|
if (regno == 0)
|
|
|
|
|
{
|
|
|
|
|
*regnop = 0;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
c = *param - '0';
|
|
|
|
|
if (c < 10)
|
|
|
|
|
{
|
|
|
|
|
regno = regno * 10 + c;
|
|
|
|
|
if (c < 64)
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*regnop = regno;
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
param = match_name (param, fcr_regs, regnop);
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
get_vec9 (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned val;
|
|
|
|
|
char *save_ptr;
|
|
|
|
|
|
|
|
|
|
save_ptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
val = get_absolute_expression ();
|
|
|
|
|
param = input_line_pointer;
|
|
|
|
|
input_line_pointer = save_ptr;
|
|
|
|
|
|
|
|
|
|
if (val >= 1 << 9)
|
|
|
|
|
as_warn ("Expression truncated to 9 bits");
|
|
|
|
|
|
|
|
|
|
*valp = val % (1 << 9);
|
|
|
|
|
|
|
|
|
|
return param;
|
|
|
|
|
}
|
1992-11-23 20:42:33 +00:00
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
|
|
|
|
get_o6 (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned val;
|
|
|
|
|
char *save_ptr;
|
|
|
|
|
|
|
|
|
|
save_ptr = input_line_pointer;
|
|
|
|
|
input_line_pointer = param;
|
|
|
|
|
val = get_absolute_expression ();
|
|
|
|
|
param = input_line_pointer;
|
|
|
|
|
input_line_pointer = save_ptr;
|
|
|
|
|
|
|
|
|
|
if (val & 0x3)
|
|
|
|
|
as_warn ("Removed lower 2 bits of expression");
|
|
|
|
|
|
|
|
|
|
*valp = val;
|
|
|
|
|
|
|
|
|
|
return(param);
|
|
|
|
|
}
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
#define hexval(z) \
|
|
|
|
|
(isdigit (z) ? (z) - '0' : \
|
|
|
|
|
islower (z) ? (z) - 'a' + 10 : \
|
|
|
|
|
isupper (z) ? (z) - 'A' + 10 : -1)
|
|
|
|
|
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
static char *
|
1992-02-18 11:27:34 +00:00
|
|
|
|
getval (param, valp)
|
|
|
|
|
char *param;
|
|
|
|
|
unsigned int *valp;
|
|
|
|
|
{
|
|
|
|
|
unsigned int val = 0;
|
|
|
|
|
unsigned int c;
|
|
|
|
|
|
|
|
|
|
c = *param++;
|
|
|
|
|
if (c == '0')
|
|
|
|
|
{
|
|
|
|
|
c = *param++;
|
|
|
|
|
if (c == 'x' || c == 'X')
|
|
|
|
|
{
|
|
|
|
|
c = *param++;
|
|
|
|
|
c = hexval (c);
|
|
|
|
|
while (c < 16)
|
|
|
|
|
{
|
|
|
|
|
val = val * 16 + c;
|
|
|
|
|
c = *param++;
|
|
|
|
|
c = hexval (c);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
c -= '0';
|
|
|
|
|
while (c < 8)
|
|
|
|
|
{
|
|
|
|
|
val = val * 8 + c;
|
|
|
|
|
c = *param++ - '0';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
c -= '0';
|
|
|
|
|
while (c < 10)
|
|
|
|
|
{
|
|
|
|
|
val = val * 10 + c;
|
|
|
|
|
c = *param++ - '0';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*valp = val;
|
|
|
|
|
return param - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_number_to_chars (buf, val, nbytes)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
char *buf;
|
1993-07-09 18:31:36 +00:00
|
|
|
|
valueT val;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
int nbytes;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
Lots of changes for:
- sparc[lite]-coff as well as sparc-lynx
- producing coff (including debug info) under BFD_ASSEMBLER option
- cleanup of cpu-specific code in non-cpu-specific files
(especially write.c)
- providing common code to avoid duplication in cpu-specific files
(specifically, md_number_to_chars)
- stylistic changes & misc cleanup
================
* config/tc-sparc.c (tc_gen_reloc): Make adjustment to addend be dependent on
howto fields, not on format flavour.
* struc-symbol.h (struct symbol): New fields sy_obj and sy_tc, defined as types
OBJ_SYMFIELD_TYPE and TC_SYMFIELD_TYPE, if those macros are defined.
* config/obj-coff.h (TC_SYMFIELD_TYPE, OBJ_SYMFIELD_TYPE): Define.
(TARGET_SYMBOL_FIELDS, I960_SYM_FIELDS): Don't define.
(sy_tc, sy_obj): Define so that the fields look like they used to, until all
references get changed.
* write.c (fixup_segment): Lots of variables no longer register. Reordered
some code for easier reading.
* config/obj-coff.c (obj_coff_dim): dim_index no longer register. Deleted
superfluous return statement.
(obj_coff_line, obj_coff_size, obj_coff_scl, obj_coff_type, obj_coff_val,
tag_init, tag_insert): Deleted superfluous return statement.
(align, obj_coff_section): Deleted debugging printfs.
* config/tc-i386.c (md_assemble): Discard some register decls. Use assignment
rather than memcpy to copy template.
(op_hash, reg_hash, prefix_hash): Default C initialization of statics is
sufficient.
* config/tc-sparc.c (print_insn): Array Reloc is now const, and points to
const.
* config/obj-coff.h (TARGET_FORMAT): Only use coff-sparc-lynx if TE_LYNX; use
coff-sparc otherwise.
[USE_NATIVE_HEADERS]: Delete this code; it isn't used.
* write.c (fixup_segment): Call TC_VALIDATE_FIX, if defined, before processing
a fixup. Call TC_ADJUST_RELOC_COUNT just before returning. Remove some
i960-coff-specific code.
(TC_ADJUST_RELOC_COUNT): Default to doing nothing.
* config/tc-i960.h (TC_ADJUST_RELOC_COUNT) [OBJ_COFF]: Define.
(i960_validate_fix): Declare.
(TC_VALIDATE_FIX): Define.
* config/tc-i960.c (i960_validate_fix): New function.
* write.c (number_to_chars_littleendian): New function. Write out bytes in
little endian order, doing size and range checking.
(number_to_chars_bigendian): New function, similar.
* write.h: Declare them.
* config/tc-*.c (md_number_to_chars): Use them.
* config/tc-vax.c (md_apply_fix): Ditto.
* config/tc-i386.c (md_apply_fix): Ditto.
* config/obj-coff.c: Rearranged code for handling line number data.
(line_fsym): Renamed from function_lineoff in BFD_ASSEMBLER case, since the
usage is different from non-BFD_ASSEMBLER case.
(in_function, clear_function, set_function): New macros, to combine some of the
functionality implemented in differnet ways in BFD_ASSEMBLER and non-... code.
Used in other functions that used to check function_lineoff &c.
(obj_emit_lineno): Split into two copies, one for BFD_ASSEMBLER, one for not.
Non-BFD_ASSEMBLER version now has temporary variable to contain char* pointer
pointed to by char** argument. Always follow CROSS_COMPILE code; easier to
read that way.
(obj_coff_ln): Don't call add_lineno or c_line_new if appline is set.
(obj_coff_endef) [BFD_ASSEMBLER]: Don't do anything special for ".bf", it's
been done elsewhere.
(coff_frob_symbol): If ilne number data is pending, call add_linesym to flush it.
(coff_frob_file): Don't do that here.
* config/obj-coff.h (coff_frob_file): Declare.
(obj_frob_file): Define, to call it.
* config/tc-sparc.h (md_create_short_jump, md_create_long_jump,
md_estimate_size_before_relax: Define them as macros calling as_fatal.
* config/tc-sparc.c: Don't define them as functions.
1993-12-03 03:10:08 +00:00
|
|
|
|
number_to_chars_bigendian (buf, val, nbytes);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
|
|
/* This routine is never called. What is it for?
|
|
|
|
|
Ian Taylor, Cygnus Support 13 Jul 1993 */
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
void
|
|
|
|
|
md_number_to_imm (buf, val, nbytes, fixP, seg_type)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
unsigned char *buf;
|
|
|
|
|
unsigned int val;
|
|
|
|
|
int nbytes;
|
|
|
|
|
fixS *fixP;
|
|
|
|
|
int seg_type;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
if (seg_type != N_TEXT || fixP->fx_r_type == NO_RELOC)
|
|
|
|
|
{
|
|
|
|
|
switch (nbytes)
|
|
|
|
|
{
|
|
|
|
|
case 4:
|
|
|
|
|
*buf++ = val >> 24;
|
|
|
|
|
*buf++ = val >> 16;
|
|
|
|
|
case 2:
|
|
|
|
|
*buf++ = val >> 8;
|
|
|
|
|
case 1:
|
|
|
|
|
*buf = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (fixP->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case RELOC_IW16:
|
|
|
|
|
buf[2] = val >> 8;
|
|
|
|
|
buf[3] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_LO16:
|
|
|
|
|
buf[0] = val >> 8;
|
|
|
|
|
buf[1] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_HI16:
|
|
|
|
|
buf[0] = val >> 24;
|
|
|
|
|
buf[1] = val >> 16;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC16:
|
|
|
|
|
val += 4;
|
|
|
|
|
buf[0] = val >> 10;
|
|
|
|
|
buf[1] = val >> 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC26:
|
|
|
|
|
val += 4;
|
|
|
|
|
buf[0] |= (val >> 26) & 0x03;
|
|
|
|
|
buf[1] = val >> 18;
|
|
|
|
|
buf[2] = val >> 10;
|
|
|
|
|
buf[3] = val >> 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_32:
|
|
|
|
|
buf[0] = val >> 24;
|
|
|
|
|
buf[1] = val >> 16;
|
|
|
|
|
buf[2] = val >> 8;
|
|
|
|
|
buf[3] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
as_fatal ("Bad relocation type");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
void
|
|
|
|
|
md_number_to_disp (buf, val, nbytes)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
char *buf;
|
|
|
|
|
int val;
|
|
|
|
|
int nbytes;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
as_fatal ("md_number_to_disp not defined");
|
|
|
|
|
md_number_to_chars (buf, val, nbytes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_number_to_field (buf, val, nbytes)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
char *buf;
|
|
|
|
|
int val;
|
|
|
|
|
int nbytes;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
as_fatal ("md_number_to_field not defined");
|
|
|
|
|
md_number_to_chars (buf, val, nbytes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#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.
|
|
|
|
|
*/
|
|
|
|
|
char *
|
|
|
|
|
md_atof (type, litP, sizeP)
|
|
|
|
|
char type;
|
|
|
|
|
char *litP;
|
|
|
|
|
int *sizeP;
|
|
|
|
|
{
|
1992-11-23 20:42:33 +00:00
|
|
|
|
int prec;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
LITTLENUM_TYPE words[MAX_LITTLENUMS];
|
|
|
|
|
LITTLENUM_TYPE *wordP;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
char *t;
|
|
|
|
|
char *atof_ieee ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case 'f':
|
|
|
|
|
case 'F':
|
|
|
|
|
case 's':
|
|
|
|
|
case 'S':
|
|
|
|
|
prec = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
|
case 'D':
|
|
|
|
|
case 'r':
|
|
|
|
|
case 'R':
|
|
|
|
|
prec = 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'x':
|
|
|
|
|
case 'X':
|
|
|
|
|
prec = 6;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'p':
|
|
|
|
|
case 'P':
|
|
|
|
|
prec = 6;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
1992-11-23 20:42:33 +00:00
|
|
|
|
*sizeP = 0;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
return "Bad call to MD_ATOF()";
|
|
|
|
|
}
|
1992-11-23 20:42:33 +00:00
|
|
|
|
t = atof_ieee (input_line_pointer, type, words);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
if (t)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
input_line_pointer = t;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
1992-11-23 20:42:33 +00:00
|
|
|
|
*sizeP = prec * sizeof (LITTLENUM_TYPE);
|
|
|
|
|
for (wordP = words; prec--;)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
md_number_to_chars (litP, (long) (*wordP++), sizeof (LITTLENUM_TYPE));
|
1992-11-23 20:42:33 +00:00
|
|
|
|
litP += sizeof (LITTLENUM_TYPE);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
1993-10-12 08:45:49 +00:00
|
|
|
|
return 0;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int md_short_jump_size = 4;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
|
|
|
|
|
char *ptr;
|
1993-07-09 18:31:36 +00:00
|
|
|
|
addressT from_addr, to_addr;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
fragS *frag;
|
|
|
|
|
symbolS *to_symbol;
|
|
|
|
|
{
|
1993-07-09 18:31:36 +00:00
|
|
|
|
ptr[0] = (char) 0xc0;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
ptr[1] = 0x00;
|
|
|
|
|
ptr[2] = 0x00;
|
|
|
|
|
ptr[3] = 0x00;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
fix_new (frag,
|
|
|
|
|
ptr - frag->fr_literal,
|
|
|
|
|
4,
|
|
|
|
|
to_symbol,
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
(offsetT) 0,
|
1992-02-18 11:27:34 +00:00
|
|
|
|
0,
|
|
|
|
|
RELOC_PC26); /* Botch: Shouldn't this be RELOC_PC16? */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int md_long_jump_size = 4;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
|
|
|
|
|
char *ptr;
|
1993-07-09 18:31:36 +00:00
|
|
|
|
addressT from_addr, to_addr;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
fragS *frag;
|
|
|
|
|
symbolS *to_symbol;
|
|
|
|
|
{
|
1993-07-09 18:31:36 +00:00
|
|
|
|
ptr[0] = (char) 0xc0;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
ptr[1] = 0x00;
|
|
|
|
|
ptr[2] = 0x00;
|
|
|
|
|
ptr[3] = 0x00;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
fix_new (frag,
|
|
|
|
|
ptr - frag->fr_literal,
|
|
|
|
|
4,
|
|
|
|
|
to_symbol,
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 00:41:42 +00:00
|
|
|
|
(offsetT) 0,
|
1992-02-18 11:27:34 +00:00
|
|
|
|
0,
|
|
|
|
|
RELOC_PC26);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
md_estimate_size_before_relax (fragP, segment_type)
|
|
|
|
|
fragS *fragP;
|
1993-07-09 18:31:36 +00:00
|
|
|
|
segT segment_type;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
as_fatal ("Relaxation should never occur");
|
* config/tc-m88k.c (get_o6): new function.
(get_bf, get_cmp, get_cnd, get_cr, get_fcr, get_imm16, get_reg,
get_vec9, getval, get_pcr, calcop, match_name): make static and
prototype.
(s_file): remove extraneous forward decl.
(md_begin): add const to retval decl.
(calcop): cope with instructions without arguments. Handle 'o'
type argument, the o6 field of the prot insn.
(md_estimate_size_before_relax): return a dummy value.
1993-09-24 19:47:59 +00:00
|
|
|
|
return (-1);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
|
|
/* As far as I can tell, this routine is never called. What is it
|
|
|
|
|
doing here?
|
|
|
|
|
Ian Taylor, Cygnus Support 13 Jul 1993 */
|
|
|
|
|
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
/*
|
|
|
|
|
* Risc relocations are completely different, so it needs
|
|
|
|
|
* this machine dependent routine to emit them.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
emit_relocations (fixP, segment_address_in_file)
|
1992-11-23 20:42:33 +00:00
|
|
|
|
fixS *fixP;
|
|
|
|
|
relax_addressT segment_address_in_file;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
1992-11-23 20:42:33 +00:00
|
|
|
|
struct reloc_info_m88k ri;
|
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
extern char *next_object_file_charP;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
1992-11-23 20:42:33 +00:00
|
|
|
|
bzero ((char *) &ri, sizeof (ri));
|
|
|
|
|
for (; fixP; fixP = fixP->fx_next)
|
|
|
|
|
{
|
|
|
|
|
if (fixP->fx_r_type >= NO_RELOC)
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "fixP->fx_r_type = %d\n", fixP->fx_r_type);
|
|
|
|
|
abort ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-11-23 20:42:33 +00:00
|
|
|
|
if ((symbolP = fixP->fx_addsy) != NULL)
|
|
|
|
|
{
|
|
|
|
|
ri.r_address = fixP->fx_frag->fr_address +
|
|
|
|
|
fixP->fx_where - segment_address_in_file;
|
|
|
|
|
if ((symbolP->sy_type & N_TYPE) == N_UNDF)
|
|
|
|
|
{
|
|
|
|
|
ri.r_extern = 1;
|
|
|
|
|
ri.r_symbolnum = symbolP->sy_number;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ri.r_extern = 0;
|
|
|
|
|
ri.r_symbolnum = symbolP->sy_type & N_TYPE;
|
|
|
|
|
}
|
|
|
|
|
if (symbolP && symbolP->sy_frag)
|
|
|
|
|
{
|
|
|
|
|
ri.r_addend = symbolP->sy_frag->fr_address;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
1992-11-23 20:42:33 +00:00
|
|
|
|
ri.r_type = fixP->fx_r_type;
|
|
|
|
|
if (fixP->fx_pcrel)
|
|
|
|
|
{
|
|
|
|
|
ri.r_addend -= ri.r_address;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
1992-11-23 20:42:33 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ri.r_addend = fixP->fx_addnumber;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-11-23 20:42:33 +00:00
|
|
|
|
append (&next_object_file_charP, (char *) &ri, sizeof (ri));
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
|
|
/* This routine can be subsumed by s_lcomm in read.c.
|
|
|
|
|
Ian Taylor, Cygnus Support 13 Jul 1993 */
|
|
|
|
|
|
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
static void
|
1992-11-23 20:42:33 +00:00
|
|
|
|
s_bss ()
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
char c;
|
|
|
|
|
char *p;
|
1992-12-30 21:39:51 +00:00
|
|
|
|
int temp, bss_align;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
|
|
|
|
|
name = input_line_pointer;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
c = get_symbol_end ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
p = input_line_pointer;
|
|
|
|
|
*p = c;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
if (*input_line_pointer != ',')
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
1992-11-23 20:42:33 +00:00
|
|
|
|
as_warn ("Expected comma after name");
|
|
|
|
|
ignore_rest_of_line ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
1992-11-23 20:42:33 +00:00
|
|
|
|
input_line_pointer++;
|
|
|
|
|
if ((temp = get_absolute_expression ()) < 0)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
1992-11-23 20:42:33 +00:00
|
|
|
|
as_warn ("BSS length (%d.) <0! Ignored.", temp);
|
|
|
|
|
ignore_rest_of_line ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
*p = 0;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
symbolP = symbol_find_or_make (name);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
*p = c;
|
|
|
|
|
if (*input_line_pointer == ',')
|
|
|
|
|
{
|
|
|
|
|
input_line_pointer++;
|
1992-11-23 20:42:33 +00:00
|
|
|
|
bss_align = get_absolute_expression ();
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
1992-12-30 21:39:51 +00:00
|
|
|
|
else
|
|
|
|
|
bss_align = 0;
|
1992-02-18 11:27:34 +00:00
|
|
|
|
|
1992-12-30 21:39:51 +00:00
|
|
|
|
if (!S_IS_DEFINED(symbolP)
|
|
|
|
|
|| S_GET_SEGMENT(symbolP) == SEG_BSS)
|
1992-02-18 11:27:34 +00:00
|
|
|
|
{
|
1992-12-30 21:39:51 +00:00
|
|
|
|
if (! need_pass_2)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
segT current_seg = now_seg;
|
|
|
|
|
subsegT current_subseg = now_subseg;
|
|
|
|
|
|
1993-09-13 21:32:07 +00:00
|
|
|
|
subseg_set (SEG_BSS, 1); /* switch to bss */
|
1992-12-30 21:39:51 +00:00
|
|
|
|
|
|
|
|
|
if (bss_align)
|
|
|
|
|
frag_align (bss_align, 0);
|
|
|
|
|
|
|
|
|
|
/* detach from old frag */
|
|
|
|
|
if (symbolP->sy_type == N_BSS && symbolP->sy_frag != NULL)
|
|
|
|
|
symbolP->sy_frag->fr_symbol = NULL;
|
|
|
|
|
|
|
|
|
|
symbolP->sy_frag = frag_now;
|
|
|
|
|
p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
|
|
|
|
|
temp, (char *)0);
|
|
|
|
|
*p = 0;
|
|
|
|
|
S_SET_SEGMENT (symbolP, SEG_BSS);
|
|
|
|
|
|
1993-09-13 21:32:07 +00:00
|
|
|
|
subseg_set (current_seg, current_subseg);
|
1992-12-30 21:39:51 +00:00
|
|
|
|
}
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1992-12-30 21:39:51 +00:00
|
|
|
|
as_warn ("Ignoring attempt to re-define symbol %s.", name);
|
1992-02-18 11:27:34 +00:00
|
|
|
|
}
|
1992-12-30 21:39:51 +00:00
|
|
|
|
|
1992-02-18 11:27:34 +00:00
|
|
|
|
while (!is_end_of_line[*input_line_pointer])
|
|
|
|
|
{
|
|
|
|
|
input_line_pointer++;
|
|
|
|
|
}
|
|
|
|
|
}
|
1993-07-15 16:02:21 +00:00
|
|
|
|
|
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
|
|
|
|
#ifdef M88KCOFF
|
|
|
|
|
|
|
|
|
|
/* These functions are needed if we are linking with obj-coffbfd.c.
|
|
|
|
|
That file may be replaced by a more BFD oriented version at some
|
|
|
|
|
point. If that happens, these functions should be rexamined.
|
|
|
|
|
|
|
|
|
|
Ian Lance Taylor, Cygnus Support, 13 July 1993. */
|
|
|
|
|
|
|
|
|
|
/* Given a fixS structure (created by a call to fix_new, above),
|
|
|
|
|
return the BFD relocation type to use for it. */
|
|
|
|
|
|
|
|
|
|
short
|
|
|
|
|
tc_coff_fix2rtype (fixp)
|
|
|
|
|
fixS *fixp;
|
|
|
|
|
{
|
|
|
|
|
switch (fixp->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case RELOC_LO16:
|
|
|
|
|
return R_LVRT16;
|
|
|
|
|
case RELOC_HI16:
|
|
|
|
|
return R_HVRT16;
|
|
|
|
|
case RELOC_PC16:
|
|
|
|
|
return R_PCR16L;
|
|
|
|
|
case RELOC_PC26:
|
|
|
|
|
return R_PCR26L;
|
|
|
|
|
case RELOC_32:
|
|
|
|
|
return R_VRT32;
|
|
|
|
|
case RELOC_IW16:
|
|
|
|
|
return R_VRT16;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply a fixS to the object file. Since COFF does not use addends
|
|
|
|
|
in relocs, the addend is actually stored directly in the object
|
|
|
|
|
file itself. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
md_apply_fix (fixp, val)
|
|
|
|
|
fixS *fixp;
|
|
|
|
|
long val;
|
|
|
|
|
{
|
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
|
|
buf = fixp->fx_frag->fr_literal + fixp->fx_where;
|
1993-07-21 17:19:33 +00:00
|
|
|
|
fixp->fx_offset = 0;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
|
|
|
|
|
switch (fixp->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case RELOC_IW16:
|
1993-07-21 17:19:33 +00:00
|
|
|
|
fixp->fx_offset = val >> 16;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
buf[2] = val >> 8;
|
|
|
|
|
buf[3] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_LO16:
|
1993-07-21 17:19:33 +00:00
|
|
|
|
fixp->fx_offset = val >> 16;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
buf[0] = val >> 8;
|
|
|
|
|
buf[1] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_HI16:
|
1993-07-21 17:19:33 +00:00
|
|
|
|
fixp->fx_offset = val >> 16;
|
|
|
|
|
buf[0] = val >> 8;
|
|
|
|
|
buf[1] = val;
|
1993-07-15 16:02:21 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC16:
|
|
|
|
|
buf[0] = val >> 10;
|
|
|
|
|
buf[1] = val >> 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_PC26:
|
|
|
|
|
buf[0] |= (val >> 26) & 0x03;
|
|
|
|
|
buf[1] = val >> 18;
|
|
|
|
|
buf[2] = val >> 10;
|
|
|
|
|
buf[3] = val >> 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELOC_32:
|
|
|
|
|
buf[0] = val >> 24;
|
|
|
|
|
buf[1] = val >> 16;
|
|
|
|
|
buf[2] = val >> 8;
|
|
|
|
|
buf[3] = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Where a PC relative offset is calculated from. On the m88k they
|
|
|
|
|
are calculated from just after the instruction. */
|
|
|
|
|
|
|
|
|
|
long
|
|
|
|
|
md_pcrel_from (fixp)
|
|
|
|
|
fixS *fixp;
|
|
|
|
|
{
|
1993-07-15 20:23:43 +00:00
|
|
|
|
switch (fixp->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case RELOC_PC16:
|
|
|
|
|
return fixp->fx_frag->fr_address + fixp->fx_where - 2;
|
|
|
|
|
case RELOC_PC26:
|
|
|
|
|
return fixp->fx_frag->fr_address + fixp->fx_where;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
/*NOTREACHED*/
|
1993-07-15 16:02:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
1995-11-03 03:58:09 +00:00
|
|
|
|
/* When we align the .init section, insert the correct NOP pattern. */
|
|
|
|
|
|
|
|
|
|
int
|
1996-02-08 00:22:02 +00:00
|
|
|
|
m88k_do_align (n, fill, len)
|
1995-11-03 03:58:09 +00:00
|
|
|
|
int n;
|
|
|
|
|
const char *fill;
|
1996-02-08 00:22:02 +00:00
|
|
|
|
int len;
|
1995-11-03 03:58:09 +00:00
|
|
|
|
{
|
1996-02-08 00:22:02 +00:00
|
|
|
|
if ((fill == NULL || (*fill == 0 && len == 1))
|
1995-11-03 03:58:09 +00:00
|
|
|
|
&& strcmp (obj_segment_name (now_seg), ".init") == 0)
|
|
|
|
|
{
|
|
|
|
|
static const unsigned char nop_pattern[] = { 0xf4, 0x00, 0x58, 0x00 };
|
|
|
|
|
frag_align_pattern (n, nop_pattern, sizeof (nop_pattern));
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-15 16:02:21 +00:00
|
|
|
|
#endif /* M88KCOFF */
|