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

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

Issue 219030: Change the functions named AllocateObjectInNewSpace to AllocateInNewSpace (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 2 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/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-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 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 756
757 ldr(scratch, FieldMemOperand(scratch, token_offset)); 757 ldr(scratch, FieldMemOperand(scratch, token_offset));
758 ldr(ip, FieldMemOperand(ip, token_offset)); 758 ldr(ip, FieldMemOperand(ip, token_offset));
759 cmp(scratch, Operand(ip)); 759 cmp(scratch, Operand(ip));
760 b(ne, miss); 760 b(ne, miss);
761 761
762 bind(&same_contexts); 762 bind(&same_contexts);
763 } 763 }
764 764
765 765
766 void MacroAssembler::AllocateObjectInNewSpace(int object_size, 766 void MacroAssembler::AllocateInNewSpace(int object_size,
767 Register result, 767 Register result,
768 Register scratch1, 768 Register scratch1,
769 Register scratch2, 769 Register scratch2,
770 Label* gc_required, 770 Label* gc_required,
771 AllocationFlags flags) { 771 AllocationFlags flags) {
772 ASSERT(!result.is(scratch1)); 772 ASSERT(!result.is(scratch1));
773 ASSERT(!scratch1.is(scratch2)); 773 ASSERT(!scratch1.is(scratch2));
774 774
775 // Load address of new object into result and allocation top address into 775 // Load address of new object into result and allocation top address into
776 // scratch1. 776 // scratch1.
777 ExternalReference new_space_allocation_top = 777 ExternalReference new_space_allocation_top =
778 ExternalReference::new_space_allocation_top_address(); 778 ExternalReference::new_space_allocation_top_address();
779 mov(scratch1, Operand(new_space_allocation_top)); 779 mov(scratch1, Operand(new_space_allocation_top));
780 if ((flags & RESULT_CONTAINS_TOP) == 0) { 780 if ((flags & RESULT_CONTAINS_TOP) == 0) {
781 ldr(result, MemOperand(scratch1)); 781 ldr(result, MemOperand(scratch1));
(...skipping 24 matching lines...) Expand all
806 // Tag and adjust back to start of new object. 806 // Tag and adjust back to start of new object.
807 if ((flags & TAG_OBJECT) != 0) { 807 if ((flags & TAG_OBJECT) != 0) {
808 sub(result, result, Operand((object_size * kPointerSize) - 808 sub(result, result, Operand((object_size * kPointerSize) -
809 kHeapObjectTag)); 809 kHeapObjectTag));
810 } else { 810 } else {
811 sub(result, result, Operand(object_size * kPointerSize)); 811 sub(result, result, Operand(object_size * kPointerSize));
812 } 812 }
813 } 813 }
814 814
815 815
816 void MacroAssembler::AllocateObjectInNewSpace(Register object_size, 816 void MacroAssembler::AllocateInNewSpace(Register object_size,
817 Register result, 817 Register result,
818 Register scratch1, 818 Register scratch1,
819 Register scratch2, 819 Register scratch2,
820 Label* gc_required, 820 Label* gc_required,
821 AllocationFlags flags) { 821 AllocationFlags flags) {
822 ASSERT(!result.is(scratch1)); 822 ASSERT(!result.is(scratch1));
823 ASSERT(!scratch1.is(scratch2)); 823 ASSERT(!scratch1.is(scratch2));
824 824
825 // Load address of new object into result and allocation top address into 825 // Load address of new object into result and allocation top address into
826 // scratch1. 826 // scratch1.
827 ExternalReference new_space_allocation_top = 827 ExternalReference new_space_allocation_top =
828 ExternalReference::new_space_allocation_top_address(); 828 ExternalReference::new_space_allocation_top_address();
829 mov(scratch1, Operand(new_space_allocation_top)); 829 mov(scratch1, Operand(new_space_allocation_top));
830 if ((flags & RESULT_CONTAINS_TOP) == 0) { 830 if ((flags & RESULT_CONTAINS_TOP) == 0) {
831 ldr(result, MemOperand(scratch1)); 831 ldr(result, MemOperand(scratch1));
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 } 1175 }
1176 1176
1177 1177
1178 void CodePatcher::Emit(Address addr) { 1178 void CodePatcher::Emit(Address addr) {
1179 masm()->emit(reinterpret_cast<Instr>(addr)); 1179 masm()->emit(reinterpret_cast<Instr>(addr));
1180 } 1180 }
1181 #endif // ENABLE_DEBUGGER_SUPPORT 1181 #endif // ENABLE_DEBUGGER_SUPPORT
1182 1182
1183 1183
1184 } } // namespace v8::internal 1184 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698