diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:09:57 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:55:17 (GMT) |
| commit | 473dfcdf47372860f6d70264755050a7a1bbd493 (patch) | |
| tree | 9ccbdbcd833ebb29ad1db6dfae1c9da0581cacb4 /src/3rdparty | |
| parent | 493bfea18600c98431c10f6853310c1c0aa6d869 (diff) | |
| download | Qt-473dfcdf47372860f6d70264755050a7a1bbd493.zip Qt-473dfcdf47372860f6d70264755050a7a1bbd493.tar.gz Qt-473dfcdf47372860f6d70264755050a7a1bbd493.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( 8662fcc9bb1d374fa10114fe629f18290641cccc )
Remove trailing \ from inline function code
https://bugs.webkit.org/show_bug.cgi?id=34223
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h | 8 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index 35aabc9..68411ab 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2010-01-27 Anton Muhin <antonm@chromium.org> + + Reviewed by Darin Adler. + + Remove trailing \ from inline function code + https://bugs.webkit.org/show_bug.cgi?id=34223 + + * assembler/ARMv7Assembler.h: + (JSC::ARMThumbImmediate::countLeadingZerosPartial): + 2010-01-27 Kwang Yul Seo <skyul@company100.net> Reviewed by Oliver Hunt. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h index 6cde63b..4e394b2 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h @@ -201,10 +201,10 @@ class ARMThumbImmediate { ALWAYS_INLINE static void countLeadingZerosPartial(uint32_t& value, int32_t& zeros, const int N) { - if (value & ~((1<<N)-1)) /* check for any of the top N bits (of 2N bits) are set */ \ - value >>= N; /* if any were set, lose the bottom N */ \ - else /* if none of the top N bits are set, */ \ - zeros += N; /* then we have identified N leading zeros */ + if (value & ~((1 << N) - 1)) /* check for any of the top N bits (of 2N bits) are set */ + value >>= N; /* if any were set, lose the bottom N */ + else /* if none of the top N bits are set, */ + zeros += N; /* then we have identified N leading zeros */ } static int32_t countLeadingZeros(uint32_t value) diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index 6351105..581837e 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from The commit imported was from the - javascriptcore-snapshot-23022010 branch/tag + javascriptcore-snapshot-07042010 branch/tag and has the sha1 checksum - 8a21225144f7c1e10ffcb9aa7a545164d9495bf2 + 8662fcc9bb1d374fa10114fe629f18290641cccc |