Reset trunk to 3.24.35.4

test/cctest/test-hashing.cc

 // Copyright 2011 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 78 matching lines @@
   __ mov(r0, Operand(0));
   __ mov(ip, Operand(string.at(0)));
   StringHelper::GenerateHashInit(masm, r0, ip);
   for (int i = 1; i < string.length(); i++) {
     __ mov(ip, Operand(string.at(i)));
     StringHelper::GenerateHashAddCharacter(masm, r0, ip);
   }
   StringHelper::GenerateHashGetHash(masm, r0);
   __ pop(kRootRegister);
   __ mov(pc, Operand(lr));
-#elif V8_TARGET_ARCH_A64
-  // The A64 assembler usually uses jssp (x28) as a stack pointer, but only csp
-  // is initialized by the calling (C++) code.
-  Register old_stack_pointer = __ StackPointer();
-  __ SetStackPointer(csp);
-  __ Push(root, xzr);
-  __ InitializeRootRegister();
-  __ Mov(x0, 0);
-  __ Mov(x10, Operand(string.at(0)));
-  StringHelper::GenerateHashInit(masm, x0, x10);
-  for (int i = 1; i < string.length(); i++) {
-    __ Mov(x10, Operand(string.at(i)));
-    StringHelper::GenerateHashAddCharacter(masm, x0, x10);
-  }
-  StringHelper::GenerateHashGetHash(masm, x0, x10);
-  __ Pop(xzr, root);
-  __ Ret();
-  __ SetStackPointer(old_stack_pointer);
 #elif V8_TARGET_ARCH_MIPS
   __ push(kRootRegister);
   __ InitializeRootRegister();
 
   __ li(v0, Operand(0));
   __ li(t1, Operand(string.at(0)));
   StringHelper::GenerateHashInit(masm, v0, t1);
   for (int i = 1; i < string.length(); i++) {
     __ li(t1, Operand(string.at(i)));
     StringHelper::GenerateHashAddCharacter(masm, v0, t1);
   }
   StringHelper::GenerateHashGetHash(masm, v0);
   __ pop(kRootRegister);
   __ jr(ra);
   __ nop();
-#else
-#error Unsupported architecture.
 #endif
 }
 
 
 void generate(MacroAssembler* masm, uint32_t key) {
 #if V8_TARGET_ARCH_IA32
   __ push(ebx);
   __ mov(eax, Immediate(key));
   __ GetNumberHash(eax, ebx);
   __ pop(ebx);
   __ Ret();
 #elif V8_TARGET_ARCH_X64
   __ push(kRootRegister);
   __ InitializeRootRegister();
   __ push(rbx);
   __ movq(rax, Immediate(key));
   __ GetNumberHash(rax, rbx);
   __ pop(rbx);
   __ pop(kRootRegister);
   __ Ret();
 #elif V8_TARGET_ARCH_ARM
   __ push(kRootRegister);
   __ InitializeRootRegister();
   __ mov(r0, Operand(key));
   __ GetNumberHash(r0, ip);
   __ pop(kRootRegister);
   __ mov(pc, Operand(lr));
-#elif V8_TARGET_ARCH_A64
-  // The A64 assembler usually uses jssp (x28) as a stack pointer, but only csp
-  // is initialized by the calling (C++) code.
-  Register old_stack_pointer = __ StackPointer();
-  __ SetStackPointer(csp);
-  __ Push(root, xzr);
-  __ InitializeRootRegister();
-  __ Mov(x0, key);
-  __ GetNumberHash(x0, x10);
-  __ Pop(xzr, root);
-  __ Ret();
-  __ SetStackPointer(old_stack_pointer);
 #elif V8_TARGET_ARCH_MIPS
   __ push(kRootRegister);
   __ InitializeRootRegister();
   __ li(v0, Operand(key));
   __ GetNumberHash(v0, t1);
   __ pop(kRootRegister);
   __ jr(ra);
   __ nop();
-#else
-#error Unsupported architecture.
 #endif
 }
 
 
 void check(i::Vector<const uint8_t> string) {
   Isolate* isolate = CcTest::i_isolate();
   Factory* factory = isolate->factory();
   HandleScope scope(isolate);
 
   v8::internal::byte buffer[2048];
   MacroAssembler masm(isolate, buffer, sizeof buffer);
 
   generate(&masm, string);
 
   CodeDesc desc;
   masm.GetCode(&desc);
   Handle<Object> undefined(isolate->heap()->undefined_value(), isolate);
   Handle<Code> code = factory->NewCode(desc,
                                        Code::ComputeFlags(Code::STUB),
                                        undefined);
   CHECK(code->IsCode());
 
   HASH_FUNCTION hash = FUNCTION_CAST<HASH_FUNCTION>(code->entry());
   Handle<String> v8_string = factory->NewStringFromOneByte(string);
   v8_string->set_hash_field(String::kEmptyHashField);
 #ifdef USE_SIMULATOR
-  uint32_t codegen_hash = static_cast<uint32_t>(
-        reinterpret_cast<uintptr_t>(CALL_GENERATED_CODE(hash, 0, 0, 0, 0, 0)));
+  uint32_t codegen_hash =
+      reinterpret_cast<uint32_t>(CALL_GENERATED_CODE(hash, 0, 0, 0, 0, 0));
 #else
   uint32_t codegen_hash = hash();
 #endif
   uint32_t runtime_hash = v8_string->Hash();
   CHECK(runtime_hash == codegen_hash);
 }
 
 
 void check(i::Vector<const char> s) {
   check(i::Vector<const uint8_t>::cast(s));
@@ skipping 13 matching lines @@
   CodeDesc desc;
   masm.GetCode(&desc);
   Handle<Object> undefined(isolate->heap()->undefined_value(), isolate);
   Handle<Code> code = factory->NewCode(desc,
                                        Code::ComputeFlags(Code::STUB),
                                        undefined);
   CHECK(code->IsCode());
 
   HASH_FUNCTION hash = FUNCTION_CAST<HASH_FUNCTION>(code->entry());
 #ifdef USE_SIMULATOR
-  uint32_t codegen_hash = static_cast<uint32_t>(
-        reinterpret_cast<uintptr_t>(CALL_GENERATED_CODE(hash, 0, 0, 0, 0, 0)));
+  uint32_t codegen_hash =
+      reinterpret_cast<uint32_t>(CALL_GENERATED_CODE(hash, 0, 0, 0, 0, 0));
 #else
   uint32_t codegen_hash = hash();
 #endif
 
   uint32_t runtime_hash = ComputeIntegerHash(key, isolate->heap()->HashSeed());
   CHECK(runtime_hash == codegen_hash);
 }
 
 
 void check_twochars(uint8_t a, uint8_t b) {
@@ skipping 41 matching lines @@
   // Some pseudo-random numbers
   static const uint32_t kLimit = 1000;
   for (uint32_t i = 0; i < 5; i++) {
     for (uint32_t j = 0; j < 5; j++) {
       check(PseudoRandom(i, j) % kLimit);
     }
   }
 }
 
 #undef __