Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1157)

Side by Side Diff: src/arm/assembler-arm.cc

Issue 6346009: Fix the ARM simulator's stop support and add conditional breakpoint.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/arm/constants-arm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 1994-2006 Sun Microsystems Inc. 1 // Copyright (c) 1994-2006 Sun Microsystems Inc.
2 // All Rights Reserved. 2 // All Rights Reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions 5 // modification, are permitted provided that the following conditions
6 // are met: 6 // are met:
7 // 7 //
8 // - Redistributions of source code must retain the above copyright notice, 8 // - Redistributions of source code must retain the above copyright notice,
9 // this list of conditions and the following disclaimer. 9 // this list of conditions and the following disclaimer.
10 // 10 //
(...skipping 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 // It expects to find the address just after the svc instruction. 1649 // It expects to find the address just after the svc instruction.
1650 BlockConstPoolFor(2); 1650 BlockConstPoolFor(2);
1651 if (code >= 0) { 1651 if (code >= 0) {
1652 svc(kStopInterruptCode + code, cond); 1652 svc(kStopInterruptCode + code, cond);
1653 } else { 1653 } else {
1654 svc(kStopInterruptCode + kMaxStopCode, cond); 1654 svc(kStopInterruptCode + kMaxStopCode, cond);
1655 } 1655 }
1656 emit(reinterpret_cast<Instr>(msg)); 1656 emit(reinterpret_cast<Instr>(msg));
1657 #else // def __arm__ 1657 #else // def __arm__
1658 #ifdef CAN_USE_ARMV5_INSTRUCTIONS 1658 #ifdef CAN_USE_ARMV5_INSTRUCTIONS
1659 ASSERT(cond == al); 1659 if (cond != al) {
1660 bkpt(0); 1660 Label skip;
1661 b(&skip, NegateCondition(cond));
1662 bkpt(0);
1663 bind(&skip);
1664 } else {
1665 bkpt(0);
1666 }
1661 #else // ndef CAN_USE_ARMV5_INSTRUCTIONS 1667 #else // ndef CAN_USE_ARMV5_INSTRUCTIONS
1662 svc(0x9f0001, cond); 1668 svc(0x9f0001, cond);
1663 #endif // ndef CAN_USE_ARMV5_INSTRUCTIONS 1669 #endif // ndef CAN_USE_ARMV5_INSTRUCTIONS
1664 #endif // def __arm__ 1670 #endif // def __arm__
1665 } 1671 }
1666 1672
1667 1673
1668 void Assembler::bkpt(uint32_t imm16) { // v5 and above 1674 void Assembler::bkpt(uint32_t imm16) { // v5 and above
1669 ASSERT(is_uint16(imm16)); 1675 ASSERT(is_uint16(imm16));
1670 emit(al | B24 | B21 | (imm16 >> 4)*B8 | 7*B4 | (imm16 & 0xf)); 1676 emit(al | B24 | B21 | (imm16 >> 4)*B8 | 7*B4 | (imm16 & 0xf));
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 2660
2655 // Since a constant pool was just emitted, move the check offset forward by 2661 // Since a constant pool was just emitted, move the check offset forward by
2656 // the standard interval. 2662 // the standard interval.
2657 next_buffer_check_ = pc_offset() + kCheckConstInterval; 2663 next_buffer_check_ = pc_offset() + kCheckConstInterval;
2658 } 2664 }
2659 2665
2660 2666
2661 } } // namespace v8::internal 2667 } } // namespace v8::internal
2662 2668
2663 #endif // V8_TARGET_ARCH_ARM 2669 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/arm/constants-arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698