Todd Nowacki
6d8999b7c1
Some simple changes for HPHP to help make it clang friendly ---hphp/compiler/package.cpp ---hphp/compiler/package.h ---hphp/runtime/ext/ext_curl.cpp ---hphp/runtime/ext/pdo_mysql.cpp ---hphp/tools/tc-print/offline-x86-code.h ---hphp/util/async_func.cpp ---hphp/util/async_func.h ---hphp/util/compression.cpp ---hphp/util/compression.h ---hphp/util/db_conn.cpp ---hphp/util/db_conn.h Deleted unused private fields ~~~hphp/compiler/analysis/symbol_table.h Static assert had to be outside the union +++hphp/runtime/TARGETS Added clang specific flag to supress unneded declaration warning ~~~hphp/runtime/base/datatype.h Use of logical '&&' with constant operand. Added !=0 to remove warning, ~~~hphp/runtime/base/string_data.h Static fields cannot be declared in an anonymous struct/union ~~~hphp/runtime/ext/bcmath/TARGETS Moved gcc specific flag from preprocessor_flags to compiler_specific_flags ~---hphp/runtime/ext/pdo_mysql.cpp Removed unnecessary self asignment for row_count ~~~hphp/runtime/vm/bytecode.h Added default return statement ~---hphp/runtime/vm/jit/codegen.cpp spillSlotsToSize was unused ~~~hphp/runtime/vm/jit/irtranslator.cpp ~~~hphp/runtime/vm/jit/linearscan.cpp The c++ standard states default arguments shall not be specified in the parameter-declaration-clause of a lambda-declarator. ~~~hphp/runtime/vm/jit/vectortranslator-internal.h Clang had some issues determining the correct cast when these macros were used A simple '!= 0' check was added to make things explicit for clang. ~~~hphp/tools/tc-print/perf-events.h Added parens to make clang happy +++hphp/util/asm-x64.h The constexpr needed to be initialized +++hphp/util/base.h Clang also supports tr1 libraries ~~~hphp/util/bits.h Again, clang had issues with implicit casting to bool. added != 0 check ~~~hphp/util/malloc_size_class.h Ambiguous operator precedence. Added parentheses. ~~~hphp/util/thread_local.h Misspelled function
67 linhas
2.2 KiB
C++
67 linhas
2.2 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef incl_HPHP_BITS_H_
|
|
#define incl_HPHP_BITS_H_
|
|
|
|
namespace HPHP {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
template <typename T>
|
|
struct BitInfo {
|
|
static const T NumBits = sizeof(T) * 8;
|
|
static const T HighMask = 0x1 << (NumBits - 1);
|
|
};
|
|
|
|
template <unsigned int i, unsigned int m>
|
|
struct BitCountImpl {
|
|
enum { value = ((i & m) ? 1 : 0) + BitCountImpl< i, (m >> 1) >::value };
|
|
};
|
|
|
|
template <unsigned int i>
|
|
struct BitCountImpl<i, 0> {
|
|
enum { value = 0 };
|
|
};
|
|
|
|
template <unsigned int i>
|
|
struct BitCount: public BitCountImpl<i,
|
|
BitInfo<unsigned int>::HighMask>
|
|
{};
|
|
|
|
template <unsigned int i, bool p, unsigned int m>
|
|
struct BitPhaseImpl {
|
|
enum {
|
|
value = ((i & m) ? (p ? 0 : 1) : (p ? 1 : 0)) +
|
|
BitPhaseImpl<i, ((i & m) != 0), (m >> 1)>::value
|
|
};
|
|
};
|
|
|
|
template <unsigned int i, bool p>
|
|
struct BitPhaseImpl<i, p, 0> {
|
|
enum { value = 0 };
|
|
};
|
|
|
|
template <unsigned int i>
|
|
struct BitPhase : public BitPhaseImpl<i,
|
|
i & BitInfo<unsigned int>::HighMask,
|
|
BitInfo<unsigned int>::HighMask>
|
|
{};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
|
|
#endif // incl_HPHP_BITS_H_
|