Fixes to run "Hello, world!" on arm64 hardware.

runtime/vm/assembler_arm64_test.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/os.h"
 #include "vm/unit_test.h"
 #include "vm/virtual_memory.h"
 
 namespace dart {
 
 #define __ assembler->
 
 ASSEMBLER_TEST_GENERATE(Simple, assembler) {
   __ add(R0, ZR, Operand(ZR));
   __ add(R0, R0, Operand(42));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Simple, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Move wide immediate tests.
 // movz
 ASSEMBLER_TEST_GENERATE(Movz0, assembler) {
   __ movz(R0, 42, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movz0, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movz1, assembler) {
   __ movz(R0, 42, 0);  // Overwritten by next instruction.
   __ movz(R0, 42, 1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movz1, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42LL << 16, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42LL << 16, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movz2, assembler) {
   __ movz(R0, 42, 2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movz2, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42LL << 32, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42LL << 32, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movz3, assembler) {
   __ movz(R0, 42, 3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movz3, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42LL << 48, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42LL << 48, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // movn
 ASSEMBLER_TEST_GENERATE(Movn0, assembler) {
   __ movn(R0, 42, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movn0, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(~42LL, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(~42LL, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movn1, assembler) {
   __ movn(R0, 42, 1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movn1, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(~(42LL << 16), EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(~(42LL << 16), EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movn2, assembler) {
   __ movn(R0, 42, 2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movn2, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(~(42LL << 32), EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(~(42LL << 32), EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movn3, assembler) {
   __ movn(R0, 42, 3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movn3, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(~(42LL << 48), EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(~(42LL << 48), EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 // movk
 ASSEMBLER_TEST_GENERATE(Movk0, assembler) {
   __ movz(R0, 1, 3);
   __ movk(R0, 42, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movk0, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(
-      42LL | (1LL << 48), EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+      42LL | (1LL << 48), EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movk1, assembler) {
   __ movz(R0, 1, 0);
   __ movk(R0, 42, 1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movk1, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(
-      (42LL << 16) | 1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+      (42LL << 16) | 1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movk2, assembler) {
   __ movz(R0, 1, 0);
   __ movk(R0, 42, 2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movk2, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(
-      (42LL << 32) | 1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+      (42LL << 32) | 1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Movk3, assembler) {
   __ movz(R0, 1, 0);
   __ movk(R0, 42, 3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Movk3, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(
-      (42LL << 48) | 1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+      (42LL << 48) | 1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(MovzBig, assembler) {
   __ movz(R0, 0x8000, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(MovzBig, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0x8000, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0x8000, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // add tests.
 ASSEMBLER_TEST_GENERATE(AddReg, assembler) {
   __ movz(R0, 20, 0);
   __ movz(R1, 22, 0);
   __ add(R0, R0, Operand(R1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AddLSLReg, assembler) {
   __ movz(R0, 20, 0);
   __ movz(R1, 11, 0);
   __ add(R0, R0, Operand(R1, LSL, 1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddLSLReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AddLSRReg, assembler) {
   __ movz(R0, 20, 0);
   __ movz(R1, 44, 0);
   __ add(R0, R0, Operand(R1, LSR, 1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddLSRReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AddASRReg, assembler) {
   __ movz(R0, 20, 0);
   __ movz(R1, 44, 0);
   __ add(R0, R0, Operand(R1, ASR, 1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddASRReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AddASRNegReg, assembler) {
   __ movz(R0, 43, 0);
   __ movn(R1, 0, 0);  // R1 <- -1
   __ add(R1, ZR, Operand(R1, LSL, 3));  // R1 <- -8
   __ add(R0, R0, Operand(R1, ASR, 3));  // R0 <- 43 + (-8 >> 3)
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddASRNegReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // TODO(zra): test other sign extension modes.
 ASSEMBLER_TEST_GENERATE(AddExtReg, assembler) {
   __ movz(R0, 43, 0);
   __ movz(R1, 0xffff, 0);
   __ movk(R1, 0xffff, 1);  // R1 <- -1 (32-bit)
   __ add(R0, R0, Operand(R1, SXTW, 0));  // R0 <- R0 + (sign extended R1)
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AddExtReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Loads and Stores.
 ASSEMBLER_TEST_GENERATE(SimpleLoadStore, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   __ str(R1, Address(SP, -1*kWordSize, Address::PreIndex));
   __ ldr(R0, Address(SP, 1*kWordSize, Address::PostIndex));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(SimpleLoadStore, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(SimpleLoadStoreHeapTag, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   __ add(R2, SP, Operand(1));
   __ str(R1, Address(R2, -1));
   __ ldr(R0, Address(R2, -1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(SimpleLoadStoreHeapTag, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadStoreLargeIndex, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   // Largest negative offset that can fit in the signed 9-bit immediate field.
   __ str(R1, Address(SP, -32*kWordSize, Address::PreIndex));
   // Largest positive kWordSize aligned offset that we can fit.
   __ ldr(R0, Address(SP, 31*kWordSize, Address::PostIndex));
   // Correction.
   __ add(SP, SP, Operand(kWordSize));  // Restore SP.
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadStoreLargeIndex, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadStoreLargeOffset, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   __ sub(SP, SP, Operand(512*kWordSize));
   __ str(R1, Address(SP, 512*kWordSize, Address::Offset));
   __ add(SP, SP, Operand(512*kWordSize));
   __ ldr(R0, Address(SP));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadStoreLargeOffset, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadStoreExtReg, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   __ movz(R2, 0xfff8, 0);
   __ movk(R2, 0xffff, 1);  // R2 <- -8 (int32_t).
   // This should sign extend R2, and add to SP to get address,
   // i.e. SP - kWordSize.
   __ str(R1, Address(SP, R2, SXTW));
   __ sub(SP, SP, Operand(kWordSize));
   __ ldr(R0, Address(SP));
   __ add(SP, SP, Operand(kWordSize));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadStoreExtReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadStoreScaledReg, assembler) {
+  __ mov(SP, CSP);
   __ movz(R0, 43, 0);
   __ movz(R1, 42, 0);
   __ movz(R2, 10, 0);
   __ sub(SP, SP, Operand(10*kWordSize));
   // Store R1 into SP + R2 * kWordSize.
   __ str(R1, Address(SP, R2, UXTX, Address::Scaled));
   __ ldr(R0, Address(SP, R2, UXTX, Address::Scaled));
   __ add(SP, SP, Operand(10*kWordSize));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadStoreScaledReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadSigned32Bit, assembler) {
+  __ mov(SP, CSP);
   __ LoadImmediate(R1, 0xffffffff, kNoPP);
   __ str(R1, Address(SP, -4, Address::PreIndex, kWord), kWord);
   __ ldr(R0, Address(SP), kWord);
   __ ldr(R1, Address(SP, 4, Address::PostIndex, kWord), kWord);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadSigned32Bit, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Logical register operations.
 ASSEMBLER_TEST_GENERATE(AndRegs, assembler) {
   __ movz(R1, 43, 0);
   __ movz(R2, 42, 0);
   __ and_(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndShiftRegs, assembler) {
   __ movz(R1, 42, 0);
   __ movz(R2, 21, 0);
   __ and_(R0, R1, Operand(R2, LSL, 1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndShiftRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(BicRegs, assembler) {
   __ movz(R1, 42, 0);
   __ movz(R2, 5, 0);
   __ bic(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(BicRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(OrrRegs, assembler) {
   __ movz(R1, 32, 0);
   __ movz(R2, 10, 0);
   __ orr(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(OrrRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(OrnRegs, assembler) {
   __ movz(R1, 32, 0);
   __ movn(R2, 0, 0);  // R2 <- 0xffffffffffffffff.
   __ movk(R2, 0xffd5, 0);  // R2 <- 0xffffffffffffffe5.
   __ orn(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(OrnRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(EorRegs, assembler) {
   __ movz(R1, 0xffd5, 0);
   __ movz(R2, 0xffff, 0);
   __ eor(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(EorRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(EonRegs, assembler) {
   __ movz(R1, 0xffd5, 0);
   __ movn(R2, 0xffff, 0);
   __ eon(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(EonRegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Logical immediate operations.
 ASSEMBLER_TEST_GENERATE(AndImm, assembler) {
   __ movz(R1, 42, 0);
   __ andi(R0, R1, 0xaaaaaaaaaaaaaaaaULL);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndImm, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndOneImm, assembler) {
   __ movz(R1, 43, 0);
   __ andi(R0, R1, 1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndOneImm, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(OrrImm, assembler) {
   __ movz(R1, 0, 0);
   __ movz(R2, 0x3f, 0);
   __ movz(R3, 0xa, 0);
   __ orri(R1, R1, 0x0020002000200020ULL);
   __ orr(R1, R1, Operand(R3));
   __ and_(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(OrrImm, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(EorImm, assembler) {
   __ movn(R0, 0, 0);
   __ movk(R0, 0xffd5, 0);  // R0 < 0xffffffffffffffd5.
   __ movz(R1, 0x3f, 0);
   __ eori(R0, R0, 0x3f3f3f3f3f3f3f3fULL);
   __ and_(R0, R0, Operand(R1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(EorImm, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Comparisons, branching.
 ASSEMBLER_TEST_GENERATE(BranchALForward, assembler) {
   Label l;
   __ movz(R0, 42, 0);
   __ b(&l, AL);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(BranchALForward, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(BranchALBackwards, assembler) {
   Label l, leave;
   __ movz(R0, 42, 0);
   __ b(&l, AL);
 
   __ movz(R0, 0, 0);
   __ Bind(&leave);
   __ ret();
   __ movz(R0, 0, 0);
 
   __ Bind(&l);
   __ b(&leave, AL);
   __ movz(R0, 0, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(BranchALBackwards, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmpEqBranch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 234, 0);
   __ movz(R2, 234, 0);
 
   __ cmp(R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmpEqBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmpEqBranchNotTaken, assembler) {
   Label l;
 
   __ movz(R0, 0, 0);
   __ movz(R1, 233, 0);
   __ movz(R2, 234, 0);
 
   __ cmp(R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 42, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmpEqBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmpEq1Branch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 1, 0);
 
   __ cmp(R1, Operand(1));
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmpEq1Branch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmnEq1Branch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movn(R1, 0, 0);  // R1 <- -1
 
   __ cmn(R1, Operand(1));
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmnEq1Branch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmpLtBranch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 233, 0);
   __ movz(R2, 234, 0);
 
   __ cmp(R1, Operand(R2));
   __ b(&l, LT);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmpLtBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CmpLtBranchNotTaken, assembler) {
   Label l;
 
   __ movz(R0, 0, 0);
   __ movz(R1, 235, 0);
   __ movz(R2, 234, 0);
 
   __ cmp(R1, Operand(R2));
   __ b(&l, LT);
   __ movz(R0, 42, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CmpLtBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
-
-
 ASSEMBLER_TEST_GENERATE(FcmpEqBranch, assembler) {
   Label l;
 
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, 234.0, kNoPP);
   __ LoadDImmediate(V2, 234.0, kNoPP);
 
   __ fcmpd(V1, V2);
   __ b(&l, EQ);
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FcmpEqBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FcmpEqBranchNotTaken, assembler) {
   Label l;
 
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 233.0, kNoPP);
   __ LoadDImmediate(V2, 234.0, kNoPP);
 
   __ fcmpd(V1, V2);
   __ b(&l, EQ);
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FcmpEqBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FcmpLtBranch, assembler) {
   Label l;
 
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, 233.0, kNoPP);
   __ LoadDImmediate(V2, 234.0, kNoPP);
 
   __ fcmpd(V1, V2);
   __ b(&l, LT);
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FcmpLtBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FcmpLtBranchNotTaken, assembler) {
   Label l;
 
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 235.0, kNoPP);
   __ LoadDImmediate(V2, 234.0, kNoPP);
 
   __ fcmpd(V1, V2);
   __ b(&l, LT);
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FcmpLtBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FcmpzGtBranch, assembler) {
   Label l;
 
   __ LoadDImmediate(V0, 235.0, kNoPP);
   __ LoadDImmediate(V1, 233.0, kNoPP);
 
   __ fcmpdz(V1);
   __ b(&l, GT);
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ ret();
   __ Bind(&l);
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FcmpzGtBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndsBranch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 2, 0);
   __ movz(R2, 1, 0);
 
   __ ands(R3, R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndsBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndsBranchNotTaken, assembler) {
   Label l;
 
   __ movz(R0, 0, 0);
   __ movz(R1, 2, 0);
   __ movz(R2, 2, 0);
 
   __ ands(R3, R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 42, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndsBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(BicsBranch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 2, 0);
   __ movz(R2, 2, 0);
 
   __ bics(R3, R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(BicsBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(BicsBranchNotTaken, assembler) {
   Label l;
 
   __ movz(R0, 0, 0);
   __ movz(R1, 2, 0);
   __ movz(R2, 1, 0);
 
   __ bics(R3, R1, Operand(R2));
   __ b(&l, EQ);
   __ movz(R0, 42, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(BicsBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndisBranch, assembler) {
   Label l;
 
   __ movz(R0, 42, 0);
   __ movz(R1, 2, 0);
 
   __ andis(R3, R1, 1);
   __ b(&l, EQ);
   __ movz(R0, 0, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndisBranch, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AndisBranchNotTaken, assembler) {
   Label l;
 
   __ movz(R0, 0, 0);
   __ movz(R1, 2, 0);
 
   __ andis(R3, R1, 2);
   __ b(&l, EQ);
   __ movz(R0, 42, 0);
   __ Bind(&l);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AndisBranchNotTaken, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Address of PC-rel offset, br, blr.
 ASSEMBLER_TEST_GENERATE(AdrBr, assembler) {
   __ movz(R0, 123, 0);
   __ adr(R1, 3 * Instr::kInstrSize);  // R1 <- PC + 3*Instr::kInstrSize
   __ br(R1);
   __ ret();
 
   // br goes here.
   __ movz(R0, 42, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AdrBr, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(AdrBlr, assembler) {
   __ movz(R0, 123, 0);
   __ add(R3, ZR, Operand(LR));  // Save LR.
   __ adr(R1, 4 * Instr::kInstrSize);  // R1 <- PC + 4*Instr::kInstrSize
   __ blr(R1);
   __ add(LR, ZR, Operand(R3));
   __ ret();
 
   // blr goes here.
   __ movz(R0, 42, 0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(AdrBlr, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Misc. arithmetic.
 ASSEMBLER_TEST_GENERATE(Udiv, assembler) {
   __ movz(R0, 27, 0);
   __ movz(R1, 9, 0);
   __ udiv(R2, R0, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Udiv, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(3, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(3, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Sdiv, assembler) {
   __ movz(R0, 27, 0);
   __ movz(R1, 9, 0);
   __ neg(R1, R1);
   __ sdiv(R2, R0, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Sdiv, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(-3, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-3, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Udiv_zero, assembler) {
   __ movz(R0, 27, 0);
   __ movz(R1, 0, 0);
   __ udiv(R2, R0, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Udiv_zero, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Sdiv_zero, assembler) {
   __ movz(R0, 27, 0);
   __ movz(R1, 0, 0);
   __ sdiv(R2, R0, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Sdiv_zero, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Udiv_corner, assembler) {
   __ movz(R0, 0x8000, 3);  // R0 <- 0x8000000000000000
   __ movn(R1, 0, 0);  // R1 <- 0xffffffffffffffff
   __ udiv(R2, R0, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Udiv_corner, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Sdiv_corner, assembler) {
   __ movz(R3, 0x8000, 3);  // R0 <- 0x8000000000000000
   __ movn(R1, 0, 0);  // R1 <- 0xffffffffffffffff
   __ sdiv(R2, R3, R1);
   __ mov(R0, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Sdiv_corner, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(static_cast<int64_t>(0x8000000000000000),
-            EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Lslv, assembler) {
   __ movz(R1, 21, 0);
   __ movz(R2, 1, 0);
   __ lslv(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Lslv, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Lsrv, assembler) {
   __ movz(R1, 84, 0);
   __ movz(R2, 1, 0);
   __ lsrv(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Lsrv, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LShiftingV, assembler) {
   __ movz(R1, 1, 0);
   __ movz(R2, 63, 0);
   __ lslv(R1, R1, R2);
   __ lsrv(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LShiftingV, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(RShiftingV, assembler) {
   __ movz(R1, 1, 0);
   __ movz(R2, 63, 0);
   __ lslv(R1, R1, R2);
   __ asrv(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(RShiftingV, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Mult_pos, assembler) {
   __ movz(R1, 6, 0);
   __ movz(R2, 7, 0);
   __ mul(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Mult_pos, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Mult_neg, assembler) {
   __ movz(R1, 6, 0);
   __ movz(R2, 7, 0);
   __ neg(R2, R2);
   __ mul(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Mult_neg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Smulh_pos, assembler) {
   __ movz(R1, 6, 0);
   __ movz(R2, 7, 0);
   __ smulh(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Smulh_pos, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Smulh_neg, assembler) {
   __ movz(R1, 6, 0);
   __ movz(R2, 7, 0);
   __ neg(R2, R2);
   __ smulh(R0, R1, R2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Smulh_neg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Loading immediate values without the object pool.
 ASSEMBLER_TEST_GENERATE(LoadImmediateSmall, assembler) {
   __ LoadImmediate(R0, 42, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateSmall, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMed, assembler) {
   __ LoadImmediate(R0, 0xf1234123, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMed, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0xf1234123, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0xf1234123, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMed2, assembler) {
   __ LoadImmediate(R0, 0x4321f1234123, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMed2, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0x4321f1234123, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(
+      0x4321f1234123, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateLarge, assembler) {
   __ LoadImmediate(R0, 0x9287436598237465, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateLarge, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(static_cast<int64_t>(0x9287436598237465),
-            EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateSmallNeg, assembler) {
   __ LoadImmediate(R0, -42, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateSmallNeg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMedNeg, assembler) {
   __ LoadImmediate(R0, -0x1212341234, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-0x1212341234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-0x1212341234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMedNeg2, assembler) {
   __ LoadImmediate(R0, -0x1212340000, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg2, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-0x1212340000, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-0x1212340000, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMedNeg3, assembler) {
   __ LoadImmediate(R0, -0x1200001234, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg3, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-0x1200001234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-0x1200001234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediateMedNeg4, assembler) {
   __ LoadImmediate(R0, -0x12341234, kNoRegister);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg4, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-0x12341234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-0x12341234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Loading immediate values with the object pool.
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPSmall, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadImmediate(R0, 42, PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPSmall, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadImmediate(R0, 0xf1234123, PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0xf1234123, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0xf1234123, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed2, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadImmediate(R0, 0x4321f1234124, PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed2, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0x4321f1234124, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(
+      0x4321f1234124, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPLarge, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadImmediate(R0, 0x9287436598237465, PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPLarge, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(static_cast<int64_t>(0x9287436598237465),
-            EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // LoadObject null.
 ASSEMBLER_TEST_GENERATE(LoadObjectNull, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadObject(R0, Object::null_object(), PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectNull, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(reinterpret_cast<int64_t>(Object::null()),
-            EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadObjectTrue, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadObject(R0, Bool::True(), PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectTrue, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(reinterpret_cast<int64_t>(Bool::True().raw()),
-            EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadObjectFalse, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
   __ LoadPoolPointer(PP);
   __ LoadObject(R0, Bool::False(), PP);
   __ PopAndUntagPP();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectFalse, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   EXPECT_EQ(reinterpret_cast<int64_t>(Bool::False().raw()),
-            EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CSelTrue, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csel(R0, R1, R2, LT);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CSelTrue, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CSelFalse, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csel(R0, R1, R2, GE);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CSelFalse, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CsincFalse, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csinc(R0, R2, R1, GE);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CsincFalse, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(43, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(43, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CsincTrue, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csinc(R0, R2, R1, LT);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CsincTrue, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CsinvFalse, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csinv(R0, R2, R1, GE);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CsinvFalse, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(~42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(~42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(CsinvTrue, assembler) {
   __ LoadImmediate(R1, 42, kNoRegister);
   __ LoadImmediate(R2, 1234, kNoRegister);
   __ CompareRegisters(R1, R2);
   __ csinv(R0, R2, R1, LT);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CsinvTrue, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(1234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Floating point move immediate, to/from integer register.
 ASSEMBLER_TEST_GENERATE(Fmovdi, assembler) {
   __ LoadDImmediate(V0, 1.0, kNoPP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fmovdi, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(1.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fmovdi2, assembler) {
   __ LoadDImmediate(V0, 123412983.1324524315, kNoPP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fmovdi2, test) {
-  typedef int (*SimpleCode)();
+  typedef double (*DoubleReturn)();
   EXPECT_FLOAT_EQ(123412983.1324524315,
-      EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()), 0.0001f);
+      EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()), 0.0001f);
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fmovrd, assembler) {
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ fmovrd(R0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fmovrd, test) {
-  typedef int (*SimpleCode)();
+  typedef int64_t (*Int64Return)();
   const int64_t one = bit_cast<int64_t, double>(1.0);
-  EXPECT_EQ(one, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  EXPECT_EQ(one, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fmovdr, assembler) {
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ fmovrd(R1, V1);
   __ fmovdr(V0, R1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fmovdr, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(1.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(1.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdPrePostIndex, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ fstrd(V1, Address(SP, -1*kWordSize, Address::PreIndex));
   __ fldrd(V0, Address(SP, 1*kWordSize, Address::PostIndex));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdPrePostIndex, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrsFstrsPrePostIndex, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ fcvtsd(V2, V1);
   __ fstrs(V2, Address(SP, -1*kWordSize, Address::PreIndex));
   __ fldrs(V3, Address(SP, 1*kWordSize, Address::PostIndex));
   __ fcvtds(V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrsFstrsPrePostIndex, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrqFstrqPrePostIndex, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V1, 21.0, kNoPP);
   __ LoadDImmediate(V2, 21.0, kNoPP);
   __ LoadImmediate(R1, 42, kNoPP);
   __ Push(R1);
   __ PushDouble(V1);
   __ PushDouble(V2);
   __ fldrq(V3, Address(SP, 2 * kWordSize, Address::PostIndex));
   __ Pop(R0);
   __ fstrq(V3, Address(SP, -2 * kWordSize, Address::PreIndex));
   __ PopDouble(V0);
   __ PopDouble(V1);
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrqFstrqPrePostIndex, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fcvtzds, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ fcvtzds(R0, V0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fcvtzds, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Scvtfd, assembler) {
   __ LoadImmediate(R0, 42, kNoPP);
   __ scvtfd(V0, R0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Scvtfd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FabsdPos, assembler) {
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ fabsd(V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FabsdPos, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FabsdNeg, assembler) {
   __ LoadDImmediate(V1, -42.0, kNoPP);
   __ fabsd(V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FabsdNeg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FnegdPos, assembler) {
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ fnegd(V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FnegdPos, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(-42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FnegdNeg, assembler) {
   __ LoadDImmediate(V1, -42.0, kNoPP);
   __ fnegd(V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FnegdNeg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fsqrtd, assembler) {
   __ LoadDImmediate(V1, 64.0, kNoPP);
   __ fsqrtd(V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fsqrtd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(8.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(8.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fmuld, assembler) {
   __ LoadDImmediate(V1, 84.0, kNoPP);
   __ LoadDImmediate(V2, 0.5, kNoPP);
   __ fmuld(V0, V1, V2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fmuld, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fdivd, assembler) {
   __ LoadDImmediate(V1, 84.0, kNoPP);
   __ LoadDImmediate(V2, 2.0, kNoPP);
   __ fdivd(V0, V1, V2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fdivd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Faddd, assembler) {
   __ LoadDImmediate(V1, 41.5, kNoPP);
   __ LoadDImmediate(V2, 0.5, kNoPP);
   __ faddd(V0, V1, V2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Faddd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Fsubd, assembler) {
   __ LoadDImmediate(V1, 42.5, kNoPP);
   __ LoadDImmediate(V2, 0.5, kNoPP);
   __ fsubd(V0, V1, V2);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Fsubd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdHeapTag, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 43.0, kNoPP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ AddImmediate(SP, SP, -1 * kWordSize, kNoPP);
   __ add(R2, SP, Operand(1));
   __ fstrd(V1, Address(R2, -1));
   __ fldrd(V0, Address(R2, -1));
   __ AddImmediate(SP, SP, 1 * kWordSize, kNoPP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdHeapTag, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdLargeIndex, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 43.0, kNoPP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   // Largest negative offset that can fit in the signed 9-bit immediate field.
   __ fstrd(V1, Address(SP, -32*kWordSize, Address::PreIndex));
   // Largest positive kWordSize aligned offset that we can fit.
   __ fldrd(V0, Address(SP, 31*kWordSize, Address::PostIndex));
   // Correction.
   __ add(SP, SP, Operand(kWordSize));  // Restore SP.
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdLargeIndex, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdLargeOffset, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 43.0, kNoPP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ sub(SP, SP, Operand(512*kWordSize));
   __ fstrd(V1, Address(SP, 512*kWordSize, Address::Offset));
   __ add(SP, SP, Operand(512*kWordSize));
   __ fldrd(V0, Address(SP));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdLargeOffset, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdExtReg, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 43.0, kNoPP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ movz(R2, 0xfff8, 0);
   __ movk(R2, 0xffff, 1);  // R2 <- -8 (int32_t).
   // This should sign extend R2, and add to SP to get address,
   // i.e. SP - kWordSize.
   __ fstrd(V1, Address(SP, R2, SXTW));
   __ sub(SP, SP, Operand(kWordSize));
   __ fldrd(V0, Address(SP));
   __ add(SP, SP, Operand(kWordSize));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdExtReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(FldrdFstrdScaledReg, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 43.0, kNoPP);
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ movz(R2, 10, 0);
   __ sub(SP, SP, Operand(10*kWordSize));
   // Store V1 into SP + R2 * kWordSize.
   __ fstrd(V1, Address(SP, R2, UXTX, Address::Scaled));
   __ fldrd(V0, Address(SP, R2, UXTX, Address::Scaled));
   __ add(SP, SP, Operand(10*kWordSize));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(FldrdFstrdScaledReg, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(VinswVmovrs, assembler) {
   __ LoadImmediate(R0, 42, kNoPP);
   __ LoadImmediate(R1, 43, kNoPP);
   __ LoadImmediate(R2, 44, kNoPP);
   __ LoadImmediate(R3, 45, kNoPP);
 
   __ vinsw(V0, 0, R0);
   __ vinsw(V0, 1, R1);
   __ vinsw(V0, 2, R2);
   __ vinsw(V0, 3, R3);
 
   __ vmovrs(R4, V0, 0);
   __ vmovrs(R5, V0, 1);
   __ vmovrs(R6, V0, 2);
   __ vmovrs(R7, V0, 3);
 
   __ add(R0, R4, Operand(R5));
   __ add(R0, R0, Operand(R6));
   __ add(R0, R0, Operand(R7));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(VinswVmovrs, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(174, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(174, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(VinsxVmovrd, assembler) {
   __ LoadImmediate(R0, 42, kNoPP);
   __ LoadImmediate(R1, 43, kNoPP);
 
   __ vinsx(V0, 0, R0);
   __ vinsx(V0, 1, R1);
 
   __ vmovrd(R2, V0, 0);
   __ vmovrd(R3, V0, 1);
 
   __ add(R0, R2, Operand(R3));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(VinsxVmovrd, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(85, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(85, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vnot, assembler) {
   __ LoadImmediate(R0, 0xfffffffe, kNoPP);
   __ LoadImmediate(R1, 0xffffffff, kNoPP);
   __ vinsw(V1, 0, R1);
   __ vinsw(V1, 1, R0);
   __ vinsw(V1, 2, R1);
   __ vinsw(V1, 3, R0);
 
   __ vnot(V0, V1);
 
   __ vmovrs(R2, V0, 0);
   __ vmovrs(R3, V0, 1);
   __ vmovrs(R4, V0, 2);
   __ vmovrs(R5, V0, 3);
   __ add(R0, R2, Operand(R3));
   __ add(R0, R0, Operand(R4));
   __ add(R0, R0, Operand(R5));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vnot, test) {
   EXPECT(test != NULL);
-  typedef int (*Tst)();
-  EXPECT_EQ(2, EXECUTE_TEST_CODE_INT64(Tst, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(2, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vabss, assembler) {
   __ LoadDImmediate(V1, 21.0, kNoPP);
   __ LoadDImmediate(V2, -21.0, kNoPP);
 
   __ fcvtsd(V1, V1);
   __ fcvtsd(V2, V2);
 
   __ veor(V3, V3, V3);
   __ vinss(V3, 1, V1, 0);
   __ vinss(V3, 3, V2, 0);
 
   __ vabss(V4, V3);
 
   __ vinss(V5, 0, V4, 1);
   __ vinss(V6, 0, V4, 3);
 
   __ fcvtds(V5, V5);
   __ fcvtds(V6, V6);
 
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vabss, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vabsd, assembler) {
   __ LoadDImmediate(V1, 21.0, kNoPP);
   __ LoadDImmediate(V2, -21.0, kNoPP);
 
   __ vinsd(V3, 0, V1, 0);
   __ vinsd(V3, 1, V2, 0);
 
   __ vabsd(V4, V3);
 
   __ vinsd(V5, 0, V4, 0);
   __ vinsd(V6, 0, V4, 1);
 
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vabsd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vnegs, assembler) {
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ LoadDImmediate(V2, -84.0, kNoPP);
 
   __ fcvtsd(V1, V1);
   __ fcvtsd(V2, V2);
 
   __ veor(V3, V3, V3);
   __ vinss(V3, 1, V1, 0);
   __ vinss(V3, 3, V2, 0);
 
   __ vnegs(V4, V3);
 
   __ vinss(V5, 0, V4, 1);
   __ vinss(V6, 0, V4, 3);
 
   __ fcvtds(V5, V5);
   __ fcvtds(V6, V6);
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vnegs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vnegd, assembler) {
   __ LoadDImmediate(V1, 42.0, kNoPP);
   __ LoadDImmediate(V2, -84.0, kNoPP);
 
   __ vinsd(V3, 0, V1, 0);
   __ vinsd(V3, 1, V2, 0);
 
   __ vnegd(V4, V3);
 
   __ vinsd(V5, 0, V4, 0);
   __ vinsd(V6, 0, V4, 1);
 
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vnegd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vadds, assembler) {
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ LoadDImmediate(V2, 2.0, kNoPP);
   __ LoadDImmediate(V3, 3.0, kNoPP);
 
   __ fcvtsd(V0, V0);
@@ skipping 19 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vadds, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(12.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(12.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsubs, assembler) {
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ LoadDImmediate(V2, 2.0, kNoPP);
   __ LoadDImmediate(V3, 3.0, kNoPP);
   __ LoadDImmediate(V5, 0.0, kNoPP);
 
@@ skipping 20 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsubs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-6.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(-6.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmuls, assembler) {
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ LoadDImmediate(V2, 2.0, kNoPP);
   __ LoadDImmediate(V3, 3.0, kNoPP);
 
   __ fcvtsd(V0, V0);
@@ skipping 19 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmuls, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(14.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(14.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vdivs, assembler) {
   __ LoadDImmediate(V0, 0.0, kNoPP);
   __ LoadDImmediate(V1, 1.0, kNoPP);
   __ LoadDImmediate(V2, 2.0, kNoPP);
   __ LoadDImmediate(V3, 3.0, kNoPP);
 
   __ fcvtsd(V0, V0);
@@ skipping 19 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V1, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vdivs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(4.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(4.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vaddd, assembler) {
   __ LoadDImmediate(V0, 2.0, kNoPP);
   __ LoadDImmediate(V1, 3.0, kNoPP);
 
   __ vinsd(V4, 0, V0, 0);
   __ vinsd(V4, 1, V1, 0);
 
   __ vaddd(V5, V4, V4);
 
   __ vinsd(V0, 0, V5, 0);
   __ vinsd(V1, 0, V5, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vaddd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(10.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(10.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsubd, assembler) {
   __ LoadDImmediate(V0, 2.0, kNoPP);
   __ LoadDImmediate(V1, 3.0, kNoPP);
   __ LoadDImmediate(V5, 0.0, kNoPP);
 
   __ vinsd(V4, 0, V0, 0);
   __ vinsd(V4, 1, V1, 0);
 
   __ vsubd(V5, V5, V4);
 
   __ vinsd(V0, 0, V5, 0);
   __ vinsd(V1, 0, V5, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsubd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-5.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(-5.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmuld, assembler) {
   __ LoadDImmediate(V0, 2.0, kNoPP);
   __ LoadDImmediate(V1, 3.0, kNoPP);
 
   __ vinsd(V4, 0, V0, 0);
   __ vinsd(V4, 1, V1, 0);
 
   __ vmuld(V5, V4, V4);
 
   __ vinsd(V0, 0, V5, 0);
   __ vinsd(V1, 0, V5, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmuld, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(13.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(13.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vdivd, assembler) {
   __ LoadDImmediate(V0, 2.0, kNoPP);
   __ LoadDImmediate(V1, 3.0, kNoPP);
 
   __ vinsd(V4, 0, V0, 0);
   __ vinsd(V4, 1, V1, 0);
 
   __ vdivd(V5, V4, V4);
 
   __ vinsd(V0, 0, V5, 0);
   __ vinsd(V1, 0, V5, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vdivd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(2.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(2.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vdupd, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 21.0, kNoPP);
   __ vdupd(V1, V0, 0);
 
   const int dword_bytes = 1 << Log2OperandSizeBytes(kDWord);
   const int qword_bytes = 1 << Log2OperandSizeBytes(kQWord);
   __ fstrq(V1, Address(SP, -1 * qword_bytes, Address::PreIndex));
 
   __ fldrd(V2, Address(SP, 1 * dword_bytes, Address::PostIndex));
   __ fldrd(V3, Address(SP, 1 * dword_bytes, Address::PostIndex));
 
   __ faddd(V0, V2, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vdupd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vdups, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 21.0, kNoPP);
   __ fcvtsd(V0, V0);
   __ vdups(V1, V0, 0);
 
-
   const int sword_bytes = 1 << Log2OperandSizeBytes(kSWord);
   const int qword_bytes = 1 << Log2OperandSizeBytes(kQWord);
   __ fstrq(V1, Address(SP, -1 * qword_bytes, Address::PreIndex));
 
   __ fldrs(V3, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V2, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V1, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V0, Address(SP, 1 * sword_bytes, Address::PostIndex));
 
   __ fcvtds(V0, V0);
   __ fcvtds(V1, V1);
   __ fcvtds(V2, V2);
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V1, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vdups, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(84.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(84.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vinsd, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V5, 42.0, kNoPP);
   __ vinsd(V1, 1, V5, 0);  // V1[1] <- V0[0].
 
   const int dword_bytes = 1 << Log2OperandSizeBytes(kDWord);
   const int qword_bytes = 1 << Log2OperandSizeBytes(kQWord);
   __ fstrq(V1, Address(SP, -1 * qword_bytes, Address::PreIndex));
 
   __ fldrd(V2, Address(SP, 1 * dword_bytes, Address::PostIndex));
   __ fldrd(V3, Address(SP, 1 * dword_bytes, Address::PostIndex));
 
   __ fmovdd(V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vinsd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vinss, assembler) {
+  __ mov(SP, CSP);
   __ LoadDImmediate(V0, 21.0, kNoPP);
   __ fcvtsd(V0, V0);
   __ vinss(V1, 3, V0, 0);
   __ vinss(V1, 1, V0, 0);
 
   const int sword_bytes = 1 << Log2OperandSizeBytes(kSWord);
   const int qword_bytes = 1 << Log2OperandSizeBytes(kQWord);
   __ fstrq(V1, Address(SP, -1 * qword_bytes, Address::PreIndex));
 
   __ fldrs(V3, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V2, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V1, Address(SP, 1 * sword_bytes, Address::PostIndex));
   __ fldrs(V0, Address(SP, 1 * sword_bytes, Address::PostIndex));
 
   __ fcvtds(V0, V0);
   __ fcvtds(V1, V1);
   __ fcvtds(V2, V2);
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vinss, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vand, assembler) {
   __ LoadDImmediate(V1, 21.0, kNoPP);
   __ LoadImmediate(R0, 0xffffffff, kNoPP);
 
   // V0 <- (0, 0xffffffff, 0, 0xffffffff)
   __ fmovdr(V0, R0);
   __ vinss(V0, 2, V0, 0);
@@ skipping 15 matching lines @@
   __ fcvtds(V6, V6);
 
   __ vaddd(V0, V3, V4);
   __ vaddd(V0, V0, V5);
   __ vaddd(V0, V0, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vand, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vorr, assembler) {
   __ LoadDImmediate(V1, 10.5, kNoPP);
   __ fcvtsd(V1, V1);
 
   // V0 <- (0, 10.5, 0, 10.5)
   __ fmovdd(V0, V1);
   __ vinss(V0, 2, V0, 0);
@@ skipping 16 matching lines @@
   __ fcvtds(V6, V6);
 
   __ vaddd(V0, V3, V4);
   __ vaddd(V0, V0, V5);
   __ vaddd(V0, V0, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vorr, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Veor, assembler) {
   __ LoadImmediate(R1, 0xffffffff, kNoPP);
   __ LoadImmediate(R2, ~21, kNoPP);
 
   __ vinsw(V1, 0, R1);
   __ vinsw(V1, 1, R2);
   __ vinsw(V1, 2, R1);
@@ skipping 12 matching lines @@
   __ vmovrs(R6, V0, 3);
 
   __ add(R0, R3, Operand(R4));
   __ add(R0, R0, Operand(R5));
   __ add(R0, R0, Operand(R6));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Veor, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vaddw, assembler) {
   __ LoadImmediate(R4, 21, kNoPP);
 
   __ vdupw(V1, R4);
   __ vdupw(V2, R4);
 
   __ vaddw(V0, V1, V2);
 
   __ vmovrs(R0, V0, 0);
   __ vmovrs(R1, V0, 1);
   __ vmovrs(R2, V0, 2);
   __ vmovrs(R3, V0, 3);
   __ add(R0, R0, Operand(R1));
   __ add(R0, R0, Operand(R2));
   __ add(R0, R0, Operand(R3));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vaddw, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(168, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(168, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsubw, assembler) {
   __ LoadImmediate(R4, 31, kNoPP);
   __ LoadImmediate(R5, 10, kNoPP);
 
   __ vdupw(V1, R4);
   __ vdupw(V2, R5);
 
   __ vsubw(V0, V1, V2);
 
   __ vmovrs(R0, V0, 0);
   __ vmovrs(R1, V0, 1);
   __ vmovrs(R2, V0, 2);
   __ vmovrs(R3, V0, 3);
   __ add(R0, R0, Operand(R1));
   __ add(R0, R0, Operand(R2));
   __ add(R0, R0, Operand(R3));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsubw, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(84, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(84, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vaddx, assembler) {
   __ LoadImmediate(R4, 21, kNoPP);
 
   __ vdupx(V1, R4);
   __ vdupx(V2, R4);
 
   __ vaddx(V0, V1, V2);
 
   __ vmovrd(R0, V0, 0);
   __ vmovrd(R1, V0, 1);
   __ add(R0, R0, Operand(R1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vaddx, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(84, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(84, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsubx, assembler) {
   __ LoadImmediate(R4, 31, kNoPP);
   __ LoadImmediate(R5, 10, kNoPP);
 
   __ vdupx(V1, R4);
   __ vdupx(V2, R5);
 
   __ vsubx(V0, V1, V2);
 
   __ vmovrd(R0, V0, 0);
   __ vmovrd(R1, V0, 1);
   __ add(R0, R0, Operand(R1));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsubx, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vceqs, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, -42.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
@@ skipping 11 matching lines @@
   __ vmovrs(R4, V4, 3);
 
   __ addw(R0, R1, Operand(R2));
   __ addw(R0, R0, Operand(R3));
   __ addw(R0, R0, Operand(R4));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vceqs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vceqd, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, -42.0, kNoPP);
 
   __ vdupd(V2, V0, 0);
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vceqd(V4, V2, V3);
 
   __ vmovrd(R1, V4, 0);
   __ vmovrd(R2, V4, 1);
 
   __ add(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vceqd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vcgts, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, -42.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
@@ skipping 11 matching lines @@
   __ vmovrs(R4, V4, 3);
 
   __ addw(R0, R1, Operand(R2));
   __ addw(R0, R0, Operand(R3));
   __ addw(R0, R0, Operand(R4));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vcgts, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vcgtd, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, -42.0, kNoPP);
 
   __ vdupd(V2, V0, 0);
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vcgtd(V4, V2, V3);
 
   __ vmovrd(R1, V4, 0);
   __ vmovrd(R2, V4, 1);
 
   __ add(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vcgtd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vcges, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, 43.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
@@ skipping 11 matching lines @@
   __ vmovrs(R4, V4, 3);
 
   __ addw(R0, R1, Operand(R2));
   __ addw(R0, R0, Operand(R3));
   __ addw(R0, R0, Operand(R4));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vcges, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(0xfffffffe, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vcged, assembler) {
   __ LoadDImmediate(V0, 42.0, kNoPP);
   __ LoadDImmediate(V1, 43.0, kNoPP);
 
   __ vdupd(V2, V0, 0);
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vcged(V4, V2, V3);
 
   __ vmovrd(R1, V4, 0);
   __ vmovrd(R2, V4, 1);
 
   __ add(R0, R1, Operand(R2));
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vcged, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(SimpleCode, test->entry()));
+  typedef int64_t (*Int64Return)();
+  EXPECT_EQ(-1, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmaxs, assembler) {
   __ LoadDImmediate(V0, 10.5, kNoPP);
   __ LoadDImmediate(V1, 10.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
@@ skipping 16 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmaxs, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmaxd, assembler) {
   __ LoadDImmediate(V0, 21.0, kNoPP);
   __ LoadDImmediate(V1, 20.5, kNoPP);
 
   __ vdupd(V2, V0, 0);
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vmaxd(V4, V2, V3);
 
   __ vinsd(V0, 0, V4, 0);
   __ vinsd(V1, 0, V4, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmaxd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmins, assembler) {
   __ LoadDImmediate(V0, 10.5, kNoPP);
   __ LoadDImmediate(V1, 11.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
@@ skipping 16 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmins, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vmind, assembler) {
   __ LoadDImmediate(V0, 21.0, kNoPP);
   __ LoadDImmediate(V1, 21.5, kNoPP);
 
   __ vdupd(V2, V0, 0);
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vmind(V4, V2, V3);
 
   __ vinsd(V0, 0, V4, 0);
   __ vinsd(V1, 0, V4, 1);
 
   __ faddd(V0, V0, V1);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vmind, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(42.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsqrts, assembler) {
   __ LoadDImmediate(V0, 64.0, kNoPP);
   __ LoadDImmediate(V1, 49.0, kNoPP);
 
   __ fcvtsd(V0, V0);
   __ fcvtsd(V1, V1);
 
   __ veor(V3, V3, V3);
   __ vinss(V3, 1, V0, 0);
   __ vinss(V3, 3, V1, 0);
 
   __ vsqrts(V4, V3);
 
   __ vinss(V5, 0, V4, 1);
   __ vinss(V6, 0, V4, 3);
 
   __ fcvtds(V5, V5);
   __ fcvtds(V6, V6);
 
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsqrts, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(15.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(15.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vsqrtd, assembler) {
   __ LoadDImmediate(V0, 64.0, kNoPP);
   __ LoadDImmediate(V1, 49.0, kNoPP);
 
   __ vinsd(V3, 0, V0, 0);
   __ vinsd(V3, 1, V1, 0);
 
   __ vsqrtd(V4, V3);
 
   __ vinsd(V5, 0, V4, 0);
   __ vinsd(V6, 0, V4, 1);
 
   __ faddd(V0, V5, V6);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vsqrtd, test) {
-  typedef int (*SimpleCode)();
-  EXPECT_EQ(15.0, EXECUTE_TEST_CODE_DOUBLE(SimpleCode, test->entry()));
+  typedef double (*DoubleReturn)();
+  EXPECT_EQ(15.0, EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry()));
 }
 
 
 // This is the same function as in the Simulator.
 static float arm_recip_estimate(float a) {
   // From the ARM Architecture Reference Manual A2-85.
   if (isinf(a) || (fabs(a) >= exp2f(126))) return 0.0;
   else if (a == 0.0) return INFINITY;
   else if (isnan(a)) return a;
 
@@ skipping 33 matching lines @@
   __ vinss(V2, 2, V1, 0);
   __ vinss(V2, 3, V1, 0);
   __ vrecpes(V0, V2);
   __ fcvtds(V0, V0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vrecpes, test) {
   EXPECT(test != NULL);
-  typedef double (*Vrecpes)();
-  float res = EXECUTE_TEST_CODE_DOUBLE(Vrecpes, test->entry());
+  typedef double (*DoubleReturn)();
+  float res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ(arm_recip_estimate(147.0), res, 0.0001);
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vrecpss, assembler) {
   __ LoadDImmediate(V1, 5.0, kNoPP);
   __ LoadDImmediate(V2, 10.0, kNoPP);
 
   __ fcvtsd(V1, V1);
   __ fcvtsd(V2, V2);
 
   __ vrecpss(V0, V1, V2);
 
   __ fcvtds(V0, V0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vrecpss, test) {
   EXPECT(test != NULL);
-  typedef double (*Vrecpss)();
-  double res = EXECUTE_TEST_CODE_DOUBLE(Vrecpss, test->entry());
+  typedef double (*DoubleReturn)();
+  double res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ(2.0 - 10.0 * 5.0, res, 0.0001);
 }
 
 
 ASSEMBLER_TEST_GENERATE(VRecps, assembler) {
   __ LoadDImmediate(V0, 1.0 / 10.5, kNoPP);
   __ fcvtsd(V0, V0);
 
   __ vdups(V1, V0, 0);
 
@@ skipping 10 matching lines @@
   __ fcvtds(V3, V3);
 
   __ faddd(V0, V0, V1);
   __ faddd(V0, V0, V2);
   __ faddd(V0, V0, V3);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(VRecps, test) {
-  typedef double (*VRecps)();
-  double res = EXECUTE_TEST_CODE_DOUBLE(VRecps, test->entry());
+  typedef double (*DoubleReturn)();
+  double res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ(42.0, res, 0.0001);
 }
 
 
 static float arm_reciprocal_sqrt_estimate(float a) {
   // From the ARM Architecture Reference Manual A2-87.
   if (isinf(a) || (fabs(a) >= exp2f(126))) return 0.0;
   else if (a == 0.0) return INFINITY;
   else if (isnan(a)) return a;
 
@@ skipping 48 matching lines @@
 
   __ vrsqrtes(V0, V1);
 
   __ fcvtds(V0, V0);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vrsqrtes, test) {
   EXPECT(test != NULL);
-  typedef double (*Vrsqrtes)();
-  double res = EXECUTE_TEST_CODE_DOUBLE(Vrsqrtes, test->entry());
+  typedef double (*DoubleReturn)();
+  double res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ(arm_reciprocal_sqrt_estimate(147.0), res, 0.0001);
 }
 
 
 ASSEMBLER_TEST_GENERATE(Vrsqrtss, assembler) {
     __ LoadDImmediate(V1, 5.0, kNoPP);
     __ LoadDImmediate(V2, 10.0, kNoPP);
 
     __ fcvtsd(V1, V1);
     __ fcvtsd(V2, V2);
 
     __ vrsqrtss(V0, V1, V2);
 
     __ fcvtds(V0, V0);
     __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Vrsqrtss, test) {
   EXPECT(test != NULL);
-  typedef double (*Vrsqrtss)();
-  double res = EXECUTE_TEST_CODE_DOUBLE(Vrsqrtss, test->entry());
+  typedef double (*DoubleReturn)();
+  double res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ((3.0 - 10.0 * 5.0)/2.0, res, 0.0001);
 }
 
 
 ASSEMBLER_TEST_GENERATE(ReciprocalSqrt, assembler) {
     __ LoadDImmediate(V1, 147000.0, kNoPP);
     __ fcvtsd(V1, V1);
 
     __ VRSqrts(V0, V1);
 
     __ fcvtds(V0, V0);
     __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(ReciprocalSqrt, test) {
   EXPECT(test != NULL);
-  typedef double (*ReciprocalSqrt)();
-  double res = EXECUTE_TEST_CODE_DOUBLE(ReciprocalSqrt, test->entry());
+  typedef double (*DoubleReturn)();
+  double res = EXECUTE_TEST_CODE_DOUBLE(DoubleReturn, test->entry());
   EXPECT_FLOAT_EQ(1.0/sqrt(147000.0), res, 0.0001);
 }
 
 
 // Called from assembler_test.cc.
 // LR: return address.
 // R0: context.
 // R1: value.
 // R2: growable array.
 ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
+  __ mov(SP, CSP);
   __ TagAndPushPP();
   __ LoadPoolPointer(PP);
   __ Push(CTX);
   __ Push(LR);
   __ mov(CTX, R0);
   __ StoreIntoObject(R2,
                      FieldAddress(R2, GrowableObjectArray::data_offset()),
                      R1);
   __ Pop(LR);
   __ Pop(CTX);
   __ PopAndUntagPP();
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_ARCH_ARM64)