Commit 7a938d53 authored by Jon Diekema's avatar Jon Diekema Committed by Laurent Vivier
Browse files

ppc: e6500 registers SPR 604 twice 



When using the e6500 CPU, QEMU generates a fatal error after
complaining about registering SPR 604 twice.

Building and testing with commit
9b2e891e shows the issue:

qemu-system-ppc64 --version
QEMU emulator version 3.1.50 (v3.1.0-456-g9b2e891ec5-dirty)
Copyright (c) 2003-2018 Fabrice Bellard and the QEMU Project developers

qemu-system-ppc64 -M none -cpu e6500
Error: Trying to register SPR 604 (25c) twice !

Signed-off-by: default avatarJon Diekema <jon.diekema@ge.com>
Message-Id: <CALvuzg43uSodseEHjNaRcPFBKKPTY2mcppUbYgiLL=QO9RxX_Q@mail.gmail.com>
[removed duplicated mail header in the commit message]
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 568c439a

target/ppc/translate_init.inc.c

+0 −8
Original line number Diff line number Diff line
@@ -4947,14 +4947,6 @@ static void init_proc_e500(CPUPPCState *env, int version) 
    }



    if (version == fsl_e6500) {

        spr_register(env, SPR_BOOKE_SPRG8, "SPRG8",

                     SPR_NOACCESS, SPR_NOACCESS,

                     &spr_read_generic, &spr_write_generic,

                     0x00000000);

        spr_register(env, SPR_BOOKE_SPRG9, "SPRG9",

                     SPR_NOACCESS, SPR_NOACCESS,

                     &spr_read_generic, &spr_write_generic,

                     0x00000000);

        /* Thread identification */

        spr_register(env, SPR_TIR, "TIR",

                     SPR_NOACCESS, SPR_NOACCESS,