47c47
< from MipsTLB import MipsTLB,MipsDTB, MipsITB, MipsUTB
---
> from MipsTLB import MipsDTB, MipsITB
75d74
< UnifiedTLB = Param.Bool(True, "Is this a Unified TLB?")
78d76
< tlb = Param.MipsUTB(MipsUTB(), "Unified TLB")
104a103,107
> if build_env['TARGET_ISA'] == 'x86':
> itb.walker_port = Port("ITB page table walker port")
> dtb.walker_port = Port("ITB page table walker port")
> _mem_ports = ["itb.walker_port", "dtb.walker_port"]
>
111c114
< assert(len(self._mem_ports) == 2 or len(self._mem_ports) == 3)
---
> assert(len(self._mem_ports) < 6)
116a120,121
> if build_env['TARGET_ISA'] == 'x86':
> self._mem_ports += ["itb.walker_port", "dtb.walker_port"]
125,180d129
<
< if build_env['TARGET_ISA'] == 'mips':
< CP0_IntCtl_IPTI = Param.Unsigned(0,"No Description")
< CP0_IntCtl_IPPCI = Param.Unsigned(0,"No Description")
< CP0_SrsCtl_HSS = Param.Unsigned(0,"No Description")
< CP0_EBase_CPUNum = Param.Unsigned(0,"No Description")
< CP0_PRId_CompanyOptions = Param.Unsigned(0,"Company Options in Processor ID Register")
< CP0_PRId_CompanyID = Param.Unsigned(0,"Company Identifier in Processor ID Register")
< CP0_PRId_ProcessorID = Param.Unsigned(1,"Processor ID (0=>Not MIPS32/64 Processor, 1=>MIPS, 2-255 => Other Company")
< CP0_PRId_Revision = Param.Unsigned(0,"Processor Revision Number in Processor ID Register")
< CP0_Config_BE = Param.Unsigned(0,"Big Endian?")
< CP0_Config_AT = Param.Unsigned(0,"No Description")
< CP0_Config_AR = Param.Unsigned(0,"No Description")
< CP0_Config_MT = Param.Unsigned(0,"No Description")
< CP0_Config_VI = Param.Unsigned(0,"No Description")
< CP0_Config1_M = Param.Unsigned(0,"Config2 Implemented?")
< CP0_Config1_MMU = Param.Unsigned(0,"MMU Type")
< CP0_Config1_IS = Param.Unsigned(0,"No Description")
< CP0_Config1_IL = Param.Unsigned(0,"No Description")
< CP0_Config1_IA = Param.Unsigned(0,"No Description")
< CP0_Config1_DS = Param.Unsigned(0,"No Description")
< CP0_Config1_DL = Param.Unsigned(0,"No Description")
< CP0_Config1_DA = Param.Unsigned(0,"No Description")
< CP0_Config1_C2 = Param.Bool(False,"No Description")
< CP0_Config1_MD = Param.Bool(False,"No Description")
< CP0_Config1_PC = Param.Bool(False,"No Description")
< CP0_Config1_WR = Param.Bool(False,"No Description")
< CP0_Config1_CA = Param.Bool(False,"No Description")
< CP0_Config1_EP = Param.Bool(False,"No Description")
< CP0_Config1_FP = Param.Bool(False,"FPU Implemented?")
< CP0_Config2_M = Param.Bool(False,"Config3 Implemented?")
< CP0_Config2_TU = Param.Unsigned(0,"No Description")
< CP0_Config2_TS = Param.Unsigned(0,"No Description")
< CP0_Config2_TL = Param.Unsigned(0,"No Description")
< CP0_Config2_TA = Param.Unsigned(0,"No Description")
< CP0_Config2_SU = Param.Unsigned(0,"No Description")
< CP0_Config2_SS = Param.Unsigned(0,"No Description")
< CP0_Config2_SL = Param.Unsigned(0,"No Description")
< CP0_Config2_SA = Param.Unsigned(0,"No Description")
< CP0_Config3_M = Param.Bool(False,"Config4 Implemented?")
< CP0_Config3_DSPP = Param.Bool(False,"DSP Extensions Present?")
< CP0_Config3_LPA = Param.Bool(False,"No Description")
< CP0_Config3_VEIC = Param.Bool(False,"No Description")
< CP0_Config3_VInt = Param.Bool(False,"No Description")
< CP0_Config3_SP = Param.Bool(False,"No Description")
< CP0_Config3_MT = Param.Bool(False,"Multithreading Extensions Present?")
< CP0_Config3_SM = Param.Bool(False,"No Description")
< CP0_Config3_TL = Param.Bool(False,"No Description")
< CP0_WatchHi_M = Param.Bool(False,"No Description")
< CP0_PerfCtr_M = Param.Bool(False,"No Description")
< CP0_PerfCtr_W = Param.Bool(False,"No Description")
< CP0_PRId = Param.Unsigned(0,"CP0 Status Register")
< CP0_Config = Param.Unsigned(0,"CP0 Config Register")
< CP0_Config1 = Param.Unsigned(0,"CP0 Config1 Register")
< CP0_Config2 = Param.Unsigned(0,"CP0 Config2 Register")
< CP0_Config3 = Param.Unsigned(0,"CP0 Config3 Register")