[ptr-compr] Fix 32-bit smis on non-ptr-compr builds

Bug: v8:10047, v8:10257
Change-Id: Ifcc65235726420fe753e26707d84061400d5d2b1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2050384
Commit-Queue: Igor Sheludko <ishell@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#66415}

src/builtins/x64/builtins-x64.cc

@@ -1213,9 +1213,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   __ bind(&stack_check_interrupt);
   // Modify the bytecode offset in the stack to be kFunctionEntryBytecodeOffset
   // for the call to the StackGuard.
+  __ Move(kScratchRegister,
+          Smi::FromInt(BytecodeArray::kHeaderSize - kHeapObjectTag +
+                       kFunctionEntryBytecodeOffset));
   __ movq(Operand(rbp, InterpreterFrameConstants::kBytecodeOffsetFromFp),
-          Immediate(Smi::FromInt(BytecodeArray::kHeaderSize - kHeapObjectTag +
-                                 kFunctionEntryBytecodeOffset)));
+          kScratchRegister);
   __ CallRuntime(Runtime::kStackGuard);
 
   // After the call, restore the bytecode array, bytecode offset and accumulator

src/codegen/x64/macro-assembler-x64.cc

@@ -1028,17 +1028,7 @@ void TurboAssembler::Set(Operand dst, intptr_t x) {
 // Smi tagging, untagging and tag detection.
 
 Register TurboAssembler::GetSmiConstant(Smi source) {
-  STATIC_ASSERT(kSmiTag == 0);
-  int value = source.value();
-  if (value == 0) {
-    xorl(kScratchRegister, kScratchRegister);
-    return kScratchRegister;
-  }
-  if (SmiValuesAre32Bits()) {
-    Move(kScratchRegister, source);
-  } else {
-    movl(kScratchRegister, Immediate(source));
-  }
+  Move(kScratchRegister, source);
   return kScratchRegister;
 }
 
@@ -1048,7 +1038,11 @@ void TurboAssembler::Move(Register dst, Smi source) {
   if (value == 0) {
     xorl(dst, dst);
   } else {
-    Move(dst, source.ptr(), RelocInfo::NONE);
+    if (COMPRESS_POINTERS_BOOL) {
+      movl(dst, Immediate(source));
+    } else {
+      Move(dst, source.ptr(), RelocInfo::NONE);
+    }
   }
 }
 

src/codegen/x64/macro-assembler-x64.h

@@ -375,11 +375,6 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void Move(Register dst, Smi source);
 
-  void Move(Operand dst, Smi source) {
-    Register constant = GetSmiConstant(source);
-    movq(dst, constant);
-  }
-
   void Move(Register dst, ExternalReference ext);
 
   void Move(XMMRegister dst, uint32_t src);

test/cctest/test-macro-assembler-x64.cc

@@ -94,7 +94,7 @@ static void TestMoveSmi(MacroAssembler* masm, Label* exit, int id, Smi value) {
   __ movl(rax, Immediate(id));
   __ Move(rcx, value);
   __ Set(rdx, static_cast<intptr_t>(value.ptr()));
-  __ cmpq(rcx, rdx);
+  __ cmp_tagged(rcx, rdx);
   __ j(not_equal, exit);
 }