MIPS64: Move load/store instructions to macro-assembler.

src/mips64/codegen-mips64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/mips64/codegen-mips64.h"
 
 #if V8_TARGET_ARCH_MIPS64
 
 #include <memory>
 
@@ skipping 108 matching lines @@
     __ Pref(pref_hint_load, MemOperand(a1, 1 * pref_chunk));
     __ Pref(pref_hint_load, MemOperand(a1, 2 * pref_chunk));
     __ Pref(pref_hint_load, MemOperand(a1, 3 * pref_chunk));
 
     if (pref_hint_store != kPrefHintPrepareForStore) {
       __ Pref(pref_hint_store, MemOperand(a0, 1 * pref_chunk));
       __ Pref(pref_hint_store, MemOperand(a0, 2 * pref_chunk));
       __ Pref(pref_hint_store, MemOperand(a0, 3 * pref_chunk));
     }
     __ bind(&loop16w);
-    __ lw(a4, MemOperand(a1));
+    __ Lw(a4, MemOperand(a1));
 
     if (pref_hint_store == kPrefHintPrepareForStore) {
       __ sltu(v1, t9, a0);  // If a0 > t9, don't use next prefetch.
       __ Branch(USE_DELAY_SLOT, &skip_pref, gt, v1, Operand(zero_reg));
     }
-    __ lw(a5, MemOperand(a1, 1, loadstore_chunk));  // Maybe in delay slot.
+    __ Lw(a5, MemOperand(a1, 1, loadstore_chunk));  // Maybe in delay slot.
 
     __ Pref(pref_hint_store, MemOperand(a0, 4 * pref_chunk));
     __ Pref(pref_hint_store, MemOperand(a0, 5 * pref_chunk));
 
     __ bind(&skip_pref);
-    __ lw(a6, MemOperand(a1, 2, loadstore_chunk));
-    __ lw(a7, MemOperand(a1, 3, loadstore_chunk));
-    __ lw(t0, MemOperand(a1, 4, loadstore_chunk));
-    __ lw(t1, MemOperand(a1, 5, loadstore_chunk));
-    __ lw(t2, MemOperand(a1, 6, loadstore_chunk));
-    __ lw(t3, MemOperand(a1, 7, loadstore_chunk));
+    __ Lw(a6, MemOperand(a1, 2, loadstore_chunk));
+    __ Lw(a7, MemOperand(a1, 3, loadstore_chunk));
+    __ Lw(t0, MemOperand(a1, 4, loadstore_chunk));
+    __ Lw(t1, MemOperand(a1, 5, loadstore_chunk));
+    __ Lw(t2, MemOperand(a1, 6, loadstore_chunk));
+    __ Lw(t3, MemOperand(a1, 7, loadstore_chunk));
     __ Pref(pref_hint_load, MemOperand(a1, 4 * pref_chunk));
 
-    __ sw(a4, MemOperand(a0));
-    __ sw(a5, MemOperand(a0, 1, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 2, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 3, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 4, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 5, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 6, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 7, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0));
+    __ Sw(a5, MemOperand(a0, 1, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 2, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 3, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 4, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 5, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 6, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 7, loadstore_chunk));
 
-    __ lw(a4, MemOperand(a1, 8, loadstore_chunk));
-    __ lw(a5, MemOperand(a1, 9, loadstore_chunk));
-    __ lw(a6, MemOperand(a1, 10, loadstore_chunk));
-    __ lw(a7, MemOperand(a1, 11, loadstore_chunk));
-    __ lw(t0, MemOperand(a1, 12, loadstore_chunk));
-    __ lw(t1, MemOperand(a1, 13, loadstore_chunk));
-    __ lw(t2, MemOperand(a1, 14, loadstore_chunk));
-    __ lw(t3, MemOperand(a1, 15, loadstore_chunk));
+    __ Lw(a4, MemOperand(a1, 8, loadstore_chunk));
+    __ Lw(a5, MemOperand(a1, 9, loadstore_chunk));
+    __ Lw(a6, MemOperand(a1, 10, loadstore_chunk));
+    __ Lw(a7, MemOperand(a1, 11, loadstore_chunk));
+    __ Lw(t0, MemOperand(a1, 12, loadstore_chunk));
+    __ Lw(t1, MemOperand(a1, 13, loadstore_chunk));
+    __ Lw(t2, MemOperand(a1, 14, loadstore_chunk));
+    __ Lw(t3, MemOperand(a1, 15, loadstore_chunk));
     __ Pref(pref_hint_load, MemOperand(a1, 5 * pref_chunk));
 
-    __ sw(a4, MemOperand(a0, 8, loadstore_chunk));
-    __ sw(a5, MemOperand(a0, 9, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 10, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 11, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 12, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 13, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 14, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 15, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0, 8, loadstore_chunk));
+    __ Sw(a5, MemOperand(a0, 9, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 10, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 11, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 12, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 13, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 14, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 15, loadstore_chunk));
     __ addiu(a0, a0, 16 * loadstore_chunk);
     __ bne(a0, a3, &loop16w);
     __ addiu(a1, a1, 16 * loadstore_chunk);  // In delay slot.
     __ mov(a2, t8);
 
     // Here we have src and dest word-aligned but less than 64-bytes to go.
     // Check for a 32 bytes chunk and copy if there is one. Otherwise jump
     // down to chk1w to handle the tail end of the copy.
     __ bind(&chkw);
     __ Pref(pref_hint_load, MemOperand(a1, 0 * pref_chunk));
     __ andi(t8, a2, 0x1f);
     __ beq(a2, t8, &chk1w);  // Less than 32?
     __ nop();  // In delay slot.
-    __ lw(a4, MemOperand(a1));
-    __ lw(a5, MemOperand(a1, 1, loadstore_chunk));
-    __ lw(a6, MemOperand(a1, 2, loadstore_chunk));
-    __ lw(a7, MemOperand(a1, 3, loadstore_chunk));
-    __ lw(t0, MemOperand(a1, 4, loadstore_chunk));
-    __ lw(t1, MemOperand(a1, 5, loadstore_chunk));
-    __ lw(t2, MemOperand(a1, 6, loadstore_chunk));
-    __ lw(t3, MemOperand(a1, 7, loadstore_chunk));
+    __ Lw(a4, MemOperand(a1));
+    __ Lw(a5, MemOperand(a1, 1, loadstore_chunk));
+    __ Lw(a6, MemOperand(a1, 2, loadstore_chunk));
+    __ Lw(a7, MemOperand(a1, 3, loadstore_chunk));
+    __ Lw(t0, MemOperand(a1, 4, loadstore_chunk));
+    __ Lw(t1, MemOperand(a1, 5, loadstore_chunk));
+    __ Lw(t2, MemOperand(a1, 6, loadstore_chunk));
+    __ Lw(t3, MemOperand(a1, 7, loadstore_chunk));
     __ addiu(a1, a1, 8 * loadstore_chunk);
-    __ sw(a4, MemOperand(a0));
-    __ sw(a5, MemOperand(a0, 1, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 2, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 3, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 4, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 5, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 6, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 7, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0));
+    __ Sw(a5, MemOperand(a0, 1, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 2, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 3, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 4, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 5, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 6, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 7, loadstore_chunk));
     __ addiu(a0, a0, 8 * loadstore_chunk);
 
     // Here we have less than 32 bytes to copy. Set up for a loop to copy
     // one word at a time. Set a2 to count how many bytes we have to copy
     // after all the word chunks are copied and a3 to the dst pointer after
     // all the word chunks have been copied. We will loop, incrementing a0
     // and a1 untill a0 equals a3.
     __ bind(&chk1w);
     __ andi(a2, t8, loadstore_chunk - 1);
     __ beq(a2, t8, &lastb);
     __ subu(a3, t8, a2);  // In delay slot.
     __ addu(a3, a0, a3);
 
     __ bind(&wordCopy_loop);
-    __ lw(a7, MemOperand(a1));
+    __ Lw(a7, MemOperand(a1));
     __ addiu(a0, a0, loadstore_chunk);
     __ addiu(a1, a1, loadstore_chunk);
     __ bne(a0, a3, &wordCopy_loop);
-    __ sw(a7, MemOperand(a0, -1, loadstore_chunk));  // In delay slot.
+    __ Sw(a7, MemOperand(a0, -1, loadstore_chunk));  // In delay slot.
 
     __ bind(&lastb);
     __ Branch(&leave, le, a2, Operand(zero_reg));
     __ addu(a3, a0, a2);
 
     __ bind(&lastbloop);
-    __ lb(v1, MemOperand(a1));
+    __ Lb(v1, MemOperand(a1));
     __ addiu(a0, a0, 1);
     __ addiu(a1, a1, 1);
     __ bne(a0, a3, &lastbloop);
-    __ sb(v1, MemOperand(a0, -1));  // In delay slot.
+    __ Sb(v1, MemOperand(a0, -1));  // In delay slot.
 
     __ bind(&leave);
     __ jr(ra);
     __ nop();
 
     // Unaligned case. Only the dst gets aligned so we need to do partial
     // loads of the source followed by normal stores to the dst (once we
     // have aligned the destination).
     __ bind(&unaligned);
     __ andi(a3, a3, loadstore_chunk - 1);  // Copy a3 bytes to align a0/a1.
@@ skipping 109 matching lines @@
       __ lwr(t0,
              MemOperand(a1, 5, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t1,
              MemOperand(a1, 6, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t2,
              MemOperand(a1, 7, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t3,
              MemOperand(a1, 8, loadstore_chunk, MemOperand::offset_minus_one));
     }
     __ Pref(pref_hint_load, MemOperand(a1, 4 * pref_chunk));
-    __ sw(a4, MemOperand(a0));
-    __ sw(a5, MemOperand(a0, 1, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 2, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 3, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 4, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 5, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 6, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 7, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0));
+    __ Sw(a5, MemOperand(a0, 1, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 2, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 3, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 4, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 5, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 6, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 7, loadstore_chunk));
     if (kArchEndian == kLittle) {
       __ lwr(a4, MemOperand(a1, 8, loadstore_chunk));
       __ lwr(a5, MemOperand(a1, 9, loadstore_chunk));
       __ lwr(a6, MemOperand(a1, 10, loadstore_chunk));
       __ lwr(a7, MemOperand(a1, 11, loadstore_chunk));
       __ lwr(t0, MemOperand(a1, 12, loadstore_chunk));
       __ lwr(t1, MemOperand(a1, 13, loadstore_chunk));
       __ lwr(t2, MemOperand(a1, 14, loadstore_chunk));
       __ lwr(t3, MemOperand(a1, 15, loadstore_chunk));
       __ lwl(a4,
@@ skipping 32 matching lines @@
       __ lwr(t0,
              MemOperand(a1, 13, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t1,
              MemOperand(a1, 14, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t2,
              MemOperand(a1, 15, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t3,
              MemOperand(a1, 16, loadstore_chunk, MemOperand::offset_minus_one));
     }
     __ Pref(pref_hint_load, MemOperand(a1, 5 * pref_chunk));
-    __ sw(a4, MemOperand(a0, 8, loadstore_chunk));
-    __ sw(a5, MemOperand(a0, 9, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 10, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 11, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 12, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 13, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 14, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 15, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0, 8, loadstore_chunk));
+    __ Sw(a5, MemOperand(a0, 9, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 10, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 11, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 12, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 13, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 14, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 15, loadstore_chunk));
     __ addiu(a0, a0, 16 * loadstore_chunk);
     __ bne(a0, a3, &ua_loop16w);
     __ addiu(a1, a1, 16 * loadstore_chunk);  // In delay slot.
     __ mov(a2, t8);
 
     // Here less than 64-bytes. Check for
     // a 32 byte chunk and copy if there is one. Otherwise jump down to
     // ua_chk1w to handle the tail end of the copy.
     __ bind(&ua_chkw);
     __ Pref(pref_hint_load, MemOperand(a1));
@@ skipping 46 matching lines @@
       __ lwr(t0,
              MemOperand(a1, 5, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t1,
              MemOperand(a1, 6, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t2,
              MemOperand(a1, 7, loadstore_chunk, MemOperand::offset_minus_one));
       __ lwr(t3,
              MemOperand(a1, 8, loadstore_chunk, MemOperand::offset_minus_one));
     }
     __ addiu(a1, a1, 8 * loadstore_chunk);
-    __ sw(a4, MemOperand(a0));
-    __ sw(a5, MemOperand(a0, 1, loadstore_chunk));
-    __ sw(a6, MemOperand(a0, 2, loadstore_chunk));
-    __ sw(a7, MemOperand(a0, 3, loadstore_chunk));
-    __ sw(t0, MemOperand(a0, 4, loadstore_chunk));
-    __ sw(t1, MemOperand(a0, 5, loadstore_chunk));
-    __ sw(t2, MemOperand(a0, 6, loadstore_chunk));
-    __ sw(t3, MemOperand(a0, 7, loadstore_chunk));
+    __ Sw(a4, MemOperand(a0));
+    __ Sw(a5, MemOperand(a0, 1, loadstore_chunk));
+    __ Sw(a6, MemOperand(a0, 2, loadstore_chunk));
+    __ Sw(a7, MemOperand(a0, 3, loadstore_chunk));
+    __ Sw(t0, MemOperand(a0, 4, loadstore_chunk));
+    __ Sw(t1, MemOperand(a0, 5, loadstore_chunk));
+    __ Sw(t2, MemOperand(a0, 6, loadstore_chunk));
+    __ Sw(t3, MemOperand(a0, 7, loadstore_chunk));
     __ addiu(a0, a0, 8 * loadstore_chunk);
 
     // Less than 32 bytes to copy. Set up for a loop to
     // copy one word at a time.
     __ bind(&ua_chk1w);
     __ andi(a2, t8, loadstore_chunk - 1);
     __ beq(a2, t8, &ua_smallCopy);
     __ subu(a3, t8, a2);  // In delay slot.
     __ addu(a3, a0, a3);
 
     __ bind(&ua_wordCopy_loop);
     if (kArchEndian == kLittle) {
       __ lwr(v1, MemOperand(a1));
       __ lwl(v1,
              MemOperand(a1, 1, loadstore_chunk, MemOperand::offset_minus_one));
     } else {
       __ lwl(v1, MemOperand(a1));
       __ lwr(v1,
              MemOperand(a1, 1, loadstore_chunk, MemOperand::offset_minus_one));
     }
     __ addiu(a0, a0, loadstore_chunk);
     __ addiu(a1, a1, loadstore_chunk);
     __ bne(a0, a3, &ua_wordCopy_loop);
-    __ sw(v1, MemOperand(a0, -1, loadstore_chunk));  // In delay slot.
+    __ Sw(v1, MemOperand(a0, -1, loadstore_chunk));  // In delay slot.
 
     // Copy the last 8 bytes.
     __ bind(&ua_smallCopy);
     __ beq(a2, zero_reg, &leave);
     __ addu(a3, a0, a2);  // In delay slot.
 
     __ bind(&ua_smallCopy_loop);
-    __ lb(v1, MemOperand(a1));
+    __ Lb(v1, MemOperand(a1));
     __ addiu(a0, a0, 1);
     __ addiu(a1, a1, 1);
     __ bne(a0, a3, &ua_smallCopy_loop);
-    __ sb(v1, MemOperand(a0, -1));  // In delay slot.
+    __ Sb(v1, MemOperand(a0, -1));  // In delay slot.
 
     __ jr(ra);
     __ nop();
   }
   CodeDesc desc;
   masm.GetCode(&desc);
   DCHECK(!RelocInfo::RequiresRelocation(isolate, desc));
 
   Assembler::FlushICache(isolate, buffer, actual_size);
   base::OS::ProtectCode(buffer, actual_size);
@@ skipping 56 matching lines @@
 
 void StringCharLoadGenerator::Generate(MacroAssembler* masm,
                                        Register string,
                                        Register index,
                                        Register result,
                                        Label* call_runtime) {
   Label indirect_string_loaded;
   __ bind(&indirect_string_loaded);
 
   // Fetch the instance type of the receiver into result register.
-  __ ld(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ lbu(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
+  __ Ld(result, FieldMemOperand(string, HeapObject::kMapOffset));
+  __ Lbu(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
 
   // We need special handling for indirect strings.
   Label check_sequential;
   __ And(at, result, Operand(kIsIndirectStringMask));
   __ Branch(&check_sequential, eq, at, Operand(zero_reg));
 
   // Dispatch on the indirect string shape: slice or cons.
   Label cons_string, thin_string;
   __ And(at, result, Operand(kStringRepresentationMask));
   __ Branch(&cons_string, eq, at, Operand(kConsStringTag));
   __ Branch(&thin_string, eq, at, Operand(kThinStringTag));
 
   // Handle slices.
-  __ ld(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ ld(string, FieldMemOperand(string, SlicedString::kParentOffset));
+  __ Ld(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
+  __ Ld(string, FieldMemOperand(string, SlicedString::kParentOffset));
   __ dsra32(at, result, 0);
   __ Daddu(index, index, at);
   __ jmp(&indirect_string_loaded);
 
   // Handle thin strings.
   __ bind(&thin_string);
-  __ ld(string, FieldMemOperand(string, ThinString::kActualOffset));
+  __ Ld(string, FieldMemOperand(string, ThinString::kActualOffset));
   __ jmp(&indirect_string_loaded);
 
   // Handle cons strings.
   // Check whether the right hand side is the empty string (i.e. if
   // this is really a flat string in a cons string). If that is not
   // the case we would rather go to the runtime system now to flatten
   // the string.
   __ bind(&cons_string);
-  __ ld(result, FieldMemOperand(string, ConsString::kSecondOffset));
+  __ Ld(result, FieldMemOperand(string, ConsString::kSecondOffset));
   __ LoadRoot(at, Heap::kempty_stringRootIndex);
   __ Branch(call_runtime, ne, result, Operand(at));
   // Get the first of the two strings and load its instance type.
-  __ ld(string, FieldMemOperand(string, ConsString::kFirstOffset));
+  __ Ld(string, FieldMemOperand(string, ConsString::kFirstOffset));
   __ jmp(&indirect_string_loaded);
 
   // Distinguish sequential and external strings. Only these two string
   // representations can reach here (slices and flat cons strings have been
   // reduced to the underlying sequential or external string).
   Label external_string, check_encoding;
   __ bind(&check_sequential);
   STATIC_ASSERT(kSeqStringTag == 0);
   __ And(at, result, Operand(kStringRepresentationMask));
   __ Branch(&external_string, ne, at, Operand(zero_reg));
@@ skipping 11 matching lines @@
     // Assert that we do not have a cons or slice (indirect strings) here.
     // Sequential strings have already been ruled out.
     __ And(at, result, Operand(kIsIndirectStringMask));
     __ Assert(eq, kExternalStringExpectedButNotFound,
         at, Operand(zero_reg));
   }
   // Rule out short external strings.
   STATIC_ASSERT(kShortExternalStringTag != 0);
   __ And(at, result, Operand(kShortExternalStringMask));
   __ Branch(call_runtime, ne, at, Operand(zero_reg));
-  __ ld(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
+  __ Ld(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
 
   Label one_byte, done;
   __ bind(&check_encoding);
   STATIC_ASSERT(kTwoByteStringTag == 0);
   __ And(at, result, Operand(kStringEncodingMask));
   __ Branch(&one_byte, ne, at, Operand(zero_reg));
   // Two-byte string.
   __ Dlsa(at, string, index, 1);
-  __ lhu(result, MemOperand(at));
+  __ Lhu(result, MemOperand(at));
   __ jmp(&done);
   __ bind(&one_byte);
   // One_byte string.
   __ Daddu(at, string, index);
-  __ lbu(result, MemOperand(at));
+  __ Lbu(result, MemOperand(at));
   __ bind(&done);
 }
 
 #ifdef DEBUG
 // nop(CODE_AGE_MARKER_NOP)
 static const uint32_t kCodeAgePatchFirstInstruction = 0x00010180;
 #endif
 
 
 CodeAgingHelper::CodeAgingHelper(Isolate* isolate) {
@@ skipping 62 matching lines @@
   }
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64