diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /JavaScriptCore/jit/JSInterfaceJIT.h | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'JavaScriptCore/jit/JSInterfaceJIT.h')
| -rw-r--r-- | JavaScriptCore/jit/JSInterfaceJIT.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/JavaScriptCore/jit/JSInterfaceJIT.h b/JavaScriptCore/jit/JSInterfaceJIT.h index 2cd0e33..12a6cfa 100644 --- a/JavaScriptCore/jit/JSInterfaceJIT.h +++ b/JavaScriptCore/jit/JSInterfaceJIT.h @@ -152,7 +152,7 @@ namespace JSC { static const FPRegisterID fpRegT0 = MIPSRegisters::f4; static const FPRegisterID fpRegT1 = MIPSRegisters::f6; static const FPRegisterID fpRegT2 = MIPSRegisters::f8; - static const FPRegisterID fpRegT2 = MIPSRegisters::f10; + static const FPRegisterID fpRegT3 = MIPSRegisters::f10; #else #error "JIT not supported on this platform." #endif @@ -169,6 +169,7 @@ namespace JSC { #if USE(JSVALUE32) || USE(JSVALUE64) Jump emitJumpIfImmediateNumber(RegisterID reg); Jump emitJumpIfNotImmediateNumber(RegisterID reg); + void emitFastArithImmToInt(RegisterID reg); #endif inline Address payloadFor(unsigned index, RegisterID base = callFrameRegister); @@ -260,7 +261,11 @@ namespace JSC { done.link(this); return notNumber; } - + + ALWAYS_INLINE void JSInterfaceJIT::emitFastArithImmToInt(RegisterID) + { + } + #endif #if USE(JSVALUE32) @@ -283,6 +288,12 @@ namespace JSC { ASSERT_NOT_REACHED(); return jump(); } + + ALWAYS_INLINE void JSInterfaceJIT::emitFastArithImmToInt(RegisterID reg) + { + rshift32(Imm32(JSImmediate::IntegerPayloadShift), reg); + } + #endif #if !USE(JSVALUE32_64) |