From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhIE-0008Dq-14 for qemu-devel@nongnu.org; Mon, 11 May 2015 02:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrhEV-0003NR-KY for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:33 -0400 Received: from mail-pd0-x229.google.com ([2607:f8b0:400e:c02::229]:33108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhEV-0003NE-5l for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:31 -0400 Received: by pdbnk13 with SMTP id nk13so138841966pdb.0 for ; Sun, 10 May 2015 23:30:30 -0700 (PDT) From: Peter Crosthwaite Date: Sun, 10 May 2015 23:29:27 -0700 Message-Id: <370768d3f3493ca80085afa72e239356ab443ff5.1431322749.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH 24/34] arm: delete dummy prototypes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgari@xilinx.com, sorenb@xilinx.com, afaerber@suse.de, rth@twiddle.net All these do now is rename the generic exec functions. Remove. Signed-off-by: Peter Crosthwaite --- linux-user/main.c | 4 ++-- target-arm/cpu.h | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 50fbd7e..fb7b138 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -678,7 +678,7 @@ void cpu_loop(CPUARMState *env) for(;;) { cpu_exec_start(cs); - trapnr = cpu_arm_exec(env); + trapnr = cpu_exec(env); cpu_exec_end(cs); switch(trapnr) { case ARMAR_EXCP_UDEF: @@ -1009,7 +1009,7 @@ void cpu_loop(CPUARMState *env) for (;;) { cpu_exec_start(cs); - trapnr = cpu_arm_exec(env); + trapnr = cpu_exec(env); cpu_exec_end(cs); switch (trapnr) { diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 147aaeb..bdcd331 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -486,7 +486,6 @@ typedef struct CPUARMState { #include "cpu-qom.h" ARMCPU *cpu_arm_init(const char *cpu_model); -int cpu_arm_exec(CPUARMState *s); uint32_t do_arm_semihosting(CPUARMState *env); void aarch64_sync_32_to_64(CPUARMState *env); void aarch64_sync_64_to_32(CPUARMState *env); @@ -496,11 +495,6 @@ static inline bool is_a64(CPUARMState *env) return env->aarch64; } -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_arm_signal_handler(int host_signum, void *pinfo, - void *puc); int arm_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int mmu_idx); @@ -1564,9 +1558,6 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx) #define cpu_init(cpu_model) CPU(cpu_arm_init(cpu_model)) -#define cpu_exec cpu_arm_exec -#define cpu_gen_code cpu_arm_gen_code -#define cpu_signal_handler cpu_arm_signal_handler #define cpu_list arm_cpu_list /* ARM has the following "translation regimes" (as the ARM ARM calls them): -- 1.9.1