From patchwork Wed Aug 17 20:54:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryce Lanham X-Patchwork-Id: 110420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA7E5B6F97 for ; Thu, 18 Aug 2011 08:46:01 +1000 (EST) Received: from localhost ([::1]:48580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn9U-0007CP-9p for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2011 16:55:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn9J-0006kW-NF for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qtn8o-0007xv-7m for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:55:20 -0400 Received: from mail-iy0-f171.google.com ([209.85.210.171]:57974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn8o-0007qk-2M for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:55:10 -0400 Received: by iyf13 with SMTP id 13so2655750iyf.30 for ; Wed, 17 Aug 2011 13:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Say+mK0TwvKDeWIt4zOXiHVsZO70iQtpFBdyVP/XKR4=; b=ogX+P6DqF9kiqZ0yiHBQSwikTiSJEPJIgJsjSzFTeuVqyzlJiGhVBZaqcUFp2cVUkP vXXIIzt8DH7ON9G2ndJ2kMYFgGFcl1dV7D/8gpbstJV/k0hA9+8mmNbO7xKxg51JJ3Gf ED+tvqshBcXZQlLJdkDk5sHEHaWe/he7HYps4= Received: by 10.231.62.80 with SMTP id w16mr3061596ibh.5.1313614489262; Wed, 17 Aug 2011 13:54:49 -0700 (PDT) Received: from localhost.localdomain (betelgeuse.cs.uchicago.edu [128.135.24.226]) by mx.google.com with ESMTPS id h12sm228311ibe.3.2011.08.17.13.54.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 13:54:48 -0700 (PDT) From: Bryce Lanham To: qemu-devel@nongnu.org Date: Wed, 17 Aug 2011 15:54:16 -0500 Message-Id: <1313614456-29404-12-git-send-email-blanham@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1313614456-29404-1-git-send-email-blanham@gmail.com> References: <1313614456-29404-1-git-send-email-blanham@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.171 Cc: Laurent Vivier Subject: [Qemu-devel] [PATCH 111/111] m68k: move from sr can use effective addresse on m68k 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Laurent Vivier --- target-m68k/translate.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index b4b36f7..0be011e 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3443,16 +3443,14 @@ DISAS_INSN(strldsr) DISAS_INSN(move_from_sr) { - TCGv reg; TCGv sr; - if (IS_USER(s)) { + if (IS_USER(s)) { /* FIXME: not privileged on 68000 */ gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); return; } sr = gen_get_sr(s); - reg = DREG(insn, 0); - gen_partset_reg(OS_WORD, reg, sr); + DEST_EA(insn, OS_WORD, sr, NULL); } DISAS_INSN(move_to_sr) @@ -4424,7 +4422,7 @@ void register_m68k_insns (CPUM68KState *env) INSN(negx, 4000, ff00, M68000); INSN(undef, 40c0, ffc0, M68000); INSN(move_from_sr, 40c0, fff8, CF_ISA_A); - INSN(move_from_sr, 40c0, fff8, M68000); + INSN(move_from_sr, 40c0, ffc0, M68000); INSN(lea, 41c0, f1c0, CF_ISA_A); INSN(lea, 41c0, f1c0, M68000); INSN(clr, 4200, ff00, CF_ISA_A);