Am 20.05.2011 um 21:10 schrieb Andreas Färber <andreas.faer...@web.de>:
> Hey Alex,
>
> Next breakage... :(
>
> Am 10.05.2011 um 00:15 schrieb Alexander Graf:
>
>> Most of the code to support e500 style MMUs is already in place, but
>> we're missing on some of the special TLB0-TLB1 handling code and slightly
>> different TLB modification.
>>
>> This patch adds support for the FSL style MMU.
>>
>> Signed-off-by: Alexander Graf <ag...@suse.de>
>
>> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
>> index 2a7431c..dd2f93f 100644
>> --- a/target-ppc/cpu.h
>> +++ b/target-ppc/cpu.h
>
>> @@ -1699,6 +1926,77 @@ static inline void cpu_set_tls(CPUState *env,
>> target_ulong newtls)
>> #endif
>> }
>>
>> +#if !defined(CONFIG_USER_ONLY)
>> +static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe)
>> +{
>> + ulong tlbel = (ulong)tlbe;
>> + ulong tlbl = (ulong)env->tlb;
>
> CC ppc-softmmu/arch_init.o
> In file included from /Users/andreas/QEMU/qemu/qemu-common.h:130,
> from /Users/andreas/QEMU/qemu/monitor.h:4,
> from /Users/andreas/QEMU/qemu/arch_init.c:32:
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h: In function ‘booke206_tlbe_id’:
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1932: error: ‘ulong’ undeclared
> (first use in this function)
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1932: error: (Each undeclared
> identifier is reported only once
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1932: error: for each function it
> appears in.)
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1932: error: expected ‘;’ before
> ‘tlbel’
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1933: error: expected ‘;’ before
> ‘tlbl’
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1935: error: ‘tlbel’ undeclared
> (first use in this function)
> /Users/andreas/QEMU/qemu/target-ppc/cpu.h:1935: error: ‘tlbl’ undeclared
> (first use in this function)
> make[1]: *** [arch_init.o] Error 1
> make: *** [subdir-ppc-softmmu] Error 2
>
> Did you mean target_ulong or unsigned long?
Yes, sorry. Stefan already fixed this one and I sent a pull request with the
fix a few hours ago. If you have a machine you could spare for osx buildbot
testing, we might be able to catch these earlier. I'll try to see if I can get
something automated rolling too :)
Alex
>
