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

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

Issue 7860035: Merge bleeding edge up to 9192 into the GC branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 years, 3 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/accessors.cc ('k') | src/arm/builtins-arm.cc » ('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 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 686
687 void Assembler::bind(Label* L) { 687 void Assembler::bind(Label* L) {
688 ASSERT(!L->is_bound()); // label can only be bound once 688 ASSERT(!L->is_bound()); // label can only be bound once
689 bind_to(L, pc_offset()); 689 bind_to(L, pc_offset());
690 } 690 }
691 691
692 692
693 void Assembler::next(Label* L) { 693 void Assembler::next(Label* L) {
694 ASSERT(L->is_linked()); 694 ASSERT(L->is_linked());
695 int link = target_at(L->pos()); 695 int link = target_at(L->pos());
696 if (link > 0) { 696 if (link == kEndOfChain) {
697 L->Unuse();
698 } else {
699 ASSERT(link >= 0);
697 L->link_to(link); 700 L->link_to(link);
698 } else {
699 ASSERT(link == kEndOfChain);
700 L->Unuse();
701 } 701 }
702 } 702 }
703 703
704 704
705 static Instr EncodeMovwImmediate(uint32_t immediate) { 705 static Instr EncodeMovwImmediate(uint32_t immediate) {
706 ASSERT(immediate < 0x10000); 706 ASSERT(immediate < 0x10000);
707 return ((immediate & 0xf000) << 4) | (immediate & 0xfff); 707 return ((immediate & 0xf000) << 4) | (immediate & 0xfff);
708 } 708 }
709 709
710 710
(...skipping 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 2654
2655 // Since a constant pool was just emitted, move the check offset forward by 2655 // Since a constant pool was just emitted, move the check offset forward by
2656 // the standard interval. 2656 // the standard interval.
2657 next_buffer_check_ = pc_offset() + kCheckPoolInterval; 2657 next_buffer_check_ = pc_offset() + kCheckPoolInterval;
2658 } 2658 }
2659 2659
2660 2660
2661 } } // namespace v8::internal 2661 } } // namespace v8::internal
2662 2662
2663 #endif // V8_TARGET_ARCH_ARM 2663 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/accessors.cc ('k') | src/arm/builtins-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698