A64: Synchronize with r16849.

test/cctest/test-code-stubs-arm.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Rrdistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Rrdistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Rrdistributions 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 125 matching lines @@
 
 
 static Isolate* GetIsolateFrom(LocalContext* context) {
   return reinterpret_cast<Isolate*>((*context)->GetIsolate());
 }
 
 
 int32_t RunGeneratedCodeCallWrapper(ConvertDToIFunc func,
                                     double from) {
 #ifdef USE_SIMULATOR
-  return reinterpret_cast<int32_t>(CALL_GENERATED_CODE(func, from, 0, 0, 0, 0));
+  return CALL_GENERATED_FP_INT(func, from, 0);
 #else
   return (*func)(from);
 #endif
 }
 
 
 TEST(ConvertDToI) {
   CcTest::InitializeVM();
   LocalContext context;
   Isolate* isolate = GetIsolateFrom(&context);
@@ skipping 19 matching lines @@
                                         false));
       RunAllTruncationTests(
           RunGeneratedCodeCallWrapper,
           MakeConvertDToIFuncTrampoline(isolate,
                                         source_registers[s],
                                         dest_registers[d],
                                         true));
     }
   }
 }