BLACK/riscv-emulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cpu argument fixes

Browse Source
This commit is contained in:
black
2025-07-08 07:46:25 +02:00
parent a857953d25
commit 462dedbe72
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/Alu.cpp
View File

@@ -3,8 +3,6 @@
// //
#include "Alu.h" #include "Alu.h"
#include <algorithm>
#include <vector> #include <vector>
#include "Memory.h" #include "Memory.h"
@@ -15,14 +13,16 @@ void Alu::calculate(const std::vector<std::string> &commandVector) {
const std::string &command = commandVector.at(0); const std::string &command = commandVector.at(0);
/// Extrahiere die Argumente des Befehls /// Extrahiere die Argumente des Befehls
const auto arg1 = parseArgument(commandVector.at(0)); const auto arg1 = parseArgument(commandVector.at(1));
/// Wandle Vektor[2] (das zweite Argument) nur um, falls es kein SW/LW Argument ist
int arg2 = 0; int arg2 = 0;
if (commandVector.at(1).find('(') != std::string::npos) { if (commandVector.at(2).find('(') != std::string::npos) {
arg2 = parseArgument(commandVector.at(2)); arg2 = parseArgument(commandVector.at(2));
} }
/// Wandle Vektor[3] (das dritte Argument) nur um, falls dieser existiert
int arg3 = 0; int arg3 = 0;
if (!commandVector.at(2).empty()) { if (!commandVector.at(3).empty()) {
arg3 = parseArgument(commandVector.at(2)); arg3 = parseArgument(commandVector.at(3));
} }
if (command == "add") { if (command == "add") {
@@ -86,14 +86,15 @@ int Alu::parseArgument(std::string argument) {
} }
int Alu::parseAddress(const std::string &argument) { int Alu::parseAddress(const std::string &argument) {
/// Trenne das Argument bei '(' /// Finde die Position von '(', trenne die den String dort und
/// 0(x1) /// addiere die umgewandelten Integer zur Adresse
/// Bsp: 0(x1)
const size_t pos = argument.find('('); const size_t pos = argument.find('(');
if (pos != std::string::npos) { if (pos != std::string::npos) {
const auto immediate = argument.substr(0, pos); const auto immediate = std::stoi(argument.substr(0, pos));
const auto register1 = argument.substr(pos + 1); const auto register1 = std::stoi(argument.substr(pos + 1));
const auto address = immediate + register1; const auto address = immediate + register1;
return std::stoi(address); return address;
} }
return 0; return 0;
} }