haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

clean build: Fix remaining sh4 warnings

Browse source 
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6668 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2009-03-03 06:12:03 +00:00
parent 8dd640e49d
commit ef7ec1c16d
4 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hw/shix.c
View file

@ -45,21 +45,6 @@ void pic_info(void)
/* XXXXX */ /* 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, static void shix_init(ram_addr_t ram_size, int vga_ram_size,
const char *boot_device, const char *boot_device,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,

2
target-sh4/cpu.h
View file

@ -165,6 +165,8 @@ static inline void cpu_set_tls(CPUSH4State *env, target_ulong newtls)
env->gbr = newtls; env->gbr = newtls;
} }
void cpu_load_tlb(CPUSH4State * env);
#include "softfloat.h" #include "softfloat.h"
#define CPUState CPUSH4State #define CPUState CPUSH4State

6
target-sh4/exec.h
View file

@ -53,10 +53,4 @@ static inline void env_to_regs(void)
/* XXXXX */ /* 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 */ #endif /* _EXEC_SH4_H */

8
target-sh4/helper.c
View file

@ -313,7 +313,7 @@ static void increment_urc(CPUState * env)
Return entry, MMU_ITLB_MISS, MMU_ITLB_MULTIPLE or MMU_DTLB_MULTIPLE Return entry, MMU_ITLB_MISS, MMU_ITLB_MULTIPLE or MMU_DTLB_MULTIPLE
Update the itlb from utlb if update is not 0 Update the itlb from utlb if update is not 0
*/ */
int find_itlb_entry(CPUState * env, target_ulong address, static int find_itlb_entry(CPUState * env, target_ulong address,
int use_asid, int update) int use_asid, int update)
{ {
int e, n; int e, n;
@ -344,7 +344,7 @@ int find_itlb_entry(CPUState * env, target_ulong address,
/* Find utlb entry /* Find utlb entry
Return entry, MMU_DTLB_MISS, MMU_DTLB_MULTIPLE */ 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 */ /* per utlb access */
increment_urc(env); increment_urc(env);
@ -418,7 +418,7 @@ static int get_mmu_address(CPUState * env, target_ulong * physical,
return n; return n;
} }
int get_physical_address(CPUState * env, target_ulong * physical, static int get_physical_address(CPUState * env, target_ulong * physical,
int *prot, target_ulong address, int *prot, target_ulong address,
int rw, int access_type) int rw, int access_type)
{ {
@ -525,7 +525,7 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
return physical; return physical;
} }
void cpu_load_tlb(CPUState * env) void cpu_load_tlb(CPUSH4State * env)
{ {
int n = cpu_mmucr_urc(env->mmucr); int n = cpu_mmucr_urc(env->mmucr);
tlb_t * entry = &env->utlb[n]; tlb_t * entry = &env->utlb[n];