diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 22:05:21 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 22:05:21 +1000 |
| commit | e45925b2653f5f9de2932e0868d8da9d6c7c9b23 (patch) | |
| tree | 807aefc3f8501ed6185c1f746431af0d12116c05 | |
| parent | f2209f6f55b7340da0f0112943c7e50fb5f761bf (diff) | |
| parent | 9ed05d4d8a5a3a7f181e4905e415f3036f334456 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging:
Fix crashes with regular expressions QtScript on ARM traditional architectures
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp index fcb8d86..1015923 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp @@ -1312,6 +1312,9 @@ class RegexGenerator : private MacroAssembler { push(ARMRegisters::r4); push(ARMRegisters::r5); push(ARMRegisters::r6); +#if CPU(ARM_TRADITIONAL) + push(ARMRegisters::r8); // scratch register +#endif move(ARMRegisters::r3, output); #endif } @@ -1327,6 +1330,9 @@ class RegexGenerator : private MacroAssembler { pop(X86Registers::ebx); pop(X86Registers::ebp); #elif CPU(ARM) +#if CPU(ARM_TRADITIONAL) + pop(ARMRegisters::r8); // scratch register +#endif pop(ARMRegisters::r6); pop(ARMRegisters::r5); pop(ARMRegisters::r4); |