* Fix typos. Remove trailing blanks. Fix coding style.

From-SVN: r195151

gcc/ChangeLog

+2013-01-14  Georg-Johann Lay  <avr@gjlay.de>
+
+	* config/avr/avr-stdint.h: Remove trailing blanks.
+	* config/avr/avr-log.h: Same.
+	* config/avr/avr-arch.h: Same.
+	* config/avr/avr-devices.c: Same.
+	* config/avr/avr-dimode.md: Same.
+	* config/avr/predicates.md: Same.
+	* config/avr/avr-c.c: Same.  And fix typo.
+	
+	* config/avr/avr-protos.h: Same.  And:
+	(function_arg_regno_p): Rename to avr_function_arg_regno_p.
+	(init_cumulative_args): Rename to avr_init_cumulative_args.
+	(expand_prologue): Rename to avr_expand_prologue.
+	(expand_epilogue): Rename to avr_expand_epilogue.
+	(adjust_insn_length): Rename to avr_adjust_insn_length.
+	(notice_update_cc): Rename to avr_notice_update_cc.
+	(final_prescan_insn): Rename to avr_final_prescan_insn.
+	* config/avr/avr.c: Same.
+	* config/avr/avr.h: Same.
+	* config/avr/avr.md: Remove trailing blanks.
+	(prologue): Use avr_expand_prologue.
+	(epilogue, sibcall_epilogue): Use avr_expand_epilogue.
+
 2013-01-14  Richard Biener  <rguenther@suse.de>
 
 	* tree-cfg.c (verify_expr_location, verify_expr_location_1,

gcc/config/avr/avr-c.c

@@ -40,7 +40,7 @@ avr_register_target_pragmas (void)
   gcc_assert (ADDR_SPACE_GENERIC == ADDR_SPACE_RAM);
 
   /* Register address spaces.  The order must be the same as in the respective
-     enum from avr.h (or designated initialized must be used in avr.c).  */
+     enum from avr.h (or designated initializers must be used in avr.c).  */
 
   for (i = 0; i < ADDR_SPACE_COUNT; i++)
     {
@@ -52,7 +52,7 @@ avr_register_target_pragmas (void)
 }
 
 
-/* Transorm LO into uppercase and write the result to UP.
+/* Transform LO into uppercase and write the result to UP.
    You must provide enough space for UP.  Return UP.  */
 
 static char*
@@ -151,8 +151,8 @@ avr_cpu_cpp_builtins (struct cpp_reader *pfile)
   cpp_define (pfile, "__WITH_AVRLIBC__");
 #endif /* WITH_AVRLIBC */
 
-  /* Define builtin macros so that the user can easily query if or if not
-     non-generic address spaces (and which) are supported.
+  /* Define builtin macros so that the user can easily query whether
+     non-generic address spaces (and which) are supported or not.
      This is only supported for C.  For C++, a language extension is needed
      (as mentioned in ISO/IEC DTR 18037; Annex F.2) which is not
      implemented in GCC up to now.  */
@@ -174,8 +174,8 @@ avr_cpu_cpp_builtins (struct cpp_reader *pfile)
           }
     }
 
-  /* Define builtin macros so that the user can easily query if or
-     if not a specific builtin is available. */
+  /* Define builtin macros so that the user can easily query whether or
+     not a specific builtin is available. */
 
   for (i = 0; avr_builtin_name[i]; i++)
     {

gcc/config/avr/avr-log.c

@@ -281,7 +281,8 @@ avr_log_vadump (FILE *file, const char *fmt, va_list ap)
               break;
 
             case 'm':
-              fputs (GET_MODE_NAME ((enum machine_mode) va_arg (ap, int)), file);
+              fputs (GET_MODE_NAME ((enum machine_mode) va_arg (ap, int)),
+                     file);
               break;
 
             case 'C':

gcc/config/avr/avr-protos.h

@@ -20,11 +20,11 @@
    <http://www.gnu.org/licenses/>.  */
 
 
-extern int function_arg_regno_p (int r);
+extern int avr_function_arg_regno_p (int r);
 extern void avr_cpu_cpp_builtins (struct cpp_reader * pfile);
 extern enum reg_class avr_regno_reg_class (int r);
 extern void asm_globalize_label (FILE *file, const char *name);
-extern void order_regs_for_local_alloc (void);
+extern void avr_adjust_reg_alloc_order (void);
 extern int avr_initial_elimination_offset (int from, int to);
 extern int avr_simple_epilogue (void);
 extern int avr_hard_regno_rename_ok (unsigned int, unsigned int);
@@ -38,8 +38,7 @@ extern void asm_output_external (FILE *file, tree decl, char *name);
 extern int avr_progmem_p (tree decl, tree attributes);
 
 #ifdef RTX_CODE /* inside TREE_CODE */
-extern void init_cumulative_args (CUMULATIVE_ARGS *cum, tree fntype,
-				  rtx libname, tree fndecl);
+extern void avr_init_cumulative_args (CUMULATIVE_ARGS*, tree, rtx, tree);
 #endif /* RTX_CODE inside TREE_CODE */
 
 #endif /* TREE_CODE */
@@ -78,8 +77,8 @@ extern bool avr_rotate_bytes (rtx operands[]);
 extern const char* avr_out_fract (rtx, rtx[], bool, int*);
 extern rtx avr_to_int_mode (rtx);
 
-extern void expand_prologue (void);
-extern void expand_epilogue (bool);
+extern void avr_expand_prologue (void);
+extern void avr_expand_epilogue (bool);
 extern bool avr_emit_movmemhi (rtx*);
 extern int avr_epilogue_uses (int regno);
 extern int avr_starting_frame_offset (void);
@@ -96,12 +95,12 @@ extern bool avr_popcount_each_byte (rtx, int, int);
 extern bool avr_has_nibble_0xf (rtx);
 
 extern int extra_constraint_Q (rtx x);
-extern int adjust_insn_length (rtx insn, int len);
+extern int avr_adjust_insn_length (rtx insn, int len);
 extern const char* output_reload_inhi (rtx*, rtx, int*);
 extern const char* output_reload_insisf (rtx*, rtx, int*);
 extern const char* avr_out_reload_inpsi (rtx*, rtx, int*);
 extern const char* avr_out_lpm (rtx, rtx*, int*);
-extern void notice_update_cc (rtx body, rtx insn);
+extern void avr_notice_update_cc (rtx body, rtx insn);
 extern int reg_unused_after (rtx insn, rtx reg);
 extern int _reg_unused_after (rtx insn, rtx reg);
 extern int avr_jump_mode (rtx x, rtx insn);
@@ -109,7 +108,7 @@ extern int test_hard_reg_class (enum reg_class rclass, rtx x);
 extern int jump_over_one_insn_p (rtx insn, rtx dest);
 
 extern int avr_hard_regno_mode_ok (int regno, enum machine_mode mode);
-extern void final_prescan_insn (rtx insn, rtx *operand, int num_operands);
+extern void avr_final_prescan_insn (rtx insn, rtx *operand, int num_operands);
 extern int avr_simplify_comparison_p (enum machine_mode mode,
 				      RTX_CODE op, rtx x);
 extern RTX_CODE avr_normalize_condition (RTX_CODE condition);

gcc/config/avr/avr.h

@@ -201,10 +201,11 @@ enum
     32,33,34,35					\
     }
 
-#define ADJUST_REG_ALLOC_ORDER order_regs_for_local_alloc ()
+#define ADJUST_REG_ALLOC_ORDER avr_adjust_reg_alloc_order()
 
 
-#define HARD_REGNO_NREGS(REGNO, MODE) ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
+#define HARD_REGNO_NREGS(REGNO, MODE)                                   \
+  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
 
 #define HARD_REGNO_MODE_OK(REGNO, MODE) avr_hard_regno_mode_ok(REGNO, MODE)
 
@@ -318,15 +319,19 @@ enum reg_class {
    for POST_DEC targets (PR27386).  */
 /*#define PUSH_ROUNDING(NPUSHED) (NPUSHED)*/
 
-typedef struct avr_args {
-  int nregs;			/* # registers available for passing */
-  int regno;			/* next available register number */
+typedef struct avr_args
+{
+  /* # Registers available for passing */
+  int nregs;
+
+  /* Next available register number */
+  int regno;
 } CUMULATIVE_ARGS;
 
 #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \
-  init_cumulative_args (&(CUM), FNTYPE, LIBNAME, FNDECL)
+  avr_init_cumulative_args (&(CUM), FNTYPE, LIBNAME, FNDECL)
 
-#define FUNCTION_ARG_REGNO_P(r) function_arg_regno_p(r)
+#define FUNCTION_ARG_REGNO_P(r) avr_function_arg_regno_p(r)
 
 #define DEFAULT_PCC_STRUCT_RETURN 0
 
@@ -415,7 +420,8 @@ typedef struct avr_args {
     "r24","r25","r26","r27","r28","r29","r30","r31",	\
     "__SP_L__","__SP_H__","argL","argH"}
 
-#define FINAL_PRESCAN_INSN(insn, operand, nop) final_prescan_insn (insn, operand,nop)
+#define FINAL_PRESCAN_INSN(insn, operand, nop)  \
+  avr_final_prescan_insn (insn, operand,nop)
 
 #define ASM_OUTPUT_REG_PUSH(STREAM, REGNO)	\
 {						\
@@ -430,7 +436,7 @@ typedef struct avr_args {
 }
 
 #define ASM_OUTPUT_ADDR_VEC_ELT(STREAM, VALUE)  \
-  avr_output_addr_vec_elt(STREAM, VALUE)
+  avr_output_addr_vec_elt (STREAM, VALUE)
 
 #define ASM_OUTPUT_ALIGN(STREAM, POWER)                 \
   do {                                                  \
@@ -459,7 +465,7 @@ typedef struct avr_args {
    after execution of an instruction whose pattern is EXP.
    Do not alter them if the instruction would not alter the cc's.  */
 
-#define NOTICE_UPDATE_CC(EXP, INSN) notice_update_cc(EXP, INSN)
+#define NOTICE_UPDATE_CC(EXP, INSN) avr_notice_update_cc (EXP, INSN)
 
 /* The add insns don't set overflow in a usable way.  */
 #define CC_OVERFLOW_UNUSABLE 01000
@@ -477,8 +483,8 @@ typedef struct avr_args {
 #define FUNCTION_PROFILER(FILE, LABELNO)  \
   fprintf (FILE, "/* profiler %d */", (LABELNO))
 
-#define ADJUST_INSN_LENGTH(INSN, LENGTH) (LENGTH =\
-					  adjust_insn_length (INSN, LENGTH))
+#define ADJUST_INSN_LENGTH(INSN, LENGTH)                \
+    (LENGTH = avr_adjust_insn_length (INSN, LENGTH))
 
 extern const char *avr_device_to_arch (int argc, const char **argv);
 extern const char *avr_device_to_data_start (int argc, const char **argv);

gcc/config/avr/avr.md

@@ -5471,7 +5471,7 @@
   [(const_int 0)]
   ""
   {
-    expand_prologue (); 
+    avr_expand_prologue ();
     DONE;
   })
 
@@ -5479,7 +5479,7 @@
   [(const_int 0)]
   ""
   {
-    expand_epilogue (false /* sibcall_p */);
+    avr_expand_epilogue (false /* sibcall_p */);
     DONE;
   })
 
@@ -5487,7 +5487,7 @@
   [(const_int 0)]
   ""
   {
-    expand_epilogue (true /* sibcall_p */);
+    avr_expand_epilogue (true /* sibcall_p */);
     DONE;
   })
 

libgcc/ChangeLog

 2013-01-14  Georg-Johann Lay  <avr@gjlay.de>
 
+	* config/avr/lib1funcs.S: Remove trailing blanks.
+	* config/avr/lib1funcs-fixed.S: Ditto.
+
+2013-01-14  Georg-Johann Lay  <avr@gjlay.de>
+
 	* config/avr/avr-lib.h: Add GPL copyright notice.
 
 2013-01-14  Georg-Johann Lay  <avr@gjlay.de>

libgcc/config/avr/lib1funcs-fixed.S

 /*  -*- Mode: Asm -*-  */
-;;    Copyright (C) 2012
+;;    Copyright (C) 2012-2013
 ;;    Free Software Foundation, Inc.
 ;;    Contributed by Sean D'Epagnier  (sean@depagnier.com)
 ;;                   Georg-Johann Lay (avr@gjlay.de)

libgcc/config/avr/lib1funcs.S

 /*  -*- Mode: Asm -*-  */
-/* Copyright (C) 1998, 1999, 2000, 2007, 2008, 2009
+/* Copyright (C) 1998-2013
    Free Software Foundation, Inc.
    Contributed by Denis Chertykov <chertykov@gmail.com>