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

Unified Diff: src/ia32/macro-assembler-ia32.cc

Issue 7113012: Call a stub for the write barrier on ARM. This is a step (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
Patch Set: '' Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ia32/macro-assembler-ia32.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/macro-assembler-ia32.cc
===================================================================
--- src/ia32/macro-assembler-ia32.cc (revision 8184)
+++ src/ia32/macro-assembler-ia32.cc (working copy)
@@ -2294,38 +2294,38 @@
Register scratch1,
Label* is_black,
Label::Distance is_black_near) {
- HasColour(object, scratch0, scratch1,
- is_black, is_black_near,
- 1, 0); // kBlackBitPattern.
+ HasColor(object, scratch0, scratch1,
+ is_black, is_black_near,
+ 1, 0); // kBlackBitPattern.
ASSERT(strcmp(Marking::kBlackBitPattern, "10") == 0);
}
-void MacroAssembler::HasColour(Register object,
- Register bitmap_scratch,
- Register mask_scratch,
- Label* has_colour,
- Label::Distance has_colour_distance,
- int first_bit,
- int second_bit) {
+void MacroAssembler::HasColor(Register object,
+ Register bitmap_scratch,
+ Register mask_scratch,
+ Label* has_color,
+ Label::Distance has_color_distance,
+ int first_bit,
+ int second_bit) {
ASSERT(!Aliasing(object, bitmap_scratch, mask_scratch, ecx));
- MarkBits(object, bitmap_scratch, mask_scratch);
+ GetMarkBits(object, bitmap_scratch, mask_scratch);
- Label other_colour, word_boundary;
+ Label other_color, word_boundary;
test(mask_scratch, Operand(bitmap_scratch, MemoryChunk::kHeaderSize));
- j(first_bit == 1 ? zero : not_zero, &other_colour, Label::kNear);
+ j(first_bit == 1 ? zero : not_zero, &other_color, Label::kNear);
add(mask_scratch, Operand(mask_scratch)); // Shift left 1 by adding.
j(zero, &word_boundary, Label::kNear);
test(mask_scratch, Operand(bitmap_scratch, MemoryChunk::kHeaderSize));
- j(second_bit == 1 ? not_zero : zero, has_colour, has_colour_distance);
- jmp(&other_colour, Label::kNear);
+ j(second_bit == 1 ? not_zero : zero, has_color, has_color_distance);
+ jmp(&other_color, Label::kNear);
bind(&word_boundary);
test_b(Operand(bitmap_scratch, MemoryChunk::kHeaderSize + kPointerSize), 1);
- j(second_bit == 1 ? not_zero : zero, has_colour, has_colour_distance);
- bind(&other_colour);
+ j(second_bit == 1 ? not_zero : zero, has_color, has_color_distance);
+ bind(&other_color);
}
@@ -2349,9 +2349,9 @@
}
-void MacroAssembler::MarkBits(Register addr_reg,
- Register bitmap_reg,
- Register mask_reg) {
+void MacroAssembler::GetMarkBits(Register addr_reg,
+ Register bitmap_reg,
+ Register mask_reg) {
ASSERT(!Aliasing(addr_reg, bitmap_reg, mask_reg, ecx));
mov(bitmap_reg, Operand(addr_reg));
and_(bitmap_reg, ~Page::kPageAlignmentMask);
@@ -2377,7 +2377,7 @@
Label* value_is_white_and_not_data,
Label::Distance distance) {
ASSERT(!Aliasing(value, bitmap_scratch, mask_scratch, ecx));
- MarkBits(value, bitmap_scratch, mask_scratch);
+ GetMarkBits(value, bitmap_scratch, mask_scratch);
// If the value is black or grey we don't need to do anything.
ASSERT(strcmp(Marking::kWhiteBitPattern, "00") == 0);
« no previous file with comments | « src/ia32/macro-assembler-ia32.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698