From 5241e1d9733ea69a91d3f497bc794ce881ad49fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 15 Jan 2018 13:13:56 +0100 Subject: Change how we configure cache and configure hazard unit --- qtmips_machine/qtmipsmachine.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'qtmips_machine/qtmipsmachine.cpp') diff --git a/qtmips_machine/qtmipsmachine.cpp b/qtmips_machine/qtmipsmachine.cpp index f2683fb..c60cdce 100644 --- a/qtmips_machine/qtmipsmachine.cpp +++ b/qtmips_machine/qtmipsmachine.cpp @@ -14,25 +14,10 @@ QtMipsMachine::QtMipsMachine(const MachineConfig &cc) : QObject(), mcnf(&cc) { regs = new Registers(); mem = new Memory(*mem_program_only); - MemoryAccess *coremem; - switch (cc.cache()) { - case MachineConfig::CCT_NONE: - cch = nullptr; - coremem = mem; - break; - case MachineConfig::CCT_ASSOCIATIVE: - // TODO - coremem = mem; - //coremem = cch = new CacheAssociative(); - break; - default: - throw QTMIPS_EXCEPTION(Sanity, "Trying to configure unknown cache type", ""); - } - if (cc.pipelined()) - cr = new CorePipelined(regs, coremem); + cr = new CorePipelined(regs, mem); else - cr = new CoreSingle(regs, coremem, cc.delay_slot()); + cr = new CoreSingle(regs, mem, cc.delay_slot()); run_t = new QTimer(this); set_speed(0); // In default run as fast as possible -- cgit v1.2.3