Changeset 150449 in webkit
- Timestamp:
- May 21, 2013 9:44:01 AM (11 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r150401 r150449 1 2013-05-21 Mark Lam <mark.lam@apple.com> 2 3 Added missing assert condition for PositiveOrZero in ARM branch32(). 4 https://bugs.webkit.org/show_bug.cgi?id=116538. 5 6 Reviewed by Geoffrey Garen. 7 8 * assembler/MacroAssemblerARM.h: 9 (JSC::MacroAssemblerARM::branchAdd32): 10 1 11 2013-05-20 Mark Hahnenberg <mhahnenberg@apple.com> 2 12 -
trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
r149152 r150449 688 688 Jump branchAdd32(ResultCondition cond, RegisterID src, RegisterID dest) 689 689 { 690 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); 690 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) 691 || (cond == NonZero) || (cond == PositiveOrZero)); 691 692 add32(src, dest); 692 693 return Jump(m_assembler.jmp(ARMCondition(cond))); … … 695 696 Jump branchAdd32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest) 696 697 { 697 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); 698 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) 699 || (cond == NonZero) || (cond == PositiveOrZero)); 698 700 add32(op1, op2, dest); 699 701 return Jump(m_assembler.jmp(ARMCondition(cond))); … … 702 704 Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest) 703 705 { 704 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); 706 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) 707 || (cond == NonZero) || (cond == PositiveOrZero)); 705 708 add32(imm, dest); 706 709 return Jump(m_assembler.jmp(ARMCondition(cond))); … … 709 712 Jump branchAdd32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest) 710 713 { 711 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); 714 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) 715 || (cond == NonZero) || (cond == PositiveOrZero)); 712 716 add32(src, imm, dest); 713 717 return Jump(m_assembler.jmp(ARMCondition(cond))); … … 716 720 Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, AbsoluteAddress dest) 717 721 { 718 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); 722 ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) 723 || (cond == NonZero) || (cond == PositiveOrZero)); 719 724 add32(imm, dest); 720 725 return Jump(m_assembler.jmp(ARMCondition(cond)));
Note: See TracChangeset
for help on using the changeset viewer.