gwj / at91sam9263 · Commits

Commit 65f9ee8d670e12a396857affb36920afd48f5e64

Authored by j_mayer
1 parent 1c27f8fb

Rename PowerPC MMUCSR0 and MMUCFG SPRs: those are not BookE specific. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3333 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
target-ppc/cpu.h
  View file @65f9ee8
@@ -1042,7 +1042,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val); @@ -1042,7 +1042,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val);
1042 #define SPR_440_DBDR (0x3F3) 1042 #define SPR_440_DBDR (0x3F3)
1043 #define SPR_LDSTDB (0x3F4) 1043 #define SPR_LDSTDB (0x3F4)
1044 #define SPR_40x_IAC1 (0x3F4) 1044 #define SPR_40x_IAC1 (0x3F4)
1045 -#define SPR_BOOKE_MMUCSR0 (0x3F4) 1045 +#define SPR_MMUCSR0 (0x3F4)
1046 #define SPR_DABR (0x3F5) 1046 #define SPR_DABR (0x3F5)
1047 #define DABR_MASK (~(target_ulong)0x7) 1047 #define DABR_MASK (~(target_ulong)0x7)
1048 #define SPR_E500_BUCSR (0x3F5) 1048 #define SPR_E500_BUCSR (0x3F5)
@@ -1054,7 +1054,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val); @@ -1054,7 +1054,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val);
1054 #define SPR_MSSSR0 (0x3F7) 1054 #define SPR_MSSSR0 (0x3F7)
1055 #define SPR_DABRX (0x3F7) 1055 #define SPR_DABRX (0x3F7)
1056 #define SPR_40x_DAC2 (0x3F7) 1056 #define SPR_40x_DAC2 (0x3F7)
1057 -#define SPR_BOOKE_MMUCFG (0x3F7) 1057 +#define SPR_MMUCFG (0x3F7)
1058 #define SPR_LDSTCR (0x3F8) 1058 #define SPR_LDSTCR (0x3F8)
1059 #define SPR_L2PMCR (0x3F8) 1059 #define SPR_L2PMCR (0x3F8)
1060 #define SPR_750_HID2 (0x3F8) 1060 #define SPR_750_HID2 (0x3F8)
target-ppc/translate_init.c
  View file @65f9ee8
@@ -1562,12 +1562,12 @@ static void gen_spr_BookE_FSL (CPUPPCState *env) @@ -1562,12 +1562,12 @@ static void gen_spr_BookE_FSL (CPUPPCState *env)
1562 0x00000000); 1562 0x00000000);
1563 } 1563 }
1564 /* XXX : not implemented */ 1564 /* XXX : not implemented */
1565 - spr_register(env, SPR_BOOKE_MMUCFG, "MMUCFG", 1565 + spr_register(env, SPR_MMUCFG, "MMUCFG",
1566 SPR_NOACCESS, SPR_NOACCESS, 1566 SPR_NOACCESS, SPR_NOACCESS,
1567 &spr_read_generic, SPR_NOACCESS, 1567 &spr_read_generic, SPR_NOACCESS,
1568 0x00000000); /* TOFIX */ 1568 0x00000000); /* TOFIX */
1569 /* XXX : not implemented */ 1569 /* XXX : not implemented */
1570 - spr_register(env, SPR_BOOKE_MMUCSR0, "MMUCSR0", 1570 + spr_register(env, SPR_MMUCSR0, "MMUCSR0",
1571 SPR_NOACCESS, SPR_NOACCESS, 1571 SPR_NOACCESS, SPR_NOACCESS,
1572 &spr_read_generic, &spr_write_generic, 1572 &spr_read_generic, &spr_write_generic,
1573 0x00000000); /* TOFIX */ 1573 0x00000000); /* TOFIX */