Commit ec4fa063 authored by Junliang Yan's avatar Junliang Yan Committed by Commit Bot

PPC/s390: Fix reg conflict when calling CallRuntimeWithCEntry

Change-Id: I2e0166cf99f2f9b501c82cbf27215389a3eb3092
Reviewed-on: https://chromium-review.googlesource.com/1135124Reviewed-by: 's avatarMuntasir Mallick <mmallick@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#54421}
parent ba89da8f
...@@ -2374,12 +2374,12 @@ void CodeGenerator::AssembleConstructFrame() { ...@@ -2374,12 +2374,12 @@ void CodeGenerator::AssembleConstructFrame() {
__ bge(&done); __ bge(&done);
} }
__ LoadP(r3, __ LoadP(r5,
FieldMemOperand(kWasmInstanceRegister, FieldMemOperand(kWasmInstanceRegister,
WasmInstanceObject::kCEntryStubOffset), WasmInstanceObject::kCEntryStubOffset),
r0); r0);
__ Move(cp, Smi::kZero); __ Move(cp, Smi::kZero);
__ CallRuntimeWithCEntry(Runtime::kThrowWasmStackOverflow, r3); __ CallRuntimeWithCEntry(Runtime::kThrowWasmStackOverflow, r5);
// We come from WebAssembly, there are no references for the GC. // We come from WebAssembly, there are no references for the GC.
ReferenceMap* reference_map = new (zone()) ReferenceMap(zone()); ReferenceMap* reference_map = new (zone()) ReferenceMap(zone());
RecordSafepoint(reference_map, Safepoint::kSimple, 0, RecordSafepoint(reference_map, Safepoint::kSimple, 0,
......
...@@ -3014,10 +3014,10 @@ void CodeGenerator::AssembleConstructFrame() { ...@@ -3014,10 +3014,10 @@ void CodeGenerator::AssembleConstructFrame() {
__ bge(&done); __ bge(&done);
} }
__ LoadP(r2, FieldMemOperand(kWasmInstanceRegister, __ LoadP(r4, FieldMemOperand(kWasmInstanceRegister,
WasmInstanceObject::kCEntryStubOffset)); WasmInstanceObject::kCEntryStubOffset));
__ Move(cp, Smi::kZero); __ Move(cp, Smi::kZero);
__ CallRuntimeWithCEntry(Runtime::kThrowWasmStackOverflow, r2); __ CallRuntimeWithCEntry(Runtime::kThrowWasmStackOverflow, r4);
// We come from WebAssembly, there are no references for the GC. // We come from WebAssembly, there are no references for the GC.
ReferenceMap* reference_map = new (zone()) ReferenceMap(zone()); ReferenceMap* reference_map = new (zone()) ReferenceMap(zone());
RecordSafepoint(reference_map, Safepoint::kSimple, 0, RecordSafepoint(reference_map, Safepoint::kSimple, 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment