diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-10-05 11:47:52 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-10-05 11:53:40 (GMT) |
commit | 502c7d324141fb48a902ef475b4fd2932dc859c5 (patch) | |
tree | 6a748d9a12e2b693727468aa381c8b8bfa3fc72f /src/3rdparty/javascriptcore/JavaScriptCore/yarr | |
parent | b2ea3433f4a42e367fd0708f0198329754903086 (diff) | |
download | Qt-502c7d324141fb48a902ef475b4fd2932dc859c5.zip Qt-502c7d324141fb48a902ef475b4fd2932dc859c5.tar.gz Qt-502c7d324141fb48a902ef475b4fd2932dc859c5.tar.bz2 |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c )
Adapt src/script to src/3rdparty/javascriptcore changes
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/yarr')
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp index 4390b5b..d777424 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp @@ -549,11 +549,11 @@ class RegexGenerator : private MacroAssembler { } if (mask) { - load32(BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), character); + load32WithUnalignedHalfWords(BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), character); or32(Imm32(mask), character); state.jumpToBacktrack(branch32(NotEqual, character, Imm32(chPair | mask)), this); } else - state.jumpToBacktrack(branch32(NotEqual, BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), Imm32(chPair)), this); + state.jumpToBacktrack(branch32WithUnalignedHalfWords(NotEqual, BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), Imm32(chPair)), this); } void generatePatternCharacterFixed(TermGenerationState& state) |