diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 13:56:55 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 13:56:55 (GMT) |
| commit | 94051a438e64eaede021b4e926ef58f793a09a70 (patch) | |
| tree | 9860dc49d8e6453df356f51da9126b583ac35206 /src/3rdparty | |
| parent | 06557b8d7c472c6298f7d8b310feda225864265f (diff) | |
| parent | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff) | |
| download | Qt-94051a438e64eaede021b4e926ef58f793a09a70.zip Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.gz Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/3rdparty')
| -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); |