diff --git a/core/broadway.cpp b/core/broadway.cpp index 572b6aa..fdb2de6 100644 --- a/core/broadway.cpp +++ b/core/broadway.cpp @@ -28,23 +28,27 @@ ircolib::u32 broadway::fetch(mem &mem) { return val; } -void broadway::decode_special(ircolib::u32 instr, mem &mem) { - switch (utils::secondary(instr)) { - case 0x153: - mfspr(instr); +void broadway::decode_special2(ircolib::u32 instr, mem &mem) { + auto secondary = utils::secondary(instr); + switch (secondary) { + case 0x0D2: // mtsr + ircolib::warn("broadway TODO mtsr (pc 0x{:08X})", pc - 4); break; + case 0x153: case 0x1D3: - mtspr(instr); + mftspr(ircolib::is_bit_set(secondary), instr); break; case 0x10A: add(instr); break; + case 0x256: // sync + break; default: - ircolib::panic("broadway unknown special 0x{:04X} (pc 0x{:08X})", utils::secondary(instr), pc - 4); + ircolib::panic("broadway unknown special2 {} (0x{:04X}) (pc 0x{:08X})", secondary, secondary, pc - 4); } } -void broadway::decode_branch(ircolib::u32 instr, mem &mem) { +void broadway::decode_special1(ircolib::u32 instr, mem &mem) { switch (utils::secondary(instr)) { case 0x10: bclrx(instr); @@ -52,8 +56,11 @@ void broadway::decode_branch(ircolib::u32 instr, mem &mem) { case 0x32: rfi(instr); break; + case 0x96: // isync + break; default: - ircolib::panic("broadway unknown branch 0x{:04X} (pc 0x{:08X})", utils::secondary(instr), pc - 4); + ircolib::panic("broadway unknown special1 {} (0x{:04X}) (pc 0x{:08X})", utils::secondary(instr), + utils::secondary(instr), pc - 4); } } @@ -75,7 +82,7 @@ void broadway::execute(ircolib::u32 instr, mem &mem) { bx(instr); break; case 19: - decode_branch(instr, mem); + decode_special1(instr, mem); break; case 21: rlwinm(instr); @@ -86,8 +93,11 @@ void broadway::execute(ircolib::u32 instr, mem &mem) { case 25: oris(instr); break; + case 28: + andi(instr); + break; case 31: - decode_special(instr, mem); + decode_special2(instr, mem); break; case 32: // lwz rd, d(ra) lwz(instr, mem); diff --git a/core/broadway.hpp b/core/broadway.hpp index 65a6c38..be712a8 100644 --- a/core/broadway.hpp +++ b/core/broadway.hpp @@ -30,15 +30,21 @@ struct broadway { ircolib::u32 raw; } xer; + // bat registers indexes + static constexpr std::size_t BAT_LOWER_OFFSET = 0; + static constexpr std::size_t BAT_UPPER_OFFSET = 8; + + std::array ibat, dbat; std::array gpr{}; // ircolib::u32 const_gpr_lookup{}; csh capstone; // Xbyak::CodeGenerator code; // instructions - void decode_special(ircolib::u32, mem &); - void decode_branch(ircolib::u32, mem &); + void decode_special1(ircolib::u32, mem &); + void decode_special2(ircolib::u32, mem &); + void andi(ircolib::u32); void add(ircolib::u32); void addis(ircolib::u32); void addi(ircolib::u32); @@ -46,8 +52,7 @@ struct broadway { void oris(ircolib::u32); void bx(ircolib::u32); void bcx(ircolib::u32); - void mtspr(ircolib::u32); - void mfspr(ircolib::u32); + void mftspr(bool, ircolib::u32); void stw(ircolib::u32, mem &); void stwu(ircolib::u32, mem &); void sth(ircolib::u32, mem &); diff --git a/core/broadway/instructions.cpp b/core/broadway/instructions.cpp index eb74710..b3f2217 100644 --- a/core/broadway/instructions.cpp +++ b/core/broadway/instructions.cpp @@ -45,88 +45,140 @@ void broadway::bx(ircolib::u32 instr) { void broadway::bcx(ircolib::u32 instr) { const bool link = instr & 1; const bool absolute = instr & 2; + const ircolib::u8 bi = (instr >> 16) & 0x1f; + const ircolib::u8 bo = (instr >> 11) & 0x1f; + if (ircolib::is_bit_set(bo, 2)) + ctr--; + + const bool ctr_ok = ircolib::is_bit_set(bo, 2) || ((ctr != 0) ^ (ircolib::is_bit_set(bo, 3))); + const bool cond_ok = ircolib::is_bit_set(bo, 0) || (ircolib::is_bit_set(cr, 32 - bi) == ircolib::is_bit_set(bo, 1)); ircolib::s32 bd = (ircolib::s32(instr << 16) >> 16) & 0xFFFFFFFC; - if (!absolute) - bd += pc - 4; + if (ctr_ok && cond_ok) { + if (!absolute) + bd += pc - 4; - if (!ircolib::is_bit_set(instr)) - ircolib::panic("broadway::bcx unimplemented variants with bit 25 == 0"); - - if (ircolib::is_bit_set(instr)) { // always if (link) lr = pc; pc = bd; - return; } - if (ircolib::is_bit_set(instr)) { // --ctr == 0 - if (--ctr != 0) + /* + if (!ircolib::is_bit_set(instr)) { + + if (!ircolib::is_bit_set(instr)) { + } + + if (!ircolib::is_bit_set(instr)) + ircolib::panic("broadway::bcx unimplemented variants with bit 23 == 0 (pc 0x{:08X})", pc - 4); + + + if () { + } + + return; + } + + if (ircolib::is_bit_set(instr)) { // always + if (link) + lr = pc; + + pc = bd; + return; + } + + if (ircolib::is_bit_set(instr)) { // --ctr == 0 + if (--ctr != 0) + return; + + if (link) + lr = pc; + + pc = bd; + return; + } + + // --ctr != 0 + if (--ctr == 0) return; if (link) lr = pc; pc = bd; - return; - } - - // --ctr != 0 - if (--ctr == 0) - return; - - if (link) - lr = pc; - - pc = bd; + */ } -void broadway::mfspr(ircolib::u32 instr) { +void broadway::mftspr(bool dir, ircolib::u32 instr) { const size_t spr_field = (instr >> 11) & 0x3FF; - switch (spr_field) { - case 0b0000100000: - gpr[utils::RD(instr)] = xer.raw; - break; - case 0b0100000000: - gpr[utils::RD(instr)] = lr; - break; - case 0b0100100000: - gpr[utils::RD(instr)] = ctr; - break; - case 0b1101000000: - gpr[utils::RD(instr)] = srr0; - break; - case 0b1101100000: - // srr1 - break; - default: - ircolib::panic("broadway::mfspr with unimplemented spr field of value 0x{:04X} (pc 0x{:08X})", spr_field, - pc - 4); - } -} -void broadway::mtspr(ircolib::u32 instr) { - const size_t spr_field = (instr >> 11) & 0x3FF; + auto move_to_or_from_spr = [&](ircolib::u32 &spr) { + if (dir) { // mtspr + spr = gpr[utils::RS(instr)]; + return; + } + // mfspr + gpr[utils::RD(instr)] = spr; + }; + switch (spr_field) { case 0b0000100000: - xer.raw = gpr[utils::RS(instr)]; + move_to_or_from_spr(xer.raw); break; case 0b0100000000: - lr = gpr[utils::RS(instr)]; + move_to_or_from_spr(lr); break; case 0b0100100000: - ctr = gpr[utils::RS(instr)]; + move_to_or_from_spr(ctr); break; case 0b1101000000: - srr0 = gpr[utils::RS(instr)]; + move_to_or_from_spr(srr0); break; - case 0b1101100000: - // srr1 + case 0b1101100000: // srr1 + break; + case 0b1000011111: // hid0 + break; + case 0b1100011100: // hid2 + break; + case 0b1100111111: // l2cr + break; + case 0b1000110000: + move_to_or_from_spr(ibat[BAT_LOWER_OFFSET + 0]); + break; + case 0b1000010000: + move_to_or_from_spr(ibat[BAT_UPPER_OFFSET + 0]); + break; + case 0b1001010000: + move_to_or_from_spr(ibat[BAT_UPPER_OFFSET + 1]); + break; + case 0b1010010000: + move_to_or_from_spr(ibat[BAT_UPPER_OFFSET + 2]); + break; + case 0b1011010000: + move_to_or_from_spr(ibat[BAT_UPPER_OFFSET + 3]); + break; + case 0b1100110000: + move_to_or_from_spr(dbat[BAT_LOWER_OFFSET + 0]); + break; + case 0b1101110000: + move_to_or_from_spr(dbat[BAT_LOWER_OFFSET + 1]); + break; + case 0b1100010000: + move_to_or_from_spr(dbat[BAT_UPPER_OFFSET + 0]); + break; + case 0b1101010000: + move_to_or_from_spr(dbat[BAT_UPPER_OFFSET + 1]); + break; + case 0b1110010000: + move_to_or_from_spr(dbat[BAT_UPPER_OFFSET + 2]); + break; + case 0b1111010000: + move_to_or_from_spr(dbat[BAT_UPPER_OFFSET + 3]); break; default: - ircolib::panic("broadway::mtspr with unimplemented spr field of value 0x{:04X} (pc 0x{:08X})", spr_field, - pc - 4); + 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); } } @@ -257,4 +309,8 @@ void broadway::lwzu(ircolib::u32 instr, mem &mem) { } void broadway::rfi(ircolib::u32 instr) { pc = srr0; } + +void broadway::andi(ircolib::u32 instr) { + gpr[utils::RA(instr)] = gpr[utils::RS(instr)] & (ircolib::u32(utils::UIMM(instr)) << 16); +} } // namespace weee::core diff --git a/external/ircolib/log.hpp b/external/ircolib/log.hpp index 8c3b3cd..0f4ab06 100644 --- a/external/ircolib/log.hpp +++ b/external/ircolib/log.hpp @@ -4,7 +4,13 @@ namespace ircolib { template void panic(std::format_string fmt, Args &&...args) { + std::print("[FATAL] "); std::println(fmt, std::forward(args)...); exit(1); } +template +void warn(std::format_string fmt, Args &&...args) { + std::print("[WARN] "); + std::println(fmt, std::forward(args)...); +} } // namespace ircolib