diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:52:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:52:29 +0200 |
| commit | a3494fbd8bde2ebda243527c2be1515170595e80 (patch) | |
| tree | e26955b654e65b741aba2a95ae055889dd959459 /Source/JavaScriptCore/llint/LowLevelInterpreter.asm | |
| parent | a5b43f4f03d88d0fca8fb4531f49d1fecff582b7 (diff) | |
| parent | 289da5616df56912fa6f8c319d61fb4489c51add (diff) | |
| download | qtwebkit-a3494fbd8bde2ebda243527c2be1515170595e80.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Source/sync.profile
Change-Id: Ia5f054c8e60b4b10a041de67f4752b999561fa56
Diffstat (limited to 'Source/JavaScriptCore/llint/LowLevelInterpreter.asm')
| -rw-r--r-- | Source/JavaScriptCore/llint/LowLevelInterpreter.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm index 00d5c4f6f..9de48f1f6 100644 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm @@ -182,10 +182,8 @@ macro assert(assertion) end macro preserveReturnAddressAfterCall(destinationRegister) - if C_LOOP - # In our case, we're only preserving the bytecode vPC. - move lr, destinationRegister - elsif ARMv7 + if C_LOOP or ARMv7 or MIPS + # In C_LOOP case, we're only preserving the bytecode vPC. move lr, destinationRegister elsif X86 or X86_64 pop destinationRegister @@ -195,10 +193,8 @@ macro preserveReturnAddressAfterCall(destinationRegister) end macro restoreReturnAddressBeforeReturn(sourceRegister) - if C_LOOP - # In our case, we're only restoring the bytecode vPC. - move sourceRegister, lr - elsif ARMv7 + if C_LOOP or ARMv7 or MIPS + # In C_LOOP case, we're only restoring the bytecode vPC. move sourceRegister, lr elsif X86 or X86_64 push sourceRegister |