Revert "ARM64: Use UntagSmi helpers and clean up assertions."

src/arm64/macro-assembler-arm64-inl.h

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_ARM64_MACRO_ASSEMBLER_ARM64_INL_H_
 #define V8_ARM64_MACRO_ASSEMBLER_ARM64_INL_H_
 
 #include <ctype.h>
 
 #include "src/globals.h"
@@ skipping 1290 matching lines @@
 
 
 void MacroAssembler::InitializeRootRegister() {
   ExternalReference roots_array_start =
       ExternalReference::roots_array_start(isolate());
   Mov(root, Operand(roots_array_start));
 }
 
 
 void MacroAssembler::SmiTag(Register dst, Register src) {
-  STATIC_ASSERT(kSmiValueSize + kSmiShift == kXRegSizeInBits);
   ASSERT(dst.Is64Bits() && src.Is64Bits());
   Lsl(dst, src, kSmiShift);
 }
 
 
 void MacroAssembler::SmiTag(Register smi) { SmiTag(smi, smi); }
 
 
 void MacroAssembler::SmiUntag(Register dst, Register src) {
-  STATIC_ASSERT(kSmiValueSize + kSmiShift == kXRegSizeInBits);
   ASSERT(dst.Is64Bits() && src.Is64Bits());
   if (FLAG_enable_slow_asserts) {
     AssertSmi(src);
   }
   Asr(dst, src, kSmiShift);
 }
 
 
 void MacroAssembler::SmiUntag(Register smi) { SmiUntag(smi, smi); }
 
@@ skipping 14 matching lines @@
                                      UntagMode mode) {
   ASSERT(dst.Is32Bits() && src.Is64Bits());
   if (FLAG_enable_slow_asserts && (mode == kNotSpeculativeUntag)) {
     AssertSmi(src);
   }
   Scvtf(dst, src, kSmiShift);
 }
 
 
 void MacroAssembler::SmiTagAndPush(Register src) {
-  STATIC_ASSERT((kSmiShift == kWRegSizeInBits) &&
-                (kSmiValueSize == kWRegSizeInBits) &&
-                (kSmiTag == 0));
+  STATIC_ASSERT((kSmiShift == 32) && (kSmiTag == 0));
   Push(src.W(), wzr);
 }
 
 
 void MacroAssembler::SmiTagAndPush(Register src1, Register src2) {
-  STATIC_ASSERT((kSmiShift == kWRegSizeInBits) &&
-                (kSmiValueSize == kWRegSizeInBits) &&
-                (kSmiTag == 0));
+  STATIC_ASSERT((kSmiShift == 32) && (kSmiTag == 0));
   Push(src1.W(), wzr, src2.W(), wzr);
 }
 
 
 void MacroAssembler::JumpIfSmi(Register value,
                                Label* smi_label,
                                Label* not_smi_label) {
   STATIC_ASSERT((kSmiTagSize == 1) && (kSmiTag == 0));
   // Check if the tag bit is set.
   if (smi_label) {
@@ skipping 330 matching lines @@
   // characters are reserved for controlling features of the instrumentation.
   ASSERT(isprint(marker_name[0]) && isprint(marker_name[1]));
 
   InstructionAccurateScope scope(this, 1);
   movn(xzr, (marker_name[1] << 8) | marker_name[0]);
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM64_MACRO_ASSEMBLER_ARM64_INL_H_