diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /JavaScriptCore/jit/SpecializedThunkJIT.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'JavaScriptCore/jit/SpecializedThunkJIT.h')
| -rw-r--r-- | JavaScriptCore/jit/SpecializedThunkJIT.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/JavaScriptCore/jit/SpecializedThunkJIT.h b/JavaScriptCore/jit/SpecializedThunkJIT.h index 57515fb..5c593d9 100644 --- a/JavaScriptCore/jit/SpecializedThunkJIT.h +++ b/JavaScriptCore/jit/SpecializedThunkJIT.h @@ -96,14 +96,10 @@ namespace JSC { #if USE(JSVALUE64) moveDoubleToPtr(src, regT0); subPtr(tagTypeNumberRegister, regT0); -#elif USE(JSVALUE32_64) +#else storeDouble(src, Address(stackPointerRegister, -(int)sizeof(double))); loadPtr(Address(stackPointerRegister, OBJECT_OFFSETOF(JSValue, u.asBits.tag) - sizeof(double)), regT1); loadPtr(Address(stackPointerRegister, OBJECT_OFFSETOF(JSValue, u.asBits.payload) - sizeof(double)), regT0); -#else - UNUSED_PARAM(src); - ASSERT_NOT_REACHED(); - m_failures.append(jump()); #endif loadPtr(Address(callFrameRegister, RegisterFile::CallerFrame * (int)sizeof(Register)), callFrameRegister); ret(); @@ -144,13 +140,8 @@ namespace JSC { { #if USE(JSVALUE64) orPtr(tagTypeNumberRegister, regT0); -#elif USE(JSVALUE32_64) - move(Imm32(JSValue::Int32Tag), regT1); #else - signExtend32ToPtr(regT0, regT0); - // If we can't tag the result, give up and jump to the slow case - m_failures.append(branchAddPtr(Overflow, regT0, regT0)); - addPtr(Imm32(JSImmediate::TagTypeNumber), regT0); + move(Imm32(JSValue::Int32Tag), regT1); #endif } |