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

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

Issue 10939018: Revert due to invalid description / CL combination. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/mips/macro-assembler-mips.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mips/macro-assembler-mips.cc
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
index a0b8e976580b4af6642ffb61ed0f3c55e9b23e94..7ded49499957b010b996229de161b0268dd45192 100644
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -5299,37 +5299,20 @@ void MacroAssembler::LoadInstanceDescriptors(Register map,
Register temp = descriptors;
lw(temp, FieldMemOperand(map, Map::kTransitionsOrBackPointerOffset));
- Label ok, fail, load_from_back_pointer;
+ Label ok, fail;
CheckMap(temp,
scratch,
isolate()->factory()->fixed_array_map(),
&fail,
DONT_DO_SMI_CHECK);
- lw(temp, FieldMemOperand(temp, TransitionArray::kDescriptorsPointerOffset));
- lw(descriptors, FieldMemOperand(temp, JSGlobalPropertyCell::kValueOffset));
+ lw(descriptors, FieldMemOperand(temp, TransitionArray::kDescriptorsOffset));
jmp(&ok);
-
bind(&fail);
- LoadRoot(scratch, Heap::kUndefinedValueRootIndex);
- Branch(&load_from_back_pointer, ne, temp, Operand(scratch));
LoadRoot(descriptors, Heap::kEmptyDescriptorArrayRootIndex);
- jmp(&ok);
-
- bind(&load_from_back_pointer);
- lw(temp, FieldMemOperand(temp, Map::kTransitionsOrBackPointerOffset));
- lw(temp, FieldMemOperand(temp, TransitionArray::kDescriptorsPointerOffset));
- lw(descriptors, FieldMemOperand(temp, JSGlobalPropertyCell::kValueOffset));
-
bind(&ok);
}
-void MacroAssembler::NumberOfOwnDescriptors(Register dst, Register map) {
- lbu(dst, FieldMemOperand(map, Map::kBitFieldOffset));
- DecodeField<Map::NumberOfOwnDescriptorsBits>(dst);
-}
-
-
void MacroAssembler::EnumLength(Register dst, Register map) {
STATIC_ASSERT(Map::EnumLengthBits::kShift == 0);
lw(dst, FieldMemOperand(map, Map::kBitField3Offset));
« no previous file with comments | « src/mips/macro-assembler-mips.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698