From fdc32cd2225c28ba6bad314315c6f3daa2d46f0e Mon Sep 17 00:00:00 2001 From: Vasili Skurydzin Date: Mon, 17 Dec 2018 14:52:31 -0500 Subject: [PATCH] s390x, ppc: Corrections to CallApiCallback calling convention Related: c6b0e12e4e664d82cdbbfddca273546b82f98f5d [nojit] Refactor CallApiCallback calling convention a31338aa08952f3e479a96f0a90ad4a0f9f4ed9a PPC/s390: [nojit] Refactor CallApiCallback calling convention Change-Id: I8f96c7b9a32ba3dde9dbbabb115d79fa36a0db46 Reviewed-on: https://chromium-review.googlesource.com/c/1380991 Reviewed-by: Junliang Yan Reviewed-by: Joran Siu Commit-Queue: Junliang Yan Cr-Commit-Position: refs/heads/master@{#58496} --- src/builtins/ppc/builtins-ppc.cc | 3 +-- src/builtins/s390/builtins-s390.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc index 6191de1346..2f14702c1d 100644 --- a/src/builtins/ppc/builtins-ppc.cc +++ b/src/builtins/ppc/builtins-ppc.cc @@ -3006,8 +3006,7 @@ void Builtins::Generate_CallApiCallback(MacroAssembler* masm) { MemOperand(sp, (kStackFrameExtraParamSlot + 2) * kPointerSize)); // FunctionCallbackInfo::length_. - __ StoreP(argc, - MemOperand(sp, (kStackFrameExtraParamSlot + 3) * kPointerSize)); + __ stw(argc, MemOperand(sp, (kStackFrameExtraParamSlot + 3) * kPointerSize)); // We also store the number of bytes to drop from the stack after returning // from the API function here. diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc index 0735418ebd..1a81064f34 100644 --- a/src/builtins/s390/builtins-s390.cc +++ b/src/builtins/s390/builtins-s390.cc @@ -2994,7 +2994,7 @@ void Builtins::Generate_CallApiCallback(MacroAssembler* masm) { MemOperand(sp, (kStackFrameExtraParamSlot + 2) * kPointerSize)); // FunctionCallbackInfo::length_. - __ StoreP(argc, + __ StoreW(argc, MemOperand(sp, (kStackFrameExtraParamSlot + 3) * kPointerSize)); // We also store the number of bytes to drop from the stack after returning