Changeset 04e367c for src/libcfa/stdlib

Timestamp:

Jul 30, 2018, 4:49:40 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

3537dd7, 3bbd012

Parents:

ba4a1d8 (diff), a4248de1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/stdlib (modified) (6 diffs)

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 23 07:44:47 2018
-// Update Count     : 341
+// Last Modified On : Fri Jul 27 07:21:36 2018
+// Update Count     : 345
 //
 
@@ -19 +19 @@
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
-        void * memset( void * dest, int c, size_t size );       // string.h
+        void * memset( void * dest, int fill, size_t size ); // string.h
         void * memcpy( void * dest, const void * src, size_t size ); // string.h
     void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA
@@ -127 +127 @@
         // data, non-array types
 
-        T * memset( T * dest, char c ) {
-                return (T *)memset( dest, c, sizeof(T) );
+        T * memset( T * dest, char fill ) {
+                return (T *)memset( dest, fill, sizeof(T) );
         } // memset
 
@@ -139 +139 @@
         // data, array types
 
-        T * memset( T dest[], size_t dim, char c ) {
-                return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset
-        } // memset
-
-        T * memcpy( T dest[], const T src[], size_t dim ) {
+        T * amemset( T dest[], char fill, size_t dim ) {
+                return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset
+        } // amemset
+
+        T * amemcpy( T dest[], const T src[], size_t dim ) {
                 return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
-        } // memcpy
+        } // amemcpy
 } // distribution
 
@@ -203 +203 @@
         E * bsearchu( E key, const E * vals, size_t dim );
         size_t bsearchu( E key, const E * vals, size_t dim );
-
-        void qsort( E * vals, size_t dim );
 } // distribution
 
@@ -214 +212 @@
         E * bsearchu( K key, const E * vals, size_t dim );
         size_t bsearchu( K key, const E * vals, size_t dim );
+} // distribution
+
+forall( otype E | { int ?<?( E, E ); } ) {
+        void qsort( E * vals, size_t dim );
 } // distribution