| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1727 | 1727 |
| 1728 // Activate inlined smi code. | 1728 // Activate inlined smi code. |
| 1729 if (previous_state == UNINITIALIZED) { | 1729 if (previous_state == UNINITIALIZED) { |
| 1730 PatchInlinedSmiCode(address(), ENABLE_INLINED_SMI_CHECK); | 1730 PatchInlinedSmiCode(address(), ENABLE_INLINED_SMI_CHECK); |
| 1731 } | 1731 } |
| 1732 } | 1732 } |
| 1733 | 1733 |
| 1734 | 1734 |
| 1735 void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) { | 1735 void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) { |
| 1736 Address cmp_instruction_address = | 1736 Address cmp_instruction_address = |
| 1737 address + Assembler::kCallTargetAddressOffset; | 1737 Assembler::return_address_from_call_start(address); |
| 1738 | 1738 |
| 1739 // If the instruction following the call is not a cmp rx, #yyy, nothing | 1739 // If the instruction following the call is not a cmp rx, #yyy, nothing |
| 1740 // was inlined. | 1740 // was inlined. |
| 1741 Instr instr = Assembler::instr_at(cmp_instruction_address); | 1741 Instr instr = Assembler::instr_at(cmp_instruction_address); |
| 1742 if (!Assembler::IsCmpImmediate(instr)) { | 1742 if (!Assembler::IsCmpImmediate(instr)) { |
| 1743 return; | 1743 return; |
| 1744 } | 1744 } |
| 1745 | 1745 |
| 1746 // The delta to the start of the map check instruction and the | 1746 // The delta to the start of the map check instruction and the |
| 1747 // condition code uses at the patched jump. | 1747 // condition code uses at the patched jump. |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1792 } else { | 1792 } else { |
| 1793 ASSERT(Assembler::GetCondition(branch_instr) == ne); | 1793 ASSERT(Assembler::GetCondition(branch_instr) == ne); |
| 1794 patcher.EmitCondition(eq); | 1794 patcher.EmitCondition(eq); |
| 1795 } | 1795 } |
| 1796 } | 1796 } |
| 1797 | 1797 |
| 1798 | 1798 |
| 1799 } } // namespace v8::internal | 1799 } } // namespace v8::internal |
| 1800 | 1800 |
| 1801 #endif // V8_TARGET_ARCH_ARM | 1801 #endif // V8_TARGET_ARCH_ARM |
| OLD | NEW |