PPC: Fix offset calculation on AIX when not using a

Milad Farazmand · Commit Bot · commit c940bd89afcf · 2019-11-19T19:11:58.000Z
function descriptor Change-Id: I439bac759cb363f35f6aa23a699b6ef1d9079684 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1925027 Reviewed-by: Junliang Yan <jyan@ca.ibm.com> Commit-Queue: Milad Farazmand <miladfar@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#65052}
diff --git a/src/codegen/ppc/macro-assembler-ppc.cc b/src/codegen/ppc/macro-assembler-ppc.cc
@@ -1940,6 +1940,7 @@ void TurboAssembler::CallCFunctionHelper(Register function,
     LoadP(ip, MemOperand(function, 0));
     dest = ip;
   } else if (ABI_CALL_VIA_IP) {
+    // pLinux and Simualtor, not AIX
     Move(ip, function);
     dest = ip;
   }
diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
@@ -1031,17 +1031,18 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Label start_call;
       bool isWasmCapiFunction =
           linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
+      int offset = 9 * kInstrSize;
 #if defined(_AIX)
       // AIX/PPC64BE Linux uses a function descriptor
       int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
       num_parameters = kNumParametersMask & misc_field;
       has_function_descriptor =
           (misc_field & kHasFunctionDescriptorBitMask) != 0;
-      // AIX emits 2 extra Load instructions under CallCFunctionHelper
+      // AIX may emit 2 extra Load instructions under CallCFunctionHelper
       // due to having function descriptor.
-      constexpr int offset = 11 * kInstrSize;
-#else
-      constexpr int offset = 9 * kInstrSize;
+      if (has_function_descriptor) {
+        offset = 11 * kInstrSize;
+      }
 #endif
       if (isWasmCapiFunction) {
         __ mflr(r0);

Original file line number	Diff line number	Diff line change
`@@ -1940,6 +1940,7 @@ void TurboAssembler::CallCFunctionHelper(Register function,`
`1940`	`1940`	`LoadP(ip, MemOperand(function, 0));`
`1941`	`1941`	`dest = ip;`
`1942`	`1942`	`} else if (ABI_CALL_VIA_IP) {`
	`1943`	`+ // pLinux and Simualtor, not AIX`
`1943`	`1944`	`Move(ip, function);`
`1944`	`1945`	`dest = ip;`
`1945`	`1946`	`}`