From 0f829c8eae76be42eaf73fefd8832853fb676f50 Mon Sep 17 00:00:00 2001 From: Catherine Moore Date: Fri, 16 Oct 1998 18:45:25 +0000 Subject: [PATCH] * cgen.c (gas_cgen_md_apply_fix3): Handle VTABLE relocs. (gas_cgen_tc_gen_reloc): Likewise. * config/tc-m32r.h (obj_fix_adjustable): Define. * config/tc-m32r.c (m32r_fix_adjustable): New. (m32r_force_relocation): Handle VTABLE relocs. --- gas/ChangeLog | 12 +++++++ gas/cgen.c | 83 ++++++++++++++++++++++++++++---------------- gas/config/tc-m32r.c | 45 +++++++++++++++++++++++- 3 files changed, 110 insertions(+), 30 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7745186c68b..6156bdd1df2 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +Fri Oct 16 13:36:34 CDT Catherine Moore + + * cgen.c (gas_cgen_md_apply_fix3): Handle VTABLE relocs. + (gas_cgen_tc_gen_reloc): Likewise. + * config/tc-m32r.h (obj_fix_adjustable): Define. + * config/tc-m32r.c (m32r_fix_adjustable): New. + (m32r_force_relocation): Handle VTABLE relocs. + +Wed Oct 14 11:33:38 1998 Nick Clifton + + * doc/c-arm.texi (ARM Directives): Document .ltorn directive. + Mon Oct 12 11:07:21 1998 Nick Clifton * config/tc-m32r.c (assemble_parallel_insn): Convert second opcode diff --git a/gas/cgen.c b/gas/cgen.c index 45d0fe0a5f7..2a859bfda01 100644 --- a/gas/cgen.c +++ b/gas/cgen.c @@ -19,6 +19,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include "ansidecl.h" +#include "libiberty.h" #include "bfd.h" #include "symcat.h" #include "cgen-opc.h" @@ -26,6 +27,10 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "subsegs.h" #include "cgen.h" +/* Opcode table descriptor, must be set by md_begin. */ + +CGEN_OPCODE_DESC gas_cgen_opcode_desc; + /* Callback to insert a register into the symbol table. A target may choose to let GAS parse the registers. ??? Not currently used. */ @@ -59,14 +64,14 @@ struct fixup expressionS exp; }; -static struct fixup fixups [CGEN_MAX_FIXUPS]; +static struct fixup fixups [GAS_CGEN_MAX_FIXUPS]; static int num_fixups; /* Prepare to parse an instruction. ??? May wish to make this static and delete calls in md_assemble. */ void -cgen_asm_init_parse () +gas_cgen_init_parse () { num_fixups = 0; } @@ -74,12 +79,12 @@ cgen_asm_init_parse () /* Queue a fixup. */ static void -cgen_queue_fixup (opindex, opinfo, expP) +queue_fixup (opindex, opinfo, expP) int opindex; expressionS * expP; { /* We need to generate a fixup for this expression. */ - if (num_fixups >= CGEN_MAX_FIXUPS) + if (num_fixups >= GAS_CGEN_MAX_FIXUPS) as_fatal (_("too many fixups")); fixups[num_fixups].exp = * expP; fixups[num_fixups].opindex = opindex; @@ -91,11 +96,14 @@ cgen_queue_fixup (opindex, opinfo, expP) and to have this backup be swapped with the current chain. This allows certain ports, eg the m32r, to swap two instructions and swap their fixups at the same time. */ -static struct fixup saved_fixups [CGEN_MAX_FIXUPS]; +/* ??? I think with cgen_asm_finish_insn (or something else) there is no + more need for this. */ + +static struct fixup saved_fixups [GAS_CGEN_MAX_FIXUPS]; static int saved_num_fixups; void -cgen_save_fixups () +gas_cgen_save_fixups () { saved_num_fixups = num_fixups; @@ -105,7 +113,7 @@ cgen_save_fixups () } void -cgen_restore_fixups () +gas_cgen_restore_fixups () { num_fixups = saved_num_fixups; @@ -115,18 +123,18 @@ cgen_restore_fixups () } void -cgen_swap_fixups () +gas_cgen_swap_fixups () { int tmp; struct fixup tmp_fixup; if (num_fixups == 0) { - cgen_restore_fixups (); + gas_cgen_restore_fixups (); } else if (saved_num_fixups == 0) { - cgen_save_fixups (); + gas_cgen_save_fixups (); } else { @@ -134,7 +142,7 @@ cgen_swap_fixups () saved_num_fixups = num_fixups; num_fixups = tmp; - for (tmp = CGEN_MAX_FIXUPS; tmp--;) + for (tmp = GAS_CGEN_MAX_FIXUPS; tmp--;) { tmp_fixup = saved_fixups [tmp]; saved_fixups [tmp] = fixups [tmp]; @@ -157,7 +165,7 @@ cgen_swap_fixups () operand type. We pick a BFD reloc type in md_apply_fix. */ fixS * -cgen_record_fixup (frag, where, insn, length, operand, opinfo, symbol, offset) +gas_cgen_record_fixup (frag, where, insn, length, operand, opinfo, symbol, offset) fragS * frag; int where; const CGEN_INSN * insn; @@ -195,7 +203,7 @@ cgen_record_fixup (frag, where, insn, length, operand, opinfo, symbol, offset) operand type. We pick a BFD reloc type in md_apply_fix. */ fixS * -cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp) +gas_cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp) fragS * frag; int where; const CGEN_INSN * insn; @@ -233,7 +241,8 @@ static jmp_buf expr_jmp_buf; The resulting value is stored in VALUEP. */ const char * -cgen_parse_operand (want, strP, opindex, opinfo, resultP, valueP) +gas_cgen_parse_operand (od, want, strP, opindex, opinfo, resultP, valueP) + CGEN_OPCODE_DESC od; enum cgen_parse_operand_type want; const char ** strP; int opindex; @@ -254,7 +263,7 @@ cgen_parse_operand (want, strP, opindex, opinfo, resultP, valueP) if (want == CGEN_PARSE_OPERAND_INIT) { - cgen_asm_init_parse (); + gas_cgen_init_parse (); return NULL; } @@ -263,7 +272,7 @@ cgen_parse_operand (want, strP, opindex, opinfo, resultP, valueP) input_line_pointer = (char *) * strP; /* We rely on md_operand to longjmp back to us. - This is done via cgen_md_operand. */ + This is done via gas_cgen_md_operand. */ if (setjmp (expr_jmp_buf) != 0) { input_line_pointer = (char *) hold; @@ -297,7 +306,7 @@ cgen_parse_operand (want, strP, opindex, opinfo, resultP, valueP) * resultP = CGEN_PARSE_OPERAND_RESULT_REGISTER; break; default : - cgen_queue_fixup (opindex, opinfo, & exp); + queue_fixup (opindex, opinfo, & exp); * valueP = 0; * resultP = CGEN_PARSE_OPERAND_RESULT_QUEUED; break; @@ -312,7 +321,7 @@ cgen_parse_operand (want, strP, opindex, opinfo, resultP, valueP) ??? This could be done differently by adding code to `expression'. */ void -cgen_md_operand (expressionP) +gas_cgen_md_operand (expressionP) expressionS * expressionP; { longjmp (expr_jmp_buf, 1); @@ -326,7 +335,7 @@ cgen_md_operand (expressionP) The "result" is stored in RESULT if non-NULL. */ void -cgen_asm_finish_insn (insn, buf, length, relax_p, result) +gas_cgen_finish_insn (insn, buf, length, relax_p, result) const CGEN_INSN * insn; cgen_insn_t * buf; unsigned int length; @@ -403,7 +412,7 @@ cgen_asm_finish_insn (insn, buf, length, relax_p, result) f); /* Record the operand number with the fragment so md_convert_frag - can use cgen_md_record_fixup to record the appropriate reloc. */ + can use gas_cgen_md_record_fixup to record the appropriate reloc. */ old_frag->fr_cgen.insn = insn; old_frag->fr_cgen.opindex = fixups[relax_operand].opindex; old_frag->fr_cgen.opinfo = fixups[relax_operand].opinfo; @@ -456,7 +465,7 @@ cgen_asm_finish_insn (insn, buf, length, relax_p, result) continue; #ifndef md_cgen_record_fixup_exp -#define md_cgen_record_fixup_exp cgen_record_fixup_exp +#define md_cgen_record_fixup_exp gas_cgen_record_fixup_exp #endif fixP = md_cgen_record_fixup_exp (frag_now, f - frag_now->fr_literal, @@ -488,7 +497,7 @@ cgen_asm_finish_insn (insn, buf, length, relax_p, result) should handle them all. */ int -cgen_md_apply_fix3 (fixP, valueP, seg) +gas_cgen_md_apply_fix3 (fixP, valueP, seg) fixS * fixP; valueT * valueP; segT seg; @@ -496,6 +505,7 @@ cgen_md_apply_fix3 (fixP, valueP, seg) char * where = fixP->fx_frag->fr_literal + fixP->fx_where; valueT value; + /* FIXME FIXME FIXME: The value we are passed in *valuep includes the symbol values. Since we are using BFD_ASSEMBLER, if we are doing this relocation the code in write.c is going to call @@ -539,6 +549,14 @@ cgen_md_apply_fix3 (fixP, valueP, seg) CGEN_FIELDS fields; const CGEN_INSN * insn = (CGEN_INSN *) fixP->tc_fix_data.insn; + + if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT + || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY) + { + fixP->fx_done = 0; + return 1; + } + /* If the reloc has been fully resolved finish the operand here. */ /* FIXME: This duplicates the capabilities of code in BFD. */ if (fixP->fx_done @@ -549,8 +567,8 @@ cgen_md_apply_fix3 (fixP, valueP, seg) CGEN_FIELDS_BITSIZE (& fields) = CGEN_INSN_BITSIZE (insn); CGEN_SYM (set_vma_operand) (opindex, & fields, (bfd_vma) value); /* ??? 0 is passed for `pc' */ - errmsg = CGEN_SYM (insert_operand) (opindex, & fields, where, - (bfd_vma) 0); + errmsg = CGEN_SYM (insert_operand) (gas_cgen_opcode_desc, opindex, + & fields, where, (bfd_vma) 0); if (errmsg) as_warn_where (fixP->fx_file, fixP->fx_line, "%s", errmsg); } @@ -563,7 +581,7 @@ cgen_md_apply_fix3 (fixP, valueP, seg) bfd_install_relocation. Note that this doesn't work when partial_inplace == false. */ - reloc_type = CGEN_SYM (lookup_reloc) (insn, operand, fixP); + reloc_type = md_cgen_lookup_reloc (insn, operand, fixP); if (reloc_type != BFD_RELOC_NONE) { fixP->fx_r_type = reloc_type; @@ -614,13 +632,13 @@ cgen_md_apply_fix3 (fixP, valueP, seg) FIXME: To what extent can we get all relevant targets to use this? */ arelent * -cgen_tc_gen_reloc (section, fixP) +gas_cgen_tc_gen_reloc (section, fixP) asection * section; fixS * fixP; { arelent * reloc; - reloc = (arelent *) bfd_alloc (stdoutput, sizeof (arelent)); + reloc = (arelent *) xmalloc (sizeof (arelent)); reloc->howto = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type); if (reloc->howto == (reloc_howto_type *) NULL) @@ -634,8 +652,15 @@ cgen_tc_gen_reloc (section, fixP) assert (!fixP->fx_pcrel == !reloc->howto->pc_relative); reloc->sym_ptr_ptr = & fixP->fx_addsy->bsym; - reloc->address = fixP->fx_frag->fr_address + fixP->fx_where; - reloc->addend = fixP->fx_addnumber; + /* Use fx_offset for these cases */ + if (fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY + || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT) + reloc->address = fixP->fx_offset; + else + { + reloc->address = fixP->fx_frag->fr_address + fixP->fx_where; + reloc->addend = fixP->fx_addnumber; + } return reloc; } diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c index 55f47a73f1c..026c772e4f0 100644 --- a/gas/config/tc-m32r.c +++ b/gas/config/tc-m32r.c @@ -798,8 +798,25 @@ assemble_parallel_insn (str, str2) str = str2 + 2; /* Advanced past the parsed string. */ str2 = str3; /* Remember the entire string in case it is needed for error messages. */ + /* Convert the opcode to lower case. */ + { + char *s2 = str; + + while (isspace (*s2 ++)) + continue; + + --s2; + + while (isalnum (*s2)) + { + if (isupper ((unsigned char) *s2)) + *s2 = tolower (*s2); + s2 ++; + } + } + /* Preserve any fixups that have been generated and reset the list to empty. */ - gas_cgen_save_fixups(); + gas_cgen_save_fixups (); /* Get the indices of the operands of the instruction. */ /* FIXME: CGEN_FIELDS is already recorded, but relying on that fact @@ -1740,6 +1757,10 @@ int m32r_force_relocation (fix) fixS * fix; { + if (fix->fx_r_type == BFD_RELOC_VTABLE_INHERIT + || fix->fx_r_type == BFD_RELOC_VTABLE_INHERIT) + return 1; + if (! m32r_relax) return 0; @@ -1841,3 +1862,25 @@ m32r_elf_section_change_hook () if (prev_insn.insn || seen_relaxable_p) (void) m32r_fill_insn (0); } + +boolean +m32r_fix_adjustable (fixP) + fixS *fixP; +{ + + if (fixP->fx_addsy == NULL) + return 1; + + /* Prevent all adjustments to global symbols. */ + if (S_IS_EXTERN (fixP->fx_addsy)) + return 0; + if (S_IS_WEAK (fixP->fx_addsy)) + return 0; + + /* We need the symbol name for the VTABLE entries */ + if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT + || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY) + return 0; + + return 1; +} -- 2.30.2