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

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

Issue 2036007: Added Heap:: prefix to kFixedArrayMapRootIndex in ARM... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 10 years, 7 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 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 8634 matching lines...) Expand 10 before | Expand all | Expand 10 after
8645 // Check that the fourth object is a JSArray object. 8645 // Check that the fourth object is a JSArray object.
8646 __ ldr(r0, MemOperand(sp, kLastMatchInfoOffset)); 8646 __ ldr(r0, MemOperand(sp, kLastMatchInfoOffset));
8647 __ tst(r0, Operand(kSmiTagMask)); 8647 __ tst(r0, Operand(kSmiTagMask));
8648 __ b(eq, &runtime); 8648 __ b(eq, &runtime);
8649 __ CompareObjectType(r0, r1, r1, JS_ARRAY_TYPE); 8649 __ CompareObjectType(r0, r1, r1, JS_ARRAY_TYPE);
8650 __ b(ne, &runtime); 8650 __ b(ne, &runtime);
8651 // Check that the JSArray is in fast case. 8651 // Check that the JSArray is in fast case.
8652 __ ldr(last_match_info_elements, 8652 __ ldr(last_match_info_elements,
8653 FieldMemOperand(r0, JSArray::kElementsOffset)); 8653 FieldMemOperand(r0, JSArray::kElementsOffset));
8654 __ ldr(r0, FieldMemOperand(last_match_info_elements, HeapObject::kMapOffset)); 8654 __ ldr(r0, FieldMemOperand(last_match_info_elements, HeapObject::kMapOffset));
8655 __ LoadRoot(ip, kFixedArrayMapRootIndex); 8655 __ LoadRoot(ip, Heap::kFixedArrayMapRootIndex);
8656 __ cmp(r0, ip); 8656 __ cmp(r0, ip);
8657 __ b(ne, &runtime); 8657 __ b(ne, &runtime);
8658 // Check that the last match info has space for the capture registers and the 8658 // Check that the last match info has space for the capture registers and the
8659 // additional information. 8659 // additional information.
8660 __ ldr(r0, 8660 __ ldr(r0,
8661 FieldMemOperand(last_match_info_elements, FixedArray::kLengthOffset)); 8661 FieldMemOperand(last_match_info_elements, FixedArray::kLengthOffset));
8662 __ add(r2, r2, Operand(RegExpImpl::kLastMatchOverhead)); 8662 __ add(r2, r2, Operand(RegExpImpl::kLastMatchOverhead));
8663 __ cmp(r2, r0); 8663 __ cmp(r2, r0);
8664 __ b(gt, &runtime); 8664 __ b(gt, &runtime);
8665 8665
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
10014 10014
10015 // Just jump to runtime to add the two strings. 10015 // Just jump to runtime to add the two strings.
10016 __ bind(&string_add_runtime); 10016 __ bind(&string_add_runtime);
10017 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); 10017 __ TailCallRuntime(Runtime::kStringAdd, 2, 1);
10018 } 10018 }
10019 10019
10020 10020
10021 #undef __ 10021 #undef __
10022 10022
10023 } } // namespace v8::internal 10023 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698