From patchwork Mon Aug 5 09:47:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 18772 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f69.google.com (mail-qe0-f69.google.com [209.85.128.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B265D2486D for ; Mon, 5 Aug 2013 09:47:50 +0000 (UTC) Received: by mail-qe0-f69.google.com with SMTP id 1sf4335446qec.4 for ; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:message-id :subject:from:reply-to:to:cc:date:organization:x-mailer:mime-version :x-gm-message-state:x-removed-original-auth:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=/rYSibAgKxJSSzi6EfzjAPYTgvCr+3a6VhRRbRlEx7Q=; b=QHXZr56tsdAeVwC1mkypzLaetu6aKwHFPgRQrP+BIkABHseugAc5c5s0o40CcP2vki QzRtB7tQygDhXA7FaV1FWza/CBXaVAmD2a4Ya15o4//5IzbNnE9l1hB7Q1NJUvEgvJUE fBiAU0769zX9+4361aX2cxxQmUwW61HZ+ialTtQpgp5PyKtmP0hP50ZkrgeDkAizGxX0 z9duhUe3aWBLrRH2zGc/Hx3lsU6UhnMyfBUtZUsgkQJvODY/DilbJdbTeSJkAFeBSYbT IsCDFloJ+BBSi+JZ6rqAtXoFb5bzFC0ZkFEOgWdwzNMdogqouuU2zMiY6ol8ON60MpBb hVzA== X-Received: by 10.236.88.231 with SMTP id a67mr7577719yhf.39.1375696070498; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.145 with SMTP id 17ls2653qee.7.gmail; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) X-Received: by 10.220.73.66 with SMTP id p2mr829855vcj.64.1375696070399; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id vg3si4782662vec.62.2013.08.05.02.47.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Aug 2013 02:47:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id 15so2849200vea.29 for ; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) X-Received: by 10.221.43.70 with SMTP id ub6mr5351572vcb.86.1375696070225; Mon, 05 Aug 2013 02:47:50 -0700 (PDT) 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.221.11.8 with SMTP id pc8csp78928vcb; Mon, 5 Aug 2013 02:47:49 -0700 (PDT) X-Received: by 10.194.80.137 with SMTP id r9mr12519931wjx.88.1375696069250; Mon, 05 Aug 2013 02:47:49 -0700 (PDT) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by mx.google.com with ESMTPS id wx7si10219936wjb.108.2013.08.05.02.47.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Aug 2013 02:47:49 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.44 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=74.125.82.44; Received: by mail-wg0-f44.google.com with SMTP id l18so2200061wgh.11 for ; Mon, 05 Aug 2013 02:47:48 -0700 (PDT) X-Received: by 10.180.11.146 with SMTP id q18mr6080493wib.50.1375696068743; Mon, 05 Aug 2013 02:47:48 -0700 (PDT) Received: from [192.168.1.77] ([146.90.53.15]) by mx.google.com with ESMTPSA id hb2sm20177996wib.0.2013.08.05.02.47.47 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 05 Aug 2013 02:47:48 -0700 (PDT) Message-ID: <1375696064.1953.7.camel@fleetfoot.lan> Subject: RFR: Fix for large frame size adjusts (resend) From: Edward Nevill Reply-To: edward.nevill@linaro.org To: aarch64-port-dev@openjdk.java.net Cc: patches@linaro.org Date: Mon, 05 Aug 2013 10:47:44 +0100 Organization: Linaro X-Mailer: Evolution 3.6.4 (3.6.4-3.fc18) Mime-Version: 1.0 X-Gm-Message-State: ALoCoQnd1Zlzr5QzozmJBK4vnvYoEQbr4fA1VQ/vw+y1PeKHMpU/o/z1rak/jAV7GLSOVMKaNlbi 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.128.170 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 fixes failures when the frame size is greater than 1<<12. With the fix it handles frame sizes up to 1<<24 wich should be enough? OK to push? Ed. --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill ed@camswl.com # Date 1375463673 -3600 # Node ID d8e110f4b119bed7019bd4037c3d5fbb8a47d881 # Parent 6a6b3b5dc103536b9c04666219452fff6db5ec3e Fix for large frame adjust diff -r 6a6b3b5dc103 -r d8e110f4b119 src/cpu/aarch64/vm/macroAssembler_aarch64.cpp --- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Fri Aug 02 16:50:44 2013 +0100 +++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Fri Aug 02 18:14:33 2013 +0100 @@ -1524,7 +1524,14 @@ if (operand_valid_for_add_sub_immediate((int)imm)) { (this->*insn1)(Rd, Rn, imm); } else { - assert_different_registers(Rd, Rn); + if (Rd == Rn) { + assert(Rd == sp, "only allowed for sp"); + // We know S flag not set so can do this as sequence of add/sub + assert(labs(imm) < (1 << 24), "sp adjust too big"); + (this->*insn1)(Rd, Rn, imm & -(1 << 12)); + (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1)); + return; + } assert(Rd != zr, "overflow in immediate operand"); mov(Rd, (uint64_t)imm); (this->*insn2)(Rd, Rn, Rd, LSL, 0); --- CUT HERE ---