i need to start caring about carry >.<

This commit is contained in:
2026-05-19 12:26:51 +02:00
parent 8824b6b75a
commit f9ab690ccd
17 changed files with 558 additions and 18 deletions
+137 -4
View File
@@ -17,6 +17,15 @@ void broadway::addi(ircolib::u32 instr) {
gpr[utils::RD(instr)] = gpr[utils::RA(instr)] + (ircolib::s32(utils::SIMM(instr)));
}
void broadway::addicr(ircolib::u32 instr) {
gpr[utils::RD(instr)] = gpr[utils::RA(instr)] + (ircolib::s32(utils::SIMM(instr)));
cr0_update(true, gpr[utils::RD(instr)]);
}
void broadway::addic(ircolib::u32 instr) {
gpr[utils::RD(instr)] = gpr[utils::RA(instr)] + (ircolib::s32(utils::SIMM(instr)));
}
void broadway::addis(ircolib::u32 instr) {
if (utils::RA(instr) == 0) { // lis
gpr[utils::RD(instr)] = ircolib::s32(utils::SIMM(instr)) << 16;
@@ -188,6 +197,20 @@ void broadway::stw(ircolib::u32 instr, mem &mem) {
});
}
void broadway::stb(ircolib::u32 instr, mem &mem) {
ircolib::s32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
b = 0;
const ircolib::u32 EA = b + 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("stw broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
}
void broadway::sth(ircolib::u32 instr, mem &mem) {
ircolib::u32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
@@ -203,6 +226,20 @@ void broadway::sth(ircolib::u32 instr, mem &mem) {
});
}
void broadway::stwx(ircolib::u32 instr, mem &mem) {
ircolib::u32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
b = 0;
const ircolib::u32 EA = b + gpr[utils::RB(instr)];
auto _ = mem.write32(EA, gpr[utils::RS(instr)])
.and_then([&] { return std::expected<void, std::string>(); })
.or_else([&](std::string e) {
ircolib::panic("stwx broadway write failed. Reason: {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<void, std::string>();
});
}
void broadway::lwz(ircolib::u32 instr, mem &mem) {
ircolib::u32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
@@ -213,7 +250,39 @@ void broadway::lwz(ircolib::u32 instr, mem &mem) {
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);
ircolib::panic("lwz broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
}
void broadway::lwzx(ircolib::u32 instr, mem &mem) {
ircolib::u32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
b = 0;
ircolib::u32 ea = ircolib::s32(b) + gpr[utils::RB(instr)];
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("lwz broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
}
void broadway::lhz(ircolib::u32 instr, mem &mem) {
ircolib::u32 b = gpr[utils::RA(instr)];
if (utils::RA(instr) == 0)
b = 0;
ircolib::u32 ea = ircolib::s32(b) + utils::SIMM(instr);
gpr[utils::RD(instr)] = mem.read16(ea)
.and_then([&](ircolib::u32 val) { return std::expected<ircolib::u32, std::string>(val); })
.or_else([&](std::string e) {
ircolib::panic("lhz broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
@@ -229,7 +298,7 @@ void broadway::lbz(ircolib::u32 instr, mem &mem) {
gpr[utils::RD(instr)] = mem.read8(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);
ircolib::panic("lbz broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
@@ -246,7 +315,7 @@ void broadway::lfd(ircolib::u32 instr, mem &mem) {
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);
ircolib::panic("lfd broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u64, std::string>();
})
.value();
@@ -337,6 +406,23 @@ void broadway::rlwinm(ircolib::u32 instr) {
cr0_update(instr & 1, r);
}
void broadway::rlwimi(ircolib::u32 instr) {
const ircolib::u8 sh = (instr >> 11) & 0x1f;
ircolib::u32 r = std::rotl(gpr[utils::RS(instr)], sh);
const ircolib::u8 mb = (instr >> 6) & 0x1f;
const ircolib::u8 me = (instr >> 1) & 0x1f;
const ircolib::u32 start = 0xffffffff >> mb;
const ircolib::u32 end = 0x7fffffff >> me;
ircolib::u32 mask = start ^ end;
if (mb > me)
mask = ~mask;
r &= mask;
r |= (gpr[utils::RA(instr)] & ~mask);
gpr[utils::RA(instr)] = r;
cr0_update(instr & 1, r);
}
void broadway::lwzu(ircolib::u32 instr, mem &mem) {
if (utils::RA(instr) == 0 || utils::RA(instr) == utils::RD(instr))
ircolib::panic("broadway::lwzu with ra == 0");
@@ -348,7 +434,7 @@ void broadway::lwzu(ircolib::u32 instr, mem &mem) {
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);
ircolib::panic("lwzu broadway read failed. Reason {} (pc: 0x{:08X})", e, pc - 4);
return std::expected<ircolib::u32, std::string>();
})
.value();
@@ -365,6 +451,18 @@ void broadway::andi(ircolib::u32 instr) {
cr0_update(true, result);
}
void broadway::andis(ircolib::u32 instr) {
const ircolib::s32 result = gpr[utils::RS(instr)] & (ircolib::u32(utils::UIMM(instr)) << 16);
gpr[utils::RA(instr)] = result;
cr0_update(true, result);
}
void broadway::and(ircolib::u32 instr) {
const ircolib::s32 result = gpr[utils::RS(instr)] & gpr[utils::RB(instr)];
gpr[utils::RA(instr)] = result;
cr0_update(instr & 1, result);
}
void broadway::mtfsf(ircolib::u32 instr) {
const ircolib::u8 fm = (instr >> 17) & 0xff;
ircolib::u8 mask = 0;
@@ -395,6 +493,7 @@ void broadway::mtfsb1(ircolib::u32 instr) {
}
void broadway::mfmsr(ircolib::u32 instr) { gpr[utils::RS(instr)] = msr; }
void broadway::mtmsr(ircolib::u32 instr) { msr = gpr[utils::RS(instr)]; }
void broadway::nand(ircolib::u32 instr) {
gpr[utils::RA(instr)] = ~(gpr[utils::RS(instr)] & gpr[utils::RB(instr)]);
@@ -410,4 +509,38 @@ 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)]);
}
void broadway::mullw(ircolib::u32 instr) {
gpr[utils::RD(instr)] = ircolib::u64(gpr[utils::RA(instr)]) * ircolib::u64(gpr[utils::RB(instr)]);
}
void broadway::mulli(ircolib::u32 instr) {
gpr[utils::RD(instr)] = ircolib::u64(gpr[utils::RA(instr)]) * ircolib::u64(utils::SIMM(instr));
}
void broadway::mfcr(ircolib::u32 instr) { gpr[utils::RD(instr)] = cr; }
void broadway::mtcrf(ircolib::u32 instr) {
ircolib::u32 mask = 0;
const ircolib::u8 crm = (instr >> 13) & 0xff;
for (int i = 0; i < 7; i++) {
if (ircolib::is_bit_set(crm, i)) {
set_cr(gpr[utils::RS(instr)] & (0xffff << i * 4), i);
}
}
}
void broadway::divwu(ircolib::u32 instr) {
ircolib::u32 dividend = gpr[utils::RA(instr)];
ircolib::u32 divisor = gpr[utils::RB(instr)];
if (divisor == 0) {
if ((instr >> 11) & 1)
xer.ov = true;
return;
}
gpr[utils::RD(instr)] = dividend / divisor;
cr0_update(instr & 1, gpr[utils::RD(instr)]);
}
} // namespace weee::core
+31
View File
@@ -0,0 +1,31 @@
#include <broadway/mmio/ai.hpp>
#include <mem.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
ai::ai(mem &mem) {
mem.register_read32_handler(0x0c006c00, 0x0c006c1f, [&](ircolib::u32 addr) { return read32(addr); });
mem.register_write32_handler(0x0c006c00, 0x0c006c1f,
[&](ircolib::u32 addr, ircolib::u32 value) { return write32(addr, value); });
}
ircolib::u32 ai::read32(ircolib::u32 addr) {
switch (addr) {
case 0:
return ctrl.raw;
default:
ircolib::panic("ai::read32 from unimplemented addr 0x{:08X}", addr);
return 0;
}
}
void ai::write32(ircolib::u32 addr, ircolib::u32 value) {
switch (addr) {
case 0:
ctrl.raw = value;
break;
default:
ircolib::panic("ai::write32 to unimplemented addr 0x{:08X} with value 0x{:08X}", addr, value);
}
}
} // namespace weee::core
+26
View File
@@ -0,0 +1,26 @@
#pragma once
#include <ircolib/types.hpp>
namespace weee::core {
struct mem;
struct ai {
ai(mem &);
ircolib::u32 read32(ircolib::u32);
void write32(ircolib::u32, ircolib::u32);
union {
struct {
unsigned pstat : 1;
unsigned afr : 1;
unsigned aiintmsk : 1;
unsigned aiint : 1;
unsigned aiintvld : 1;
unsigned screset : 1;
unsigned dsp_sr : 1;
unsigned : 25;
};
ircolib::u32 raw;
} ctrl;
};
} // namespace weee::core
+31
View File
@@ -0,0 +1,31 @@
#include <broadway/mmio/dsp.hpp>
#include <mem.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
dsp::dsp(mem &mem) {
mem.register_read16_handler(0x0c005000, 0x0c0051ff, [&](ircolib::u32 addr) { return read16(addr); });
mem.register_write16_handler(0x0c005000, 0x0c0051ff,
[&](ircolib::u32 addr, ircolib::u16 value) { return write16(addr, value); });
}
ircolib::u16 dsp::read16(ircolib::u32 addr) {
switch (addr) {
case 0x0a:
return csr.raw;
default:
ircolib::panic("dsp::read16 from unimplemented addr 0x{:08X}", addr);
return 0;
}
}
void dsp::write16(ircolib::u32 addr, ircolib::u16 value) {
switch (addr) {
case 0x0a:
csr.raw = value;
break;
default:
ircolib::panic("dsp::read16 from unimplemented addr 0x{:08X}", addr);
}
}
} // namespace weee::core
+30
View File
@@ -0,0 +1,30 @@
#pragma once
#include <ircolib/types.hpp>
namespace weee::core {
struct mem;
struct dsp {
dsp(mem &);
ircolib::u16 read16(ircolib::u32);
void write16(ircolib::u32, ircolib::u16);
union {
struct {
unsigned res : 1;
unsigned piint : 1;
unsigned halt : 1;
unsigned aidint : 1;
unsigned aidint_mask : 1;
unsigned arint : 1;
unsigned arint_mask : 1;
unsigned dspint : 1;
unsigned dspint_mask : 1;
unsigned int_status : 1;
unsigned : 1;
unsigned res2 : 1;
unsigned : 4;
};
ircolib::u16 raw;
} csr;
};
} // namespace weee::core
+41
View File
@@ -0,0 +1,41 @@
#include <broadway/mmio/exi.hpp>
#include <mem.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
exi::exi(mem &mem) {
mem.register_read32_handler(0x0c006800, 0x0c00683f, [&](ircolib::u32 addr) { return read32(addr); });
mem.register_write32_handler(0x0c006800, 0x0c00683f,
[&](ircolib::u32 addr, ircolib::u32 value) { return write32(addr, value); });
}
ircolib::u32 exi::read32(ircolib::u32 addr) {
switch (addr) {
case 0:
return param0.raw;
case 0x14:
return param1.raw;
case 0x28:
return param2.raw;
default:
ircolib::panic("exi::read32 from unimplemented addr 0x{:08X}", addr);
return 0;
}
}
void exi::write32(ircolib::u32 addr, ircolib::u32 value) {
switch (addr) {
case 0:
param0.raw = value;
break;
case 0x14:
param1.raw = value;
break;
case 0x28:
param2.raw = value;
break;
default:
ircolib::panic("exi::write32 to unimplemented addr 0x{:08X} with value 0x{:08X}", addr, value);
}
}
} // namespace weee::core
+30
View File
@@ -0,0 +1,30 @@
#pragma once
#include <ircolib/types.hpp>
namespace weee::core {
struct mem;
struct exi {
exi(mem &);
ircolib::u32 read32(ircolib::u32);
void write32(ircolib::u32, ircolib::u32);
union {
struct {
unsigned ext_int_mask : 1;
unsigned ext_int : 1;
unsigned tc_int_mask : 1;
unsigned tc_int : 1;
unsigned clk : 3;
unsigned cs : 3;
unsigned ext_int_mask2 : 1;
unsigned ext_int2 : 1;
unsigned ext : 1;
unsigned romdis : 1;
unsigned : 18;
};
ircolib::u32 raw;
} param0, param1, param2;
};
} // namespace weee::core
+20
View File
@@ -0,0 +1,20 @@
#include <mem.hpp>
#include <broadway/mmio/mi.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
memory_interface::memory_interface(mem &mem) {
mem.register_write16_handler(0x0c004000, 0x0c00407f,
[&](ircolib::u32 addr, ircolib::u16 value) { write16(addr, value); });
}
void memory_interface::write16(ircolib::u32 addr, ircolib::u16 value) {
switch (addr) {
case 0x1C:
int_mask.raw = value;
break;
default:
ircolib::panic("memory_interface::write16 to unimplemented addr 0x{:08X} with value 0x{:04X}", addr, value);
}
}
} // namespace weee::core
+23
View File
@@ -0,0 +1,23 @@
#pragma once
#include <ircolib/types.hpp>
namespace weee::core {
struct mem;
struct memory_interface {
union {
struct {
unsigned mem0 : 1;
unsigned mem1 : 1;
unsigned mem2 : 1;
unsigned mem3 : 1;
unsigned all : 1;
unsigned : 27;
};
ircolib::u32 raw;
} int_mask;
memory_interface(mem &);
void write16(ircolib::u32, ircolib::u16);
};
} // namespace weee::core
+31
View File
@@ -0,0 +1,31 @@
#include <mem.hpp>
#include <broadway/mmio/pi.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
processor_interface::processor_interface(mem &mem) {
mem.register_write32_handler(0x0c003000, 0x0c0030ff,
[&](ircolib::u32 addr, ircolib::u32 value) { return write32(addr, value); });
mem.register_read32_handler(0x0c003000, 0x0c0030ff, [&](ircolib::u32 addr) { return read32(addr); });
}
void processor_interface::write32(ircolib::u32 addr, ircolib::u32 value) {
switch (addr) {
case 0x04:
intmr.raw = value;
break;
default:
ircolib::panic("processor_interface::write32 to unimplemented addr 0x{:08X} with value 0x{:08X}", addr, value);
}
}
ircolib::u32 processor_interface::read32(ircolib::u32 addr) {
switch (addr) {
case 0x2c:
return 2;
default:
ircolib::panic("processor_interface::read32 from unimplemented addr 0x{:08X}", addr);
return 0;
}
}
} // namespace weee::core
+33
View File
@@ -0,0 +1,33 @@
#pragma once
#include <ircolib/types.hpp>
namespace weee::core {
struct mem;
struct processor_interface {
union {
struct {
unsigned error : 1;
unsigned rsw : 1;
unsigned di : 1;
unsigned si : 1;
unsigned exi : 1;
unsigned ai : 1;
unsigned dsp : 1;
unsigned mem : 1;
unsigned vi : 1;
unsigned pe_token : 1;
unsigned pe_finish : 1;
unsigned cp : 1;
unsigned debug : 1;
unsigned hsp : 1;
unsigned : 18;
};
ircolib::u32 raw;
} intmr;
processor_interface(mem &);
void write32(ircolib::u32, ircolib::u32);
ircolib::u32 read32(ircolib::u32);
};
} // namespace weee::core