Skip to content

Commit

Permalink
PPC/s390: make target reg correct and remove unnecessary instr
Browse files Browse the repository at this point in the history
R=joransiu@ca.ibm.com

Change-Id: I441427d7b769c448b1355956b16a4e7f105b149d
Reviewed-on: https://chromium-review.googlesource.com/952022
Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#51777}
  • Loading branch information
Junliang Yan authored and Commit Bot committed Mar 6, 2018
1 parent 66f2138 commit 05b93ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion src/builtins/ppc/builtins-ppc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,6 @@ static void MaybeTailCallOptimizedCodeSlot(MacroAssembler* masm,
static_assert(kJavaScriptCallCodeStartRegister == r5, "ABI mismatch");
__ addi(r5, optimized_code_entry,
Operand(Code::kHeaderSize - kHeapObjectTag));
__ mr(ip, r5);
__ Jump(r5);

// Optimized code slot contains deoptimized code, evict it and re-enter the
Expand Down
2 changes: 1 addition & 1 deletion src/s390/macro-assembler-s390.cc
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void TurboAssembler::Call(Register target) {
}

void MacroAssembler::CallJSEntry(Register target) {
DCHECK(target == ip);
DCHECK(target == r4);
Call(target);
}

Expand Down

0 comments on commit 05b93ea

Please sign in to comment.