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

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

Issue 6873076: Revert revisions 7644 and 7632, they are causing assertion failures in interactive_ui_tests debug... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 8 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 | « src/ia32/assembler-ia32.h ('k') | src/ia32/assembler-ia32-inl.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 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 1582
1583 void Assembler::call(const Operand& adr) { 1583 void Assembler::call(const Operand& adr) {
1584 positions_recorder()->WriteRecordedPositions(); 1584 positions_recorder()->WriteRecordedPositions();
1585 EnsureSpace ensure_space(this); 1585 EnsureSpace ensure_space(this);
1586 last_pc_ = pc_; 1586 last_pc_ = pc_;
1587 EMIT(0xFF); 1587 EMIT(0xFF);
1588 emit_operand(edx, adr); 1588 emit_operand(edx, adr);
1589 } 1589 }
1590 1590
1591 1591
1592 void Assembler::call(Handle<Code> code, 1592 void Assembler::call(Handle<Code> code, RelocInfo::Mode rmode) {
1593 RelocInfo::Mode rmode,
1594 unsigned ast_id) {
1595 positions_recorder()->WriteRecordedPositions(); 1593 positions_recorder()->WriteRecordedPositions();
1596 EnsureSpace ensure_space(this); 1594 EnsureSpace ensure_space(this);
1597 last_pc_ = pc_; 1595 last_pc_ = pc_;
1598 ASSERT(RelocInfo::IsCodeTarget(rmode)); 1596 ASSERT(RelocInfo::IsCodeTarget(rmode));
1599 EMIT(0xE8); 1597 EMIT(0xE8);
1600 emit(reinterpret_cast<intptr_t>(code.location()), rmode, ast_id); 1598 emit(reinterpret_cast<intptr_t>(code.location()), rmode);
1601 } 1599 }
1602 1600
1603 1601
1604 void Assembler::jmp(Label* L) { 1602 void Assembler::jmp(Label* L) {
1605 EnsureSpace ensure_space(this); 1603 EnsureSpace ensure_space(this);
1606 last_pc_ = pc_; 1604 last_pc_ = pc_;
1607 if (L->is_bound()) { 1605 if (L->is_bound()) {
1608 const int short_size = 2; 1606 const int short_size = 2;
1609 const int long_size = 5; 1607 const int long_size = 5;
1610 int offs = L->pos() - pc_offset(); 1608 int offs = L->pos() - pc_offset();
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
2839 fprintf(coverage_log, "%s\n", file_line); 2837 fprintf(coverage_log, "%s\n", file_line);
2840 fflush(coverage_log); 2838 fflush(coverage_log);
2841 } 2839 }
2842 } 2840 }
2843 2841
2844 #endif 2842 #endif
2845 2843
2846 } } // namespace v8::internal 2844 } } // namespace v8::internal
2847 2845
2848 #endif // V8_TARGET_ARCH_IA32 2846 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/ia32/assembler-ia32.h ('k') | src/ia32/assembler-ia32-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698