From patchwork Mon Jun 2 16:21:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 31297 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 01108203C2 for ; Mon, 2 Jun 2014 17:07:10 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hq11sf15173153vcb.8 for ; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=gKJMqhEC+8eoSkH8tQG/ApG3BzpevReqW5crxdLhqmM=; b=DQxYfUfzzjtZCKSUt6A/oLEo3k3wG6sEalJHg3unIQvtPPrifPbGelNQniJA571SXn vJCIycHgMWtj4VvbffNcOG259KCXBXsC/mlCJVTE5zhfylaR3ecTpE5HJYSqCwHaen9R 7Syha3xbx72D+9rNr+oPL3naQ4XtkW/IXgD/vx2SIpRLyk0CKxmJ7AihnpMAgRSC12jJ 3UehSYb9AoYDasyuiKL/jGk0jMi5g+/dMi1gR0BWdKJlNvYPdGz9UE16S/91BS3dI8G3 T64AT6PkuoYMbPmV5rA3lIOSHloKhl0Lu/VE6Jx+3j0lA7XfHJfLrksJ5tY8COJAOtj2 7i7A== X-Gm-Message-State: ALoCoQlTZPfPgteZp4jEyXvU3Hd8bJnmE95a4nqYOKPEnrMgH6Y8Phoc1Gui13i53xY+r1v5HPUy X-Received: by 10.236.222.36 with SMTP id s34mr13016875yhp.24.1401728830685; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.35 with SMTP id d32ls2106114qga.87.gmail; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) X-Received: by 10.220.179.197 with SMTP id br5mr37686vcb.80.1401728830506; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id b16si8270935veh.25.2014.06.02.10.07.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 10:07:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so5520257veb.16 for ; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) X-Received: by 10.58.2.74 with SMTP id 10mr1758695ves.61.1401728830392; Mon, 02 Jun 2014 10:07:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp112969vcb; Mon, 2 Jun 2014 10:07:10 -0700 (PDT) X-Received: by 10.140.98.116 with SMTP id n107mr47149238qge.93.1401728829874; Mon, 02 Jun 2014 10:07:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i90si18311430qgf.63.2014.06.02.10.07.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 02 Jun 2014 10:07:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:47742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrV2t-0007uc-MV for patch@linaro.org; Mon, 02 Jun 2014 12:25:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrV0b-0005KV-O5 for qemu-devel@nongnu.org; Mon, 02 Jun 2014 12:22:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrV0U-0007JP-8V for qemu-devel@nongnu.org; Mon, 02 Jun 2014 12:22:49 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:41890 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrV0U-0007JE-2j for qemu-devel@nongnu.org; Mon, 02 Jun 2014 12:22:42 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1WrV1c-0007B7-NZ; Mon, 02 Jun 2014 18:23:52 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 2 Jun 2014 17:21:59 +0100 Message-Id: <1401726122-11132-6-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1401726122-11132-1-git-send-email-alex.bennee@linaro.org> References: <1401726122-11132-1-git-send-email-alex.bennee@linaro.org> X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, Riku Voipio , =?UTF-8?q?Alex=20Benn=C3=A9e?= , greg.bellows@linaro.org Subject: [Qemu-devel] [RCF PATCH 5/8] arm/nwfps: remove use of cpsr_write() and set flags directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This is a pre-cursor to removing the cpsr_write function. diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index bb9ac65..0dbdf75 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -108,7 +108,10 @@ static inline void writeRegister(unsigned int x, unsigned int y) static inline void writeConditionCodes(unsigned int x) { - cpsr_write(user_registers,x,CPSR_NZCV); + user_registers->ZF = (~val) & CPSR_Z; + user_registers->NF = val; + user_registers->CF = (val >> 29) & 1; + user_registers->VF = (val << 3) & 0x80000000; } #define ARM_REG_PC 15