Implement instructions 0x03C-0x053, add flag constants and fix execute pipeline #5

Merged
Kittycannon merged 4 commits from diego/instruc-03c-053 into main 2026-04-09 01:14:03 +00:00
7 changed files with 250 additions and 57 deletions
Showing only changes of commit d2ce5ea4bd - Show all commits

View File

@@ -80,7 +80,7 @@ namespace spider {
_opers[1] = _opers[0]; _opers[1] = _opers[0];
// call specific addressing mode // call specific addressing mode
(this->*(CPU::addrModes[_addrm]))(); (this->*(CPU::addrModes[_addrm & 0b111]))(); // mask added here too
} }
void CPU::fetchOperSrc() { void CPU::fetchOperSrc() {
@@ -88,21 +88,19 @@ namespace spider {
_alu = &ALU1; _alu = &ALU1;
// call specific addressing mode // call specific addressing mode
(this->*(CPU::addrModes[_addrm]))(); (this->*(CPU::addrModes[_addrm & 0b111]))(); // mask keeps index within 0-7
// modify the _addrm register // modify the _addrm register
_addrm = static_cast<u8>((_addrm >> 3) & 0x1F); _addrm = static_cast<u8>((_addrm >> 3) & 0x1F);
_addrm++; _addrm++;
} }
/**
instrMap[] is the correct 512-entry dispatch
table that maps operation codes to instruction methods.
*/
void CPU::execute() { void CPU::execute() {
(this->*(CPU::instrMap[_opcode]))(); (this->*(CPU::instrMap[_opcode]))(); // no null check needed
} }
// Addressing Modes // // Addressing Modes //
/** /**
@@ -149,6 +147,7 @@ namespace spider {
// get byte // get byte
u8 reg = (_reel->readU8(RI) >> sh) & 0xF; u8 reg = (_reel->readU8(RI) >> sh) & 0xF;
_alu = &GPR[reg]; _alu = &GPR[reg];
_opers[0] = _alu; // explicitly sets _opers[0] = _dst
RI += use; RI += use;
// store no-op // store no-op

View File

@@ -330,18 +330,16 @@ namespace spider {
int liveDebugMain() { int liveDebugMain() {
Terminal t; Terminal t;
Runtime runtime(1024); Runtime runtime(1024);
InstrReelFixed fix(100); InstrReelFixed fix(100);
runtime.ram[0] = 0xFF;
runtime.ram[1] = 0xEE;
runtime.ram[2] = 0xDD;
runtime.ram[3] = 0xCC;
runtime.ram[4] = 0xBB;
runtime.ram[5] = 0xAA;
runtime.ram[6] = 0x99;
runtime.ram[7] = 0x88;
fix.writeU16(0, 0b0000111);
runtime.hookReel(&fix, false); runtime.hookReel(&fix, false);
bool running = true, update = true; bool running = true, update = true;
u64 ramScroll = 0; u64 ramScroll = 0;
u8 key = Terminal::UNKNOWN; u8 key = Terminal::UNKNOWN;
@@ -388,7 +386,7 @@ namespace spider {
case Terminal::ENTER: case Terminal::ENTER:
update = true; update = true;
runtime.cpu.fetchInstr(); runtime.cpu.fetchInstr();
runtime.cpu.fetchOperDst(); runtime.cpu.execute(); // looks up instrMap[_opcode] & calls the correct instruction method (e.g. FMUL)
break; break;
default: default:
break; break;

View File

@@ -111,16 +111,16 @@ namespace spider {
fetchOperDst(); fetchOperDst();
switch(_size){ switch(_size){
case 0b00: //byte case 0b00: //byte
_dst->_u16 = _dst->_u8 & 1; _dst->_i16 = static_cast<i16>(_dst->_i8);
break; break;
case 0b01: //short case 0b01: //short
_dst->_u32 = _dst->_u16 & 1; _dst->_i32 = static_cast<i32>(_dst->_i16);
break; break;
case 0b10: //int case 0b10: //int
_dst->_u64 = _dst->_u32 & 1; _dst->_i64 = static_cast<i64>(_dst->_i32);
break; break;
case 0b11: //long case 0b11: //long
_dst->_u64 = _dst->_u64; _dst->_i64 = _dst->_i64;
break; break;
} }
_dst->_u32 = _dst->_u8; _dst->_u32 = _dst->_u8;
@@ -295,19 +295,19 @@ namespace spider {
(this->*_post)(); (this->*_post)();
} }
void CPU::DMOD() { void CPU::DMOD() { //It gives error and I dont understand why
// TODO: Implement DMOD // TODO: Implement DMOD
fetchOperSrc(); fetchOperSrc();
fetchOperDst(); fetchOperDst();
switch(_size){ switch(_size){
case 0b00: //byte case 0b00: //byte
_dst->_i8 = _dst->_i8 / _src->_i8, _dst->_i8 % _src->_i8; //_dst->_i8 / _src->_i8 = RX * _src + RY;
case 0b01: //short case 0b01: //short
_dst->_i16 = _dst->_i16 / _src->_i16, _dst->_i16 % _src->_i16; //_dst->_i16 / _src->_i16 = RX * _src->_i16 + RY;
case 0b10: //int case 0b10: //int
_dst->_i32 = _dst->_i32 / _src->_i32, _dst->_i32 % _src->_i32; //_dst->_i32 / _src->_i32 = RX * _src->_i32 + RY;
case 0b11: //long case 0b11: //long
_dst->_i64 = _dst->_i64 / _src->_i64, _dst->_i64 % _src->_i64; //_dst->_i64 / _src->_i64 = RX * _src->_i64 + RY;
} }
(this->*_post)(); (this->*_post)();
} }
@@ -318,13 +318,13 @@ namespace spider {
fetchOperDst(); fetchOperDst();
switch(_size){ switch(_size){
case 0b00: //byte case 0b00: //byte
_dst->_u8 = _dst->_u8 / _src->_u8, _dst->_u8 % _src->_u8; //_dst->_u8 / _src->_u8 = RX * _src->_u8 + RY;
case 0b01: //short case 0b01: //short
_dst->_u16 = _dst->_u16 / _src->_u16, _dst->_u16 % _src->_u16; //_dst->_u16 / _src->_u16 = RX * _src->_u16 + RY;
case 0b10: //int case 0b10: //int
_dst->_u32 = _dst->_u32 / _src->_u32, _dst->_u32 % _src->_u32; //_dst->_u32 / _src->_u32 = RX * _src->_u32 + RY;
case 0b11: //long case 0b11: //long
_dst->_u64 = _dst->_u64 / _src->_u64, _dst->_u64 % _src->_u64; //_dst->_u64 / _src->_u64 = RX * _src->_u64 + RY;
} }
(this->*_post)(); (this->*_post)();
} }

View File

@@ -63,13 +63,13 @@ namespace spider {
fetchOperDst(); fetchOperDst();
switch(_size){ switch(_size){
case 0b00: //byte case 0b00: //byte
_dst->_u8 = 1; _dst->_u8 = _dst != 0;
case 0b01: //short case 0b01: //short
_dst->_u16 = 1; _dst->_u16 = _dst != 0;
case 0b10: //int case 0b10: //int
_dst->_u32 = 1; _dst->_u32 = _dst != 0;
case 0b11: //long case 0b11: //long
_dst->_u64 = 1; _dst->_u64 = _dst != 0;
} }
(this->*_post)(); (this->*_post)();
} }

View File

@@ -5,6 +5,8 @@
#include <spider/runtime/cpu/CPU.hpp> #include <spider/runtime/cpu/CPU.hpp>
#include <spider/runtime/memory/RAM.hpp> #include <spider/runtime/memory/RAM.hpp>
#include <cmath> // provides std::fmod, std::fma and cast support
namespace spider { namespace spider {
@@ -193,52 +195,207 @@ namespace spider {
(this->*_post)(); (this->*_post)();
} }
// ── 0x054 — FMUL: Float Multiplication ───────────────────────────────────
void CPU::FMUL() { void CPU::FMUL() {
// TODO: Implement FMUL fetchOperSrc();
fetchOperDst();
switch (_size) {
case 0b10: _dst->_f32 *= _src->_f32; break; // f32
case 0b11: _dst->_f64 *= _src->_f64; break; // f64
default: break; // invalid size
}
(this->*_post)();
} }
// ── 0x055 — FDIV: Float Division ─────────────────────────────────────────
void CPU::FDIV() { void CPU::FDIV() {
// TODO: Implement FDIV fetchOperSrc();
fetchOperDst();
switch (_size) {
case 0b10: _dst->_f32 /= _src->_f32; break;
case 0b11: _dst->_f64 /= _src->_f64; break;
default: break;
}
(this->*_post)();
} }
// ── 0x056 — FMOD: Float Modulus ──────────────────────────────────────────
// C++ has no % for floats — std::fmod performs the equivalent operation
void CPU::FMOD() { void CPU::FMOD() {
// TODO: Implement FMOD fetchOperSrc();
fetchOperDst();
switch (_size) {
case 0b10: _dst->_f32 = std::fmod(_dst->_f32, _src->_f32); break;
case 0b11: _dst->_f64 = std::fmod(_dst->_f64, _src->_f64); break;
default: break;
}
(this->*_post)();
} }
// ── 0x057 — FDMOD: Float Division and Modulus ────────────────────────────
// dst / src = RX (quotient) * src + RY (remainder)
void CPU::FDMOD() { void CPU::FDMOD() {
// TODO: Implement FDMOD fetchOperSrc();
fetchOperDst();
switch (_size) {
case 0b10: {
f32 q = static_cast<f32>(static_cast<i32>(_dst->_f32 / _src->_f32));
f32 r = _dst->_f32 - (q * _src->_f32);
RX._f32 = q;
RY._f32 = r;
break;
}
case 0b11: {
f64 q = static_cast<f64>(static_cast<i64>(_dst->_f64 / _src->_f64));
f64 r = _dst->_f64 - (q * _src->_f64);
RX._f64 = q;
RY._f64 = r;
break;
}
default: break;
}
(this->*_post)();
} }
// ── 0x058 — FEPS: Set Float Epsilon Value ────────────────────────────────
// Loads the epsilon value into RN (the epsilon register)
void CPU::FEPS() { void CPU::FEPS() {
// TODO: Implement FEPS fetchOperDst();
switch (_size) {
case 0b10: RN = _dst->_u32; break; // store f32 bits in RN
case 0b11: RN = _dst->_u64; break; // store f64 bits in RN
default: break;
}
(this->*_post)();
} }
// ── 0x059 — FEEP: Float Enable/Disable Epsilon ───────────────────────────
// Bit 12 of RF is the Epsilon Enable flag
void CPU::FEEP() { void CPU::FEEP() {
// TODO: Implement FEEP fetchOperDst();
constexpr u64 EPSILON_ENABLE_BIT = (1ULL << 12);
if (_dst->_u64) RF |= EPSILON_ENABLE_BIT; // non-zero → enable
else RF &= ~EPSILON_ENABLE_BIT; // zero → disable
(this->*_post)();
} }
// ── 0x05A — FEQ: Float Equal ──────────────────────────────────────────────
// Sets bit 10 (Zero/Equal flag) in RF if dst == src
void CPU::FEQ() { void CPU::FEQ() {
// TODO: Implement FEQ fetchOperSrc();
fetchOperDst();
constexpr u64 ZERO_FLAG = (1ULL << 10);
bool equal = false;
switch (_size) {
case 0b10: equal = (_dst->_f32 == _src->_f32); break;
case 0b11: equal = (_dst->_f64 == _src->_f64); break;
default: break;
}
if (equal) RF |= ZERO_FLAG;
else RF &= ~ZERO_FLAG;
(this->*_post)();
} }
// ── 0x05B — FNE: Float Not Equal ─────────────────────────────────────────
void CPU::FNE() { void CPU::FNE() {
// TODO: Implement FNE fetchOperSrc();
fetchOperDst();
constexpr u64 ZERO_FLAG = (1ULL << 10);
bool notEqual = false;
switch (_size) {
case 0b10: notEqual = (_dst->_f32 != _src->_f32); break;
case 0b11: notEqual = (_dst->_f64 != _src->_f64); break;
default: break;
}
if (notEqual) RF |= ZERO_FLAG;
else RF &= ~ZERO_FLAG;
(this->*_post)();
} }
// ── 0x05C — FGT: Float Greater Than ──────────────────────────────────────
// Sets/clears bit 9 (Negative flag) in RF
void CPU::FGT() { void CPU::FGT() {
// TODO: Implement FGT fetchOperSrc();
fetchOperDst();
constexpr u64 NEGATIVE_FLAG = (1ULL << 9);
bool gt = false;
switch (_size) {
case 0b10: gt = (_dst->_f32 > _src->_f32); break;
case 0b11: gt = (_dst->_f64 > _src->_f64); break;
default: break;
}
if (gt) RF &= ~NEGATIVE_FLAG;
else RF |= NEGATIVE_FLAG;
(this->*_post)();
} }
// ── 0x05D — FGE: Float Greater or Equal ──────────────────────────────────
void CPU::FGE() { void CPU::FGE() {
// TODO: Implement FGE fetchOperSrc();
fetchOperDst();
constexpr u64 NEGATIVE_FLAG = (1ULL << 9);
constexpr u64 ZERO_FLAG = (1ULL << 10);
bool ge = false;
bool eq = false;
switch (_size) {
case 0b10:
ge = (_dst->_f32 >= _src->_f32);
eq = (_dst->_f32 == _src->_f32);
break;
case 0b11:
ge = (_dst->_f64 >= _src->_f64);
eq = (_dst->_f64 == _src->_f64);
break;
default: break;
}
if (ge) RF &= ~NEGATIVE_FLAG;
else RF |= NEGATIVE_FLAG;
if (eq) RF |= ZERO_FLAG;
else RF &= ~ZERO_FLAG;
(this->*_post)();
} }
// ── 0x05E — FLT: Float Lower Than ────────────────────────────────────────
void CPU::FLT() { void CPU::FLT() {
// TODO: Implement FLT fetchOperSrc();
fetchOperDst();
constexpr u64 NEGATIVE_FLAG = (1ULL << 9);
bool lt = false;
switch (_size) {
case 0b10: lt = (_dst->_f32 < _src->_f32); break;
case 0b11: lt = (_dst->_f64 < _src->_f64); break;
default: break;
}
if (lt) RF |= NEGATIVE_FLAG;
else RF &= ~NEGATIVE_FLAG;
(this->*_post)();
} }
// ── 0x05F — FLE: Float Lower or Equal ────────────────────────────────────
void CPU::FLE() { void CPU::FLE() {
// TODO: Implement FLE fetchOperSrc();
fetchOperDst();
constexpr u64 NEGATIVE_FLAG = (1ULL << 9);
constexpr u64 ZERO_FLAG = (1ULL << 10);
bool le = false;
bool eq = false;
switch (_size) {
case 0b10:
le = (_dst->_f32 <= _src->_f32);
eq = (_dst->_f32 == _src->_f32);
break;
case 0b11:
le = (_dst->_f64 <= _src->_f64);
eq = (_dst->_f64 == _src->_f64);
break;
default: break;
}
if (le) RF &= ~NEGATIVE_FLAG;
else RF |= NEGATIVE_FLAG;
if (eq) RF |= ZERO_FLAG;
else RF &= ~ZERO_FLAG;
(this->*_post)();
} }
} }

View File

@@ -4,39 +4,69 @@
*/ */
#include <spider/runtime/cpu/CPU.hpp> #include <spider/runtime/cpu/CPU.hpp>
#include <cmath> // provides std::fmod, std::fma and cast support
namespace spider { namespace spider {
// ── 0x060 — F2D: Float (f32) to Double (f64) ─────────────────────────────
// Widening conversion — no precision is lost
void CPU::F2D() { void CPU::F2D() {
// TODO: Implement F2D fetchOperDst();
_dst->_f64 = static_cast<f64>(_dst->_f32);
(this->*_post)();
} }
// ── 0x061 — D2F: Double (f64) to Float (f32) ─────────────────────────────
// Narrowing conversion — precision may be lost
void CPU::D2F() { void CPU::D2F() {
// TODO: Implement D2F fetchOperDst();
_dst->_f32 = static_cast<f32>(_dst->_f64);
(this->*_post)();
} }
// ── 0x062 — I2F: Integer (i32) to Float (f32) ────────────────────────────
void CPU::I2F() { void CPU::I2F() {
// TODO: Implement I2F fetchOperDst();
_dst->_f32 = static_cast<f32>(_dst->_u32);
(this->*_post)();
} }
// ── 0x063 — I2D: Integer (i32) to Double (f64) ───────────────────────────
void CPU::I2D() { void CPU::I2D() {
// TODO: Implement I2D fetchOperDst();
_dst->_f64 = static_cast<f64>(_dst->_u32);
(this->*_post)();
} }
// ── 0x064 — L2F: Long (i64) to Float (f32) ───────────────────────────────
void CPU::L2F() { void CPU::L2F() {
// TODO: Implement L2F fetchOperDst();
_dst->_f32 = static_cast<f32>(_dst->_u64);
(this->*_post)();
} }
// ── 0x065 — L2D: Long (i64) to Double (f64) ──────────────────────────────
void CPU::L2D() { void CPU::L2D() {
// TODO: Implement L2D fetchOperDst();
_dst->_f64 = static_cast<f64>(_dst->_u64);
(this->*_post)();
} }
// ── 0x066 — F2I: Float (f32) to Integer (i32) ────────────────────────────
// Truncates toward zero
void CPU::F2I() { void CPU::F2I() {
// TODO: Implement F2I fetchOperDst();
_dst->_u32 = static_cast<u32>(_dst->_f32);
(this->*_post)();
} }
// ── 0x067 — F2L: Float (f32) to Long (i64) ───────────────────────────────
// Truncates toward zero
void CPU::F2L() { void CPU::F2L() {
// TODO: Implement F2L fetchOperDst();
_dst->_u64 = static_cast<u64>(_dst->_f32);
(this->*_post)();
} }
void CPU::D2I() { void CPU::D2I() {

View File

@@ -11,8 +11,15 @@
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/ioctl.h> //This was missing,
//The ioctl, TIOCGWINSZ and winsize used in getSize() live in that header, but it was never included.
#endif #endif
//the Linux includes at the top are inside #if SPIDER_OS_LINUX which IS defined,
//but getSize() is inside #if SPIDER_DISTRO_DESKTOP which is NOT defined,
//so the compiler sees the ioctl call without the include that would have covered it.
#if defined(SPIDER_DISTRO_DESKTOP) #if defined(SPIDER_DISTRO_DESKTOP)
namespace spider { namespace spider {
@@ -218,7 +225,8 @@ namespace spider {
struct termios oldt, newt; struct termios oldt, newt;
tcgetattr(STDIN_FILENO, &oldt); tcgetattr(STDIN_FILENO, &oldt);
newt = oldt; newt = oldt;
newt.c_lflag &= ~(ICANON | ECHO); //newt.c_lflag &= ~(ICANON | ECHO);
newt.c_lflag &= static_cast<tcflag_t>(~(ICANON | ECHO)); //added this line
tcsetattr(STDIN_FILENO, TCSANOW, &newt); tcsetattr(STDIN_FILENO, TCSANOW, &newt);
u8 result = Terminal::UNKNOWN; u8 result = Terminal::UNKNOWN;
@@ -247,7 +255,8 @@ namespace spider {
} }
} else if (ch == 10) result = Terminal::ENTER; } else if (ch == 10) result = Terminal::ENTER;
else if (ch == 127) result = Terminal::BACKSPACE; else if (ch == 127) result = Terminal::BACKSPACE;
else result = (u8)ch; else result = static_cast<u8>(ch); //added this line
//else result = (u8)ch;
tcsetattr(STDIN_FILENO, TCSANOW, &oldt); tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
return result; return result;