From patchwork Tue Feb 11 14:48:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 24463 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1539B203F3 for ; Tue, 11 Feb 2014 14:48:18 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id w20sf17347947vbb.3 for ; Tue, 11 Feb 2014 06:48:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:subject:from:reply-to:to :cc:date:organization:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=E+U2J+aqnwZFfIwaNWW0RC2JdJ2P06XBMPeC5WbltGk=; b=aN9/nz+xgvoOT6nSjjTmOg/1eT07VahTDRQ2dkHoE9lnpIDf1Vh5pVrBQ2vE3yoxuK Fe8ZJ0d1jPJDVc7X+PJObNfjC0QYEkcZJCoOp44JGoNNtV6b0UdL0GY2cZnEpCE8BtEx mf8FSysFNuRcJZXFJuEFwjwPuEJfZ0LMGzy2C7w2bHlgk9pLA/nE3fTDTUoOcbLBUAn4 HODn+3OwglMd78TemF61ZYjWr46aWIKfEfDhdOmHcareSsDcWE9I2ahOb7vnTMfUUf0b faXP596ptwX8kCsjqYiRVPKsvHyEntlK9oZd0Wjgb9pGv0kpSzLLPZZ1XzR90nz0qhq1 oLnw== X-Gm-Message-State: ALoCoQlA+Rt36igaPtQ1nGoI0tHGSHo1tmG2Q3QeJjUFuvpI5KVT6z5QGjXeGcdVpwxNaFUNS0BC X-Received: by 10.236.84.239 with SMTP id s75mr13620747yhe.28.1392130098170; Tue, 11 Feb 2014 06:48:18 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.239 with SMTP id 102ls2439462qgx.23.gmail; Tue, 11 Feb 2014 06:48:18 -0800 (PST) X-Received: by 10.52.246.42 with SMTP id xt10mr23930891vdc.9.1392130098013; Tue, 11 Feb 2014 06:48:18 -0800 (PST) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id dq2si3588475veb.31.2014.02.11.06.48.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 06:48:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id g10so6065651vbg.0 for ; Tue, 11 Feb 2014 06:48:17 -0800 (PST) X-Received: by 10.58.181.230 with SMTP id dz6mr480863vec.35.1392130097931; Tue, 11 Feb 2014 06:48:17 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp251727vcz; Tue, 11 Feb 2014 06:48:17 -0800 (PST) X-Received: by 10.15.42.72 with SMTP id t48mr44697292eev.45.1392130096772; Tue, 11 Feb 2014 06:48:16 -0800 (PST) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx.google.com with ESMTPS id x7si32638460eef.135.2014.02.11.06.48.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 06:48:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.177 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=209.85.215.177; Received: by mail-ea0-f177.google.com with SMTP id m10so1115002eaj.22 for ; Tue, 11 Feb 2014 06:48:16 -0800 (PST) X-Received: by 10.15.94.135 with SMTP id bb7mr6390380eeb.48.1392130096245; Tue, 11 Feb 2014 06:48:16 -0800 (PST) Received: from [10.0.7.5] ([88.98.47.97]) by mx.google.com with ESMTPSA id k41sm68484532een.19.2014.02.11.06.48.15 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 06:48:15 -0800 (PST) Message-ID: <1392130093.17642.5.camel@localhost.localdomain> Subject: RFR: Remove all uses of Deoptimization::UnrollBlock::initial_info_offset_in_bytes From: Edward Nevill Reply-To: edward.nevill@linaro.org To: "aarch64-port-dev@openjdk.java.net" Cc: patches@linaro.org Date: Tue, 11 Feb 2014 14:48:13 +0000 Organization: Linaro X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: edward.nevill@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Hi, The following patch removes all uses of Deoptimization::UnrollBlock::initial_info_offset_in_bytes and also removes the setting of initial_info. Regards, Ed. --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1391791457 0 # Fri Feb 07 16:44:17 2014 +0000 # Node ID 6cdb560d99ab5b5acd1e17c2a3ccf185c882583e # Parent 896a8f65fa0b0efdc498485d42995c59ce53476e Remove all uses of Deoptimization::UnrollBlock::initial_info_offset_in_bytes diff -r 896a8f65fa0b -r 6cdb560d99ab src/cpu/aarch64/vm/frame_aarch64.cpp --- a/src/cpu/aarch64/vm/frame_aarch64.cpp Fri Feb 07 10:44:52 2014 +0000 +++ b/src/cpu/aarch64/vm/frame_aarch64.cpp Fri Feb 07 16:44:17 2014 +0000 @@ -688,11 +688,6 @@ } #endif -intptr_t *frame::initial_deoptimization_info() { - // used to reset the saved FP - return fp(); -} - intptr_t* frame::real_fp() const { if (_cb != NULL) { // use the frame size if valid diff -r 896a8f65fa0b -r 6cdb560d99ab src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp --- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Fri Feb 07 10:44:52 2014 +0000 +++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Fri Feb 07 16:44:17 2014 +0000 @@ -2681,11 +2681,6 @@ Deoptimization::UnrollBlock:: number_of_frames_offset_in_bytes())); // (int) - // Pick up the initial fp we should save - __ ldr(rfp, - Address(r4, - Deoptimization::UnrollBlock::initial_info_offset_in_bytes())); - // Now adjust the caller's stack to make up for the extra locals but // record the original sp so that we can save it in the skeletal // interpreter frame and the stack walking of interpreter_sender diff -r 896a8f65fa0b -r 6cdb560d99ab src/share/vm/runtime/deoptimization.cpp --- a/src/share/vm/runtime/deoptimization.cpp Fri Feb 07 10:44:52 2014 +0000 +++ b/src/share/vm/runtime/deoptimization.cpp Fri Feb 07 16:44:17 2014 +0000 @@ -497,7 +497,9 @@ // On some platforms, we need a way to pass some platform dependent // information to the unpacking code so the skeletal frames come out // correct (initial fp value, unextended sp, ...) +#ifndef AARCH64 info->set_initial_info((intptr_t) array->sender().initial_deoptimization_info()); +#endif if (array->frames() > 1) { if (VerifyStack && TraceDeoptimization) { --- CUR HERE ---