On Wed, Jun 24, 2015 at 11:29 AM, Andreas Färber <afaer...@suse.de> wrote:
> Am 24.06.2015 um 20:00 schrieb Andreas Färber:
>> Am 24.06.2015 um 05:19 schrieb Peter Crosthwaite:
>>> Use cpu_set_pc() for setting program counters when bootloading. This
>>> removes an instance of system level code having to reach into the CPU
>>> env.
>>>
>>> Reviewed-by: Andreas Färber <afaer...@suse.de>
>>> Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
>>> ---
>>> changed since v2:
>>> Add () to function names in commit messages
>>> ---
>>> dtc | 2 +-
>>> hw/microblaze/boot.c | 2 +-
>>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/dtc b/dtc
>>> index 65cc4d2..bc895d6 160000
>>> --- a/dtc
>>> +++ b/dtc
>>> @@ -1 +1 @@
>>> -Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf
>>> +Subproject commit bc895d6d09695d05ceb8b52486ffe861d6cfbdde
>>
>> Submodule strikes again. Preparing to queue.
>
> Will squash the following deduplication:
>
ACK.
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 9f4698a..3e8820f 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -48,13 +48,14 @@ static struct
> static void main_cpu_reset(void *opaque)
> {
> MicroBlazeCPU *cpu = opaque;
> + CPUState *cs = CPU(cpu);
> CPUMBState *env = &cpu->env;
>
> - cpu_reset(CPU(cpu));
> + cpu_reset(cs);
> env->regs[5] = boot_info.cmdline;
> env->regs[6] = boot_info.initrd_start;
> env->regs[7] = boot_info.fdt;
> - cpu_set_pc(CPU(cpu), boot_info.bootstrap_pc);
> + cpu_set_pc(cs, boot_info.bootstrap_pc);
> if (boot_info.machine_cpu_reset) {
> boot_info.machine_cpu_reset(cpu);
> }
>
> Regards,
> Andreas
>
> --
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
> 21284 (AG Nürnberg)
>
