MIPS64: Fix 'MIPS: Fix dd() implementations for compact branches.'

test/cctest/test-macro-assembler-mips.cc

 // Copyright 2013 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
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 271 matching lines @@
   __ addiu(sp, sp, -4);
   __ sw(ra, MemOperand(sp));
 
   {
     __ BlockTrampolinePoolFor(kNumCases * 2 + 7 + 1);
     PredictableCodeSizeScope predictable(
         masm, kNumCases * kPointerSize + ((7 + 1) * Assembler::kInstrSize));
     Label here;
 
     __ bal(&here);
-    __ sll(at, a0, 3);  // In delay slot.
+    __ sll(at, a0, 2);  // In delay slot.
     __ bind(&here);
     __ addu(at, at, ra);
     __ lw(at, MemOperand(at, 6 * Assembler::kInstrSize));
     __ jalr(at);
     __ nop();  // Branch delay slot nop.
     __ bc(&done);
     for (int i = 0; i < kNumCases; ++i) {
       __ dd(&labels[i]);
     }
   }
@@ skipping 14 matching lines @@
 
   CodeDesc desc;
   masm->GetCode(&desc);
   Handle<Code> code = isolate->factory()->NewCode(
       desc, Code::ComputeFlags(Code::STUB), Handle<Code>());
 #ifdef OBJECT_PRINT
   code->Print(std::cout);
 #endif
   F1 f = FUNCTION_CAST<F1>(code->entry());
   for (int i = 0; i < kNumCases; ++i) {
-    int64_t res = reinterpret_cast<int64_t>(
+    int32_t res = reinterpret_cast<int32_t>(
         CALL_GENERATED_CODE(isolate, f, i, 0, 0, 0, 0));
-    ::printf("f(%d) = %" PRId64 "\n", i, res);
+    ::printf("f(%d) = %d\n", i, res);
     CHECK_EQ(values[i], res);
   }
 }
 
 
 static uint32_t run_lsa(uint32_t rt, uint32_t rs, int8_t sa) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
   MacroAssembler assembler(isolate, nullptr, 0,
                            v8::internal::CodeObjectRequired::kYes);
@@ skipping 67 matching lines @@
   size_t nr_test_cases = sizeof(tc) / sizeof(TestCaseLsa);
   for (size_t i = 0; i < nr_test_cases; ++i) {
     uint32_t res = run_lsa(tc[i].rt, tc[i].rs, tc[i].sa);
     PrintF("0x%x =? 0x%x == lsa(v0, %x, %x, %hhu)\n", tc[i].expected_res, res,
            tc[i].rt, tc[i].rs, tc[i].sa);
     CHECK_EQ(tc[i].expected_res, res);
   }
 }
 
 #undef __