added loading
This commit is contained in:
parent
598865d216
commit
7b79c35f63
8 changed files with 84 additions and 14 deletions
|
|
@ -4,6 +4,8 @@
|
|||
#include "../../include/machine.h"
|
||||
#include "../../include/instructions.h"
|
||||
#include "../../include/opcode.h"
|
||||
#include "../../include/constants.h"
|
||||
#include "../../../include/loader.h"
|
||||
|
||||
#include <QIntValidator>
|
||||
#include <QLineEdit>
|
||||
|
|
@ -16,6 +18,10 @@
|
|||
#include <QLabel>
|
||||
#include <QFont>
|
||||
|
||||
class Loader;
|
||||
|
||||
std::shared_ptr<Loader> g_loader;
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
ui(new Ui::MainWindow),
|
||||
|
|
@ -93,7 +99,9 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
|
||||
setupMemoryDisplay();
|
||||
setupDisassemblyDisplay();
|
||||
loadDemoProgram();
|
||||
//loadDemoProgram();
|
||||
g_loader = std::make_shared<Loader>(machine(), std::string(PATH_RESOURCES) + "demo_program.obj");
|
||||
g_loader->load();
|
||||
|
||||
updateRegisterDisplays();
|
||||
updateMemoryDisplay();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue