67,69c67,70
< from m5.objects.AlphaInterrupts import AlphaInterrupts
< from m5.objects.AlphaISA import AlphaISA
< default_isa_class = AlphaISA
---
> from m5.objects.AlphaInterrupts import AlphaInterrupts as ArchInterrupts
> from m5.objects.AlphaISA import AlphaISA as ArchISA
> ArchInterruptsParam = VectorParam.AlphaInterrupts
> ArchISAsParam = VectorParam.AlphaISA
72,74c73,76
< from m5.objects.SparcInterrupts import SparcInterrupts
< from m5.objects.SparcISA import SparcISA
< default_isa_class = SparcISA
---
> from m5.objects.SparcInterrupts import SparcInterrupts as ArchInterrupts
> from m5.objects.SparcISA import SparcISA as ArchISA
> ArchInterruptsParam = VectorParam.SparcInterrupts
> ArchISAsParam = VectorParam.SparcISA
77,79c79,82
< from m5.objects.X86LocalApic import X86LocalApic
< from m5.objects.X86ISA import X86ISA
< default_isa_class = X86ISA
---
> from m5.objects.X86LocalApic import X86LocalApic as ArchInterrupts
> from m5.objects.X86ISA import X86ISA as ArchISA
> ArchInterruptsParam = VectorParam.X86LocalApic
> ArchISAsParam = VectorParam.X86ISA
82,84c85,88
< from m5.objects.MipsInterrupts import MipsInterrupts
< from m5.objects.MipsISA import MipsISA
< default_isa_class = MipsISA
---
> from m5.objects.MipsInterrupts import MipsInterrupts as ArchInterrupts
> from m5.objects.MipsISA import MipsISA as ArchISA
> ArchInterruptsParam = VectorParam.MipsInterrupts
> ArchISAsParam = VectorParam.MipsISA
88,90c92,95
< from m5.objects.ArmInterrupts import ArmInterrupts
< from m5.objects.ArmISA import ArmISA
< default_isa_class = ArmISA
---
> from m5.objects.ArmInterrupts import ArmInterrupts as ArchInterrupts
> from m5.objects.ArmISA import ArmISA as ArchISA
> ArchInterruptsParam = VectorParam.ArmInterrupts
> ArchISAsParam = VectorParam.ArmISA
93,95c98,101
< from m5.objects.PowerInterrupts import PowerInterrupts
< from m5.objects.PowerISA import PowerISA
< default_isa_class = PowerISA
---
> from m5.objects.PowerInterrupts import PowerInterrupts as ArchInterrupts
> from m5.objects.PowerISA import PowerISA as ArchISA
> ArchInterruptsParam = VectorParam.PowerInterrupts
> ArchISAsParam = VectorParam.PowerISA
98,100c104,111
< from m5.objects.RiscvInterrupts import RiscvInterrupts
< from m5.objects.RiscvISA import RiscvISA
< default_isa_class = RiscvISA
---
> from m5.objects.RiscvInterrupts import RiscvInterrupts as ArchInterrupts
> from m5.objects.RiscvISA import RiscvISA as ArchISA
> ArchInterruptsParam = VectorParam.RiscvInterrupts
> ArchISAsParam = VectorParam.RiscvISA
> else:
> print("Don't know what object types to use for ISA %s" %
> buildEnv['TARGET_ISA'])
> sys.exit(1)
174,189c185
< if buildEnv['TARGET_ISA'] == 'sparc':
< interrupts = VectorParam.SparcInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.SparcISA([], "ISA instance")
< elif buildEnv['TARGET_ISA'] == 'alpha':
< interrupts = VectorParam.AlphaInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.AlphaISA([], "ISA instance")
< elif buildEnv['TARGET_ISA'] == 'x86':
< interrupts = VectorParam.X86LocalApic([], "Interrupt Controller")
< isa = VectorParam.X86ISA([], "ISA instance")
< elif buildEnv['TARGET_ISA'] == 'mips':
< interrupts = VectorParam.MipsInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.MipsISA([], "ISA instance")
< elif buildEnv['TARGET_ISA'] == 'arm':
---
> if buildEnv['TARGET_ISA'] == 'arm':
192,194d187
< interrupts = VectorParam.ArmInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.ArmISA([], "ISA instance")
197,207c190,191
< interrupts = VectorParam.PowerInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.PowerISA([], "ISA instance")
< elif buildEnv['TARGET_ISA'] == 'riscv':
< interrupts = VectorParam.RiscvInterrupts(
< [], "Interrupt Controller")
< isa = VectorParam.RiscvISA([], "ISA instance")
< else:
< print("Don't know what TLB to use for ISA %s" %
< buildEnv['TARGET_ISA'])
< sys.exit(1)
---
> interrupts = ArchInterruptsParam([], "Interrupt Controller")
> isa = ArchISAsParam([], "ISA instance")
243,261c227
< if buildEnv['TARGET_ISA'] == 'sparc':
< self.interrupts = [SparcInterrupts() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'alpha':
< self.interrupts = [AlphaInterrupts() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'x86':
< self.interrupts = [X86LocalApic() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'mips':
< self.interrupts = [MipsInterrupts() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'arm':
< self.interrupts = [ArmInterrupts() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'power':
< self.interrupts = [PowerInterrupts() for i in range(self.numThreads)]
< elif buildEnv['TARGET_ISA'] == 'riscv':
< self.interrupts = \
< [RiscvInterrupts() for i in range(self.numThreads)]
< else:
< print("Don't know what Interrupt Controller to use for ISA %s" %
< buildEnv['TARGET_ISA'])
< sys.exit(1)
---
> self.interrupts = [ArchInterrupts() for i in range(self.numThreads)]
315c281
< self.isa = [ default_isa_class() for i in range(self.numThreads) ]
---
> self.isa = [ ArchISA() for i in range(self.numThreads) ]