Commit 8f95ad1c authored by Leon Alrae's avatar Leon Alrae
Browse files

target-mips: replace MIPS64R6-generic with the real I6400 CPU model 



MIPS64R6-generic gradually gets closer to I6400 CPU, feature-wise. Rename
it to make it clear which MIPS processor it is supposed to emulate.

Signed-off-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
parent c09199fe

target-mips/translate_init.c

+9 −11
Original line number Diff line number Diff line
@@ -671,26 +671,23 @@ static const mips_def_t mips_defs[] = 
        .mmu_type = MMU_TYPE_R4000,

    },

    {

        /* A generic CPU supporting MIPS64 Release 6 ISA.

           FIXME: Support IEEE 754-2008 FP.

                  Eventually this should be replaced by a real CPU model. */

        .name = "MIPS64R6-generic",

        .CP0_PRid = 0x00010000,

        .name = "I6400",

        .CP0_PRid = 0x1A900,

        .CP0_Config0 = MIPS_CONFIG0 | (0x2 << CP0C0_AR) | (0x2 << CP0C0_AT) |

                       (MMU_TYPE_R4000 << CP0C0_MT),

        .CP0_Config1 = MIPS_CONFIG1 | (1 << CP0C1_FP) | (63 << CP0C1_MMU) |

                       (2 << CP0C1_IS) | (4 << CP0C1_IL) | (3 << CP0C1_IA) |

                       (2 << CP0C1_DS) | (4 << CP0C1_DL) | (3 << CP0C1_DA) |

        .CP0_Config1 = MIPS_CONFIG1 | (1 << CP0C1_FP) | (15 << CP0C1_MMU) |

                       (2 << CP0C1_IS) | (5 << CP0C1_IL) | (3 << CP0C1_IA) |

                       (2 << CP0C1_DS) | (5 << CP0C1_DL) | (3 << CP0C1_DA) |

                       (0 << CP0C1_PC) | (1 << CP0C1_WR) | (1 << CP0C1_EP),

        .CP0_Config2 = MIPS_CONFIG2,

        .CP0_Config3 = MIPS_CONFIG3 | (1U << CP0C3_M) |

                       (1 << CP0C3_CMGCR) | (1 << CP0C3_MSAP) |

                       (1 << CP0C3_BP) | (1 << CP0C3_BI) | (1 << CP0C3_ULRI) |

                       (1 << CP0C3_RXI) | (1 << CP0C3_LPA),

                       (1 << CP0C3_RXI) | (1 << CP0C3_LPA) | (1 << CP0C3_VInt),

        .CP0_Config4 = MIPS_CONFIG4 | (1U << CP0C4_M) | (3 << CP0C4_IE) |

                       (0xfc << CP0C4_KScrExist),

        .CP0_Config5 = MIPS_CONFIG5 | (1 << CP0C5_XNP) | (1 << CP0C5_VP) |

                       (1 << CP0C5_LLB),

                       (1 << CP0C5_LLB) | (1 << CP0C5_MRP),

        .CP0_Config5_rw_bitmask = (1 << CP0C5_MSAEn) | (1 << CP0C5_SBRI) |

                                  (1 << CP0C5_FRE) | (1 << CP0C5_UFE),

        .CP0_LLAddr_rw_bitmask = 0,
@@ -703,9 +700,10 @@ static const mips_def_t mips_defs[] = 
        .CP0_PageGrain_rw_bitmask = (1 << CP0PG_ELPA),

        .CP1_fcr0 = (1 << FCR0_FREP) | (1 << FCR0_HAS2008) | (1 << FCR0_F64) |

                    (1 << FCR0_L) | (1 << FCR0_W) | (1 << FCR0_D) |

                    (1 << FCR0_S) | (0x00 << FCR0_PRID) | (0x0 << FCR0_REV),

                    (1 << FCR0_S) | (0x03 << FCR0_PRID) | (0x0 << FCR0_REV),

        .CP1_fcr31 = (1 << FCR31_ABS2008) | (1 << FCR31_NAN2008),

        .CP1_fcr31_rw_bitmask = 0x0103FFFF,

        .MSAIR = 0x03 << MSAIR_ProcID,

        .SEGBITS = 48,

        .PABITS = 48,

        .insn_flags = CPU_MIPS64R6 | ASE_MSA,