From 3230238711ad444a8172b45a516a3205494d13d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 22 Mar 2018 17:25:28 +0100 Subject: Add control signals for non-pipelined cpu --- qtmips_gui/coreview/alu.cpp | 2 +- qtmips_gui/coreview/memory.cpp | 4 ++-- qtmips_gui/coreview/registers.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qtmips_gui/coreview') diff --git a/qtmips_gui/coreview/alu.cpp b/qtmips_gui/coreview/alu.cpp index 2f24210..7644e40 100644 --- a/qtmips_gui/coreview/alu.cpp +++ b/qtmips_gui/coreview/alu.cpp @@ -45,7 +45,7 @@ void coreview::Alu::setPos(qreal x, qreal y) { con_in_a->setPos(x, y + off); con_in_b->setPos(x, y + HEIGHT - off); con_out->setPos(x + WIDTH, y + HEIGHT/2); - con_ctl->setPos(x + WIDTH/2, y + HEIGHT - (WIDTH/2)); + con_ctl->setPos(x + WIDTH/2, y + (WIDTH/2)); } const coreview::Connector *coreview::Alu::connector_in_a() const { diff --git a/qtmips_gui/coreview/memory.cpp b/qtmips_gui/coreview/memory.cpp index a2e5899..f4ba058 100644 --- a/qtmips_gui/coreview/memory.cpp +++ b/qtmips_gui/coreview/memory.cpp @@ -84,8 +84,8 @@ DataMemory::DataMemory(machine::QtMipsMachine *machine) : Memory(machine) { con_address = new Connector(Connector::AX_X); con_data_out = new Connector(Connector::AX_X); con_data_in = new Connector(Connector::AX_X); - con_req_write = new Connector(Connector::AX_X); - con_req_read = new Connector(Connector::AX_X); + con_req_write = new Connector(Connector::AX_Y); + con_req_read = new Connector(Connector::AX_Y); } DataMemory::~DataMemory() { diff --git a/qtmips_gui/coreview/registers.cpp b/qtmips_gui/coreview/registers.cpp index 2b1c1b5..ba46f53 100644 --- a/qtmips_gui/coreview/registers.cpp +++ b/qtmips_gui/coreview/registers.cpp @@ -57,9 +57,9 @@ void Registers::setPos(qreal x, qreal y) { con_read1->setPos(x + WIDTH, y + 10); con_read2->setPos(x + WIDTH, y + 30); - con_write_reg->setPos(x + WIDTH/2, y); - con_write->setPos(x, y + HEIGHT - 10); - con_ctl_write->setPos(x, y + HEIGHT - 20); + con_write_reg->setPos(x, y + HEIGHT - 10); + con_write->setPos(x, y + HEIGHT - 20); + con_ctl_write->setPos(x + WIDTH - 10, y); } const Connector *Registers::connector_read1() const { -- cgit v1.2.3