commit 0ba49b37e6e3d51bc80c1d1cd6cdf9cd923e70ac
parent 002314f842bfa3d514890b14b9c9b8dd2ee29322
Author: Andrew Laack <andrew@laack.co>
Date: Wed, 14 Oct 2026 11:35:41 -0500
Added jumps
Diffstat:
4 files changed, 80 insertions(+), 41 deletions(-)
diff --git a/perf-aware-programming/8086-simulator/Makefile b/perf-aware-programming/8086-simulator/Makefile
@@ -5,3 +5,5 @@ run: build
./sim.out source/0043.asm
./sim.out source/0044.asm
./sim.out source/0046.asm
+ ./sim.out source/0048.asm
+ ./sim.out source/0049.asm
diff --git a/perf-aware-programming/8086-simulator/sim.cpp b/perf-aware-programming/8086-simulator/sim.cpp
@@ -1,17 +1,19 @@
#include <cstdint>
#include <filesystem>
+#include <unordered_map>
#include <fstream>
#include <string>
#include <vector>
#include <unistd.h>
#include <iostream>
-
enum Mnemonic {
MOV,
ADD,
SUB,
CMP,
+ JNZ,
+ FN,
UNKNOWN
};
@@ -29,13 +31,15 @@ void printMnemonic(Mnemonic mn) {
case (CMP):
std::cout << "cmp";
break;
+ case (JNZ):
+ std::cout << "jnz";
+ break;
case (UNKNOWN):
std::cout << "unknown";
break;
}
}
-
int isHalfReg(std::string reg) {
if(reg[1] == 'l' || reg[1] == 'h') {
return 1;
@@ -56,6 +60,12 @@ Mnemonic getMnemonic(std::string line) {
if(line.substr(0,3) == "cmp") {
return CMP;
}
+ if(line.substr(0,3) == "jnz") {
+ return JNZ;
+ }
+ if(line.find(":") != std::string::npos) {
+ return FN;
+ }
return UNKNOWN;
}
@@ -75,9 +85,14 @@ std::string parseDestination(std::string st) {
// assumes entire instruction is input
-std::string parseSource(std::string st) {
- std::string source = st.substr(st.find(' ')+1);
- return source.substr(0,source.find(','));
+std::string parseSource(std::string st, Mnemonic mn) {
+ if(mn == FN) {
+ return st.substr(0,st.size() - 1);
+ }
+ else {
+ std::string source = st.substr(st.find(' ')+1);
+ return source.substr(0,source.find(','));
+ }
}
void printRegisters(std::vector<std::pair<std::string,uint16_t>> registers) {
@@ -134,9 +149,19 @@ uint16_t setZeroFlag(bool value, uint16_t original) {
return original + (value << 15);
}
-int8_t handleInstruction(std::string source, std::string dest, std::vector<std::pair<std::string,uint16_t>>& registers, Mnemonic mn) {
+// return where to jump to
+std::string handleInstruction(std::string source, std::string dest, std::vector<std::pair<std::string,uint16_t>>& registers, Mnemonic mn, uint16_t in) {
+
+ if(mn == JNZ) {
+ if((registers[8].second & 0b1000000000000000) == 0) {
+ return source;
+ }
+ return "";
+ }
+
auto reg = getReg(source);
if(reg != -1) {
+ uint32_t cb = 0;
try {
if(isHalfReg(source)) {
auto before = registers[reg/2].second;
@@ -151,6 +176,7 @@ int8_t handleInstruction(std::string source, std::string dest, std::vector<std::
current += std::stoi(dest) << 8;
}
registers[reg/2].second = current;
+ cb = current;
printf("\t; 0x%.2X->0x%.2X", before , current);
} else {
auto before = registers[reg/2].second;
@@ -164,22 +190,24 @@ int8_t handleInstruction(std::string source, std::string dest, std::vector<std::
auto pf = registers[8].second;
registers[8].second = setZeroFlag(current == 0,registers[8].second);
registers[8].second = setSignFlag((current & 0x8000) != 0,registers[8].second);
- printf("\t; flag: 0x%.2X->0x%.2X", pf , registers[8].second);
+ printf("\t; start in: 0x%.2X, flag: 0x%.2X->0x%.2X", in, pf , registers[8].second);
}
- if(mn != CMP) {
+ cb = current;
+ if(mn != CMP && mn != FN) {
registers[reg/2].second = current;
if(mn == SUB) {
printf("\t\tval: 0x%.2X->0x%.2X", before , current);
} else {
- printf("\t; \t\t\t\tval: 0x%.2X->0x%.2X", before , current);
+ printf("\t; start in: 0x%.2X \t\t\t\tval: 0x%.2X->0x%.2X", in, before , current);
}
}
}
+
} catch (...) {
auto num = getReg(dest);
if(num == -1) {
- return -1; // not implemented yet
+ return "";
}
auto destVal = valueAt(registers,num);
@@ -195,20 +223,20 @@ int8_t handleInstruction(std::string source, std::string dest, std::vector<std::
auto pf = registers[8].second;
registers[8].second = setZeroFlag(current == 0,registers[8].second);
registers[8].second = setSignFlag((current & 0x8000) != 0,registers[8].second);
- printf("\t; flag: 0x%.2X->0x%.2X", pf , registers[8].second);
+ printf("\t; start in: 0x%.2X, flag: 0x%.2X->0x%.2X", in, pf , registers[8].second);
}
- if(mn != CMP) {
+ if(mn != CMP && mn != FN) {
registers[reg/2].second = current;
if(mn == SUB) {
printf("\t\tval: 0x%.2X->0x%.2X", before , current);
} else {
- printf("\t; \t\t\t\tval: 0x%.2X->0x%.2X", before , current);
+ printf("\t; start in: 0x%.2X \t\t\t\tval: 0x%.2X->0x%.2X", in, before , current);
}
}
}
}
- return 0;
+ return "";
}
int main(int argc, char** argv) {
@@ -241,44 +269,42 @@ int main(int argc, char** argv) {
lines.push_back(acc);
}
- std::cout << "INSTRUCTIONS:" << std::endl;
- for(auto& line : lines) {
- Mnemonic mne = getMnemonic(line);
- printMnemonic(mne);
- std::cout << " ";
-
- std::string source = parseSource(line);
- std::string dest = parseDestination(line);
- std::cout << source << ", " << dest;
+ std::cout << "INSTRUCTIONS:" << std::endl;
+
+ std::unordered_map<std::string, size_t> knownFunctions{};
- if(mne == MOV) {
- if(handleInstruction(source, dest, registers, MOV) == -1) {
- return -1;
- }
- }
+ for(size_t in = 0; in < lines.size() ; ) {
- if(mne == ADD) {
- if(handleInstruction(source, dest, registers, ADD) == -1) {
- return -1;
- }
- }
+ auto& line = lines[in];
+ Mnemonic mne = getMnemonic(line);
- if(mne == SUB) {
- if(handleInstruction(source, dest, registers, SUB) == -1) {
- return -1;
- }
+ printMnemonic(mne);
+ if(mne != FN) {
+ std::cout << " ";
}
- if(mne == CMP) {
- if(handleInstruction(source, dest, registers, CMP) == -1) {
- return -1;
+ std::string source = parseSource(line, mne);
+ std::string dest = parseDestination(line);
+ if(mne != FN) {
+ if(mne != JNZ) {
+ std::cout << source << ", " << dest;
+ } else {
+ std::cout << source;
}
+ } else {
+ std::cout << source;
+ knownFunctions[source] = in;
}
-
+ std::string res = handleInstruction(source, dest, registers, mne,in);
std::cout << std::endl;
+ if(res != "") {
+ in = knownFunctions[source];
+ } else {
+ in += 1;
+ }
}
std::cout << std::endl;
diff --git a/perf-aware-programming/8086-simulator/source/0048.asm b/perf-aware-programming/8086-simulator/source/0048.asm
@@ -0,0 +1,5 @@
+mov cx, 200
+mov bx, cx
+add cx, 1000
+mov bx, 2000
+sub cx, bx
diff --git a/perf-aware-programming/8086-simulator/source/0049.asm b/perf-aware-programming/8086-simulator/source/0049.asm
@@ -0,0 +1,6 @@
+mov cx, 3
+mov bx, 1000
+loop_start:
+add bx, 10
+sub cx, 1
+jnz loop_start