diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java index ed5c8c13acc..8c0267a23db 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation * Markus Schorn (Wind River Systems) @@ -55,11 +55,11 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPReferenceType; @SuppressWarnings("nls") public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { /** - * BUILTIN_GCC_SYMBOL is a built-in GCC symbol. + * {@code BUILTIN_GCC_SYMBOL} is a built-in GCC symbol. */ public static final ASTNodeProperty BUILTIN_GCC_SYMBOL = new ASTNodeProperty( "GCCBuiltinSymbolProvider.BUILTIN_GCC_SYMBOL - built-in GCC symbol"); //$NON-NLS-1$ - + private static final Map CHAR_ARRAYS = new HashMap(); private IBinding[] fBindings; @@ -69,19 +69,19 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { private Map fTypeMap; private List fBindingList; - + public GCCBuiltinSymbolProvider(ParserLanguage lang, boolean supportGnuSymbols) { fCpp= lang == ParserLanguage.CPP; fGnu= supportGnuSymbols; } - + @Override public IBinding[] getBuiltinBindings(IScope scope) { fScope= scope; initialize(); return fBindings; } - + private void initialize() { // Symbols for all parsers fTypeMap= new HashMap(); @@ -90,12 +90,12 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { if (fGnu) { addGnuBuiltins(); } - + fBindings= fBindingList.toArray(new IBinding[fBindingList.size()]); fTypeMap= null; fBindingList= null; } - + private void addStdBuiltins() { variable("const char*", "__func__"); variable("const char*", "__FUNCTION__"); @@ -106,20 +106,20 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { // Used in stdtypes.h, mentioned in the manual but not defined in there. typedef("va_list", "__builtin_va_list"); function("void*", "__builtin_va_start", "va_list", "..."); - function("void", "__builtin_va_end", "va_list"); + function("void", "__builtin_va_end", "va_list"); function("void", "__builtin_va_copy", "va_list", "va_list"); // Gcc 4.6.0, Section 6.48 function("void*", "__builtin_return_address", "unsigned int"); function("void*", "__builtin_extract_return_address", "void*"); function("void*", "__builtin_frob_return_address", "void*"); - function("void*", "__builtin_frame_address", "unsigned int"); - + function("void*", "__builtin_frame_address", "unsigned int"); + // Gcc 4.6.0, Section 6.51 String[] types= {"int", "long", "long long", "unsigned int", "unsigned long", "unsigned long long"}; for (String type : types) { // Manual does not mention volatile, however functions can be used for ptr to volatile - String typePtr= "volatile " + type+"*"; + String typePtr= "volatile " + type + "*"; function(type, "__sync_fetch_and_add", typePtr, type, "..."); function(type, "__sync_fetch_and_sub", typePtr, type, "..."); function(type, "__sync_fetch_and_or", typePtr, type, "..."); @@ -132,28 +132,74 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { function(type, "__sync_and_and_fetch", typePtr, type, "..."); function(type, "__sync_xor_and_fetch", typePtr, type, "..."); function(type, "__sync_nand_and_fetch", typePtr, type, "..."); - function(type, "__sync_lock_test_and_set", typePtr, type, "..."); - function(type, "__sync_lock_release", typePtr, "..."); + function(type, "__sync_lock_test_and_set", typePtr, type, "..."); + function(type, "__sync_lock_release", typePtr, "..."); } - function("void", "__sync_synchronize"); - - // Gcc 4.6.0, Section 6.53 (incomplete) + function("void", "__sync_synchronize"); + + // Gcc 4.6.0, Section 6.52 + for (String type : types) { + // Manual does not mention volatile, however functions can be used for ptr to volatile + String typePtr= "volatile " + type + "*"; + function(type, "__atomic_load_n", typePtr, "int"); + function("void", "__atomic_load", typePtr, typePtr, "int"); + function("void", "__atomic_store_n", typePtr, type, "int"); + function("void", "__atomic_store", typePtr, typePtr, "int"); + function(type, "__atomic_exchange_n", typePtr, type, "int"); + function("void", "__atomic_exchange", typePtr, typePtr, typePtr, "int"); + function("bool", "__atomic_compare_exchange_n", typePtr, typePtr, type, "int", "int", "int"); + function("bool", "__atomic_compare_exchange", typePtr, typePtr, typePtr, "int", "int", "int"); + function(type, "__atomic_add_fetch", typePtr, type, "int"); + function(type, "__atomic_sub_fetch", typePtr, type, "int"); + function(type, "__atomic_add_fetch", typePtr, type, "int"); + function(type, "__atomic_and_fetch", typePtr, type, "int"); + function(type, "__atomic_xor_fetch", typePtr, type, "int"); + function(type, "__atomic_or_fetch", typePtr, type, "int"); + function(type, "__atomic_nadd_fetch", typePtr, type, "int"); + function(type, "__atomic_fetch_add", typePtr, type, "int"); + function(type, "__atomic_fetch_sub", typePtr, type, "int"); + function(type, "__atomic_fetch_add", typePtr, type, "int"); + function(type, "__atomic_fetch_and", typePtr, type, "int"); + function(type, "__atomic_fetch_xor", typePtr, type, "int"); + function(type, "__atomic_fetch_or", typePtr, type, "int"); + function(type, "__atomic_fetch_nadd", typePtr, type, "int"); + function("bool", "__atomic_test_and_set", "void*", "int"); + function("void", "__atomic_clear", "bool*", "int"); + function("void", "__atomic_thread_fence", "int"); + function("void", "__atomic_signal_fence", "int"); + function("bool", "__atomic_always_lock_free", "size_t", "void*"); + function("bool", "__atomic_is_lock_free", "size_t", "void*"); + } + + // GCC 4.8.0, Section 6.55 (incomplete) function("void", "__builtin_abort", "void"); function("int", "__builtin_abs", "int"); function("double", "__builtin_acos", "double"); function("float", "__builtin_acosf", "float"); function("long double", "__builtin_acosl", "long double"); + function("double", "__builtin_acosh", "double"); + function("float", "__builtin_acoshf", "float"); + function("long double", "__builtin_acoshl", "long double"); function("double", "__builtin_asin", "double"); function("float", "__builtin_asinf", "float"); function("long double", "__builtin_asinl", "long double"); + function("double", "__builtin_asinh", "double"); + function("float", "__builtin_asinhf", "float"); + function("long double", "__builtin_asinhl", "long double"); function("double", "__builtin_atan", "double"); - function("long double", "__builtin_atanl", "long double"); function("float", "__builtin_atanf", "float"); - function("double", "__builtin_atan2", "double", "double"); - function("float", "__builtin_atan2f", "float", "float"); - function("long double", "__builtin_atan2l", "long double", "long double"); + function("long double", "__builtin_atanl", "long double"); + function("double", "__builtin_atanh", "double"); + function("float", "__builtin_atanhf", "float"); + function("long double", "__builtin_atanhl", "long double"); + function("double", "__builtin_atan2", "double", "double"); + function("float", "__builtin_atan2f", "float", "float"); + function("long double", "__builtin_atan2l", "long double", "long double"); function("void*", "__builtin_alloca", "size_t"); cfunction("", "__builtin_choose_expr", "", "", ""); + function("double", "__builtin_cbrt", "double"); + function("float", "__builtin_cbrtf", "float"); + function("long double", "__builtin_cbrtl", "long double"); function("double", "__builtin_ceil", "double"); function("float", "__builtin_ceilf", "float"); function("long double", "__builtin_ceill", "long double"); @@ -166,87 +212,158 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { function("complex double", "__builtin_conj", "complex double"); function("complex float", "__builtin_conjf", "complex float"); function("complex long double", "__builtin_conjl", "complex long double"); + function("double", "__builtin_copysign", "double", "double"); + function("float", "__builtin_copysignf", "float", "float"); + function("long double", "__builtin_copysignl", "long double", "long double"); function("double", "__builtin_cos", "double"); function("float", "__builtin_cosf", "float"); + function("long double", "__builtin_cosl", "long double"); function("double", "__builtin_cosh", "double"); function("float", "__builtin_coshf", "float"); function("long double", "__builtin_coshl", "long double"); - function("long double", "__builtin_cosl", "long double"); function("double", "__builtin_creal", "complex double"); function("float", "__builtin_crealf", "complex float"); function("long double", "__builtin_creall", "complex long double"); function("int", "__builtin_ctz", "unsigned int"); function("int", "__builtin_ctzl", "unsigned long"); function("int", "__builtin_ctzll", "unsigned long long"); + function("double", "__builtin_erf", "double"); + function("float", "__builtin_erff", "float"); + function("long double", "__builtin_erfl", "long double"); + function("double", "__builtin_ercf", "double"); + function("float", "__builtin_erfcf", "float"); + function("long double", "__builtin_erfcl", "long double"); function("void", "__builtin__Exit", "int"); function("void", "__builtin__exit", "int"); function("void", "__builtin_exit", "int"); function("double", "__builtin_exp", "double"); function("float", "__builtin_expf", "float"); function("long double", "__builtin_expl", "long double"); - function("long", "__builtin_expect", "long", "long"); + function("double", "__builtin_exp2", "double"); + function("float", "__builtin_exp2f", "float"); + function("long double", "__builtin_exp2l", "long double"); + function("double", "__builtin_expm1", "double"); + function("float", "__builtin_expm1f", "float"); + function("long double", "__builtin_expm1l", "long double"); + function("long", "__builtin_expect", "long", "long"); function("double", "__builtin_fabs", "double"); function("float", "__builtin_fabsf", "float"); function("long double", "__builtin_fabsl", "long double"); + function("double", "__builtin_fdim", "double"); + function("float", "__builtin_fdimf", "float"); + function("long double", "__builtin_fdiml", "long double"); function("int", "__builtin_ffs", "unsigned int"); function("int", "__builtin_ffsl", "unsigned long"); function("int", "__builtin_ffsll", "unsigned long long"); function("double", "__builtin_floor", "double"); function("float", "__builtin_floorf", "float"); function("long double", "__builtin_floorl", "long double"); - function("double", "__builtin_fmod", "double", "double"); - function("float", "__builtin_fmodf", "float", "float"); - function("long double", "__builtin_fmodl", "long double", "long double"); + function("double", "__builtin_fma", "double"); + function("float", "__builtin_fmaf", "float"); + function("long double", "__builtin_fmal", "long double"); + function("double", "__builtin_fmax", "double"); + function("float", "__builtin_fmaxf", "float"); + function("long double", "__builtin_fmaxl", "long double"); + function("double", "__builtin_fmin", "double"); + function("float", "__builtin_fminf", "float"); + function("long double", "__builtin_fminl", "long double"); + function("double", "__builtin_fmod", "double", "double"); + function("float", "__builtin_fmodf", "float", "float"); + function("long double", "__builtin_fmodl", "long double", "long double"); + function("int", "__builtin_fpclassify", "int", "int", "int", "int", "int", "double"); function("int", "__builtin_fprintf", "FILE*", "const char*"); function("int", "__builtin_fputs", "const char*", "FILE*"); function("double", "__builtin_frexp", "double", "int*"); function("float", "__builtin_frexpf", "float", "int*"); function("long double", "__builtin_frexpl", "long double", "int*"); - function("double", "__builtin_huge_val", "void"); - function("float", "__builtin_huge_valf", "void"); - function("long double", "__builtin_huge_vall", "void"); + function("double", "__builtin_huge_val", "void"); + function("float", "__builtin_huge_valf", "void"); + function("long double", "__builtin_huge_vall", "void"); + function("double", "__builtin_fhypot", "double"); + function("float", "__builtin_fhypotf", "float"); + function("long double", "__builtin_fhypotl", "long double"); + function("int", "__builtin_ilogb", "double"); + function("int", "__builtin_ilogbf", "float"); + function("int", "__builtin_ilogbl", "long double"); function("long long", "__builtin_imaxabs", "long long"); - function("double", "__builtin_inf", "void"); - function("float", "__builtin_inff", "void"); - function("long double", "__builtin_infl", "void"); - function("int", "__builtin_isgreater", "float", "float"); - function("int", "__builtin_isgreaterequal", "float", "float"); - function("int", "__builtin_isless", "float", "float"); - function("int", "__builtin_islessequal", "float", "float"); - function("int", "__builtin_islessgreater", "float", "float"); - function("int", "__builtin_isunordered", "float", "float"); + function("double", "__builtin_inf", "void"); + function("float", "__builtin_inff", "void"); + function("long double", "__builtin_infl", "void"); + function("bool", "__builtin_isfinite", "double"); + function("bool", "__builtin_isgreater", "float", "float"); + function("bool", "__builtin_isgreaterequal", "float", "float"); + function("bool", "__builtin_isinf", "double"); + function("bool", "__builtin_isless", "float", "float"); + function("bool", "__builtin_islessequal", "float", "float"); + function("bool", "__builtin_islessgreater", "float", "float"); + function("bool", "__builtin_isnan", "double"); + function("bool", "__builtin_isnormal", "double"); + function("bool", "__builtin_isunordered", "float", "float"); function("long", "__builtin_labs", "long"); function("double", "__builtin_ldexp", "double", "int"); function("float", "__builtin_ldexpf", "float", "int"); function("long double", "__builtin_ldexpl", "long double", "int"); + function("double", "__builtin_lgamma", "double"); + function("float", "__builtin_lgammaf", "float"); + function("long double", "__builtin_lgammal", "long double"); function("long long", "__builtin_llabs", "long long"); + function("long long", "__builtin_llrint", "double"); + function("long long", "__builtin_llrintf", "float"); + function("long long", "__builtin_llrintl", "long double"); + function("long long", "__builtin_llround", "double"); + function("long long", "__builtin_llroundf", "float"); + function("long long", "__builtin_llroundl", "long double"); function("double", "__builtin_log", "double"); function("float", "__builtin_logf", "float"); function("long double", "__builtin_logl", "long double"); function("double", "__builtin_log10", "double"); function("float", "__builtin_log10f", "float"); function("long double", "__builtin_log10l", "long double"); - function("float", "__builtin_modff", "float", "float*"); - function("long double", "__builtin_modfl", "long double", "long double*"); + function("double", "__builtin_log1p", "double"); + function("float", "__builtin_log1pf", "float"); + function("long double", "__builtin_log1pl", "long double"); + function("double", "__builtin_log2", "double"); + function("float", "__builtin_log2f", "float"); + function("long double", "__builtin_log2l", "long double"); + function("double", "__builtin_logb", "double"); + function("float", "__builtin_logbf", "float"); + function("long double", "__builtin_logbl", "long double"); + function("long", "__builtin_lrint", "double"); + function("long", "__builtin_lrintf", "float"); + function("long", "__builtin_lrintl", "long double"); + function("long", "__builtin_lround", "double"); + function("long", "__builtin_lroundf", "float"); + function("long", "__builtin_lroundl", "long double"); + function("float", "__builtin_modff", "float", "float*"); + function("long double", "__builtin_modfl", "long double", "long double*"); function("void*", "__builtin_memchr", "const void*", "int", "size_t"); // not in the manual function("int", "__builtin_memcmp", "const void*", "const void*", "size_t"); function("void*", "__builtin_memcpy", "void*", "const void*", "size_t"); function("void*", "__builtin_memmove", "void*", "const void*", "size_t"); // not in the manual function("void*", "__builtin_memset", "void*", "int", "size_t"); - function("double", "__builtin_nan", "const char*"); - function("float", "__builtin_nanf", "const char*"); - function("long double", "__builtin_nanl", "const char*"); - function("double", "__builtin_nans", "const char*"); - function("float", "__builtin_nansf", "const char*"); - function("long double", "__builtin_nansl", "const char*"); + function("double", "__builtin_nan", "const char*"); + function("float", "__builtin_nanf", "const char*"); + function("long double", "__builtin_nanl", "const char*"); + function("double", "__builtin_nans", "const char*"); + function("float", "__builtin_nansf", "const char*"); + function("long double", "__builtin_nansl", "const char*"); + function("double", "__builtin_nearby", "double"); + function("float", "__builtin_nearbyf", "float"); + function("long double", "__builtin_nearbyl", "long double"); + function("double", "__builtin_nextafter", "double", "double"); + function("float", "__builtin_nextafterf", "float", "float"); + function("long double", "__builtin_nextafterl", "long double", "long double"); + function("double", "__builtin_nexttoward", "double", "long double"); + function("float", "__builtin_nexttowardf", "float", "long double"); + function("long double", "__builtin_nexttowardl", "long double", "long double"); function("int", "__builtin_parity", "unsigned int"); function("int", "__builtin_parityl", "unsigned long"); function("int", "__builtin_parityll", "unsigned long long"); function("int", "__builtin_popcount", "unsigned int"); function("int", "__builtin_popcountl", "unsigned long"); function("int", "__builtin_popcountll", "unsigned long long"); - function("float", "__builtin_powf", "float"); - function("long", "__builtin_pow", "long", "long"); + function("double", "__builtin_pow", "double", "double"); + function("float", "__builtin_powf", "float", "float"); function("long double", "__builtin_powl", "long double", "long double"); function("double", "__builtin_powi", "double", "int"); function("float", "__builtin_powif", "float", "int"); @@ -255,13 +372,32 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { function("int", "__builtin_printf", "const char*", "..."); function("int", "__builtin_putchar", "int"); function("int", "__builtin_puts", "const char*"); + function("double", "__builtin_remainder", "double", "double"); + function("float", "__builtin_remainderf", "float", "float"); + function("long double", "__builtin_remainderl", "long double", "long double"); + function("double", "__builtin_remquo", "double", "double", "int*"); + function("float", "__builtin_remquof", "float", "float", "int*"); + function("long double", "__builtin_remquol", "long double", "long double", "int*"); + function("double", "__builtin_rint", "double"); + function("float", "__builtin_rintf", "float"); + function("long double", "__builtin_rintl", "long double"); + function("double", "__builtin_round", "double"); + function("float", "__builtin_roundf", "float"); + function("long double", "__builtin_roundl", "long double"); + function("double", "__builtin_scalbln", "double", "long"); + function("float", "__builtin_scalblnf", "float", "long"); + function("long double", "__builtin_scalblnl", "long double", "long"); + function("double", "__builtin_scalbn", "double", "int"); + function("float", "__builtin_scalbnf", "float", "int"); + function("long double", "__builtin_scalbnl", "long double", "int"); function("int", "__builtin_scanf", "const char*", "..."); + function("bool", "__builtin_signbit", "double"); function("double", "__builtin_sin", "double"); function("float", "__builtin_sinf", "float"); + function("long double", "__builtin_sinl", "long double"); function("double", "__builtin_sinh", "double"); function("float", "__builtin_sinhf", "float"); function("long double", "__builtin_sinhl", "long double"); - function("long double", "__builtin_sinl", "long double"); function("int", "__builtin_snprintf", "char*", "size_t", "const char*", "..."); function("int", "__builtin_sprintf", "char*", "const char*", "..."); function("double", "__builtin_sqrt", "double"); @@ -283,10 +419,16 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { function("char*", "__builtin_strstr", "const char*", "const char*"); function("double", "__builtin_tan", "double"); function("float", "__builtin_tanf", "float"); + function("long double", "__builtin_tanl", "long double"); function("double", "__builtin_tanh", "double"); function("float", "__builtin_tanhf", "float"); function("long double", "__builtin_tanhl", "long double"); - function("long double", "__builtin_tanl", "long double"); + function("double", "__builtin_tgamma", "double"); + function("float", "__builtin_tgammaf", "float"); + function("long double", "__builtin_tgammal", "long double"); + function("double", "__builtin_trunc", "double"); + function("float", "__builtin_truncf", "float"); + function("long double", "__builtin_truncl", "long double"); function("int", "__builtin_types_compatible_p", "", ""); function("int", "__builtin_vprintf", "const char*", "va_list"); function("int", "__builtin_vscanf", "const char*", "va_list"); @@ -312,13 +454,13 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { function(returnType, name, parameterTypes); } } - + private void function(String returnType, String name, String... parameterTypes) { int len = parameterTypes.length; boolean varargs= len > 0 && parameterTypes[len-1].equals("..."); if (varargs) len--; - + IType[] pTypes = new IType[len]; IParameter[] theParms = fCpp ? new ICPPParameter[len] : new IParameter[len]; for (int i = 0; i < len; i++) { @@ -368,7 +510,7 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { final IType nt= toType(nested); return fCpp ? new CPPPointerType(nt) : new CPointerType(nt, 0); } - + boolean isConst = false; boolean isVolatile = false; if (tstr.startsWith("const ")) { @@ -420,20 +562,24 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider { } else if (tstr.equals("double")) { Kind kind = Kind.eDouble; t = fCpp ? new CPPBasicType(kind, q) : new CBasicType(kind, q); + } else if (tstr.equals("bool")) { + t = fCpp ? new CPPBasicType(Kind.eBoolean, q) : new CBasicType(Kind.eInt, q); } else if (tstr.equals("va_list")) { // Use 'char*(*)()' IType rt= toType("char*"); t = fCpp ? new CPPPointerType(new CPPFunctionType(rt, IType.EMPTY_TYPE_ARRAY)) : - new CPointerType(new CFunctionType(rt, IType.EMPTY_TYPE_ARRAY), 0); + new CPointerType(new CFunctionType(rt, IType.EMPTY_TYPE_ARRAY), 0); } else if (tstr.equals("size_t")) { t= toType("unsigned long"); } else { throw new IllegalArgumentException(type); } - if (isConst || isVolatile) - return fCpp ? new CPPQualifierType(t, isConst, isVolatile) - : new CQualifierType(t, isConst, isVolatile, false); + if (isConst || isVolatile) { + return fCpp ? + new CPPQualifierType(t, isConst, isVolatile) : + new CQualifierType(t, isConst, isVolatile, false); + } return t; } }