Changeset eba74ba for src/prelude

Timestamp:

May 25, 2018, 2:51:06 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/prelude

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• builtins.def (modified) (4 diffs)
• prelude.cf (modified) (1 diff)
• prototypes.awk (modified) (5 diffs)
• prototypes.sed (modified) (1 diff)
• sync-builtins.cf (added)

src/prelude/Makefile.am

@@ -37 +37 @@
 # create forward declarations for gcc builtins
 gcc-builtins.cf : gcc-builtins.c prototypes.sed
-        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@
+        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -r -f prototypes.sed > $@
 
-gcc-builtins.c : builtins.def prototypes.awk
+gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
         ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
 

src/prelude/Makefile.in

@@ -506 +506 @@
 # create forward declarations for gcc builtins
 gcc-builtins.cf : gcc-builtins.c prototypes.sed
-        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@
-
-gcc-builtins.c : builtins.def prototypes.awk
+        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -r -f prototypes.sed > $@
+
+gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
         ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
 

src/prelude/builtins.def

@@ -190 +190 @@
 
 /* Builtin used by implementation of Cilk Plus.  Most of these are decomposed
-   by the compiler but a few are implemented in libcilkrts.  */ 
+   by the compiler but a few are implemented in libcilkrts.  */
 #undef DEF_CILK_BUILTIN_STUB
 #define DEF_CILK_BUILTIN_STUB(ENUM, NAME) \
@@ -204 +204 @@
 
 /* Builtin used by the implementation of libsanitizer. These
-   functions are mapped to the actual implementation of the 
+   functions are mapped to the actual implementation of the
    libtsan library. */
 #undef DEF_SANITIZER_BUILTIN
@@ -217 +217 @@
 #define DEF_CILKPLUS_BUILTIN(ENUM, NAME, TYPE, ATTRS)  \
   DEF_BUILTIN (ENUM, NAME, BUILT_IN_NORMAL, BT_FN_INT_VAR, BT_LAST, \
-               false, false, false, ATTRS, false, flag_cilkplus) 
+               false, false, false, ATTRS, false, flag_cilkplus)
 
 /* Builtin used by the implementation of Pointer Bounds Checker.  */
@@ -927 +927 @@
 DEF_GCC_BUILTIN (BUILT_IN_LINE, "LINE", BT_FN_INT, ATTR_NOTHROW_LEAF_LIST)
 
+#if 0 //Ifdefed out because we hard-coded the proper overloadings of the atomic built-ins
 /* Synchronization Primitives.  */
 #include "sync-builtins.def"
 
-#if 0
 /* Offloading and Multi Processing builtins.  */
 #include "omp-builtins.def"

src/prelude/prelude.cf

@@ -458 +458 @@
 signed long long int    ?=?( signed long long int &, signed long long int ),    ?=?( volatile signed long long int &, signed long long int );
 unsigned long long int  ?=?( unsigned long long int &, unsigned long long int ), ?=?( volatile unsigned long long int &, unsigned long long int );
+__int128        ?=?( __int128 &, __int128 ),    ?=?( volatile __int128 &, __int128 );
 zero_t                  ?=?( zero_t &, zero_t );
 one_t                   ?=?( one_t &, one_t );

src/prelude/prototypes.awk

@@ -5 +5 @@
 # file "LICENCE" distributed with Cforall.
 #
-# prototypes.awk -- 
+# prototypes.awk --
 #
 # Author           : Peter A. Buhr
@@ -12 +12 @@
 # Last Modified On : Tue Jul  5 14:32:52 2016
 # Update Count     : 32
-# 
+#
 
 # http://llvm.org/svn/llvm-project/cfe/trunk/include/clang/Basic/Builtins.def
@@ -83 +83 @@
 } # BEGIN
 
-/BT_FN/ { 
+/BT_FN/ {
     for (i = 1; i <= NF; i++) {
       if( match($i, "BT_FN") != 0 ) {
@@ -116 +116 @@
 
       # generate function return type as macro
-      for ( t = 0; t < N; t += 1 ) {                                    # find longest match 
+      for ( t = 0; t < N; t += 1 ) {                                    # find longest match
         type = types[t];
         if ( index( prototype, type ) == 1 ) {          # found match
@@ -150 +150 @@
         # extras
         printf( "\n#include \"builtins.def\"\n\n" );
+        printf( "\n#include \"sync-builtins.cf\"\n\n" );
         printf( "extern const char *__PRETTY_FUNCTION__;\n" );
 } # END

src/prelude/prototypes.sed

@@ -2 +2 @@
 /targetm/s/.*//                         #Remove targetm declarations
 /__Unsupported/s/.*//                   #Remove Unsupported types declarations
-s/void (const char \*)0();//            #Remove void (const char \*)0();
+s/void \(const char \*\)0\(\);//        #Remove void (const char \*)0();
 s/\"//g                                         #Remove extraenous quotes in declarations
-/__builtin_/s/_ /_/g                    #Remove extraenous spaces in declarations 
+/__builtin_/s/_ /_/g                    #Remove extraenous spaces in declarations
+
+#Fix gcc overloading
+# various sed rules for the gcc sync builtins which are overloaded
+# kept here because they generate an acceptable approximate of the correct prototypes
+
+#/__sync_/s/_[0-9][0-9]*\(.*\)/\(\);/g  #hack since it will accept any parameters
+#/__atomic_/s/_[0-9][0-9]*\(.*\)/\(\);/g        #hack since it will accept any parameters
+
+#/_16/s/void \*/__int128 \*/g
+#/_8/s/void \*/long long int \*/g
+#/_4/s/void \*/int \*/g
+#/_2/s/void \*/short \*/g
+#/_1/s/void \*/char \*/g
+
+#s/([a-zA-Z0-9_ ]+)\s+__sync([a-z_]+)_([0-9]+)\((.*)\);/\1 __sync\2\(\4\,...); \1 __sync\2_\3\(\4\,...);/
+#s/([a-zA-Z0-9_ ]+)\s+__atomic([a-z_]+)_([0-9]+)\((.*)\);/\1 __atomic\2\(\4\); \1 __atomic\2_\3\(\4\);/