From patchwork Tue Jun 29 07:58:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 57249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D941DB6F0C for ; Tue, 29 Jun 2010 18:02:46 +1000 (EST) Received: from localhost ([127.0.0.1]:41521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTVmF-0007we-Pn for incoming@patchwork.ozlabs.org; Tue, 29 Jun 2010 04:02:43 -0400 Received: from [140.186.70.92] (port=46208 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTVih-0006l6-Gw for qemu-devel@nongnu.org; Tue, 29 Jun 2010 03:59:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTVif-00050y-Lf for qemu-devel@nongnu.org; Tue, 29 Jun 2010 03:59:03 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:61791) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTVif-00050W-J2 for qemu-devel@nongnu.org; Tue, 29 Jun 2010 03:59:01 -0400 Received: by mail-vw0-f45.google.com with SMTP id 14so1857973vws.4 for ; Tue, 29 Jun 2010 00:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=iZxcEMY1KQV+V4PO5kDvfg8MkPHZ5VPBf1eJy8NKrCA=; b=EGtm7IXrVW9gsaKBgslnce5AP+HvzBSPSSdyP3JPWSLdt/1Z4k6syWZwvevLfw55ih AMFRl6rGIcTu/S/PULe3Z2LlcBuVzX7M2M38Uh8STmN4fmNxsbpHZFrLwVwmFlTybPXh vjl8yftmmBpV5hHwW7hx5RI82g95ZzOhBtK1k= 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=kXWvmNRunRbGsACI+F0//nTqQYry3hZK+axEV0qI5ZPqDArJaJeD/bJE5haY4zTlfV 22rdhkMrtcYH0RB+mvGvQtbjtS6by2rUwwXvtY8NH06nNbCM2Fbnd1o7IT4DzOI2Airg dHGbpDhpJb/bZluutvKGpIIpzwfvWUjUypIUo= Received: by 10.220.47.216 with SMTP id o24mr3679096vcf.86.1277798341087; Tue, 29 Jun 2010 00:59:01 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id h17sm6136800vcr.3.2010.06.29.00.58.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 29 Jun 2010 00:59:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 29 Jun 2010 09:58:49 +0200 Message-Id: <1277798332-32389-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1277798332-32389-1-git-send-email-pbonzini@redhat.com> References: <1277798332-32389-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH v2 1/4] remove unused stuff from */exec.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- target-alpha/exec.h | 2 -- target-cris/exec.h | 3 --- target-i386/op_helper.c | 2 +- target-microblaze/exec.h | 2 -- target-mips/exec.h | 8 -------- target-mips/op_helper.c | 7 ++++++- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/target-alpha/exec.h b/target-alpha/exec.h index 66526e2..0fb459d 100644 --- a/target-alpha/exec.h +++ b/target-alpha/exec.h @@ -28,8 +28,6 @@ register struct CPUAlphaState *env asm(AREG0); -#define PARAM(n) ((uint64_t)PARAM##n) -#define SPARAM(n) ((int32_t)PARAM##n) #define FP_STATUS (env->fp_status) #include "cpu.h" diff --git a/target-cris/exec.h b/target-cris/exec.h index 728aa80..55776ba 100644 --- a/target-cris/exec.h +++ b/target-cris/exec.h @@ -28,9 +28,6 @@ register struct CPUCRISState *env asm(AREG0); #include "softmmu_exec.h" #endif -void cpu_cris_flush_flags(CPUCRISState *env, int cc_op); -void helper_movec(CPUCRISState *env, int reg, uint32_t val); - static inline int cpu_has_work(CPUState *env) { return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)); diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index c1256f4..00fc671 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#define CPU_NO_GLOBAL_REGS + #include "exec.h" #include "exec-all.h" #include "host-utils.h" diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h index 646701c..db1c99e 100644 --- a/target-microblaze/exec.h +++ b/target-microblaze/exec.h @@ -27,8 +27,6 @@ register struct CPUMBState *env asm(AREG0); #include "softmmu_exec.h" #endif -void cpu_mb_flush_flags(CPUMBState *env, int cc_op); - static inline int cpu_has_work(CPUState *env) { return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)); diff --git a/target-mips/exec.h b/target-mips/exec.h index 01e9c4d..a07761d 100644 --- a/target-mips/exec.h +++ b/target-mips/exec.h @@ -17,14 +17,6 @@ register struct CPUMIPSState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -void dump_fpu(CPUState *env); -void fpu_dump_state(CPUState *env, FILE *f, - int (*fpu_fprintf)(FILE *f, const char *fmt, ...), - int flags); - -void cpu_mips_clock_init (CPUState *env); -void cpu_mips_tlb_flush (CPUState *env, int flush_global); - static inline int cpu_has_work(CPUState *env) { return (env->interrupt_request & diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index d09d6ed..8ae510a 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -22,6 +22,11 @@ #include "host-utils.h" #include "helper.h" + +#ifndef CONFIG_USER_ONLY +static inline void cpu_mips_tlb_flush (CPUState *env, int flush_global); +#endif + /*****************************************************************************/ /* Exceptions processing helpers */ @@ -1635,7 +1640,7 @@ target_ulong helper_yield(target_ulong arg1) #ifndef CONFIG_USER_ONLY /* TLB management */ -void cpu_mips_tlb_flush (CPUState *env, int flush_global) +static void cpu_mips_tlb_flush (CPUState *env, int flush_global) { /* Flush qemu's TLB and discard all shadowed entries. */ tlb_flush (env, flush_global);