Remove special-casing of EAGER and SOFT deoptimization calling conventions, allowing calling addres…

src/mips/deoptimizer-mips.cc

 
 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
@@ skipping 439 matching lines @@
       __ sw(ToRegister(i), MemOperand(sp, kPointerSize * i));
     }
   }
 
   const int kSavedRegistersAreaSize =
       (kNumberOfRegisters * kPointerSize) + kDoubleRegsSize;
 
   // Get the bailout id from the stack.
   __ lw(a2, MemOperand(sp, kSavedRegistersAreaSize));
 
-  // Get the address of the location in the code object if possible (a3) (return
+  // Get the address of the location in the code object (a3) (return
   // address for lazy deoptimization) and compute the fp-to-sp delta in
   // register t0.
-  if (type() == EAGER || type() == SOFT) {
-    __ mov(a3, zero_reg);
-    // Correct one word for bailout id.
-    __ Addu(t0, sp, Operand(kSavedRegistersAreaSize + (1 * kPointerSize)));
-  } else if (type() == OSR) {
+  if (type() == EAGER || type() == SOFT || type() == OSR) {

[danno, 2013/07/10 10:04:30]

As with ARM, why the special handling of LAZY?

[titzer, 2013/07/11 09:43:43]

Done.

     __ mov(a3, ra);
     // Correct one word for bailout id.
     __ Addu(t0, sp, Operand(kSavedRegistersAreaSize + (1 * kPointerSize)));
   } else {
     __ mov(a3, ra);
     // Correct two words for bailout id and return address.
     __ Addu(t0, sp, Operand(kSavedRegistersAreaSize + (2 * kPointerSize)));
   }
 
   __ Subu(t0, fp, t0);
@@ skipping 188 matching lines @@
   }
 
   ASSERT_EQ(masm()->SizeOfCodeGeneratedSince(&table_start),
       count() * table_entry_size_);
 }
 
 #undef __
 
 
 } }  // namespace v8::internal