Update condition when the address is mode dependent.

Author: Claudiu Zissulescu

gcc/ChangeLog.ARC

@@ -1,3 +1,11 @@
+2013-04-02 Claudiu Zissulescu <[email protected]>
+
+	* config/arc/arc.c (arc_mode_dependent_address_p): Update
+          condition when the address is mode dependent.
+	  (__builtin_arc_trap_s): Enable builtin for ARCv2.
+	* doc/extend.texi: Update document.
+	* testsuite/gcc.target/arc/pr9000727530.c: New test.
+
 2013-03-28 Claudiu Zissulescu <[email protected]>
 
 	* config/arc/arc.md (movsi_ne): Update pattern.

gcc/config/arc/arc.c

@@ -5407,17 +5407,15 @@ arc_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
    has an effect that depends on the machine mode it is used for.  */
 
 static bool
-arc_mode_dependent_address_p (const_rtx addr, addr_space_t)
+arc_mode_dependent_address_p (const_rtx addr,
+			      addr_space_t addrspace ATTRIBUTE_UNUSED)
 {
   /* SYMBOL_REF is not mode dependent: it is either a small data reference,
      which is valid for loads and stores, or a limm offset, which is valid for
      loads.  */
-  /* Scaled indices are scaled by the access mode; likewise for scaled
-     offsets, which are needed for maximum offset stores.  */
+  /* Scaled indices are scaled by the access mode. */
   if (GET_CODE (addr) == PLUS
-      && (GET_CODE (XEXP ((addr), 0)) == MULT
-	  || (CONST_INT_P (XEXP ((addr), 1))
-	      && !SMALL_INT (INTVAL (XEXP ((addr), 1))))))
+      && GET_CODE (XEXP ((addr), 0)) == MULT)
     return true;
   return false;
 }
@@ -5519,7 +5517,7 @@ arc_init_builtins (void)
     def_mbuiltin (1,"__builtin_arc_core_write", void_ftype_usint_usint, ARC_BUILTIN_CORE_WRITE);
     def_mbuiltin (1,"__builtin_arc_lr", usint_ftype_usint, ARC_BUILTIN_LR);
     def_mbuiltin (1,"__builtin_arc_sr", void_ftype_usint_usint, ARC_BUILTIN_SR);
-    def_mbuiltin (TARGET_ARC700,"__builtin_arc_trap_s", void_ftype_usint, ARC_BUILTIN_TRAP_S);
+    def_mbuiltin (TARGET_ARC700 || TARGET_V2,"__builtin_arc_trap_s", void_ftype_usint, ARC_BUILTIN_TRAP_S);
     def_mbuiltin (TARGET_ARC700 || TARGET_V2,"__builtin_arc_unimp_s", void_ftype_void, ARC_BUILTIN_UNIMP_S);
     def_mbuiltin (1,"__builtin_arc_aligned", int_ftype_pcvoid_int, ARC_BUILTIN_ALIGNED);
 
@@ -10768,7 +10766,7 @@ arc_variable_issue (FILE *dump ATTRIBUTE_UNUSED,
 
       int unit = -1;
       int old_unit = -1;
-      switch (arc_attr_type(insn))
+      switch (arc_attr_type (insn))
 	{
 	case TYPE_MOVE:
 	case TYPE_CMOVE:

gcc/doc/extend.texi

@@ -8934,7 +8934,7 @@ brk
 @end deftypefn
 
 @deftypefn {Built-in Function}  void __builtin_arc_clri (unsigned int  @var{c})
-Only valid with @option{-mcpu=ARCv2EM}. Generates
+Only valid for ARCv2 architecture. Generates
 @example
 clri  @var{c}
 @end example
@@ -8960,7 +8960,7 @@ mov  r@var{regno}, @var{val}
 
 @deftypefn {Built-in Function} int __builtin_arc_divaw (int @var{a}, int @var{b})
 Only available with either @option{-mcpu=ARC700} or @option{-mea} is set, and
-never with @option{-mcpu=ARCv2EM}.  Generates:
+never ARCv2 architecture.  Generates:
 @example
 divaw  @var{dest}, @var{a}, @var{b}
 @end example
@@ -8969,7 +8969,8 @@ built-in.
 @end deftypefn
 
 @deftypefn {Built-in Function} int __builtin_arc_ffs (int @var{a})
-Only valid with @option{-mcpu=ARCv2EM} and @option{-mnorm}.  Generates:
+Only valid with @option{-mcpu=ARCv2EM} and @option{-mnorm}, or with
+@option{-mcpu=ARCv2HS}.  Generates:
 @example
 ffs  @var{dest}, @var{a}
 @end example
@@ -8985,7 +8986,8 @@ flag  @var{a}
 @end deftypefn
 
 @deftypefn {Built-in Function} int __builtin_arc_fls (int @var{a})
-Only valid with @option{-mcpu=ARCv2EM} and @option{-mnorm}.  Generates:
+Only valid with @option{-mcpu=ARCv2EM} and @option{-mnorm}, or with
+@option{-mcpu=ARCv2HS}.  Generates:
 @example
 fls  @var{dest}, @var{a}
 @end example
@@ -8994,7 +8996,7 @@ built-in.
 @end deftypefn
 
 @deftypefn {Built-in Function} void __builtin_arc_kflag (unsigned int @var{cc})
-Only valid with @option{-mcpu=ARCv2EM}. Generates:
+Only valid for ARCv2 architecture. Generates:
 @example
 kflag  @var{cc}
 @end example
@@ -9015,13 +9017,15 @@ Only available with @option{-mmul64}.  Generates:
 @example
 mul64  @var{a}, @var{b}
 @end example
+This builtin is deprecated.
 @end deftypefn
 
 @deftypefn {Built-in Function} void __builtin_arc_mulu64 (unsigned int @var{a}, unsigned int @var{b})
 Only available with @option{-mmul64}.  Generates:
 @example
 mulu64  @var{a}, @var{b}
 @end example
+This builtin is deprecated.
 @end deftypefn
 
 @deftypefn {Built-in Function} void __builtin_arc_nop (void)

gcc/testsuite/gcc.target/arc/pr9000727530.c

@@ -0,0 +1,98 @@
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+/* The expand pass generates a subreg of mem, where the address is a
+   function of virtual-stack-vars. The vregs step fails to convert the
+   virtual-stack-vars to an fp/sp register, hence, the compiler crashes
+   when checking the instruction constrains. */
+
+#include "stdio.h"
+
+char *outfile;
+
+_Bool reverse;
+static FILE *rejfp;
+static char *rejname;
+
+struct outstate
+{
+  FILE *ofp;
+  _Bool after_newline;
+  _Bool zero_output;
+};
+
+struct __longlong_aligned { long long x; };
+
+struct stat
+{
+  unsigned long long st_dev;
+  unsigned long long st_ino;
+  unsigned long long st_rdev;
+  unsigned long long _pad1;
+  long long st_size;
+  int st_blksize;
+  int __pad2;
+  long long st_blocks;
+  struct timespec st_atim;
+  struct timespec st_mtim;
+  struct timespec st_ctim;
+  unsigned int __unused4;
+  unsigned int __unused5;
+} __attribute__((aligned(__alignof__(struct __longlong_aligned))));
+
+enum diff
+  {
+    NO_DIFF,
+    CONTEXT_DIFF,
+    NORMAL_DIFF,
+    ED_DIFF,
+    NEW_CONTEXT_DIFF,
+    UNI_DIFF,
+    GIT_BINARY_DIFF
+  };
+
+enum diff diff_type;
+
+int
+foo (int x)
+{
+  struct outstate outstate;
+  struct stat tmpoutst;
+  mode_t file_type;
+  int outfd = -1;
+  int failed = 0;
+
+  tmpoutst.st_size = -1;
+  if (diff_type == ED_DIFF)
+    {
+      outstate.zero_output = 0;
+      if (! outfile )
+	{
+	  fstat (outfd, &tmpoutst);
+	  outstate.zero_output = tmpoutst.st_size == 0;
+	}
+    }
+  else
+    {
+      failed++;
+    }
+
+    if (outstate.zero_output
+	&& ((pch_says_nonexistent (! reverse) == 2)
+	    || ((((file_type)) & 0170000) == (0120000))))
+      {
+	struct stat rejst;
+
+	if (fstat (fileno (rejfp), &rejst) != 0)
+	  {
+	    char *rej = rejname;
+	    if (rejname)
+	      {
+		struct stat oldst;
+		int olderrno;
+
+		olderrno = stat_file (rej, &oldst);
+	      }
+	  }
+      }
+  return 0;
+}