From patchwork Sun Oct 14 19:58:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 191383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 42AD92C0097 for ; Mon, 15 Oct 2012 06:59:29 +1100 (EST) Received: from localhost ([::1]:58662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNULP-0008Po-Hi for incoming@patchwork.ozlabs.org; Sun, 14 Oct 2012 15:59:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNULI-0008Ph-FL for qemu-devel@nongnu.org; Sun, 14 Oct 2012 15:59:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNULH-0002Dt-1O for qemu-devel@nongnu.org; Sun, 14 Oct 2012 15:59:20 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:50005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNULG-0002B9-QR; Sun, 14 Oct 2012 15:59:18 -0400 Received: by mail-lb0-f173.google.com with SMTP id gj3so2850165lbb.4 for ; Sun, 14 Oct 2012 12:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=HwU7ABK+DKHUjCWvo6nraEJjnDQDngUfcRp5vjDxvsQ=; b=mJiUJI4tMRkLuuEzwjh+FHtDtgICbJLWmGML0G42ShpSOiEMti67zouX9pjqOLnXdo 6Ica+nB5umUDClUnOdXQZqZ3aCrSeRCUkbTmpGwa0uiaQjN8DAjBgWc12KpS0Cm5ntoT cR36UTHaKp+7qV+JdvaoRNRRvGfeIGGihORBolhm9YMRMsUkZDGe9uzcQ1M2COX2RScy ByX+PVzq/JORlEUISgo0cpVHY7BON/Zv4Lvr2dJ4Nfc19aqxI8mosAVh8ShFCDWdH13W 7qA+0ndaHQvdSO4evU+ZuXFfrE3eE6J3nkCSq/dOmsmVspCr4dVGJ9OThpBlJ5pV6k+c wicw== Received: by 10.152.104.240 with SMTP id gh16mr8374796lab.56.1350244758135; Sun, 14 Oct 2012 12:59:18 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1000:b::b867]) by mx.google.com with ESMTPS id r8sm3941759lba.15.2012.10.14.12.59.13 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 14 Oct 2012 12:59:17 -0700 (PDT) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sun, 14 Oct 2012 19:58:49 +0000 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.217.173 Cc: qemu-trivial@nongnu.org, blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 01/11] target-sparc: make do_unaligned_access static 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 Signed-off-by: Blue Swirl --- target-sparc/cpu.h | 3 --- target-sparc/ldst_helper.c | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 214d01d..b4eda18 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -711,9 +711,6 @@ uint64_t cpu_tick_get_count(CPUTimer *timer); void cpu_tick_set_limit(CPUTimer *timer, uint64_t limit); trap_state* cpu_tsptr(CPUSPARCState* env); #endif -void QEMU_NORETURN do_unaligned_access(CPUSPARCState *env, target_ulong addr, - int is_write, int is_user, - uintptr_t retaddr); void cpu_restore_state2(CPUSPARCState *env, uintptr_t retaddr); #define TB_FLAG_FPU_ENABLED (1 << 4) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 2ca9a5c..795b0bd 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -65,6 +65,9 @@ #define QT1 (env->qt1) #if !defined(CONFIG_USER_ONLY) +static void QEMU_NORETURN do_unaligned_access(CPUSPARCState *env, + target_ulong addr, int is_write, + int is_user, uintptr_t retaddr); #include "softmmu_exec.h" #define MMUSUFFIX _mmu #define ALIGNED_ONLY @@ -2407,8 +2410,9 @@ void cpu_restore_state2(CPUSPARCState *env, uintptr_t retaddr) } #if !defined(CONFIG_USER_ONLY) -void do_unaligned_access(CPUSPARCState *env, target_ulong addr, int is_write, - int is_user, uintptr_t retaddr) +static void QEMU_NORETURN do_unaligned_access(CPUSPARCState *env, + target_ulong addr, int is_write, + int is_user, uintptr_t retaddr) { #ifdef DEBUG_UNALIGNED printf("Unaligned access to 0x" TARGET_FMT_lx " from 0x" TARGET_FMT_lx