From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LeNrP-0001W8-6h for qemu-devel@nongnu.org; Tue, 03 Mar 2009 01:12:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LeNrN-0001Vw-Bt for qemu-devel@nongnu.org; Tue, 03 Mar 2009 01:12:09 -0500 Received: from [199.232.76.173] (port=39192 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LeNrN-0001Vt-7z for qemu-devel@nongnu.org; Tue, 03 Mar 2009 01:12:09 -0500 Received: from savannah.gnu.org ([199.232.41.3]:46766 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LeNrN-0004ws-0p for qemu-devel@nongnu.org; Tue, 03 Mar 2009 01:12:09 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LeNrI-0004FJ-Oj for qemu-devel@nongnu.org; Tue, 03 Mar 2009 06:12:04 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LeNrI-0004ER-BA for qemu-devel@nongnu.org; Tue, 03 Mar 2009 06:12:04 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Tue, 03 Mar 2009 06:12:04 +0000 Subject: [Qemu-devel] [6668] clean build: Fix remaining sh4 warnings Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6668 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6668 Author: aurel32 Date: 2009-03-03 06:12:03 +0000 (Tue, 03 Mar 2009) Log Message: ----------- clean build: Fix remaining sh4 warnings Signed-off-by: Jan Kiszka Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/shix.c trunk/target-sh4/cpu.h trunk/target-sh4/exec.h trunk/target-sh4/helper.c Modified: trunk/hw/shix.c =================================================================== --- trunk/hw/shix.c 2009-03-02 22:39:39 UTC (rev 6667) +++ trunk/hw/shix.c 2009-03-03 06:12:03 UTC (rev 6668) @@ -45,21 +45,6 @@ /* XXXXX */ } -void vga_update_display(void) -{ - /* XXXXX */ -} - -void vga_invalidate_display(void) -{ - /* XXXXX */ -} - -void vga_screen_dump(const char *filename) -{ - /* XXXXX */ -} - static void shix_init(ram_addr_t ram_size, int vga_ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, Modified: trunk/target-sh4/cpu.h =================================================================== --- trunk/target-sh4/cpu.h 2009-03-02 22:39:39 UTC (rev 6667) +++ trunk/target-sh4/cpu.h 2009-03-03 06:12:03 UTC (rev 6668) @@ -165,6 +165,8 @@ env->gbr = newtls; } +void cpu_load_tlb(CPUSH4State * env); + #include "softfloat.h" #define CPUState CPUSH4State Modified: trunk/target-sh4/exec.h =================================================================== --- trunk/target-sh4/exec.h 2009-03-02 22:39:39 UTC (rev 6667) +++ trunk/target-sh4/exec.h 2009-03-03 06:12:03 UTC (rev 6668) @@ -53,10 +53,4 @@ /* XXXXX */ } -void cpu_load_tlb(CPUState * env); - -int find_itlb_entry(CPUState * env, target_ulong address, - int use_asid, int update); -int find_utlb_entry(CPUState * env, target_ulong address, int use_asid); - #endif /* _EXEC_SH4_H */ Modified: trunk/target-sh4/helper.c =================================================================== --- trunk/target-sh4/helper.c 2009-03-02 22:39:39 UTC (rev 6667) +++ trunk/target-sh4/helper.c 2009-03-03 06:12:03 UTC (rev 6668) @@ -313,8 +313,8 @@ Return entry, MMU_ITLB_MISS, MMU_ITLB_MULTIPLE or MMU_DTLB_MULTIPLE Update the itlb from utlb if update is not 0 */ -int find_itlb_entry(CPUState * env, target_ulong address, - int use_asid, int update) +static int find_itlb_entry(CPUState * env, target_ulong address, + int use_asid, int update) { int e, n; @@ -344,7 +344,7 @@ /* Find utlb entry Return entry, MMU_DTLB_MISS, MMU_DTLB_MULTIPLE */ -int find_utlb_entry(CPUState * env, target_ulong address, int use_asid) +static int find_utlb_entry(CPUState * env, target_ulong address, int use_asid) { /* per utlb access */ increment_urc(env); @@ -418,9 +418,9 @@ return n; } -int get_physical_address(CPUState * env, target_ulong * physical, - int *prot, target_ulong address, - int rw, int access_type) +static int get_physical_address(CPUState * env, target_ulong * physical, + int *prot, target_ulong address, + int rw, int access_type) { /* P1, P2 and P4 areas do not use translation */ if ((address >= 0x80000000 && address < 0xc0000000) || @@ -525,7 +525,7 @@ return physical; } -void cpu_load_tlb(CPUState * env) +void cpu_load_tlb(CPUSH4State * env) { int n = cpu_mmucr_urc(env->mmucr); tlb_t * entry = &env->utlb[n];