From patchwork Thu Nov 24 18:33:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5309 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7783123E04 for ; Thu, 24 Nov 2011 18:33:39 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4BC4BA18102 for ; Thu, 24 Nov 2011 18:33:39 +0000 (UTC) Received: by faaa26 with SMTP id a26so4098320faa.11 for ; Thu, 24 Nov 2011 10:33:39 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr18265388lab.40.1322159618996; Thu, 24 Nov 2011 10:33:38 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs313961lal; Thu, 24 Nov 2011 10:33:37 -0800 (PST) Received: by 10.227.202.70 with SMTP id fd6mr18733907wbb.27.1322159615121; Thu, 24 Nov 2011 10:33:35 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id fj13si10760539wbb.115.2011.11.24.10.33.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Nov 2011 10:33:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RTe71-0000ud-BB; Thu, 24 Nov 2011 18:33:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Laurent Desnogues Subject: [PATCH] target-arm/translate.c: Fix slightly misleading comment in Thumb decoder Date: Thu, 24 Nov 2011 18:33:31 +0000 Message-Id: <1322159611-3484-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Clarify some slightly misleading comments in the Thumb decoder's handling of the memory hint space -- in particular one code path marked as 'UNPREDICTABLE or unallocated hint' also includes some legitimate preload instructions. Signed-off-by: Peter Maydell --- target-arm/translate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 0f35b60..f91553a 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -9025,14 +9025,16 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1) goto illegal_op; } if (rn == 15) { - /* UNPREDICTABLE or unallocated hint */ + /* UNPREDICTABLE, unallocated hint or + * PLD/PLDW/PLI (literal) + */ return 0; } if (op1 & 1) { - return 0; /* PLD* or unallocated hint */ + return 0; /* PLD/PLDW/PLI or unallocated hint */ } if ((op2 == 0) || ((op2 & 0x3c) == 0x30)) { - return 0; /* PLD* or unallocated hint */ + return 0; /* PLD/PLDW/PLI or unallocated hint */ } /* UNDEF space, or an UNPREDICTABLE */ return 1;