* alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,

	c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
	cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
	haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
	sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
	vmsdbgout.c: Replace calls via (*targetm.foo) () with
	targetm.foo ().

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79729 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ebda5ec..4be5285 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,
+       c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
+       cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
+       haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
+       sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
+       vmsdbgout.c: Replace calls via (*targetm.foo) () with
+       targetm.foo ().
+
 2004-03-19  Ziemowit Laski  <zlaski@apple.com>
 
        * config/rs6000/altivec.h (vec_dst, vec_dstst, vec_dststt,

diff --git a/gcc/alias.c b/gcc/alias.c
index 58ec82d..2c7770d 100644 (file)
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -2635,7 +2635,7 @@ mark_constant_function (void)
       || DECL_IS_PURE (current_function_decl)
       || TREE_THIS_VOLATILE (current_function_decl)
       || current_function_has_nonlocal_goto
-      || !(*targetm.binds_local_p) (current_function_decl))
+      || !targetm.binds_local_p (current_function_decl))
     return;
 
   /* A loop might not return which counts as a side effect.  */

diff --git a/gcc/attribs.c b/gcc/attribs.c
index a40fea7..5d8450f 100644 (file)
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -1,6 +1,6 @@
 /* Functions dealing with attribute handling, used by most front ends.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003 Free Software Foundation, Inc.
+   2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -145,7 +145,7 @@ decl_attributes (tree *node, tree attributes, int flags)
   if (!attributes_initialized)
     init_attributes ();
 
-  (*targetm.insert_attributes) (*node, &attributes);
+  targetm.insert_attributes (*node, &attributes);
 
   for (a = attributes; a; a = TREE_CHAIN (a))
     {

diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 366e678..4aa6066 100644 (file)
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -1267,7 +1267,7 @@ migrate_btr_def (btr_def def, int min_cost)
   bitmap_copy (live_range, def->live_range);
 
 #ifdef INSN_SCHEDULING
-  if ((*targetm.sched.use_dfa_pipeline_interface) ())
+  if (targetm.sched.use_dfa_pipeline_interface ())
     def_latency = insn_default_latency (def->insn);
   else
     def_latency = result_ready_cost (def->insn);
@@ -1414,12 +1414,12 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
 void
 branch_target_load_optimize (rtx insns, bool after_prologue_epilogue_gen)
 {
-  enum reg_class class = (*targetm.branch_target_register_class) ();
+  enum reg_class class = targetm.branch_target_register_class ();
   if (class != NO_REGS)
     {
       /* Initialize issue_rate.  */
       if (targetm.sched.issue_rate)
-       issue_rate = (*targetm.sched.issue_rate) ();
+       issue_rate = targetm.sched.issue_rate ();
       else
        issue_rate = 1;
 

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 0222673..012b5a5 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4961,7 +4961,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
   emit_queue ();
 
   if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
-    return (*targetm.expand_builtin) (exp, target, subtarget, mode, ignore);
+    return targetm.expand_builtin (exp, target, subtarget, mode, ignore);
 
   /* When not optimizing, generate calls to library functions for a certain
      set of builtins.  */

diff --git a/gcc/c-common.c b/gcc/c-common.c
index 49c9ccf..e21d5bd 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -3401,7 +3401,7 @@ c_common_nodes_and_builtins (void)
 #include "builtins.def"
 #undef DEF_BUILTIN
 
-  (*targetm.init_builtins) ();
+  targetm.init_builtins ();
 
   main_identifier_node = get_identifier ("main");
 }
@@ -4614,7 +4614,7 @@ handle_mode_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
 
       else if ((TREE_CODE (type) == POINTER_TYPE
                || TREE_CODE (type) == REFERENCE_TYPE)
-              && !(*targetm.valid_pointer_mode) (mode))
+              && !targetm.valid_pointer_mode (mode))
        error ("invalid pointer mode `%s'", p);
       else
        {

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 9589d54..50ea380 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1268,7 +1268,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
     }
 
   DECL_ATTRIBUTES (newdecl)
-    = (*targetm.merge_decl_attributes) (olddecl, newdecl);
+    = targetm.merge_decl_attributes (olddecl, newdecl);
 
   /* Merge the data types specified in the two decls.  */
   TREE_TYPE (newdecl)

diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c
index 3bc89ee..5754071 100644 (file)
--- a/gcc/c-objc-common.c
+++ b/gcc/c-objc-common.c
@@ -86,7 +86,7 @@ c_cannot_inline_tree_fn (tree *fnp)
 
   /* Don't auto-inline anything that might not be bound within
      this unit of translation.  */
-  if (!DECL_DECLARED_INLINE_P (fn) && !(*targetm.binds_local_p) (fn))
+  if (!DECL_DECLARED_INLINE_P (fn) && !targetm.binds_local_p (fn))
     {
       if (do_warning)
        warning ("%Jfunction '%F' can never be inlined because it might not "

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 1d069a9..50ae16f 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -226,7 +226,7 @@ common_type (tree t1, tree t2)
     return t1;
 
   /* Merge the attributes.  */
-  attributes = (*targetm.merge_type_attributes) (t1, t2);
+  attributes = targetm.merge_type_attributes (t1, t2);
 
   /* Treat an enum type as the unsigned integer type of the same width.  */
 
@@ -502,7 +502,7 @@ comptypes (tree type1, tree type2, int flags)
     return 1;
 
   /* 1 if no need for warning yet, 2 if warning cause has been seen.  */
-  if (! (attrval = (*targetm.comp_type_attributes) (t1, t2)))
+  if (! (attrval = targetm.comp_type_attributes (t1, t2)))
      return 0;
 
   /* 1 if no need for warning yet, 2 if warning cause has been seen.  */
@@ -577,8 +577,8 @@ comptypes (tree type1, tree type2, int flags)
 
     case VECTOR_TYPE:
       /* The target might allow certain vector types to be compatible.  */
-      val = (*targetm.vector_opaque_p) (t1)
-       || (*targetm.vector_opaque_p) (t2)
+      val = targetm.vector_opaque_p (t1)
+       || targetm.vector_opaque_p (t2)
        || TYPE_MODE (t1) == TYPE_MODE (t2);
       break;
 
@@ -3393,8 +3393,8 @@ convert_for_assignment (tree type, tree rhs, const char *errtype,
       int target_cmp = 0;   /* Cache comp_target_types () result.  */
 
       /* Opaque pointers are treated like void pointers.  */
-      is_opaque_pointer = ((*targetm.vector_opaque_p) (type)
-                           || (*targetm.vector_opaque_p) (rhstype))
+      is_opaque_pointer = (targetm.vector_opaque_p (type)
+                           || targetm.vector_opaque_p (rhstype))
         && TREE_CODE (ttl) == VECTOR_TYPE
         && TREE_CODE (ttr) == VECTOR_TYPE;
 
@@ -4345,7 +4345,7 @@ really_start_incremental_init (tree type)
   if (type == 0)
     type = TREE_TYPE (constructor_decl);
 
-  if ((*targetm.vector_opaque_p) (type))
+  if (targetm.vector_opaque_p (type))
     error ("opaque vector types cannot be initialized");
 
   p->type = constructor_type;

diff --git a/gcc/calls.c b/gcc/calls.c
index 04e1671..0d429f6 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -2514,7 +2514,7 @@ expand_call (tree exp, rtx target, int ignore)
       || structure_value_addr != NULL_RTX
       /* Check whether the target is able to optimize the call
         into a sibcall.  */
-      || !(*targetm.function_ok_for_sibcall) (fndecl, exp)
+      || !targetm.function_ok_for_sibcall (fndecl, exp)
       /* Functions that do not return exactly once may not be sibcall
          optimized.  */
       || (flags & (ECF_RETURNS_TWICE | ECF_LONGJMP | ECF_NORETURN))

diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index 2534965..aa79d6e 100644 (file)
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -907,7 +907,7 @@ cfg_layout_can_duplicate_bb_p (basic_block bb)
       rtx insn = BB_HEAD (bb);
       while (1)
        {
-         if (INSN_P (insn) && (*targetm.cannot_copy_insn_p) (insn))
+         if (INSN_P (insn) && targetm.cannot_copy_insn_p (insn))
            return false;
          if (insn == BB_END (bb))
            break;

diff --git a/gcc/cse.c b/gcc/cse.c
index d93fb84..9e4cab8 100644 (file)
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -7697,7 +7697,7 @@ cse_cc_succs (basic_block bb, rtx cc_reg, rtx cc_src, bool can_change_mode)
                                       XEXP (SET_SRC (set), 1)))
                           
                {
-                 comp_mode = (*targetm.cc_modes_compatible) (mode, set_mode);
+                 comp_mode = targetm.cc_modes_compatible (mode, set_mode);
                  if (comp_mode != VOIDmode
                      && (can_change_mode || comp_mode == mode))
                    found = true;
@@ -7815,7 +7815,7 @@ cse_condition_code_reg (void)
   rtx cc_reg_2;
   basic_block bb;
 
-  if (! (*targetm.fixed_condition_code_regs) (&cc_regno_1, &cc_regno_2))
+  if (! targetm.fixed_condition_code_regs (&cc_regno_1, &cc_regno_2))
     return;
 
   cc_reg_1 = gen_rtx_REG (CCmode, cc_regno_1);

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 1729b4e..89ba1cf 100644 (file)
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -452,7 +452,7 @@ dbxout_function_end (void)
      the system doesn't insert underscores in front of user generated
      labels.  */
   ASM_GENERATE_INTERNAL_LABEL (lscope_label_name, "Lscope", scope_labelno);
-  (*targetm.asm_out.internal_label) (asmfile, "Lscope", scope_labelno);
+  targetm.asm_out.internal_label (asmfile, "Lscope", scope_labelno);
   scope_labelno++;
 
   /* By convention, GCC will mark the end of a function with an N_FUN
@@ -520,7 +520,7 @@ dbxout_init (const char *input_file_name)
   assemble_name (asmfile, ltext_label_name);
   fputc ('\n', asmfile);
   text_section ();
-  (*targetm.asm_out.internal_label) (asmfile, "Ltext", 0);
+  targetm.asm_out.internal_label (asmfile, "Ltext", 0);
 #endif /* no DBX_OUTPUT_MAIN_SOURCE_FILENAME */
 
 #ifdef DBX_OUTPUT_GCC_MARKER
@@ -729,7 +729,7 @@ dbxout_source_file (FILE *file, const char *filename)
        ; /* Don't change section amid function.  */
       else
        text_section ();
-      (*targetm.asm_out.internal_label) (file, "Ltext", source_label_number);
+      targetm.asm_out.internal_label (file, "Ltext", source_label_number);
       source_label_number++;
       lastfile = filename;
     }
@@ -757,7 +757,7 @@ static void
 dbxout_begin_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n)
 {
   emit_pending_bincls_if_required ();
-  (*targetm.asm_out.internal_label) (asmfile, "LBB", n);
+  targetm.asm_out.internal_label (asmfile, "LBB", n);
 }
 
 /* Describe the end line-number of an internal block within a function.  */
@@ -766,7 +766,7 @@ static void
 dbxout_end_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n)
 {
   emit_pending_bincls_if_required ();
-  (*targetm.asm_out.internal_label) (asmfile, "LBE", n);
+  targetm.asm_out.internal_label (asmfile, "LBE", n);
 }
 
 /* Output dbx data for a function definition.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 485dc26..3cc1782 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -149,7 +149,7 @@ collect2_eh_frame_section (void)
 
   data_section ();
   ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (PTR_SIZE));
-  (*targetm.asm_out.globalize_label) (asm_out_file, IDENTIFIER_POINTER (label));
+  targetm.asm_out.globalize_label (asm_out_file, IDENTIFIER_POINTER (label));
   ASM_OUTPUT_LABEL (asm_out_file, IDENTIFIER_POINTER (label));
 }
 
@@ -1958,7 +1958,7 @@ output_call_frame_info (int for_eh)
       if ((fde_table[i].nothrow || fde_table[i].all_throwers_are_sibcalls)
           && !fde_table[i].uses_eh_lsda
          && ! DECL_ONE_ONLY (fde_table[i].decl))
-       (*targetm.asm_out.unwind_label) (asm_out_file, fde_table[i].decl,
+       targetm.asm_out.unwind_label (asm_out_file, fde_table[i].decl,
                                         /* empty */ 1);
 
   /* If we don't have any functions we'll want to unwind out of, don't
@@ -1988,7 +1988,7 @@ output_call_frame_info (int for_eh)
     app_enable ();
 
   if (for_eh)
-    (*targetm.asm_out.eh_frame_section) ();
+    targetm.asm_out.eh_frame_section ();
   else
     named_section_flags (DEBUG_FRAME_SECTION, SECTION_DEBUG);
 
@@ -2123,8 +2123,8 @@ output_call_frame_info (int for_eh)
          && !fde->uses_eh_lsda)
        continue;
 
-      (*targetm.asm_out.unwind_label) (asm_out_file, fde->decl, /* empty */ 0);
-      (*targetm.asm_out.internal_label) (asm_out_file, FDE_LABEL, for_eh + i * 2);
+      targetm.asm_out.unwind_label (asm_out_file, fde->decl, /* empty */ 0);
+      targetm.asm_out.internal_label (asm_out_file, FDE_LABEL, for_eh + i * 2);
       ASM_GENERATE_INTERNAL_LABEL (l1, FDE_AFTER_SIZE_LABEL, for_eh + i * 2);
       ASM_GENERATE_INTERNAL_LABEL (l2, FDE_END_LABEL, for_eh + i * 2);
       dw2_asm_output_delta (for_eh ? 4 : DWARF_OFFSET_SIZE, l2, l1,
@@ -6632,7 +6632,7 @@ output_die_symbol (dw_die_ref die)
     /* We make these global, not weak; if the target doesn't support
        .linkonce, it doesn't support combining the sections, so debugging
        will break.  */
-    (*targetm.asm_out.globalize_label) (asm_out_file, sym);
+    targetm.asm_out.globalize_label (asm_out_file, sym);
 
   ASM_OUTPUT_LABEL (asm_out_file, sym);
 }
@@ -8230,7 +8230,7 @@ reg_loc_descriptor (rtx rtl)
     return 0;
 
   reg = reg_number (rtl);
-  regs = (*targetm.dwarf_register_span) (rtl);
+  regs = targetm.dwarf_register_span (rtl);
 
   if (hard_regno_nregs[reg][GET_MODE (rtl)] > 1
       || regs)
@@ -8405,7 +8405,7 @@ mem_loc_descriptor (rtx rtl, enum machine_mode mode, bool can_use_fbreg)
      actually within the array.  That's *not* necessarily the same as the
      zeroth element of the array.  */
 
-  rtl = (*targetm.delegitimize_address) (rtl);
+  rtl = targetm.delegitimize_address (rtl);
 
   switch (GET_CODE (rtl))
     {
@@ -8879,7 +8879,7 @@ loc_descriptor_from_tree (tree loc, int addressp)
        mode = GET_MODE (rtl);
        rtl = XEXP (rtl, 0);
 
-       rtl = (*targetm.delegitimize_address) (rtl);
+       rtl = targetm.delegitimize_address (rtl);
 
        indirect_p = 1;
        ret = mem_loc_descriptor (rtl, mode, true);
@@ -9664,7 +9664,7 @@ rtl_for_decl_location (tree decl)
                  && TREE_CODE (decl) == VAR_DECL
                  && TREE_STATIC (decl))))
        {
-         rtl = (*targetm.delegitimize_address) (rtl);
+         rtl = targetm.delegitimize_address (rtl);
          return rtl;
        }
       rtl = NULL_RTX;
@@ -9771,7 +9771,7 @@ rtl_for_decl_location (tree decl)
     }
 
   if (rtl)
-    rtl = (*targetm.delegitimize_address) (rtl);
+    rtl = targetm.delegitimize_address (rtl);
 
   /* If we don't look past the constant pool, we risk emitting a
      reference to a constant pool entry that isn't referenced from
@@ -13052,7 +13052,7 @@ dwarf2out_source_line (unsigned int line, const char *filename)
       else if (DECL_SECTION_NAME (current_function_decl))
        {
          dw_separate_line_info_ref line_info;
-         (*targetm.asm_out.internal_label) (asm_out_file, SEPARATE_LINE_CODE_LABEL,
+         targetm.asm_out.internal_label (asm_out_file, SEPARATE_LINE_CODE_LABEL,
                                     separate_line_info_table_in_use);
 
          /* Expand the line info table if necessary.  */
@@ -13082,7 +13082,7 @@ dwarf2out_source_line (unsigned int line, const char *filename)
        {
          dw_line_info_ref line_info;
 
-         (*targetm.asm_out.internal_label) (asm_out_file, LINE_CODE_LABEL,
+         targetm.asm_out.internal_label (asm_out_file, LINE_CODE_LABEL,
                                     line_info_table_in_use);
 
          /* Expand the line info table if necessary.  */
@@ -13590,7 +13590,7 @@ dwarf2out_finish (const char *filename)
 
   /* Output a terminator label for the .text section.  */
   text_section ();
-  (*targetm.asm_out.internal_label) (asm_out_file, TEXT_END_LABEL, 0);
+  targetm.asm_out.internal_label (asm_out_file, TEXT_END_LABEL, 0);
 
   /* Output the source line correspondence table.  We must do this
      even if there is no line information.  Otherwise, on an empty

diff --git a/gcc/except.c b/gcc/except.c
index c739650..36e3f43 100644 (file)
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -3738,7 +3738,7 @@ output_function_exception_table (void)
   /* Note that varasm still thinks we're in the function's code section.
      The ".endp" directive that will immediately follow will take us back.  */
 #else
-  (*targetm.asm_out.exception_section) ();
+  targetm.asm_out.exception_section ();
 #endif
 
   have_tt_data = (VARRAY_ACTIVE_SIZE (cfun->eh->ttype_data) > 0
@@ -3759,7 +3759,7 @@ output_function_exception_table (void)
       assemble_align (tt_format_size * BITS_PER_UNIT);
     }
 
-  (*targetm.asm_out.internal_label) (asm_out_file, "LLSDA",
+  targetm.asm_out.internal_label (asm_out_file, "LLSDA",
                             current_function_funcdef_no);
 
   /* The LSDA header.  */

diff --git a/gcc/final.c b/gcc/final.c
index 832b333..b53e9a8 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1380,7 +1380,7 @@ final_start_function (rtx first ATTRIBUTE_UNUSED, FILE *file,
     }
 
   /* First output the function prologue: code to set up the stack frame.  */
-  (*targetm.asm_out.function_prologue) (file, get_frame_size ());
+  targetm.asm_out.function_prologue (file, get_frame_size ());
 
   /* If the machine represents the prologue as RTL, the profiling code must
      be emitted when NOTE_INSN_PROLOGUE_END is scanned.  */
@@ -1418,7 +1418,7 @@ profile_function (FILE *file ATTRIBUTE_UNUSED)
       int align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE);
       data_section ();
       ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
-      (*targetm.asm_out.internal_label) (file, "LP", current_function_funcdef_no);
+      targetm.asm_out.internal_label (file, "LP", current_function_funcdef_no);
       assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, align, 1);
     }
 
@@ -1474,7 +1474,7 @@ final_end_function (void)
 
   /* Finally, output the function epilogue:
      code to restore the stack frame and return to the caller.  */
-  (*targetm.asm_out.function_epilogue) (asm_out_file, get_frame_size ());
+  targetm.asm_out.function_epilogue (asm_out_file, get_frame_size ());
 
   /* And debug output.  */
   (*debug_hooks->end_epilogue) (last_linenum, last_filename);
@@ -1609,7 +1609,7 @@ output_alternate_entry_point (FILE *file, rtx insn)
       ASM_WEAKEN_LABEL (file, name);
 #endif
     case LABEL_GLOBAL_ENTRY:
-      (*targetm.asm_out.globalize_label) (file, name);
+      targetm.asm_out.globalize_label (file, name);
     case LABEL_STATIC_ENTRY:
 #ifdef ASM_OUTPUT_TYPE_DIRECTIVE
       ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function");
@@ -1701,7 +1701,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
          break;
 
        case NOTE_INSN_PROLOGUE_END:
-         (*targetm.asm_out.function_end_prologue) (file);
+         targetm.asm_out.function_end_prologue (file);
          profile_after_prologue (file);
 
          if ((*seen & (SEEN_EMITTED | SEEN_NOTE)) == SEEN_NOTE)
@@ -1715,7 +1715,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
          break;
 
        case NOTE_INSN_EPILOGUE_BEG:
-         (*targetm.asm_out.function_begin_epilogue) (file);
+         targetm.asm_out.function_begin_epilogue (file);
          break;
 
        case NOTE_INSN_FUNCTION_BEG:
@@ -1901,7 +1901,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
              ASM_OUTPUT_CASE_LABEL (file, "L", CODE_LABEL_NUMBER (insn),
                                     NEXT_INSN (insn));
 #else
-             (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn));
+             targetm.asm_out.internal_label (file, "L", CODE_LABEL_NUMBER (insn));
 #endif
 #endif
              break;
@@ -1910,7 +1910,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
       if (LABEL_ALT_ENTRY_P (insn))
        output_alternate_entry_point (file, insn);
       else
-       (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn));
+       targetm.asm_out.internal_label (file, "L", CODE_LABEL_NUMBER (insn));
       break;
 
     default:

diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 34e8606..a87d7ad 100644 (file)
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -875,7 +875,7 @@ insn_cost (rtx insn, rtx link, rtx used)
       else
        {
          if (targetm.sched.use_dfa_pipeline_interface
-             && (*targetm.sched.use_dfa_pipeline_interface) ())
+             && targetm.sched.use_dfa_pipeline_interface ())
            cost = insn_default_latency (insn);
          else
            cost = result_ready_cost (insn);
@@ -899,7 +899,7 @@ insn_cost (rtx insn, rtx link, rtx used)
   else
     {
       if (targetm.sched.use_dfa_pipeline_interface
-         && (*targetm.sched.use_dfa_pipeline_interface) ())
+         && targetm.sched.use_dfa_pipeline_interface ())
        {
          if (INSN_CODE (insn) >= 0)
            {
@@ -918,7 +918,7 @@ insn_cost (rtx insn, rtx link, rtx used)
        }
 
       if (targetm.sched.adjust_cost)
-       cost = (*targetm.sched.adjust_cost) (used, link, insn, cost);
+       cost = targetm.sched.adjust_cost (used, link, insn, cost);
 
       if (cost < 0)
        cost = 0;
@@ -1210,7 +1210,7 @@ adjust_priority (rtx prev)
 
   if (targetm.sched.adjust_priority)
     INSN_PRIORITY (prev) =
-      (*targetm.sched.adjust_priority) (prev, INSN_PRIORITY (prev));
+      targetm.sched.adjust_priority (prev, INSN_PRIORITY (prev));
 }
 
 /* Advance time on one cycle.  */
@@ -1218,17 +1218,17 @@ HAIFA_INLINE static void
 advance_one_cycle (void)
 {
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       if (targetm.sched.dfa_pre_cycle_insn)
        state_transition (curr_state,
-                         (*targetm.sched.dfa_pre_cycle_insn) ());
+                         targetm.sched.dfa_pre_cycle_insn ());
 
       state_transition (curr_state, NULL);
 
       if (targetm.sched.dfa_post_cycle_insn)
        state_transition (curr_state,
-                         (*targetm.sched.dfa_post_cycle_insn) ());
+                         targetm.sched.dfa_post_cycle_insn ());
     }
 }
 
@@ -1250,11 +1250,11 @@ schedule_insn (rtx insn, struct ready_list *ready, int clock)
   int premature_issue = 0;
 
   if (!targetm.sched.use_dfa_pipeline_interface
-      || !(*targetm.sched.use_dfa_pipeline_interface) ())
+      || !targetm.sched.use_dfa_pipeline_interface ())
     unit = insn_unit (insn);
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ()
+      && targetm.sched.use_dfa_pipeline_interface ()
       && sched_verbose >= 1)
     {
       char buf[2048];
@@ -1278,7 +1278,7 @@ schedule_insn (rtx insn, struct ready_list *ready, int clock)
     }
 
   if (!targetm.sched.use_dfa_pipeline_interface
-      || !(*targetm.sched.use_dfa_pipeline_interface) ())
+      || !targetm.sched.use_dfa_pipeline_interface ())
     {
       if (sched_verbose && unit == -1)
        visualize_no_unit (insn);
@@ -1808,7 +1808,7 @@ queue_to_ready (struct ready_list *ready)
        }
 
       if ((!targetm.sched.use_dfa_pipeline_interface
-          || !(*targetm.sched.use_dfa_pipeline_interface) ())
+          || !targetm.sched.use_dfa_pipeline_interface ())
          && sched_verbose && stalls)
        visualize_stall_cycles (stalls);
 
@@ -2194,7 +2194,7 @@ choose_ready (struct ready_list *ready)
   int lookahead = 0;
 
   if (targetm.sched.first_cycle_multipass_dfa_lookahead)
-    lookahead = (*targetm.sched.first_cycle_multipass_dfa_lookahead) ();
+    lookahead = targetm.sched.first_cycle_multipass_dfa_lookahead ();
   if (lookahead <= 0 || SCHED_GROUP_P (ready_element (ready, 0)))
     return ready_remove_first (ready);
   else
@@ -2219,7 +2219,7 @@ choose_ready (struct ready_list *ready)
          ready_try [i]
            = (INSN_CODE (insn) < 0
               || (targetm.sched.first_cycle_multipass_dfa_lookahead_guard
-                  && !(*targetm.sched.first_cycle_multipass_dfa_lookahead_guard) (insn)));
+                  && !targetm.sched.first_cycle_multipass_dfa_lookahead_guard (insn)));
        }
       if (max_issue (ready, &index) == 0)
        return ready_remove_first (ready);
@@ -2272,7 +2272,7 @@ schedule_block (int b, int rgn_n_insns)
     }
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     state_reset (curr_state);
   else
     clear_units ();
@@ -2284,7 +2284,7 @@ schedule_block (int b, int rgn_n_insns)
   ready.n_ready = 0;
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       /* It is used for first cycle multipass scheduling.  */
       temp_state = alloca (dfa_state_size);
@@ -2298,7 +2298,7 @@ schedule_block (int b, int rgn_n_insns)
   (*current_sched_info->init_ready_list) (&ready);
 
   if (targetm.sched.md_init)
-    (*targetm.sched.md_init) (sched_dump, sched_verbose, ready.veclen);
+    targetm.sched.md_init (sched_dump, sched_verbose, ready.veclen);
 
   /* We start inserting insns after PREV_HEAD.  */
   last_scheduled_insn = prev_head;
@@ -2309,7 +2309,7 @@ schedule_block (int b, int rgn_n_insns)
   q_size = 0;
 
   if (!targetm.sched.use_dfa_pipeline_interface
-      || !(*targetm.sched.use_dfa_pipeline_interface) ())
+      || !targetm.sched.use_dfa_pipeline_interface ())
     max_insn_queue_index_macro_value = INSN_QUEUE_SIZE - 1;
   else
     max_insn_queue_index_macro_value = max_insn_queue_index;
@@ -2370,9 +2370,9 @@ schedule_block (int b, int rgn_n_insns)
          && (ready.n_ready == 0
              || !SCHED_GROUP_P (ready_element (&ready, 0))))
        can_issue_more =
-         (*targetm.sched.reorder) (sched_dump, sched_verbose,
-                                   ready_lastpos (&ready),
-                                   &ready.n_ready, clock_var);
+         targetm.sched.reorder (sched_dump, sched_verbose,
+                                ready_lastpos (&ready),
+                                &ready.n_ready, clock_var);
       else
        can_issue_more = issue_rate;
 
@@ -2391,7 +2391,7 @@ schedule_block (int b, int rgn_n_insns)
            }
 
          if (!targetm.sched.use_dfa_pipeline_interface
-             || !(*targetm.sched.use_dfa_pipeline_interface) ())
+             || !targetm.sched.use_dfa_pipeline_interface ())
            {
              if (ready.n_ready == 0 || !can_issue_more
                  || !(*current_sched_info->schedule_more_p) ())
@@ -2427,9 +2427,9 @@ schedule_block (int b, int rgn_n_insns)
                insn = ready_remove_first (&ready);
 
              if (targetm.sched.dfa_new_cycle
-                 && (*targetm.sched.dfa_new_cycle) (sched_dump, sched_verbose,
-                                                    insn, last_clock_var,
-                                                    clock_var, &sort_p))
+                 && targetm.sched.dfa_new_cycle (sched_dump, sched_verbose,
+                                                 insn, last_clock_var,
+                                                 clock_var, &sort_p))
                {
                  ready_add (&ready, insn);
                  break;
@@ -2465,7 +2465,7 @@ schedule_block (int b, int rgn_n_insns)
                          rtx bubble;
 
                          for (j = 0;
-                              (bubble = (*targetm.sched.dfa_bubble) (j))
+                              (bubble = targetm.sched.dfa_bubble (j))
                                 != NULL_RTX;
                               j++)
                            {
@@ -2538,7 +2538,7 @@ schedule_block (int b, int rgn_n_insns)
          last_scheduled_insn = move_insn (insn, last_scheduled_insn);
 
          if (targetm.sched.use_dfa_pipeline_interface
-             && (*targetm.sched.use_dfa_pipeline_interface) ())
+             && targetm.sched.use_dfa_pipeline_interface ())
            {
              if (memcmp (curr_state, temp_state, dfa_state_size) != 0)
                cycle_issued_insns++;
@@ -2547,7 +2547,7 @@ schedule_block (int b, int rgn_n_insns)
 
          if (targetm.sched.variable_issue)
            can_issue_more =
-             (*targetm.sched.variable_issue) (sched_dump, sched_verbose,
+             targetm.sched.variable_issue (sched_dump, sched_verbose,
                                               insn, can_issue_more);
          /* A naked CLOBBER or USE generates no instruction, so do
             not count them against the issue rate.  */
@@ -2573,22 +2573,22 @@ schedule_block (int b, int rgn_n_insns)
                  || !SCHED_GROUP_P (ready_element (&ready, 0))))
            {
              can_issue_more =
-               (*targetm.sched.reorder2) (sched_dump, sched_verbose,
-                                          ready.n_ready
-                                          ? ready_lastpos (&ready) : NULL,
-                                          &ready.n_ready, clock_var);
+               targetm.sched.reorder2 (sched_dump, sched_verbose,
+                                       ready.n_ready
+                                       ? ready_lastpos (&ready) : NULL,
+                                       &ready.n_ready, clock_var);
            }
        }
 
       if ((!targetm.sched.use_dfa_pipeline_interface
-          || !(*targetm.sched.use_dfa_pipeline_interface) ())
+          || !targetm.sched.use_dfa_pipeline_interface ())
          && sched_verbose)
        /* Debug info.  */
        visualize_scheduled_insns (clock_var);
     }
 
   if (targetm.sched.md_finish)
-    (*targetm.sched.md_finish) (sched_dump, sched_verbose);
+    targetm.sched.md_finish (sched_dump, sched_verbose);
 
   /* Debug info.  */
   if (sched_verbose)
@@ -2596,7 +2596,7 @@ schedule_block (int b, int rgn_n_insns)
       fprintf (sched_dump, ";;\tReady list (final):  ");
       debug_ready_list (&ready);
       if (!targetm.sched.use_dfa_pipeline_interface
-         || !(*targetm.sched.use_dfa_pipeline_interface) ())
+         || !targetm.sched.use_dfa_pipeline_interface ())
        print_block_visualization ("");
     }
 
@@ -2665,7 +2665,7 @@ schedule_block (int b, int rgn_n_insns)
   free (ready.vec);
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       free (ready_try);
       for (i = 0; i <= rgn_n_insns; i++)
@@ -2738,7 +2738,7 @@ sched_init (FILE *dump_file)
 
   /* Initialize issue_rate.  */
   if (targetm.sched.issue_rate)
-    issue_rate = (*targetm.sched.issue_rate) ();
+    issue_rate = targetm.sched.issue_rate ();
   else
     issue_rate = 1;
 
@@ -2759,17 +2759,17 @@ sched_init (FILE *dump_file)
     h_i_d [i].cost = -1;
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       if (targetm.sched.init_dfa_pre_cycle_insn)
-       (*targetm.sched.init_dfa_pre_cycle_insn) ();
+       targetm.sched.init_dfa_pre_cycle_insn ();
 
       if (targetm.sched.init_dfa_post_cycle_insn)
-       (*targetm.sched.init_dfa_post_cycle_insn) ();
+       targetm.sched.init_dfa_post_cycle_insn ();
 
       if (targetm.sched.first_cycle_multipass_dfa_lookahead
          && targetm.sched.init_dfa_bubbles)
-       (*targetm.sched.init_dfa_bubbles) ();
+       targetm.sched.init_dfa_bubbles ();
 
       dfa_start ();
       dfa_state_size = state_size ();
@@ -2832,7 +2832,7 @@ sched_init (FILE *dump_file)
     }
 
   if ((!targetm.sched.use_dfa_pipeline_interface
-       || !(*targetm.sched.use_dfa_pipeline_interface) ())
+       || !targetm.sched.use_dfa_pipeline_interface ())
       && sched_verbose)
     /* Find units used in this function, for visualization.  */
     init_target_units ();
@@ -2858,7 +2858,7 @@ sched_init (FILE *dump_file)
     find_insn_reg_weight (b->index);
 
   if (targetm.sched.md_init_global)
-      (*targetm.sched.md_init_global) (sched_dump, sched_verbose, old_max_uid);
+      targetm.sched.md_init_global (sched_dump, sched_verbose, old_max_uid);
 }
 
 /* Free global data used during insn scheduling.  */
@@ -2869,7 +2869,7 @@ sched_finish (void)
   free (h_i_d);
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       free (curr_state);
       dfa_finish ();
@@ -2880,6 +2880,6 @@ sched_finish (void)
     free (line_note_head);
 
   if (targetm.sched.md_finish_global)
-      (*targetm.sched.md_finish_global) (sched_dump, sched_verbose);
+      targetm.sched.md_finish_global (sched_dump, sched_verbose);
 }
 #endif /* INSN_SCHEDULING */

diff --git a/gcc/integrate.c b/gcc/integrate.c
index d7136c3..b9f4681 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -130,7 +130,7 @@ function_attribute_inlinable_p (tree fndecl)
 
          for (i = 0; targetm.attribute_table[i].name != NULL; i++)
            if (is_attribute_p (targetm.attribute_table[i].name, name))
-             return (*targetm.function_attribute_inlinable_p) (fndecl);
+             return targetm.function_attribute_inlinable_p (fndecl);
        }
     }
 

diff --git a/gcc/passes.c b/gcc/passes.c
index 24a2d23..f70cb85 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -556,7 +556,7 @@ rest_of_handle_machine_reorg (tree decl, rtx insns)
   timevar_push (TV_MACH_DEP);
   open_dump_file (DFI_mach, decl);
 
-  (*targetm.machine_dependent_reorg) ();
+  targetm.machine_dependent_reorg ();
 
   close_dump_file (DFI_mach, print_rtl, insns);
   timevar_pop (TV_MACH_DEP);
@@ -2086,7 +2086,7 @@ rest_of_compilation (tree decl)
 
   timevar_pop (TV_FINAL);
 
-  if ((*targetm.binds_local_p) (current_function_decl))
+  if (targetm.binds_local_p (current_function_decl))
     {
       int pref = cfun->preferred_stack_boundary;
       if (cfun->recursive_call_emit

diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 15fc7ad..3f3a428 100644 (file)
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -3841,7 +3841,7 @@ rtx_cost (rtx x, enum rtx_code outer_code ATTRIBUTE_UNUSED)
       break;
 
     default:
-      if ((*targetm.rtx_costs) (x, code, outer_code, &total))
+      if (targetm.rtx_costs (x, code, outer_code, &total))
        return total;
       break;
     }
@@ -3881,7 +3881,7 @@ address_cost (rtx x, enum machine_mode mode)
   if (!memory_address_p (mode, x))
     return 1000;
 
-  return (*targetm.address_cost) (x);
+  return targetm.address_cost (x);
 }
 
 /* If the target doesn't override, compute the cost as with arithmetic.  */

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 673416f..2cb89a4 100644 (file)
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -1761,7 +1761,7 @@ init_ready_list (struct ready_list *ready)
 
          if (targetm.sched.adjust_priority)
            INSN_PRIORITY (insn) =
-             (*targetm.sched.adjust_priority) (insn, INSN_PRIORITY (insn));
+             targetm.sched.adjust_priority (insn, INSN_PRIORITY (insn));
        }
       target_n_insns++;
     }
@@ -1788,10 +1788,10 @@ init_ready_list (struct ready_list *ready)
            if (!CANT_MOVE (insn)
                && (!IS_SPECULATIVE_INSN (insn)
                    || ((((!targetm.sched.use_dfa_pipeline_interface
-                          || !(*targetm.sched.use_dfa_pipeline_interface) ())
+                          || !targetm.sched.use_dfa_pipeline_interface ())
                          && insn_issue_delay (insn) <= 3)
                         || (targetm.sched.use_dfa_pipeline_interface
-                            && (*targetm.sched.use_dfa_pipeline_interface) ()
+                            && targetm.sched.use_dfa_pipeline_interface ()
                             && (recog_memoized (insn) < 0
                                 || min_insn_conflict_delay (curr_state,
                                                             insn, insn) <= 3)))
@@ -1803,7 +1803,7 @@ init_ready_list (struct ready_list *ready)
 
                  if (targetm.sched.adjust_priority)
                    INSN_PRIORITY (insn) =
-                     (*targetm.sched.adjust_priority) (insn, INSN_PRIORITY (insn));
+                     targetm.sched.adjust_priority (insn, INSN_PRIORITY (insn));
                }
          }
       }
@@ -1887,12 +1887,12 @@ new_ready (rtx next)
          || (IS_SPECULATIVE_INSN (next)
              && (0
                  || (targetm.sched.use_dfa_pipeline_interface
-                     && (*targetm.sched.use_dfa_pipeline_interface) ()
+                     && targetm.sched.use_dfa_pipeline_interface ()
                      && recog_memoized (next) >= 0
                      && min_insn_conflict_delay (curr_state, next,
                                                  next) > 3)
                  || ((!targetm.sched.use_dfa_pipeline_interface
-                      || !(*targetm.sched.use_dfa_pipeline_interface) ())
+                      || !targetm.sched.use_dfa_pipeline_interface ())
                      && insn_issue_delay (next) > 3)
                  || !check_live (next, INSN_BB (next))
                  || !is_exception_free (next, INSN_BB (next), target_bb)))))
@@ -2293,7 +2293,7 @@ debug_dependencies (void)
                   BB_TO_BLOCK (bb), bb);
 
          if (targetm.sched.use_dfa_pipeline_interface
-             && (*targetm.sched.use_dfa_pipeline_interface) ())
+             && targetm.sched.use_dfa_pipeline_interface ())
            {
              fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%14s\n",
                       "insn", "code", "bb", "dep", "prio", "cost",
@@ -2333,7 +2333,7 @@ debug_dependencies (void)
                }
 
              if (targetm.sched.use_dfa_pipeline_interface
-                 && (*targetm.sched.use_dfa_pipeline_interface) ())
+                 && targetm.sched.use_dfa_pipeline_interface ())
                {
                  fprintf (sched_dump,
                           ";;   %s%5d%6d%6d%6d%6d%6d   ",

diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index 9174c8b..b7544d2 100644 (file)
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -1,6 +1,6 @@
 /* Instruction scheduling pass.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com) Enhanced by,
    and currently maintained by, Jim Wilson (wilson@cygnus.com)
 
@@ -126,7 +126,7 @@ get_visual_tbl_length (void)
   char *s;
 
   if (targetm.sched.use_dfa_pipeline_interface
-      && (*targetm.sched.use_dfa_pipeline_interface) ())
+      && targetm.sched.use_dfa_pipeline_interface ())
     {
       visual_tbl_line_length = 1;
       return 1; /* Can't return 0 because that will cause problems

diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index ffb05d5..0058589 100644 (file)
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -132,7 +132,7 @@ avoid_constant_pool_reference (rtx x)
   addr = XEXP (x, 0);
 
   /* Call target hook to avoid the effects of -fpic etc....  */
-  addr = (*targetm.delegitimize_address) (addr);
+  addr = targetm.delegitimize_address (addr);
 
   if (GET_CODE (addr) == LO_SUM)
     addr = XEXP (addr, 1);

diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index fa26bd7..2b039db 100644 (file)
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -394,7 +394,7 @@ layout_decl (tree decl, unsigned int known_align)
             field.  */
          if (integer_zerop (DECL_SIZE (decl))
              && ! DECL_PACKED (decl)
-             && ! (*targetm.ms_bitfield_layout_p) (DECL_FIELD_CONTEXT (decl)))
+             && ! targetm.ms_bitfield_layout_p (DECL_FIELD_CONTEXT (decl)))
            {
 #ifdef PCC_BITFIELD_TYPE_MATTERS
              if (PCC_BITFIELD_TYPE_MATTERS)

diff --git a/gcc/tree.c b/gcc/tree.c
index 1e38652..ed7771a 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -303,7 +303,7 @@ make_node_stat (enum tree_code code MEM_STAT_DECL)
 
       /* Default to no attributes for type, but let target change that.  */
       TYPE_ATTRIBUTES (t) = NULL_TREE;
-      (*targetm.set_default_type_attributes) (t);
+      targetm.set_default_type_attributes (t);
 
       /* We have not yet computed the alias set for this type.  */
       TYPE_ALIAS_SET (t) = -1;
@@ -5131,7 +5131,7 @@ build_common_tree_nodes_2 (int short_double)
   layout_type (complex_long_double_type_node);
 
   {
-    tree t = (*targetm.build_builtin_va_list) ();
+    tree t = targetm.build_builtin_va_list ();
 
     /* Many back-ends define record types without setting TYPE_NAME.
        If we copied the record type here, we'd keep the original

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 9cf8b94..6256421 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -348,7 +348,7 @@ named_section_flags (const char *name, unsigned int flags)
       if (! set_named_section_flags (name, flags))
        abort ();
 
-      (*targetm.asm_out.named_section) (name, flags);
+      targetm.asm_out.named_section (name, flags);
 
       if (flags & SECTION_FORGET)
        in_section = no_section;
@@ -402,7 +402,7 @@ resolve_unique_section (tree decl, int reloc ATTRIBUTE_UNUSED,
       && targetm.have_named_sections
       && (flag_function_or_data_sections
          || DECL_ONE_ONLY (decl)))
-    (*targetm.asm_out.unique_section) (decl, reloc);
+    targetm.asm_out.unique_section (decl, reloc);
 }
 
 #ifdef BSS_SECTION_ASM_OP
@@ -432,7 +432,7 @@ asm_output_bss (FILE *file, tree decl ATTRIBUTE_UNUSED,
                unsigned HOST_WIDE_INT size ATTRIBUTE_UNUSED,
                unsigned HOST_WIDE_INT rounded)
 {
-  (*targetm.asm_out.globalize_label) (file, name);
+  targetm.asm_out.globalize_label (file, name);
   bss_section ();
 #ifdef ASM_DECLARE_OBJECT_NAME
   last_assemble_variable_decl = decl;
@@ -499,7 +499,7 @@ variable_section (tree decl, int reloc)
   if (IN_NAMED_SECTION (decl))
     named_section (decl, NULL, reloc);
   else
-    (*targetm.asm_out.select_section) (decl, reloc, DECL_ALIGN (decl));
+    targetm.asm_out.select_section (decl, reloc, DECL_ALIGN (decl));
 }
 
 /* Tell assembler to switch to the section for string merging.  */
@@ -1610,7 +1610,7 @@ assemble_external_libcall (rtx fun)
   if (! SYMBOL_REF_USED (fun))
     {
       SYMBOL_REF_USED (fun) = 1;
-      (*targetm.asm_out.external_libcall) (fun);
+      targetm.asm_out.external_libcall (fun);
     }
 }
 
@@ -1741,7 +1741,7 @@ assemble_trampoline_template (void)
       ASM_OUTPUT_ALIGN (asm_out_file, align);
     }
 
-  (*targetm.asm_out.internal_label) (asm_out_file, "LTRAMP", 0);
+  targetm.asm_out.internal_label (asm_out_file, "LTRAMP", 0);
   TRAMPOLINE_TEMPLATE (asm_out_file);
 
   /* Record the rtl to refer to it.  */
@@ -1833,7 +1833,7 @@ assemble_integer (rtx x, unsigned int size, unsigned int align, int force)
   aligned_p = (align >= MIN (size * BITS_PER_UNIT, BIGGEST_ALIGNMENT));
 
   /* See if the target hook can handle this kind of object.  */
-  if ((*targetm.asm_out.integer) (x, size, aligned_p))
+  if (targetm.asm_out.integer (x, size, aligned_p))
     return true;
 
   /* If the object is a multi-byte one, try splitting it up.  Split
@@ -2371,7 +2371,7 @@ build_constant_desc (tree exp)
      information.  This call might invalidate our local variable
      SYMBOL; we can't use it afterward.  */
 
-  (*targetm.encode_section_info) (exp, rtl, true);
+  targetm.encode_section_info (exp, rtl, true);
 
   desc->rtl = rtl;
 
@@ -2474,7 +2474,7 @@ output_constant_def_contents (rtx symbol)
   if (IN_NAMED_SECTION (exp))
     named_section (exp, NULL, reloc);
   else
-    (*targetm.asm_out.select_section) (exp, reloc, align);
+    targetm.asm_out.select_section (exp, reloc, align);
 
   if (align > BITS_PER_UNIT)
     {
@@ -2723,7 +2723,7 @@ force_const_mem (enum machine_mode mode, rtx x)
   void **slot;
 
   /* If we're not allowed to drop X into the constant pool, don't.  */
-  if ((*targetm.cannot_force_const_mem) (x))
+  if (targetm.cannot_force_const_mem (x))
     return NULL_RTX;
 
   /* Lookup the value in the hashtable.  */
@@ -2964,7 +2964,7 @@ output_constant_pool_1 (struct constant_descriptor_rtx *desc)
     }
 
   /* First switch to correct section.  */
-  (*targetm.asm_out.select_rtx_section) (desc->mode, x, desc->align);
+  targetm.asm_out.select_rtx_section (desc->mode, x, desc->align);
 
 #ifdef ASM_OUTPUT_SPECIAL_POOL_ENTRY
   ASM_OUTPUT_SPECIAL_POOL_ENTRY (asm_out_file, x, desc->mode,
@@ -2974,7 +2974,7 @@ output_constant_pool_1 (struct constant_descriptor_rtx *desc)
   assemble_align (desc->align);
 
   /* Output the label.  */
-  (*targetm.asm_out.internal_label) (asm_out_file, "LC", desc->labelno);
+  targetm.asm_out.internal_label (asm_out_file, "LC", desc->labelno);
 
   /* Output the data.  */
   output_constant_pool_2 (desc->mode, x, desc->align);
@@ -4109,7 +4109,7 @@ globalize_decl (tree decl)
     ASM_MAKE_LABEL_LINKONCE (asm_out_file, name);
 #endif
 
-  (*targetm.asm_out.globalize_label) (asm_out_file, name);
+  targetm.asm_out.globalize_label (asm_out_file, name);
 }
 
 /* Emit an assembler directive to make the symbol for DECL an alias to
@@ -4283,7 +4283,7 @@ decl_tls_model (tree decl)
       return kind;
     }
 
-  is_local = (*targetm.binds_local_p) (decl);
+  is_local = targetm.binds_local_p (decl);
   if (!flag_pic)
     {
       if (is_local)
@@ -4586,7 +4586,7 @@ categorize_decl_for_section (tree decl, int reloc, int shlib)
     }
 
   /* If the target uses small data sections, select it.  */
-  else if ((*targetm.in_small_data_p) (decl))
+  else if (targetm.in_small_data_p (decl))
     {
       if (ret == SECCAT_BSS)
        ret = SECCAT_SBSS;
@@ -4828,9 +4828,9 @@ default_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
   flags = 0;
   if (TREE_CODE (decl) == FUNCTION_DECL)
     flags |= SYMBOL_FLAG_FUNCTION;
-  if ((*targetm.binds_local_p) (decl))
+  if (targetm.binds_local_p (decl))
     flags |= SYMBOL_FLAG_LOCAL;
-  if ((*targetm.in_small_data_p) (decl))
+  if (targetm.in_small_data_p (decl))
     flags |= SYMBOL_FLAG_SMALL;
   if (TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL (decl))
     flags |= decl_tls_model (decl) << SYMBOL_FLAG_TLS_SHIFT;

diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index f0b49f6..6456251 100644 (file)
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -1323,7 +1323,7 @@ vmsdbgout_begin_block (register unsigned line, register unsigned blocknum)
     (*dwarf2_debug_hooks.begin_block) (line, blocknum);
 
   if (debug_info_level > DINFO_LEVEL_TERSE)
-    (*targetm.asm_out.internal_label) (asm_out_file, BLOCK_BEGIN_LABEL, blocknum);
+    targetm.asm_out.internal_label (asm_out_file, BLOCK_BEGIN_LABEL, blocknum);
 }
 
 /* Output a marker (i.e. a label) for the end of the generated code for a
@@ -1336,7 +1336,7 @@ vmsdbgout_end_block (register unsigned line, register unsigned blocknum)
     (*dwarf2_debug_hooks.end_block) (line, blocknum);
 
   if (debug_info_level > DINFO_LEVEL_TERSE)
-    (*targetm.asm_out.internal_label) (asm_out_file, BLOCK_END_LABEL, blocknum);
+    targetm.asm_out.internal_label (asm_out_file, BLOCK_END_LABEL, blocknum);
 }
 
 /* Not implemented in VMS Debug.  */
@@ -1516,8 +1516,8 @@ vmsdbgout_source_line (register unsigned line, register const char *filename)
     {
       dst_line_info_ref line_info;
 
-      (*targetm.asm_out.internal_label) (asm_out_file, LINE_CODE_LABEL,
-                                line_info_table_in_use);
+      targetm.asm_out.internal_label (asm_out_file, LINE_CODE_LABEL,
+                                     line_info_table_in_use);
 
       /* Expand the line info table if necessary.  */
       if (line_info_table_in_use == line_info_table_allocated)
@@ -1673,7 +1673,7 @@ vmsdbgout_finish (const char *main_input_filename ATTRIBUTE_UNUSED)
 
   /* Output a terminator label for the .text section.  */
   text_section ();
-  (*targetm.asm_out.internal_label) (asm_out_file, TEXT_END_LABEL, 0);
+  targetm.asm_out.internal_label (asm_out_file, TEXT_END_LABEL, 0);
 
   /* Output debugging information.
      Warning! Do not change the name of the .vmsdebug section without