From patchwork Sat Apr 30 22:24:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 93531 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 80D6AB6EF0 for ; Sun, 1 May 2011 08:26:51 +1000 (EST) Received: from localhost ([::1]:59713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGIci-0002g5-QU for incoming@patchwork.ozlabs.org; Sat, 30 Apr 2011 18:26:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGIam-0007vT-32 for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:24:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGIak-0004kS-Vj for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:24:47 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:55698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGIak-0004gz-Oc for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:24:46 -0400 Received: by mail-pw0-f45.google.com with SMTP id 6so2851739pwi.4 for ; Sat, 30 Apr 2011 15:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=vkvXsEuoDMREFH5TmfCfBzTiiMVrGYCdj30tStKa+NU=; b=M+A90xYkIYVpKzTfSVlarKeN95cZruAN9uyN4bq5pG2IFGJufzjjSKPZvjo95BvgsK uYxf7UztrqbQVmywyWqByHb4HUaNjJOvsNLSNTqMPFHXuAzylHU3HA/Zv/7t7hsQfcsI jByUns0EPkGingVMrJSYNapn32XQEC6F48DZ8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=wJzWoFBXcQBuWyGrYBItO84d2JReqErHYjWFWaZ5/z/cxs18t9VzOyTtwnGxvrgKCh O9gKoD0kL0d74uH8xrOID0V2ogrST89c0QKYtQJc9XpWmlr/TkbEG0LsTprBm9tuDBX2 5sz4Kh1Y/N+b+h2Z7IHAtaHP3DqnExWiiOiPI= Received: by 10.68.29.234 with SMTP id n10mr6581393pbh.94.1304202286410; Sat, 30 Apr 2011 15:24:46 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id y7sm2797195pbk.30.2011.04.30.15.24.45 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 30 Apr 2011 15:24:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 30 Apr 2011 15:24:30 -0700 Message-Id: <1304202271-24730-8-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304202271-24730-1-git-send-email-rth@twiddle.net> References: <1304202271-24730-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.45 Cc: Blue Swirl , Aurelien Jarno Subject: [Qemu-devel] [PATCH 7/8] target-i386: Privatize some i386-specific interrupt names. 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 SMI, VIRQ, INIT, SIPI, and MCE are all only used by the i386 port. Signed-off-by: Richard Henderson --- cpu-all.h | 5 ----- poison.h | 2 -- target-i386/cpu.h | 8 ++++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 88c8361..1ecf42b 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -828,12 +828,7 @@ extern CPUState *cpu_single_env; /* Temporary remapping from the generic names back to the previous cpu-specific names. These will be moved to target-foo/cpu.h next. */ -#define CPU_INTERRUPT_SMI CPU_INTERRUPT_TGT_EXT_2 -#define CPU_INTERRUPT_VIRQ CPU_INTERRUPT_TGT_INT_0 #define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3 -#define CPU_INTERRUPT_INIT CPU_INTERRUPT_TGT_INT_1 -#define CPU_INTERRUPT_SIPI CPU_INTERRUPT_TGT_INT_2 -#define CPU_INTERRUPT_MCE CPU_INTERRUPT_TGT_EXT_4 /* The set of all bits that should be masked when single-stepping. */ #define CPU_INTERRUPT_SSTEP_MASK \ diff --git a/poison.h b/poison.h index 787f8e9..4fcf46d 100644 --- a/poison.h +++ b/poison.h @@ -40,9 +40,7 @@ #pragma GCC poison CPU_INTERRUPT_HARD #pragma GCC poison CPU_INTERRUPT_EXITTB #pragma GCC poison CPU_INTERRUPT_HALT -#pragma GCC poison CPU_INTERRUPT_SMI #pragma GCC poison CPU_INTERRUPT_DEBUG -#pragma GCC poison CPU_INTERRUPT_VIRQ #pragma GCC poison CPU_INTERRUPT_NMI #pragma GCC poison CPU_INTERRUPT_TGT_EXT_0 #pragma GCC poison CPU_INTERRUPT_TGT_EXT_1 diff --git a/target-i386/cpu.h b/target-i386/cpu.h index c7047d5..01880f9 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -466,6 +466,14 @@ #define EXCP_SYSCALL 0x100 /* only happens in user only emulation for syscall instruction */ +/* i386-specific interrupt pending bits. */ +#define CPU_INTERRUPT_SMI CPU_INTERRUPT_TGT_EXT_2 +#define CPU_INTERRUPT_MCE CPU_INTERRUPT_TGT_EXT_4 +#define CPU_INTERRUPT_VIRQ CPU_INTERRUPT_TGT_INT_0 +#define CPU_INTERRUPT_INIT CPU_INTERRUPT_TGT_INT_1 +#define CPU_INTERRUPT_SIPI CPU_INTERRUPT_TGT_INT_2 + + enum { CC_OP_DYNAMIC, /* must use dynamic code to get cc_op */ CC_OP_EFLAGS, /* all cc are explicitly computed, CC_SRC = flags */