From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TU05p-0006ap-2m for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TU05n-0007RF-Sw for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TU05n-0007R9-JS for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:15 -0400 From: Stefan Hajnoczi Date: Thu, 1 Nov 2012 20:05:45 +0100 Message-Id: <1351796754-21703-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1351796754-21703-1-git-send-email-stefanha@redhat.com> References: <1351796754-21703-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] target-sparc: make do_unaligned_access static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , qemu-devel@nongnu.org, Stefan Hajnoczi From: Blue Swirl Signed-off-by: Blue Swirl Signed-off-by: Stefan Hajnoczi --- 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 a55fe08..7c689ee 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 356144a..f3e08fd 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 -- 1.7.12.1