* include/tr1_impl/array (at): Do not use builtin_expect.

[pf3gnuchains/gcc-fork.git] / libgfortran / m4 / transpose.m4

diff --git a/libgfortran/m4/transpose.m4 b/libgfortran/m4/transpose.m4
index 4ae6c09..8c50767 100644 (file)
--- a/libgfortran/m4/transpose.m4
+++ b/libgfortran/m4/transpose.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the TRANSPOSE intrinsic
-   Copyright 2003, 2005 Free Software Foundation, Inc.
+   Copyright 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
    Contributed by Tobias Schlüter
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -7,44 +7,43 @@ This file is part of the GNU Fortran 95 runtime library (libgfortran).
 Libgfortran 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 2 of the License, or (at your option) any later version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
+version 3 of the License, or (at your option) any later version.
 
 Libgfortran 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 libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#include "libgfortran.h"
+#include <assert.h>'
 
-#include "config.h"
-#include <assert.h>
-#include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern void transpose_`'rtype_code (rtype * ret, rtype * source);
-export_proto(transpose_`'rtype_code);
+`#if defined (HAVE_'rtype_name`)
+
+extern void transpose_'rtype_code` ('rtype` * const restrict ret, 
+       'rtype` * const restrict source);
+export_proto(transpose_'rtype_code`);
 
 void
-transpose_`'rtype_code (rtype * ret, rtype * source)
+transpose_'rtype_code` ('rtype` * const restrict ret, 
+       'rtype` * const restrict source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
-  rtype_name *rptr;
+  'rtype_name` * restrict rptr;
   /* s.* indicates the source array.  */
   index_type sxstride, systride;
-  const rtype_name *sptr;
+  const 'rtype_name` *sptr;
 
   index_type xcount, ycount;
   index_type x, y;
@@ -64,14 +63,31 @@ transpose_`'rtype_code (rtype * ret, rtype * source)
       ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
       ret->dim[1].stride = ret->dim[0].ubound+1;
 
-      ret->data = internal_malloc_size (sizeof (rtype_name) * size0 (ret));
-      ret->base = 0;
-    }
+      ret->data = internal_malloc_size (sizeof ('rtype_name`) * size0 ((array_t *) ret));
+      ret->offset = 0;
+    } else if (unlikely (compile_options.bounds_check))
+    {
+      index_type ret_extent, src_extent;
 
-  if (ret->dim[0].stride == 0)
-    ret->dim[0].stride = 1;
-  if (source->dim[0].stride == 0)
-    source->dim[0].stride = 1;
+      ret_extent = ret->dim[0].ubound + 1 - ret->dim[0].lbound;
+      src_extent = source->dim[1].ubound + 1 - source->dim[1].lbound;
+
+      if (src_extent != ret_extent)
+       runtime_error ("Incorrect extent in return value of TRANSPOSE"
+                      " intrinsic in dimension 1: is %ld,"
+                      " should be %ld", (long int) src_extent,
+                      (long int) ret_extent);
+
+      ret_extent = ret->dim[1].ubound + 1 - ret->dim[1].lbound;
+      src_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (src_extent != ret_extent)
+       runtime_error ("Incorrect extent in return value of TRANSPOSE"
+                      " intrinsic in dimension 2: is %ld,"
+                      " should be %ld", (long int) src_extent,
+                      (long int) ret_extent);
+
+    }
 
   sxstride = source->dim[0].stride;
   systride = source->dim[1].stride;
@@ -97,3 +113,5 @@ transpose_`'rtype_code (rtype * ret, rtype * source)
         rptr += rxstride - (rystride * xcount);
     }
 }
+
+#endif'