--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java	2020-05-01 02:30:43.577574946 -0700
+++ /dev/null	2020-03-09 18:57:19.455001459 -0700
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.hotspot.sparc;
-
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.vm.ci.sparc.SPARC.g0;
-import static jdk.vm.ci.sparc.SPARC.l7;
-import static jdk.vm.ci.sparc.SPARC.sp;
-
-import org.graalvm.compiler.asm.sparc.SPARCAddress;
-import org.graalvm.compiler.asm.sparc.SPARCAssembler.CC;
-import org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag;
-import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
-import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler.ScratchRegister;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-
-import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
-
-/**
- * Sets up the arguments for an exception handler in the callers frame, removes the current frame
- * and jumps to the handler.
- */
-@Opcode("JUMP_TO_EXCEPTION_HANDLER_IN_CALLER")
-final class SPARCHotSpotJumpToExceptionHandlerInCallerOp extends SPARCHotSpotEpilogueOp {
-
-    public static final LIRInstructionClass<SPARCHotSpotJumpToExceptionHandlerInCallerOp> TYPE = LIRInstructionClass.create(SPARCHotSpotJumpToExceptionHandlerInCallerOp.class);
-    public static final SizeEstimate SIZE = SizeEstimate.create(5);
-
-    @Use(REG) AllocatableValue handlerInCallerPc;
-    @Use(REG) AllocatableValue exception;
-    @Use(REG) AllocatableValue exceptionPc;
-    private final Register thread;
-    private final int isMethodHandleReturnOffset;
-
-    SPARCHotSpotJumpToExceptionHandlerInCallerOp(AllocatableValue handlerInCallerPc, AllocatableValue exception, AllocatableValue exceptionPc, int isMethodHandleReturnOffset, Register thread) {
-        super(TYPE, SIZE);
-        this.handlerInCallerPc = handlerInCallerPc;
-        this.exception = exception;
-        this.exceptionPc = exceptionPc;
-        this.isMethodHandleReturnOffset = isMethodHandleReturnOffset;
-        this.thread = thread;
-    }
-
-    @Override
-    public void emitCode(CompilationResultBuilder crb, SPARCMacroAssembler masm) {
-        // Restore SP from L7 if the exception PC is a method handle call site.
-        SPARCAddress dst = new SPARCAddress(thread, isMethodHandleReturnOffset);
-        try (ScratchRegister scratch = masm.getScratchRegister()) {
-            Register scratchReg = scratch.getRegister();
-            masm.lduw(dst, scratchReg);
-            masm.cmp(scratchReg, scratchReg);
-            masm.movcc(ConditionFlag.NotZero, CC.Icc, l7, sp);
-        }
-        masm.jmpl(asRegister(handlerInCallerPc), 0, g0);
-        leaveFrame(crb); // Delay slot
-    }
-}