there might be an off by 1 error...

This commit is contained in:
2026-05-18 17:42:02 +02:00
parent aeb5094b05
commit eee9fcfb17
6 changed files with 266 additions and 44 deletions
+150 -9
View File
@@ -1,5 +1,5 @@
#include <broadway/utils.hpp>
#include "ircolib/log.hpp"
#include <broadway/utils.hpp>
#include <mem.hpp>
namespace weee::core {
@@ -49,6 +49,7 @@ void broadway::bx(ircolib::u32 instr) {
bool broadway::test_cond_and_ctr(ircolib::u32 instr) {
const ircolib::u8 bo = (instr >> 21) & 0x1f;
const ircolib::u8 bi = (instr >> 16) & 0x1f;
const bool ctr_ok = ircolib::is_bit_set(bo, 2) || ((--ctr == 0) == (ircolib::is_bit_set(bo, 1)));
const bool cond_ok = ircolib::is_bit_set(bo, 4) || (get_cr_bit(0, bi) == ircolib::is_bit_set(bo, 3));
@@ -132,7 +133,8 @@ void broadway::mftspr(bool dir, ircolib::u32 instr) {
move_to_or_from_spr(dbat[BAT_UPPER_OFFSET + 3]);
break;
default:
ircolib::warn("broadway::m{}spr with unimplemented spr field of value 0b{:010b} (0x{:04X}) (pc 0x{:08X})",
ircolib::warn("broadway::m{}spr with unimplemented spr field of value "
"0b{:010b} (0x{:04X}) (pc 0x{:08X})",
dir ? 't' : 'f', spr_field, spr_field, pc - 4);
}
}
@@ -142,7 +144,26 @@ void broadway::stwu(ircolib::u32 instr, mem &mem) {
ircolib::panic("broadway::stwu with ra == 0");
const ircolib::u32 EA = ircolib::s32(gpr[utils::RA(instr)]) + utils::SIMM(instr);
mem.write32(EA, gpr[utils::RS(instr)]);
auto _ = mem.write32(EA, gpr[utils::RS(instr)])
.and_then([&] { return std::expected<void, std::string>(); })
.or_else([&](std::string e) {
ircolib::panic("broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
gpr[utils::RA(instr)] = EA;
}
void broadway::stbu(ircolib::u32 instr, mem &mem) {
if (utils::RA(instr) == 0)
ircolib::panic("broadway::stbu with ra == 0");
const ircolib::u32 EA = ircolib::s32(gpr[utils::RA(instr)]) + utils::SIMM(instr);
auto _ = mem.write8(EA, gpr[utils::RS(instr)])
.and_then([&] { return std::expected<void, std::string>(); })
.or_else([&](std::string e) {
ircolib::panic("broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
gpr[utils::RA(instr)] = EA;
}
@@ -152,7 +173,12 @@ void broadway::stw(ircolib::u32 instr, mem &mem) {
b = 0;
const ircolib::u32 EA = b + utils::SIMM(instr);
mem.write32(EA, gpr[utils::RS(instr)]);
auto _ = mem.write32(EA, gpr[utils::RS(instr)])
.and_then([&] { return std::expected<void, std::string>(); })
.or_else([&](std::string e) {
ircolib::panic("broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
}
void broadway::sth(ircolib::u32 instr, mem &mem) {
@@ -163,7 +189,12 @@ void broadway::sth(ircolib::u32 instr, mem &mem) {
const ircolib::s32 d = utils::SIMM(instr);
const ircolib::u32 EA = b + d;
mem.write16(EA, ircolib::u16(gpr[utils::RS(instr)]));
auto _ = mem.write16(EA, ircolib::u16(gpr[utils::RS(instr)]))
.and_then([&] { return std::expected<void, std::string>(); })
.or_else([&](std::string e) {
ircolib::panic("broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
}
void broadway::lwz(ircolib::u32 instr, mem &mem) {
@@ -172,7 +203,14 @@ void broadway::lwz(ircolib::u32 instr, mem &mem) {
b = 0;
ircolib::u32 ea = ircolib::s32(b) + utils::SIMM(instr);
gpr[utils::RD(instr)] = mem.read32(ea);
gpr[utils::RD(instr)] = mem.read32(ea)
.and_then([&](ircolib::u32 val) { return std::expected<ircolib::u32, std::string>(val); })
.or_else([&](std::string e) {
ircolib::panic("broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
}
void broadway::lfd(ircolib::u32 instr, mem &mem) {
@@ -182,9 +220,15 @@ void broadway::lfd(ircolib::u32 instr, mem &mem) {
ircolib::u32 ea = ircolib::s32(b) + utils::SIMM(instr);
double val;
ircolib::u64 read = mem.read64(ea);
ircolib::u64 read = mem.read64(ea)
.and_then([&](ircolib::u64 val) { return std::expected<ircolib::u64, std::string>(val); })
.or_else([&](std::string e) {
ircolib::panic("broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u64, std::string>();
})
.value();
memcpy(&val, &read, 8);
fpr[utils::RD(instr)] = val;
fgrs[utils::RD(instr)].ps0 = val;
}
void broadway::bclrx(ircolib::u32 instr) {
@@ -211,6 +255,51 @@ void broadway::cmpi(ircolib::u32 instr) {
set_cr(result, utils::crfD(instr));
}
void broadway::cmpli(ircolib::u32 instr) {
const ircolib::u32 a = gpr[utils::RA(instr)];
const ircolib::u32 uimm = utils::UIMM(instr);
ircolib::u8 c;
if (a < uimm)
c = 0b001;
else if (a > uimm)
c = 0b010;
else
c = 0b100;
const ircolib::u8 result = (xer.so << 3) | c;
set_cr(result, utils::crfD(instr));
}
void broadway::cmp(ircolib::u32 instr) {
const ircolib::s32 a = gpr[utils::RA(instr)];
const ircolib::s32 b = gpr[utils::RB(instr)];
ircolib::u8 c;
if (a < b)
c = 0b001;
else if (a > b)
c = 0b010;
else
c = 0b100;
const ircolib::u8 result = (xer.so << 3) | c;
set_cr(result, utils::crfD(instr));
}
void broadway::cmpl(ircolib::u32 instr) {
const ircolib::u32 a = gpr[utils::RA(instr)];
const ircolib::u32 b = gpr[utils::RB(instr)];
ircolib::u8 c;
if (a < b)
c = 0b001;
else if (a > b)
c = 0b010;
else
c = 0b100;
const ircolib::u8 result = (xer.so << 3) | c;
set_cr(result, utils::crfD(instr));
}
void broadway::rlwinm(ircolib::u32 instr) {
const ircolib::u8 sh = (instr >> 11) & 0x1f;
ircolib::u32 r = std::rotl(gpr[utils::RS(instr)], sh);
@@ -226,7 +315,13 @@ void broadway::lwzu(ircolib::u32 instr, mem &mem) {
ircolib::panic("broadway::lwzu with ra == 0");
const ircolib::u32 EA = ircolib::s32(gpr[utils::RA(instr)]) + utils::SIMM(instr);
gpr[utils::RD(instr)] = mem.read32(EA);
gpr[utils::RD(instr)] = mem.read32(EA)
.and_then([&](ircolib::u32 val) { return std::expected<ircolib::u32, std::string>(val); })
.or_else([&](std::string e) {
ircolib::panic("broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
gpr[utils::RA(instr)] = EA;
}
@@ -237,4 +332,50 @@ void broadway::andi(ircolib::u32 instr) {
gpr[utils::RA(instr)] = result;
cr0_update(true, result);
}
void broadway::mtfsf(ircolib::u32 instr) {
const ircolib::u8 fm = (instr >> 17) & 0xff;
ircolib::u8 mask = 0;
for (int i = 0; i < 8; i++) {
if (ircolib::is_bit_set(fm, i)) {
mask |= 0xf << (i * 4);
}
}
ircolib::u32 frb = fgrs[utils::RB(instr)].ps0;
fpscr = (fpscr & ~mask) | (frb & mask);
cr1_update(instr & 1);
}
void broadway::mtfsb0(ircolib::u32 instr) {
ircolib::u32 mask = ~(1 << utils::RD(instr));
fpscr = fpscr & mask;
cr1_update(instr & 1);
}
void broadway::mtfsb1(ircolib::u32 instr) {
ircolib::u32 bit = 1 << utils::RD(instr);
ircolib::u32 mask = ~bit;
fpscr = (fpscr & mask) | bit;
cr1_update(instr & 1);
}
void broadway::mfmsr(ircolib::u32 instr) { gpr[utils::RS(instr)] = msr; }
void broadway::nand(ircolib::u32 instr) {
gpr[utils::RA(instr)] = ~(gpr[utils::RS(instr)] & gpr[utils::RB(instr)]);
cr0_update(instr & 1, gpr[utils::RA(instr)]);
}
void broadway::subf(ircolib::u32 instr) {
gpr[utils::RD(instr)] = ~(gpr[utils::RA(instr)] + gpr[utils::RB(instr)] + 1);
cr0_update(instr & 1, gpr[utils::RD(instr)]);
}
void broadway:: or (ircolib::u32 instr) {
gpr[utils::RA(instr)] = gpr[utils::RS(instr)] & gpr[utils::RB(instr)];
cr0_update(instr & 1, gpr[utils::RA(instr)]);
}
} // namespace weee::core