Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index 4faa6a4b249188ba6c8a8f5be08b8e5ba76eb711..d3e2a919cad26ad0d6f3fc36fbec19888be8fee1 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -7024,47 +7024,44 @@ struct AheadOfTimeWriteBarrierStubList { |
}; |
-#define REG(Name) { kRegister_ ## Name ## _Code } |
- |
-static const AheadOfTimeWriteBarrierStubList kAheadOfTime[] = { |
+struct AheadOfTimeWriteBarrierStubList kAheadOfTime[] = { |
// Used in RegExpExecStub. |
- { REG(ebx), REG(eax), REG(edi), EMIT_REMEMBERED_SET }, |
+ { ebx, eax, edi, EMIT_REMEMBERED_SET }, |
// Used in CompileArrayPushCall. |
- { REG(ebx), REG(ecx), REG(edx), EMIT_REMEMBERED_SET }, |
- { REG(ebx), REG(edi), REG(edx), OMIT_REMEMBERED_SET }, |
+ { ebx, ecx, edx, EMIT_REMEMBERED_SET }, |
+ { ebx, edi, edx, OMIT_REMEMBERED_SET }, |
// Used in CompileStoreGlobal and CallFunctionStub. |
- { REG(ebx), REG(ecx), REG(edx), OMIT_REMEMBERED_SET }, |
+ { ebx, ecx, edx, OMIT_REMEMBERED_SET }, |
// Used in StoreStubCompiler::CompileStoreField and |
// KeyedStoreStubCompiler::CompileStoreField via GenerateStoreField. |
- { REG(edx), REG(ecx), REG(ebx), EMIT_REMEMBERED_SET }, |
+ { edx, ecx, ebx, EMIT_REMEMBERED_SET }, |
// GenerateStoreField calls the stub with two different permutations of |
// registers. This is the second. |
- { REG(ebx), REG(ecx), REG(edx), EMIT_REMEMBERED_SET }, |
+ { ebx, ecx, edx, EMIT_REMEMBERED_SET }, |
// StoreIC::GenerateNormal via GenerateDictionaryStore |
- { REG(ebx), REG(edi), REG(edx), EMIT_REMEMBERED_SET }, |
+ { ebx, edi, edx, EMIT_REMEMBERED_SET }, |
// KeyedStoreIC::GenerateGeneric. |
- { REG(ebx), REG(edx), REG(ecx), EMIT_REMEMBERED_SET}, |
+ { ebx, edx, ecx, EMIT_REMEMBERED_SET}, |
// KeyedStoreStubCompiler::GenerateStoreFastElement. |
- { REG(edi), REG(ebx), REG(ecx), EMIT_REMEMBERED_SET}, |
- { REG(edx), REG(edi), REG(ebx), EMIT_REMEMBERED_SET}, |
+ { edi, ebx, ecx, EMIT_REMEMBERED_SET}, |
+ { edx, edi, ebx, EMIT_REMEMBERED_SET}, |
// ElementsTransitionGenerator::GenerateSmiOnlyToObject |
// and ElementsTransitionGenerator::GenerateSmiOnlyToDouble |
// and ElementsTransitionGenerator::GenerateDoubleToObject |
- { REG(edx), REG(ebx), REG(edi), EMIT_REMEMBERED_SET}, |
- { REG(edx), REG(ebx), REG(edi), OMIT_REMEMBERED_SET}, |
+ { edx, ebx, edi, EMIT_REMEMBERED_SET}, |
+ { edx, ebx, edi, OMIT_REMEMBERED_SET}, |
// ElementsTransitionGenerator::GenerateDoubleToObject |
- { REG(eax), REG(edx), REG(esi), EMIT_REMEMBERED_SET}, |
- { REG(edx), REG(eax), REG(edi), EMIT_REMEMBERED_SET}, |
+ { eax, edx, esi, EMIT_REMEMBERED_SET}, |
+ { edx, eax, edi, EMIT_REMEMBERED_SET}, |
// StoreArrayLiteralElementStub::Generate |
- { REG(ebx), REG(eax), REG(ecx), EMIT_REMEMBERED_SET}, |
+ { ebx, eax, ecx, EMIT_REMEMBERED_SET}, |
// Null termination. |
- { REG(no_reg), REG(no_reg), REG(no_reg), EMIT_REMEMBERED_SET} |
+ { no_reg, no_reg, no_reg, EMIT_REMEMBERED_SET} |
}; |
-#undef REG |
bool RecordWriteStub::IsPregenerated() { |
- for (const AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime; |
+ for (AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime; |
!entry->object.is(no_reg); |
entry++) { |
if (object_.is(entry->object) && |
@@ -7092,7 +7089,7 @@ void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime() { |
void RecordWriteStub::GenerateFixedRegStubsAheadOfTime() { |
- for (const AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime; |
+ for (AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime; |
!entry->object.is(no_reg); |
entry++) { |
RecordWriteStub stub(entry->object, |