aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtmips_gui/mainwindow.cpp1
-rw-r--r--qtmips_gui/peripheralsdock.cpp6
-rw-r--r--qtmips_gui/peripheralsdock.h5
-rw-r--r--qtmips_gui/peripheralsview.cpp27
-rw-r--r--qtmips_gui/peripheralsview.h26
-rw-r--r--qtmips_gui/peripheralsview.ui161
-rw-r--r--qtmips_gui/programdock.h1
-rw-r--r--qtmips_gui/qtmips_gui.pro9
-rw-r--r--qtmips_machine/peripspiled.cpp128
-rw-r--r--qtmips_machine/peripspiled.h82
-rw-r--r--qtmips_machine/qtmips_machine.pro6
-rw-r--r--qtmips_machine/qtmipsmachine.cpp7
-rw-r--r--qtmips_machine/qtmipsmachine.h3
13 files changed, 454 insertions, 8 deletions
diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp
index b77d0d6..3e95a8f 100644
--- a/qtmips_gui/mainwindow.cpp
+++ b/qtmips_gui/mainwindow.cpp
@@ -174,6 +174,7 @@ void MainWindow::create_core(const machine::MachineConfig &config) {
cache_program->setup(machine->cache_program());
cache_data->setup(machine->cache_data());
terminal->setup(machine->serial_port());
+ peripherals->setup(machine->peripheral_spi_led());
// Connect signals for instruction address followup
connect(machine->core(), SIGNAL(fetch_inst_addr_value(std::uint32_t)),
diff --git a/qtmips_gui/peripheralsdock.cpp b/qtmips_gui/peripheralsdock.cpp
index ad423a0..4494948 100644
--- a/qtmips_gui/peripheralsdock.cpp
+++ b/qtmips_gui/peripheralsdock.cpp
@@ -39,11 +39,13 @@ PeripheralsDock::PeripheralsDock(QWidget *parent, QSettings *settings) : QDockWi
top_widget = new QWidget(this);
setWidget(top_widget);
layout_box = new QVBoxLayout(top_widget);
+ periph_view = new PeripheralsView(0);
+ layout_box->addWidget(periph_view);
setObjectName("Peripherals");
setWindowTitle("Peripherals");
}
-void PeripheralsDock::setup(const machine::QtMipsMachine *machine) {
-
+void PeripheralsDock::setup(const machine::PeripSpiLed *perip_spi_led) {
+ periph_view->setup(perip_spi_led);
}
diff --git a/qtmips_gui/peripheralsdock.h b/qtmips_gui/peripheralsdock.h
index b611515..d1f8b47 100644
--- a/qtmips_gui/peripheralsdock.h
+++ b/qtmips_gui/peripheralsdock.h
@@ -39,6 +39,8 @@
#include <QDockWidget>
#include <QLabel>
#include <QFormLayout>
+#include <peripheralsview.h>
+#include "peripspiled.h"
#include "peripheral.h"
#include "qtmipsmachine.h"
@@ -47,12 +49,13 @@ class PeripheralsDock : public QDockWidget {
public:
PeripheralsDock(QWidget *parent, QSettings *settings);
- void setup(const machine::QtMipsMachine *machine);
+ void setup(const machine::PeripSpiLed *perip_spi_led);
private:
QVBoxLayout *layout_box;
QWidget *top_widget, *top_form;
QFormLayout *layout_top_form;
+ PeripheralsView *periph_view;
};
#endif // PERIPHERALSDOCK_H
diff --git a/qtmips_gui/peripheralsview.cpp b/qtmips_gui/peripheralsview.cpp
new file mode 100644
index 0000000..5a8ec70
--- /dev/null
+++ b/qtmips_gui/peripheralsview.cpp
@@ -0,0 +1,27 @@
+#include "peripheralsview.h"
+#include "ui_peripheralsview.h"
+
+PeripheralsView::PeripheralsView(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::PeripheralsView)
+{
+ ui->setupUi(this);
+
+ connect(ui->dialRed, SIGNAL(valueChanged(int)), ui->spinRed, SLOT(setValue(int)));
+ connect(ui->dialGreen, SIGNAL(valueChanged(int)), ui->spinGreen, SLOT(setValue(int)));
+ connect(ui->dialBlue, SIGNAL(valueChanged(int)), ui->spinBlue, SLOT(setValue(int)));
+ connect(ui->spinRed, SIGNAL(valueChanged(int)), ui->dialRed, SLOT(setValue(int)));
+ connect(ui->spinGreen, SIGNAL(valueChanged(int)), ui->dialGreen, SLOT(setValue(int)));
+ connect(ui->spinBlue, SIGNAL(valueChanged(int)), ui->dialBlue, SLOT(setValue(int)));
+}
+
+PeripheralsView::~PeripheralsView()
+{
+ delete ui;
+}
+
+void PeripheralsView::setup(const machine::PeripSpiLed *perip_spi_led) {
+ connect(ui->spinRed, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(red_knob_update(int)));
+ connect(ui->spinGreen, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(green_knob_update(int)));
+ connect(ui->spinBlue, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(blue_knob_update(int)));
+}
diff --git a/qtmips_gui/peripheralsview.h b/qtmips_gui/peripheralsview.h
new file mode 100644
index 0000000..8aaf9b9
--- /dev/null
+++ b/qtmips_gui/peripheralsview.h
@@ -0,0 +1,26 @@
+#ifndef PERIPHERALSVIEW_H
+#define PERIPHERALSVIEW_H
+
+#include <QWidget>
+
+#include "peripspiled.h"
+
+namespace Ui {
+class PeripheralsView;
+}
+
+class PeripheralsView : public QWidget
+{
+ Q_OBJECT
+
+public:
+ explicit PeripheralsView(QWidget *parent = 0);
+ ~PeripheralsView();
+
+ void setup(const machine::PeripSpiLed *perip_spi_led);
+
+private:
+ Ui::PeripheralsView *ui;
+};
+
+#endif // PERIPHERALSVIEW_H
diff --git a/qtmips_gui/peripheralsview.ui b/qtmips_gui/peripheralsview.ui
new file mode 100644
index 0000000..59a1e4d
--- /dev/null
+++ b/qtmips_gui/peripheralsview.ui
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PeripheralsView</class>
+ <widget class="QWidget" name="PeripheralsView">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>573</width>
+ <height>484</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMaximumSize</enum>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetNoConstraint</enum>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QDial" name="dialRed">
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ <property name="wrapping">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinRed">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QDial" name="dialGreen">
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ <property name="wrapping">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinGreen">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QDial" name="dialBlue">
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ <property name="wrapping">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBlue">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>b31</string>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox_2">
+ <property name="text">
+ <string>b30</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox_3">
+ <property name="text">
+ <string>b29</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/qtmips_gui/programdock.h b/qtmips_gui/programdock.h
index 529730a..56fb1b7 100644
--- a/qtmips_gui/programdock.h
+++ b/qtmips_gui/programdock.h
@@ -39,6 +39,7 @@
#include <QDockWidget>
#include <QLabel>
#include <QComboBox>
+#include "peripheralsview.h"
#include "qtmipsmachine.h"
class ProgramDock : public QDockWidget {
diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro
index fa1cbc6..56e6909 100644
--- a/qtmips_gui/qtmips_gui.pro
+++ b/qtmips_gui/qtmips_gui.pro
@@ -53,7 +53,8 @@ SOURCES += \
programtableview.cpp \
aboutdialog.cpp \
peripheralsdock.cpp \
- terminaldock.cpp
+ terminaldock.cpp \
+ peripheralsview.cpp
HEADERS += \
mainwindow.h \
@@ -87,12 +88,14 @@ HEADERS += \
programtableview.h \
aboutdialog.h \
peripheralsdock.h \
- terminaldock.h
+ terminaldock.h \
+ peripheralsview.h
FORMS += \
NewDialog.ui \
NewDialogCache.ui \
- MainWindow.ui
+ MainWindow.ui \
+ peripheralsview.ui
RESOURCES += \
icons.qrc
diff --git a/qtmips_machine/peripspiled.cpp b/qtmips_machine/peripspiled.cpp
new file mode 100644
index 0000000..f811714
--- /dev/null
+++ b/qtmips_machine/peripspiled.cpp
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*******************************************************************************
+ * QtMips - MIPS 32-bit Architecture Subset Simulator
+ *
+ * Implemented to support following courses:
+ *
+ * B35APO - Computer Architectures
+ * https://cw.fel.cvut.cz/wiki/courses/b35apo
+ *
+ * B4M35PAP - Advanced Computer Architectures
+ * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start
+ *
+ * Copyright (c) 2017-2019 Karel Koci<cynerd@email.cz>
+ * Copyright (c) 2019 Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *
+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)
+ * Czech Technical University (http://www.cvut.cz/)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ ******************************************************************************/
+
+#include "peripspiled.h"
+
+using namespace machine;
+
+#define SPILED_REG_LED_LINE_o 0x004
+#define SPILED_REG_LED_RGB1_o 0x010
+#define SPILED_REG_LED_RGB2_o 0x014
+#define SPILED_REG_LED_KBDWR_DIRECT_o 0x018
+
+#define SPILED_REG_KBDRD_KNOBS_DIRECT_o 0x020
+#define SPILED_REG_KNOBS_8BIT_o 0x024
+
+PeripSpiLed::PeripSpiLed() {
+
+}
+
+PeripSpiLed::~PeripSpiLed() {
+
+}
+
+bool PeripSpiLed::wword(std::uint32_t address, std::uint32_t value) {
+#if 0
+ printf("PeripSpiLed::wword address 0x%08lx data 0x%08lx\n",
+ (unsigned long)address, (unsigned long)value);
+#endif
+ switch (address) {
+ case SPILED_REG_LED_LINE_o:
+ spiled_reg_led_line = value;
+ break;
+ case SPILED_REG_LED_RGB1_o:
+ spiled_reg_led_rgb1 = value;
+ break;
+ case SPILED_REG_LED_RGB2_o:
+ spiled_reg_led_rgb2 = value;
+ break;
+ default:
+ break;
+ }
+
+ emit write_notification(address, value);
+
+ return true;
+}
+
+std::uint32_t PeripSpiLed::rword(std::uint32_t address, bool debug_access) const {
+ (void)debug_access;
+ std::uint32_t value = 0x00000000;
+#if 0
+ printf("PeripSpiLed::rword address 0x%08lx\n",
+ (unsigned long)address);
+#endif
+ switch (address) {
+ case SPILED_REG_LED_LINE_o:
+ value = spiled_reg_led_line;
+ break;
+ case SPILED_REG_LED_RGB1_o:
+ value = spiled_reg_led_rgb1;
+ break;
+ case SPILED_REG_LED_RGB2_o:
+ value = spiled_reg_led_rgb2;
+ break;
+ case SPILED_REG_LED_KBDWR_DIRECT_o:
+ value = spiled_reg_led_kbdwr_direct;
+ break;
+ case SPILED_REG_KBDRD_KNOBS_DIRECT_o:
+ value = spiled_reg_kbdrd_knobs_direct;
+ break;
+ case SPILED_REG_KNOBS_8BIT_o:
+ value = spiled_reg_knobs_8bit;
+ break;
+ default:
+ break;
+ }
+
+ emit read_notification(address, &value);
+
+ return value;
+}
+
+void PeripSpiLed::red_knob_update(int val) {
+ spiled_reg_knobs_8bit &= ~(0xff << 16);
+ spiled_reg_knobs_8bit |= (val & 0xff) << 16;
+}
+
+void PeripSpiLed::green_knob_update(int val) {
+ spiled_reg_knobs_8bit &= ~(0xff << 8);
+ spiled_reg_knobs_8bit |= (val & 0xff) << 8;
+}
+
+void PeripSpiLed::blue_knob_update(int val) {
+ spiled_reg_knobs_8bit &= ~(0xff << 0);
+ spiled_reg_knobs_8bit |= (val & 0xff) << 0;
+}
diff --git a/qtmips_machine/peripspiled.h b/qtmips_machine/peripspiled.h
new file mode 100644
index 0000000..762b04d
--- /dev/null
+++ b/qtmips_machine/peripspiled.h
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*******************************************************************************
+ * QtMips - MIPS 32-bit Architecture Subset Simulator
+ *
+ * Implemented to support following courses:
+ *
+ * B35APO - Computer Architectures
+ * https://cw.fel.cvut.cz/wiki/courses/b35apo
+ *
+ * B4M35PAP - Advanced Computer Architectures
+ * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start
+ *
+ * Copyright (c) 2017-2019 Karel Koci<cynerd@email.cz>
+ * Copyright (c) 2019 Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *
+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)
+ * Czech Technical University (http://www.cvut.cz/)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ ******************************************************************************/
+
+#ifndef PERIPSPILED_H
+#define PERIPSPILED_H
+
+#include <QObject>
+#include <QMap>
+#include <cstdint>
+#include <qtmipsexception.h>
+#include "machinedefs.h"
+#include "memory.h"
+
+namespace machine {
+
+class PeripSpiLed : public MemoryAccess {
+ Q_OBJECT
+public:
+ PeripSpiLed();
+ ~PeripSpiLed();
+
+signals:
+ void write_notification(std::uint32_t address, std::uint32_t value);
+ void read_notification(std::uint32_t address, std::uint32_t *value) const;
+
+ void led_line_changed(uint val) const;
+ void led_rgb1_changed(int val) const;
+ void led_rgb2_changed(int val) const;
+
+public slots:
+ void red_knob_update(int val);
+ void green_knob_update(int val);
+ void blue_knob_update(int val);
+
+public:
+ bool wword(std::uint32_t address, std::uint32_t value);
+ std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+private:
+ std::uint32_t spiled_reg_led_line;
+ std::uint32_t spiled_reg_led_rgb1;
+ std::uint32_t spiled_reg_led_rgb2;
+ std::uint32_t spiled_reg_led_kbdwr_direct;
+
+ std::uint32_t spiled_reg_kbdrd_knobs_direct;
+ std::uint32_t spiled_reg_knobs_8bit;
+};
+
+}
+
+#endif // PERIPSPILED_H
diff --git a/qtmips_machine/qtmips_machine.pro b/qtmips_machine/qtmips_machine.pro
index e63c8a1..961800c 100644
--- a/qtmips_machine/qtmips_machine.pro
+++ b/qtmips_machine/qtmips_machine.pro
@@ -26,7 +26,8 @@ SOURCES += \
utils.cpp \
physaddrspace.cpp \
peripheral.cpp \
- serialport.cpp
+ serialport.cpp \
+ peripspiled.cpp
HEADERS += \
qtmipsmachine.h \
@@ -43,4 +44,5 @@ HEADERS += \
machinedefs.h \
physaddrspace.h \
peripheral.h \
- serialport.h
+ serialport.h \
+ peripspiled.h
diff --git a/qtmips_machine/qtmipsmachine.cpp b/qtmips_machine/qtmipsmachine.cpp
index 61cac0c..c7a00aa 100644
--- a/qtmips_machine/qtmipsmachine.cpp
+++ b/qtmips_machine/qtmipsmachine.cpp
@@ -59,6 +59,9 @@ QtMipsMachine::QtMipsMachine(const MachineConfig &cc) : QObject(), mcnf(&cc) {
ser_port = new SerialPort();
addressapce_insert_range(ser_port, 0xffffc000, 0xffffc0ff, true);
+ perip_spi_led = new PeripSpiLed();
+ addressapce_insert_range(perip_spi_led, 0xffffc100, 0xffffc1ff, true);
+
cch_program = new Cache(cpu_mem, &cc.cache_program(), cc.memory_access_time_read(), cc.memory_access_time_write());
cch_data = new Cache(cpu_mem, &cc.cache_data(), cc.memory_access_time_read(), cc.memory_access_time_write());
@@ -136,6 +139,10 @@ SerialPort *QtMipsMachine::serial_port() {
return ser_port;
}
+PeripSpiLed *QtMipsMachine::peripheral_spi_led() {
+ return perip_spi_led;
+}
+
const Core *QtMipsMachine::core() {
return cr;
}
diff --git a/qtmips_machine/qtmipsmachine.h b/qtmips_machine/qtmipsmachine.h
index 3680a71..b49cb2f 100644
--- a/qtmips_machine/qtmipsmachine.h
+++ b/qtmips_machine/qtmipsmachine.h
@@ -48,6 +48,7 @@
#include <physaddrspace.h>
#include <peripheral.h>
#include <serialport.h>
+#include <peripspiled.h>
namespace machine {
@@ -67,6 +68,7 @@ public:
const Cache *cache_data();
Cache *cache_data_rw();
SerialPort *serial_port();
+ PeripSpiLed *peripheral_spi_led();
const Core *core();
const CoreSingle *core_singe();
const CorePipelined *core_pipelined();
@@ -113,6 +115,7 @@ private:
Memory *mem, *mem_program_only;
PhysAddrSpace *physaddrspace;
SerialPort *ser_port;
+ PeripSpiLed *perip_spi_led;
Cache *cch_program, *cch_data;
Core *cr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 14:09:26 +0000