Index: src/ic/mips64/stub-cache-mips64.cc |
diff --git a/src/ic/arm/stub-cache-arm.cc b/src/ic/mips64/stub-cache-mips64.cc |
similarity index 67% |
copy from src/ic/arm/stub-cache-arm.cc |
copy to src/ic/mips64/stub-cache-mips64.cc |
index a8b650beecfc99f06199d6a93dd63da98d46e183..6d3fcb3e1d04f9a311292b1d22773294332f7d4e 100644 |
--- a/src/ic/arm/stub-cache-arm.cc |
+++ b/src/ic/mips64/stub-cache-mips64.cc |
@@ -4,7 +4,7 @@ |
#include "src/v8.h" |
-#if V8_TARGET_ARCH_ARM |
+#if V8_TARGET_ARCH_MIPS64 |
#include "src/codegen.h" |
#include "src/ic/stub-cache.h" |
@@ -25,9 +25,9 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm, |
ExternalReference value_offset(isolate->stub_cache()->value_reference(table)); |
ExternalReference map_offset(isolate->stub_cache()->map_reference(table)); |
- uint32_t key_off_addr = reinterpret_cast<uint32_t>(key_offset.address()); |
- uint32_t value_off_addr = reinterpret_cast<uint32_t>(value_offset.address()); |
- uint32_t map_off_addr = reinterpret_cast<uint32_t>(map_offset.address()); |
+ uint64_t key_off_addr = reinterpret_cast<uint64_t>(key_offset.address()); |
+ uint64_t value_off_addr = reinterpret_cast<uint64_t>(value_offset.address()); |
+ uint64_t map_off_addr = reinterpret_cast<uint64_t>(map_offset.address()); |
// Check the relative positions of the address fields. |
DCHECK(value_off_addr > key_off_addr); |
@@ -42,39 +42,34 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm, |
scratch = no_reg; |
// Multiply by 3 because there are 3 fields per entry (name, code, map). |
- __ add(offset_scratch, offset, Operand(offset, LSL, 1)); |
+ __ dsll(offset_scratch, offset, 1); |
+ __ Daddu(offset_scratch, offset_scratch, offset); |
// Calculate the base address of the entry. |
- __ mov(base_addr, Operand(key_offset)); |
- __ add(base_addr, base_addr, Operand(offset_scratch, LSL, kPointerSizeLog2)); |
+ __ li(base_addr, Operand(key_offset)); |
+ __ dsll(at, offset_scratch, kPointerSizeLog2); |
+ __ Daddu(base_addr, base_addr, at); |
// Check that the key in the entry matches the name. |
- __ ldr(ip, MemOperand(base_addr, 0)); |
- __ cmp(name, ip); |
- __ b(ne, &miss); |
+ __ ld(at, MemOperand(base_addr, 0)); |
+ __ Branch(&miss, ne, name, Operand(at)); |
// Check the map matches. |
- __ ldr(ip, MemOperand(base_addr, map_off_addr - key_off_addr)); |
- __ ldr(scratch2, FieldMemOperand(receiver, HeapObject::kMapOffset)); |
- __ cmp(ip, scratch2); |
- __ b(ne, &miss); |
+ __ ld(at, MemOperand(base_addr, map_off_addr - key_off_addr)); |
+ __ ld(scratch2, FieldMemOperand(receiver, HeapObject::kMapOffset)); |
+ __ Branch(&miss, ne, at, Operand(scratch2)); |
// Get the code entry from the cache. |
Register code = scratch2; |
scratch2 = no_reg; |
- __ ldr(code, MemOperand(base_addr, value_off_addr - key_off_addr)); |
+ __ ld(code, MemOperand(base_addr, value_off_addr - key_off_addr)); |
// Check that the flags match what we're looking for. |
Register flags_reg = base_addr; |
base_addr = no_reg; |
- __ ldr(flags_reg, FieldMemOperand(code, Code::kFlagsOffset)); |
- // It's a nice optimization if this constant is encodable in the bic insn. |
- |
- uint32_t mask = Code::kFlagsNotUsedInLookup; |
- DCHECK(__ ImmediateFitsAddrMode1Instruction(mask)); |
- __ bic(flags_reg, flags_reg, Operand(mask)); |
- __ cmp(flags_reg, Operand(flags)); |
- __ b(ne, &miss); |
+ __ lw(flags_reg, FieldMemOperand(code, Code::kFlagsOffset)); |
+ __ And(flags_reg, flags_reg, Operand(~Code::kFlagsNotUsedInLookup)); |
+ __ Branch(&miss, ne, flags_reg, Operand(flags)); |
#ifdef DEBUG |
if (FLAG_test_secondary_stub_cache && table == StubCache::kPrimary) { |
@@ -85,7 +80,8 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm, |
#endif |
// Jump to the first instruction in the code stub. |
- __ add(pc, code, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ Daddu(at, code, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ Jump(at); |
// Miss: fall through. |
__ bind(&miss); |
@@ -101,7 +97,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Flags flags, |
// Make sure that code is valid. The multiplying code relies on the |
// entry size being 12. |
- DCHECK(sizeof(Entry) == 12); |
+ // DCHECK(sizeof(Entry) == 12); |
+ // DCHECK(sizeof(Entry) == 3 * kPointerSize); |
// Make sure the flags does not name a specific type. |
DCHECK(Code::ExtractTypeFromFlags(flags) == 0); |
@@ -117,7 +114,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Flags flags, |
DCHECK(!extra2.is(scratch)); |
DCHECK(!extra2.is(extra)); |
- // Check scratch, extra and extra2 registers are valid. |
+ // Check register validity. |
DCHECK(!scratch.is(no_reg)); |
DCHECK(!extra.is(no_reg)); |
DCHECK(!extra2.is(no_reg)); |
@@ -131,28 +128,26 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Flags flags, |
__ JumpIfSmi(receiver, &miss); |
// Get the map of the receiver and compute the hash. |
- __ ldr(scratch, FieldMemOperand(name, Name::kHashFieldOffset)); |
- __ ldr(ip, FieldMemOperand(receiver, HeapObject::kMapOffset)); |
- __ add(scratch, scratch, Operand(ip)); |
- uint32_t mask = kPrimaryTableSize - 1; |
+ __ ld(scratch, FieldMemOperand(name, Name::kHashFieldOffset)); |
+ __ ld(at, FieldMemOperand(receiver, HeapObject::kMapOffset)); |
+ __ Daddu(scratch, scratch, at); |
+ uint64_t mask = kPrimaryTableSize - 1; |
// We shift out the last two bits because they are not part of the hash and |
// they are always 01 for maps. |
- __ mov(scratch, Operand(scratch, LSR, kCacheIndexShift)); |
- // Mask down the eor argument to the minimum to keep the immediate |
- // ARM-encodable. |
- __ eor(scratch, scratch, Operand((flags >> kCacheIndexShift) & mask)); |
- // Prefer and_ to ubfx here because ubfx takes 2 cycles. |
- __ and_(scratch, scratch, Operand(mask)); |
+ __ dsrl(scratch, scratch, kCacheIndexShift); |
+ __ Xor(scratch, scratch, Operand((flags >> kCacheIndexShift) & mask)); |
+ __ And(scratch, scratch, Operand(mask)); |
// Probe the primary table. |
ProbeTable(isolate, masm, flags, kPrimary, receiver, name, scratch, extra, |
extra2, extra3); |
// Primary miss: Compute hash for secondary probe. |
- __ sub(scratch, scratch, Operand(name, LSR, kCacheIndexShift)); |
- uint32_t mask2 = kSecondaryTableSize - 1; |
- __ add(scratch, scratch, Operand((flags >> kCacheIndexShift) & mask2)); |
- __ and_(scratch, scratch, Operand(mask2)); |
+ __ dsrl(at, name, kCacheIndexShift); |
+ __ Dsubu(scratch, scratch, at); |
+ uint64_t mask2 = kSecondaryTableSize - 1; |
+ __ Daddu(scratch, scratch, Operand((flags >> kCacheIndexShift) & mask2)); |
+ __ And(scratch, scratch, Operand(mask2)); |
// Probe the secondary table. |
ProbeTable(isolate, masm, flags, kSecondary, receiver, name, scratch, extra, |
@@ -170,4 +165,4 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Flags flags, |
} |
} // namespace v8::internal |
-#endif // V8_TARGET_ARCH_ARM |
+#endif // V8_TARGET_ARCH_MIPS64 |