diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2010-11-30 11:34:27 -0800 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2010-11-30 11:37:43 -0800 |
| commit | 7286b7952150672cded846e5eee5c533e72f3e9e (patch) | |
| tree | ca2402b34014b3ca916836eaf33156585501c466 /deps/v8/src/arm/assembler-arm-inl.h | |
| parent | 486c74e72bd015ac178f881806a1d36accdcecce (diff) | |
| download | node-7286b7952150672cded846e5eee5c533e72f3e9e.tar.gz | |
Upgrade V8 to 2.5.9.1
Diffstat (limited to 'deps/v8/src/arm/assembler-arm-inl.h')
| -rw-r--r-- | deps/v8/src/arm/assembler-arm-inl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/deps/v8/src/arm/assembler-arm-inl.h b/deps/v8/src/arm/assembler-arm-inl.h index f72ad76ab..15720c956 100644 --- a/deps/v8/src/arm/assembler-arm-inl.h +++ b/deps/v8/src/arm/assembler-arm-inl.h @@ -164,7 +164,7 @@ bool RelocInfo::IsPatchedReturnSequence() { bool RelocInfo::IsPatchedDebugBreakSlotSequence() { Instr current_instr = Assembler::instr_at(pc_); - return !Assembler::IsNop(current_instr, 2); + return !Assembler::IsNop(current_instr, Assembler::DEBUG_BREAK_NOP); } @@ -288,9 +288,7 @@ Address Assembler::target_address_address_at(Address pc) { } #endif - // Verify that the instruction to patch is a - // ldr<cond> <Rd>, [pc +/- offset_12]. - ASSERT((instr & 0x0f7f0000) == 0x051f0000); + ASSERT(IsLdrPcImmediateOffset(instr)); int offset = instr & 0xfff; // offset_12 is unsigned if ((instr & (1 << 23)) == 0) offset = -offset; // U bit defines offset sign // Verify that the constant pool comes after the instruction referencing it. |