diff --git a/test/cctest/test-disasm-arm64.cc b/test/cctest/test-disasm-arm64.cc
index 208f1f5..beca93e 100644
--- a/test/cctest/test-disasm-arm64.cc
+++ b/test/cctest/test-disasm-arm64.cc
@@ -45,19 +45,30 @@
 
 #define EXP_SIZE   (256)
 #define INSTR_SIZE (1024)
-#define SET_UP_CLASS(ASMCLASS)                             \
-  InitializeVM();                                          \
-  Isolate* isolate = Isolate::Current();                   \
-  HandleScope scope(isolate);                              \
-  byte* buf = static_cast<byte*>(malloc(INSTR_SIZE));      \
-  uint32_t encoding = 0;                                   \
-  ASMCLASS* assm = new ASMCLASS(isolate, buf, INSTR_SIZE); \
-  Decoder<DispatchingDecoderVisitor>* decoder =            \
-      new Decoder<DispatchingDecoderVisitor>();            \
-  Disassembler* disasm = new Disassembler();               \
+#define SET_UP_MASM()                                                    \
+  InitializeVM();                                                        \
+  Isolate* isolate = CcTest::i_isolate();                                \
+  HandleScope scope(isolate);                                            \
+  byte* buf = static_cast<byte*>(malloc(INSTR_SIZE));                    \
+  uint32_t encoding = 0;                                                 \
+  MacroAssembler* assm = new MacroAssembler(                             \
+      isolate, buf, INSTR_SIZE, v8::internal::CodeObjectRequired::kYes); \
+  Decoder<DispatchingDecoderVisitor>* decoder =                          \
+      new Decoder<DispatchingDecoderVisitor>();                          \
+  DisassemblingDecoder* disasm = new DisassemblingDecoder();             \
   decoder->AppendVisitor(disasm)
 
-#define SET_UP() SET_UP_CLASS(Assembler)
+#define SET_UP_ASM()                                         \
+  InitializeVM();                                            \
+  Isolate* isolate = CcTest::i_isolate();                    \
+  HandleScope scope(isolate);                                \
+  byte* buf = static_cast<byte*>(malloc(INSTR_SIZE));        \
+  uint32_t encoding = 0;                                     \
+  Assembler* assm = new Assembler(isolate, buf, INSTR_SIZE); \
+  Decoder<DispatchingDecoderVisitor>* decoder =              \
+      new Decoder<DispatchingDecoderVisitor>();              \
+  DisassemblingDecoder* disasm = new DisassemblingDecoder(); \
+  decoder->AppendVisitor(disasm)
 
 #define COMPARE(ASM, EXP)                                                      \
   assm->Reset();                                                               \
@@ -83,10 +94,11 @@
     abort();                                                                   \
   }
 
-#define CLEANUP()                                                              \
-  delete disasm;                                                               \
-  delete decoder;                                                              \
-  delete assm
+#define CLEANUP() \
+  delete disasm;  \
+  delete decoder; \
+  delete assm;    \
+  free(buf)
 
 
 static bool vm_initialized = false;
@@ -101,7 +113,7 @@
 
 
 TEST_(bootstrap) {
-  SET_UP();
+  SET_UP_ASM();
 
   // Instructions generated by C compiler, disassembled by objdump, and
   // reformatted to suit our disassembly style.
@@ -131,7 +143,7 @@
 
 
 TEST_(mov_mvn) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   COMPARE(Mov(w0, Operand(0x1234)), "movz w0, #0x1234");
   COMPARE(Mov(x1, Operand(0x1234)), "movz x1, #0x1234");
@@ -165,7 +177,7 @@
 
 
 TEST_(move_immediate) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(movz(w0, 0x1234), "movz w0, #0x1234");
   COMPARE(movz(x1, 0xabcd0000), "movz x1, #0xabcd0000");
@@ -202,7 +214,7 @@
 
 
 TEST(move_immediate_2) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   // Move instructions expected for certain immediates. This is really a macro
   // assembler test, to ensure it generates immediates efficiently.
@@ -258,7 +270,7 @@
 
 
 TEST_(add_immediate) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(add(w0, w1, Operand(0xff)), "add w0, w1, #0xff (255)");
   COMPARE(add(x2, x3, Operand(0x3ff)), "add x2, x3, #0x3ff (1023)");
@@ -288,7 +300,7 @@
 
 
 TEST_(sub_immediate) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(sub(w0, w1, Operand(0xff)), "sub w0, w1, #0xff (255)");
   COMPARE(sub(x2, x3, Operand(0x3ff)), "sub x2, x3, #0x3ff (1023)");
@@ -316,7 +328,7 @@
 
 
 TEST_(add_shifted) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(add(w0, w1, Operand(w2)), "add w0, w1, w2");
   COMPARE(add(x3, x4, Operand(x5)), "add x3, x4, x5");
@@ -342,7 +354,7 @@
 
 
 TEST_(sub_shifted) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(sub(w0, w1, Operand(w2)), "sub w0, w1, w2");
   COMPARE(sub(x3, x4, Operand(x5)), "sub x3, x4, x5");
@@ -372,7 +384,7 @@
 
 
 TEST_(add_extended) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(add(w0, w1, Operand(w2, UXTB)), "add w0, w1, w2, uxtb");
   COMPARE(adds(x3, x4, Operand(w5, UXTB, 1)), "adds x3, x4, w5, uxtb #1");
@@ -398,7 +410,7 @@
 
 
 TEST_(sub_extended) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(sub(w0, w1, Operand(w2, UXTB)), "sub w0, w1, w2, uxtb");
   COMPARE(subs(x3, x4, Operand(w5, UXTB, 1)), "subs x3, x4, w5, uxtb #1");
@@ -424,7 +436,7 @@
 
 
 TEST_(adc_subc_ngc) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(adc(w0, w1, Operand(w2)), "adc w0, w1, w2");
   COMPARE(adc(x3, x4, Operand(x5)), "adc x3, x4, x5");
@@ -444,7 +456,7 @@
 
 
 TEST_(mul_and_div) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(mul(w0, w1, w2), "mul w0, w1, w2");
   COMPARE(mul(x3, x4, x5), "mul x3, x4, x5");
@@ -477,7 +489,7 @@
 
 
 TEST(maddl_msubl) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(smaddl(x0, w1, w2, x3), "smaddl x0, w1, w2, x3");
   COMPARE(smaddl(x25, w21, w22, x16), "smaddl x25, w21, w22, x16");
@@ -494,7 +506,7 @@
 
 
 TEST_(dp_1_source) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(rbit(w0, w1), "rbit w0, w1");
   COMPARE(rbit(x2, x3), "rbit x2, x3");
@@ -513,7 +525,7 @@
 
 
 TEST_(bitfield) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(sxtb(w0, w1), "sxtb w0, w1");
   COMPARE(sxtb(x2, x3), "sxtb x2, w3");
@@ -555,7 +567,7 @@
 
 
 TEST_(extract) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(extr(w0, w1, w2, 0), "extr w0, w1, w2, #0");
   COMPARE(extr(x3, x4, x5, 1), "extr x3, x4, x5, #1");
@@ -569,7 +581,7 @@
 
 
 TEST_(logical_immediate) {
-  SET_UP();
+  SET_UP_ASM();
   #define RESULT_SIZE (256)
 
   char result[RESULT_SIZE];
@@ -695,7 +707,7 @@
 
 
 TEST_(logical_shifted) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(and_(w0, w1, Operand(w2)), "and w0, w1, w2");
   COMPARE(and_(x3, x4, Operand(x5, LSL, 1)), "and x3, x4, x5, lsl #1");
@@ -765,7 +777,7 @@
 
 
 TEST_(dp_2_source) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(lslv(w0, w1, w2), "lsl w0, w1, w2");
   COMPARE(lslv(x3, x4, x5), "lsl x3, x4, x5");
@@ -781,7 +793,7 @@
 
 
 TEST_(adr) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE_PREFIX(adr(x0, 0), "adr x0, #+0x0");
   COMPARE_PREFIX(adr(x1, 1), "adr x1, #+0x1");
@@ -797,7 +809,7 @@
 
 
 TEST_(branch) {
-  SET_UP();
+  SET_UP_ASM();
 
   #define INST_OFF(x) ((x) >> kInstructionSizeLog2)
   COMPARE_PREFIX(b(INST_OFF(0x4)), "b #+0x4");
@@ -834,7 +846,7 @@
 
 
 TEST_(load_store) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldr(w0, MemOperand(x1)), "ldr w0, [x1]");
   COMPARE(ldr(w2, MemOperand(x3, 4)), "ldr w2, [x3, #4]");
@@ -891,7 +903,7 @@
 
 
 TEST_(load_store_regoffset) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldr(w0, MemOperand(x1, w2, UXTW)), "ldr w0, [x1, w2, uxtw]");
   COMPARE(ldr(w3, MemOperand(x4, w5, UXTW, 2)), "ldr w3, [x4, w5, uxtw #2]");
@@ -976,7 +988,7 @@
 
 
 TEST_(load_store_byte) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldrb(w0, MemOperand(x1)), "ldrb w0, [x1]");
   COMPARE(ldrb(x2, MemOperand(x3)), "ldrb w2, [x3]");
@@ -1008,7 +1020,7 @@
 
 
 TEST_(load_store_half) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldrh(w0, MemOperand(x1)), "ldrh w0, [x1]");
   COMPARE(ldrh(x2, MemOperand(x3)), "ldrh w2, [x3]");
@@ -1044,7 +1056,7 @@
 
 
 TEST_(load_store_fp) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldr(s0, MemOperand(x1)), "ldr s0, [x1]");
   COMPARE(ldr(s2, MemOperand(x3, 4)), "ldr s2, [x3, #4]");
@@ -1096,7 +1108,7 @@
 
 
 TEST_(load_store_unscaled) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldr(w0, MemOperand(x1, 1)), "ldur w0, [x1, #1]");
   COMPARE(ldr(w2, MemOperand(x3, -1)), "ldur w2, [x3, #-1]");
@@ -1129,7 +1141,7 @@
 
 
 TEST_(load_store_pair) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ldp(w0, w1, MemOperand(x2)), "ldp w0, w1, [x2]");
   COMPARE(ldp(x3, x4, MemOperand(x5)), "ldp x3, x4, [x5]");
@@ -1248,28 +1260,9 @@
 }
 
 
-TEST_(load_store_pair_nontemp) {
-  SET_UP();
-
-  COMPARE(ldnp(w0, w1, MemOperand(x2)), "ldnp w0, w1, [x2]");
-  COMPARE(stnp(w3, w4, MemOperand(x5, 252)), "stnp w3, w4, [x5, #252]");
-  COMPARE(ldnp(w6, w7, MemOperand(x8, -256)), "ldnp w6, w7, [x8, #-256]");
-  COMPARE(stnp(x9, x10, MemOperand(x11)), "stnp x9, x10, [x11]");
-  COMPARE(ldnp(x12, x13, MemOperand(x14, 504)), "ldnp x12, x13, [x14, #504]");
-  COMPARE(stnp(x15, x16, MemOperand(x17, -512)), "stnp x15, x16, [x17, #-512]");
-  COMPARE(ldnp(s18, s19, MemOperand(x20)), "ldnp s18, s19, [x20]");
-  COMPARE(stnp(s21, s22, MemOperand(x23, 252)), "stnp s21, s22, [x23, #252]");
-  COMPARE(ldnp(s24, s25, MemOperand(x26, -256)), "ldnp s24, s25, [x26, #-256]");
-  COMPARE(stnp(d27, d28, MemOperand(fp)), "stnp d27, d28, [fp]");
-  COMPARE(ldnp(d30, d31, MemOperand(x0, 504)), "ldnp d30, d31, [x0, #504]");
-  COMPARE(stnp(d1, d2, MemOperand(x3, -512)), "stnp d1, d2, [x3, #-512]");
-
-  CLEANUP();
-}
-
 #if 0  // TODO(all): enable.
 TEST_(load_literal) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE_PREFIX(ldr(x10, 0x1234567890abcdefUL),  "ldr x10, pc+8");
   COMPARE_PREFIX(ldr(w20, 0xfedcba09),  "ldr w20, pc+8");
@@ -1281,7 +1274,7 @@
 #endif
 
 TEST_(cond_select) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(csel(w0, w1, w2, eq), "csel w0, w1, w2, eq");
   COMPARE(csel(x3, x4, x5, ne), "csel x3, x4, x5, ne");
@@ -1316,7 +1309,7 @@
 
 
 TEST(cond_select_macro) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   COMPARE(Csel(w0, w1, -1, eq), "csinv w0, w1, wzr, eq");
   COMPARE(Csel(w2, w3, 0, ne), "csel w2, w3, wzr, ne");
@@ -1330,7 +1323,7 @@
 
 
 TEST_(cond_cmp) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(ccmn(w0, w1, NZCVFlag, eq), "ccmn w0, w1, #NZCV, eq");
   COMPARE(ccmn(x2, x3, NZCFlag, ne), "ccmn x2, x3, #NZCv, ne");
@@ -1348,7 +1341,7 @@
 
 
 TEST_(cond_cmp_macro) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   COMPARE(Ccmp(w0, -1, VFlag, hi), "ccmn w0, #1, #nzcV, hi");
   COMPARE(Ccmp(x1, -31, CFlag, ge), "ccmn x1, #31, #nzCv, ge");
@@ -1360,7 +1353,7 @@
 
 
 TEST_(fmov_imm) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fmov(s0, 1.0f), "fmov s0, #0x70 (1.0000)");
   COMPARE(fmov(s31, -13.0f), "fmov s31, #0xaa (-13.0000)");
@@ -1372,7 +1365,7 @@
 
 
 TEST_(fmov_reg) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fmov(w3, s13), "fmov w3, s13");
   COMPARE(fmov(x6, d26), "fmov x6, d26");
@@ -1386,7 +1379,7 @@
 
 
 TEST_(fp_dp1) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fabs(s0, s1), "fabs s0, s1");
   COMPARE(fabs(s31, s30), "fabs s31, s30");
@@ -1424,7 +1417,7 @@
 
 
 TEST_(fp_dp2) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fadd(s0, s1, s2), "fadd s0, s1, s2");
   COMPARE(fadd(d3, d4, d5), "fadd d3, d4, d5");
@@ -1448,7 +1441,7 @@
 
 
 TEST(fp_dp3) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fmadd(s7, s8, s9, s10), "fmadd s7, s8, s9, s10");
   COMPARE(fmadd(d10, d11, d12, d10), "fmadd d10, d11, d12, d10");
@@ -1465,7 +1458,7 @@
 
 
 TEST_(fp_compare) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fcmp(s0, s1), "fcmp s0, s1");
   COMPARE(fcmp(s31, s30), "fcmp s31, s30");
@@ -1479,7 +1472,7 @@
 
 
 TEST_(fp_cond_compare) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fccmp(s0, s1, NoFlag, eq), "fccmp s0, s1, #nzcv, eq");
   COMPARE(fccmp(s2, s3, ZVFlag, ne), "fccmp s2, s3, #nZcV, ne");
@@ -1497,7 +1490,7 @@
 
 
 TEST_(fp_select) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fcsel(s0, s1, s2, eq), "fcsel s0, s1, s2, eq")
   COMPARE(fcsel(s31, s31, s30, ne), "fcsel s31, s31, s30, ne");
@@ -1511,7 +1504,7 @@
 
 
 TEST_(fcvt_scvtf_ucvtf) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(fcvtas(w0, s1), "fcvtas w0, s1");
   COMPARE(fcvtas(x2, s3), "fcvtas x2, s3");
@@ -1573,7 +1566,7 @@
 
 
 TEST_(system_mrs) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(mrs(x0, NZCV), "mrs x0, nzcv");
   COMPARE(mrs(lr, NZCV), "mrs lr, nzcv");
@@ -1584,7 +1577,7 @@
 
 
 TEST_(system_msr) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(msr(NZCV, x0), "msr nzcv, x0");
   COMPARE(msr(NZCV, x30), "msr nzcv, lr");
@@ -1595,7 +1588,7 @@
 
 
 TEST_(system_nop) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(nop(), "nop");
 
@@ -1604,9 +1597,9 @@
 
 
 TEST_(debug) {
-  SET_UP();
+  SET_UP_ASM();
 
-  DCHECK(kImmExceptionIsDebug == 0xdeb0);
+  CHECK(kImmExceptionIsDebug == 0xdeb0);
 
   // All debug codes should produce the same instruction, and the debug code
   // can be any uint32_t.
@@ -1623,7 +1616,7 @@
 
 
 TEST_(hlt) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(hlt(0), "hlt #0x0");
   COMPARE(hlt(1), "hlt #0x1");
@@ -1634,7 +1627,7 @@
 
 
 TEST_(brk) {
-  SET_UP();
+  SET_UP_ASM();
 
   COMPARE(brk(0), "brk #0x0");
   COMPARE(brk(1), "brk #0x1");
@@ -1645,7 +1638,7 @@
 
 
 TEST_(add_sub_negative) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   COMPARE(Add(x10, x0, -42), "sub x10, x0, #0x2a (42)");
   COMPARE(Add(x11, x1, -687), "sub x11, x1, #0x2af (687)");
@@ -1676,7 +1669,7 @@
 
 
 TEST_(logical_immediate_move) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   COMPARE(And(w0, w1, 0), "movz w0, #0x0");
   COMPARE(And(x0, x1, 0), "movz x0, #0x0");
@@ -1715,7 +1708,7 @@
 
 
 TEST_(barriers) {
-  SET_UP_CLASS(MacroAssembler);
+  SET_UP_MASM();
 
   // DMB
   COMPARE(Dmb(FullSystem, BarrierAll), "dmb sy");