From patchwork Sat Apr 14 01:00:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 152463 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 D956EB6FFC for ; Sat, 14 Apr 2012 11:00:56 +1000 (EST) Received: from localhost ([::1]:44039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIrME-0000wh-Pt for incoming@patchwork.ozlabs.org; Fri, 13 Apr 2012 21:00:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIrLy-0000qQ-6K for qemu-devel@nongnu.org; Fri, 13 Apr 2012 21:00:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIrLw-0007d5-00 for qemu-devel@nongnu.org; Fri, 13 Apr 2012 21:00:37 -0400 Received: from mail-lpp01m010-f45.google.com ([209.85.215.45]:41237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIrLv-0007cU-IY for qemu-devel@nongnu.org; Fri, 13 Apr 2012 21:00:35 -0400 Received: by lahe6 with SMTP id e6so2872971lah.4 for ; Fri, 13 Apr 2012 18:00:33 -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 :mime-version:content-type:content-transfer-encoding; bh=Y1uY7BVlrtKXmg2fnbGnDXaHV4vCB1HgxsJMyqfeKdY=; b=DM6XEKKJ80u382lsJT2Q8sw657sNLVKdo8Rerdd+4S/RQh/wstAMhOLn8d+dJUShdr OVRg+s1zcmlOSBcq8+4sKqBaRTLeZsHjy0TUUHU5hICd+8WP16yMSkVceDIUqtpiYeXa je+H+FwrYx5SsgiKoj1WPrndmxCV7mXLn6emB9Ao/2rCoF+86PvwIddSdgfOqISjGIEk ZSaSBA2mYylaWlrUXTRjweBlntCKQv+zgyWZHLbrhWFm1mbqIw8QPILh258Z8Mhi8HWa gklYKxgB+nMA5JCqHkylAkUEXxTGPwugNpkTNdrSNuj7LLyKz02WVninfYjdGSz0Cxgp MAIA== Received: by 10.152.112.100 with SMTP id ip4mr3252382lab.1.1334365233181; Fri, 13 Apr 2012 18:00:33 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id mk9sm11148911lab.0.2012.04.13.18.00.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Apr 2012 18:00:32 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Sat, 14 Apr 2012 05:00:09 +0400 Message-Id: <1334365213-15986-2-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1334365213-15986-1-git-send-email-jcmvbkbc@gmail.com> References: <1334365213-15986-1-git-send-email-jcmvbkbc@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.45 Cc: Blue Swirl , Max Filippov , Anthony Liguori , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Subject: [Qemu-devel] [PATCH 1/5] target-xtensa: Move helpers.h to helper.h 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: Lluís Vilanova Provides a file naming scheme consistent with other targets. Signed-off-by: Lluís Vilanova Signed-off-by: Max Filippov --- target-xtensa/helper.h | 39 +++++++++++++++++++++++++++++++++++++++ target-xtensa/helpers.h | 39 --------------------------------------- target-xtensa/op_helper.c | 2 +- target-xtensa/translate.c | 6 +++--- xtensa-semi.c | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 target-xtensa/helper.h delete mode 100644 target-xtensa/helpers.h diff --git a/target-xtensa/helper.h b/target-xtensa/helper.h new file mode 100644 index 0000000..48a741e --- /dev/null +++ b/target-xtensa/helper.h @@ -0,0 +1,39 @@ +#include "def-helper.h" + +DEF_HELPER_1(exception, void, i32) +DEF_HELPER_2(exception_cause, void, i32, i32) +DEF_HELPER_3(exception_cause_vaddr, void, i32, i32, i32) +DEF_HELPER_2(debug_exception, void, i32, i32) + +DEF_HELPER_1(nsa, i32, i32) +DEF_HELPER_1(nsau, i32, i32) +DEF_HELPER_1(wsr_windowbase, void, i32) +DEF_HELPER_3(entry, void, i32, i32, i32) +DEF_HELPER_1(retw, i32, i32) +DEF_HELPER_1(rotw, void, i32) +DEF_HELPER_2(window_check, void, i32, i32) +DEF_HELPER_0(restore_owb, void) +DEF_HELPER_1(movsp, void, i32) +DEF_HELPER_1(wsr_lbeg, void, i32) +DEF_HELPER_1(wsr_lend, void, i32) +DEF_HELPER_1(simcall, void, env) +DEF_HELPER_0(dump_state, void) + +DEF_HELPER_2(waiti, void, i32, i32) +DEF_HELPER_2(timer_irq, void, i32, i32) +DEF_HELPER_1(advance_ccount, void, i32) +DEF_HELPER_1(check_interrupts, void, env) + +DEF_HELPER_1(wsr_rasid, void, i32) +DEF_HELPER_2(rtlb0, i32, i32, i32) +DEF_HELPER_2(rtlb1, i32, i32, i32) +DEF_HELPER_2(itlb, void, i32, i32) +DEF_HELPER_2(ptlb, i32, i32, i32) +DEF_HELPER_3(wtlb, void, i32, i32, i32) + +DEF_HELPER_1(wsr_ibreakenable, void, i32) +DEF_HELPER_2(wsr_ibreaka, void, i32, i32) +DEF_HELPER_2(wsr_dbreaka, void, i32, i32) +DEF_HELPER_2(wsr_dbreakc, void, i32, i32) + +#include "def-helper.h" diff --git a/target-xtensa/helpers.h b/target-xtensa/helpers.h deleted file mode 100644 index 48a741e..0000000 --- a/target-xtensa/helpers.h +++ /dev/null @@ -1,39 +0,0 @@ -#include "def-helper.h" - -DEF_HELPER_1(exception, void, i32) -DEF_HELPER_2(exception_cause, void, i32, i32) -DEF_HELPER_3(exception_cause_vaddr, void, i32, i32, i32) -DEF_HELPER_2(debug_exception, void, i32, i32) - -DEF_HELPER_1(nsa, i32, i32) -DEF_HELPER_1(nsau, i32, i32) -DEF_HELPER_1(wsr_windowbase, void, i32) -DEF_HELPER_3(entry, void, i32, i32, i32) -DEF_HELPER_1(retw, i32, i32) -DEF_HELPER_1(rotw, void, i32) -DEF_HELPER_2(window_check, void, i32, i32) -DEF_HELPER_0(restore_owb, void) -DEF_HELPER_1(movsp, void, i32) -DEF_HELPER_1(wsr_lbeg, void, i32) -DEF_HELPER_1(wsr_lend, void, i32) -DEF_HELPER_1(simcall, void, env) -DEF_HELPER_0(dump_state, void) - -DEF_HELPER_2(waiti, void, i32, i32) -DEF_HELPER_2(timer_irq, void, i32, i32) -DEF_HELPER_1(advance_ccount, void, i32) -DEF_HELPER_1(check_interrupts, void, env) - -DEF_HELPER_1(wsr_rasid, void, i32) -DEF_HELPER_2(rtlb0, i32, i32, i32) -DEF_HELPER_2(rtlb1, i32, i32, i32) -DEF_HELPER_2(itlb, void, i32, i32) -DEF_HELPER_2(ptlb, i32, i32, i32) -DEF_HELPER_3(wtlb, void, i32, i32, i32) - -DEF_HELPER_1(wsr_ibreakenable, void, i32) -DEF_HELPER_2(wsr_ibreaka, void, i32, i32) -DEF_HELPER_2(wsr_dbreaka, void, i32, i32) -DEF_HELPER_2(wsr_dbreakc, void, i32, i32) - -#include "def-helper.h" diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index cdef0db..806384f 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "dyngen-exec.h" -#include "helpers.h" +#include "helper.h" #include "host-utils.h" static void do_unaligned_access(target_ulong addr, int is_write, int is_user, diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index e0ff72b..492dbcc 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -37,9 +37,9 @@ #include "qemu-log.h" #include "sysemu.h" -#include "helpers.h" +#include "helper.h" #define GEN_HELPER 1 -#include "helpers.h" +#include "helper.h" typedef struct DisasContext { const XtensaConfig *config; @@ -183,7 +183,7 @@ void xtensa_translate_init(void) } } #define GEN_HELPER 2 -#include "helpers.h" +#include "helper.h" } static inline bool option_bits_enabled(DisasContext *dc, uint64_t opt) diff --git a/xtensa-semi.c b/xtensa-semi.c index 5754b77..b7c8c34 100644 --- a/xtensa-semi.c +++ b/xtensa-semi.c @@ -31,7 +31,7 @@ #include #include "cpu.h" #include "dyngen-exec.h" -#include "helpers.h" +#include "helper.h" #include "qemu-log.h" enum {