[Isolates] Merge from bleeding_edge to isolates, revisions 6100-6300.

test/cctest/test-disasm-ia32.cc

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 399 matching lines @@
       __ cmov(not_sign, eax, Operand(ecx, 1));
       __ cmov(parity_even, eax, Operand(ecx, 2));
       __ cmov(parity_odd, eax, Operand(ecx, 3));
       __ cmov(less, eax, Operand(edx, 0));
       __ cmov(greater_equal, eax, Operand(edx, 1));
       __ cmov(less_equal, eax, Operand(edx, 2));
       __ cmov(greater, eax, Operand(edx, 3));
     }
   }
 
-  // andpd, cmpltsd, movaps, psllq.
+  // andpd, cmpltsd, movaps, psllq, psrlq, por.
   {
     if (Isolate::Current()->cpu_features()->IsSupported(SSE2)) {
       CpuFeatures::Scope fscope(SSE2);
       __ andpd(xmm0, xmm1);
       __ andpd(xmm1, xmm2);
 
       __ cmpltsd(xmm0, xmm1);
       __ cmpltsd(xmm1, xmm2);
 
       __ movaps(xmm0, xmm1);
       __ movaps(xmm1, xmm2);
 
       __ psllq(xmm0, 17);
       __ psllq(xmm1, 42);
+
+      __ psllq(xmm0, xmm1);
+      __ psllq(xmm1, xmm2);
+
+      __ psrlq(xmm0, 17);
+      __ psrlq(xmm1, 42);
+
+      __ psrlq(xmm0, xmm1);
+      __ psrlq(xmm1, xmm2);
+
+      __ por(xmm0, xmm1);
+      __ por(xmm1, xmm2);
     }
   }
 
   __ ret(0);
 
   CodeDesc desc;
   assm.GetCode(&desc);
   Object* code = HEAP->CreateCode(
       desc,
       Code::ComputeFlags(Code::STUB),
       Handle<Object>(HEAP->undefined_value()))->ToObjectChecked();
   CHECK(code->IsCode());
-#ifdef DEBUG
+#ifdef OBJECT_PRINT
   Code::cast(code)->Print();
   byte* begin = Code::cast(code)->instruction_start();
   byte* end = begin + Code::cast(code)->instruction_size();
   disasm::Disassembler::Disassemble(stdout, begin, end);
 #endif
 }
 
 #undef __