MIPS; Improve checked load/store operators for constant offset and length.

src/compiler/mips64/code-generator-mips64.cc

 // Copyright 2014 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/compiler/code-generator.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/mips/macro-assembler-mips.h"
@@ skipping 148 matching lines @@
 
   void Generate() FINAL { __ mov(result_, zero_reg); }
 
  private:
   Register const result_;
 };
 
 }  // namespace
 
 
-#define ASSEMBLE_CHECKED_LOAD_FLOAT(width, asm_instr)                 \
-  do {                                                                \
-    auto result = i.Output##width##Register();                        \
-    auto offset = i.InputRegister(0);                                 \
-    auto ool = new (zone()) OutOfLineLoad##width(this, result);       \
-    __ Branch(ool->entry(), hs, offset, Operand(i.InputRegister(1))); \
-    __ Daddu(at, i.InputRegister(2), offset);                         \
-    __ asm_instr(result, MemOperand(at, 0));                          \
-    __ bind(ool->exit());                                             \
+#define ASSEMBLE_CHECKED_LOAD_FLOAT(width, asm_instr)                   \
+  do {                                                                  \
+    auto result = i.Output##width##Register();                          \
+    auto ool = new (zone()) OutOfLineLoad##width(this, result);         \
+    if (instr->InputAt(0)->IsRegister()) {                              \
+      auto offset = i.InputRegister(0);                                 \
+      __ Branch(ool->entry(), hs, offset, i.InputOperand(1));           \
+      __ Daddu(at, i.InputRegister(2), offset);                         \

[paul.l..., 2014/12/04 16:05:56]

If you use delay slot, might want to make this add non-macro version for
clarity: daddu()

+      __ asm_instr(result, MemOperand(at, 0));                          \
+    } else {                                                            \
+      auto offset = i.InputOperand(0).immediate();                      \
+      __ Branch(ool->entry(), ls, i.InputRegister(1), Operand(offset)); \
+      __ asm_instr(result, MemOperand(i.InputRegister(2), offset));     \
+    }                                                                   \
+    __ bind(ool->exit());                                               \
   } while (0)
 
 
-#define ASSEMBLE_CHECKED_LOAD_INTEGER(asm_instr)                      \
-  do {                                                                \
-    auto result = i.OutputRegister();                                 \
-    auto offset = i.InputRegister(0);                                 \
-    auto ool = new (zone()) OutOfLineLoadInteger(this, result);       \
-    __ Branch(ool->entry(), hs, offset, Operand(i.InputRegister(1))); \
-    __ Daddu(at, i.InputRegister(2), offset);                         \
-    __ asm_instr(result, MemOperand(at, 0));                          \
-    __ bind(ool->exit());                                             \
+#define ASSEMBLE_CHECKED_LOAD_INTEGER(asm_instr)                        \
+  do {                                                                  \
+    auto result = i.OutputRegister();                                   \
+    auto ool = new (zone()) OutOfLineLoadInteger(this, result);         \
+    if (instr->InputAt(0)->IsRegister()) {                              \
+      auto offset = i.InputRegister(0);                                 \
+      __ Branch(ool->entry(), hs, offset, i.InputOperand(1));           \
+      __ Daddu(at, i.InputRegister(2), offset);                         \
+      __ asm_instr(result, MemOperand(at, 0));                          \
+    } else {                                                            \
+      auto offset = i.InputOperand(0).immediate();                      \
+      __ Branch(ool->entry(), ls, i.InputRegister(1), Operand(offset)); \
+      __ asm_instr(result, MemOperand(i.InputRegister(2), offset));     \
+    }                                                                   \
+    __ bind(ool->exit());                                               \
   } while (0)
 
 
-#define ASSEMBLE_CHECKED_STORE_FLOAT(width, asm_instr)         \
-  do {                                                         \
-    auto offset = i.InputRegister(0);                          \
-    Label done;                                                \
-    __ Branch(&done, hs, offset, Operand(i.InputRegister(1))); \
-    auto value = i.Input##width##Register(2);                  \
-    __ Daddu(at, i.InputRegister(3), offset);                  \
-    __ asm_instr(value, MemOperand(at, 0));                    \
-    __ bind(&done);                                            \
+#define ASSEMBLE_CHECKED_STORE_FLOAT(width, asm_instr)             \
+  do {                                                             \
+    Label done;                                                    \
+    if (instr->InputAt(0)->IsRegister()) {                         \
+      auto offset = i.InputRegister(0);                            \
+      __ Branch(&done, hs, offset, i.InputOperand(1));             \
+      auto value = i.Input##width##Register(2);                    \
+      __ Daddu(at, i.InputRegister(3), offset);                    \
+      __ asm_instr(value, MemOperand(at, 0));                      \
+    } else {                                                       \
+      auto offset = i.InputOperand(0).immediate();                 \
+      __ Branch(&done, ls, i.InputRegister(1), Operand(offset));   \
+      auto value = i.Input##width##Register(2);                    \
+      __ asm_instr(value, MemOperand(i.InputRegister(3), offset)); \
+    }                                                              \
+    __ bind(&done);                                                \
   } while (0)
 
 
-#define ASSEMBLE_CHECKED_STORE_INTEGER(asm_instr)              \
-  do {                                                         \
-    auto offset = i.InputRegister(0);                          \
-    Label done;                                                \
-    __ Branch(&done, hs, offset, Operand(i.InputRegister(1))); \
-    auto value = i.InputRegister(2);                           \
-    __ Daddu(at, i.InputRegister(3), offset);                  \
-    __ asm_instr(value, MemOperand(at, 0));                    \
-    __ bind(&done);                                            \
+#define ASSEMBLE_CHECKED_STORE_INTEGER(asm_instr)                  \
+  do {                                                             \
+    Label done;                                                    \
+    if (instr->InputAt(0)->IsRegister()) {                         \
+      auto offset = i.InputRegister(0);                            \
+      __ Branch(&done, hs, offset, i.InputOperand(1));             \
+      auto value = i.InputRegister(2);                             \
+      __ Daddu(at, i.InputRegister(3), offset);                    \
+      __ asm_instr(value, MemOperand(at, 0));                      \
+    } else {                                                       \
+      auto offset = i.InputOperand(0).immediate();                 \
+      __ Branch(&done, ls, i.InputRegister(1), Operand(offset));   \
+      auto value = i.InputRegister(2);                             \
+      __ asm_instr(value, MemOperand(i.InputRegister(3), offset)); \
+    }                                                              \
+    __ bind(&done);                                                \
   } while (0)
 
 
 // Assembles an instruction after register allocation, producing machine code.
 void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
   MipsOperandConverter i(this, instr);
   InstructionCode opcode = instr->opcode();
 
   switch (ArchOpcodeField::decode(opcode)) {
     case kArchCallCodeObject: {
@@ skipping 1128 matching lines @@
     }
   }
   MarkLazyDeoptSite();
 }
 
 #undef __
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8