getting floating point stuff now

core/broadway/instructions.cpp

@@ -50,7 +50,7 @@ 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) || (ircolib::is_bit_set(cr, 32 - bi) == ircolib::is_bit_set(bo, 3));
+    const bool cond_ok = ircolib::is_bit_set(bo, 4) || (get_cr_bit(0, bi) == ircolib::is_bit_set(bo, 3));
 
     return cond_ok && ctr_ok;
 }
@@ -175,6 +175,18 @@ void broadway::lwz(ircolib::u32 instr, mem &mem) {
     gpr[utils::RD(instr)] = mem.read32(ea);
 }
 
+void broadway::lfd(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);
+    double val;
+    ircolib::u64 read = mem.read64(ea);
+    memcpy(&val, &read, 8);
+    fpr[utils::RD(instr)] = val;
+}
+
 void broadway::bclrx(ircolib::u32 instr) {
     const bool link = instr & 1;
 
@@ -195,9 +207,8 @@ void broadway::cmpi(ircolib::u32 instr) {
     else
         c = 0b100;
 
-    const ircolib::u32 result = ((xer.so << 3) | c) << (28 - 4 * utils::crfD(instr));
-    cr &= ~(0xffff << (28 - 4 * utils::crfD(instr)));
-    cr |= result;
+    const ircolib::u8 result = (xer.so << 3) | c;
+    set_cr(result, utils::crfD(instr));
 }
 
 void broadway::rlwinm(ircolib::u32 instr) {
@@ -222,6 +233,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);
+    const ircolib::s32 result = gpr[utils::RS(instr)] & utils::UIMM(instr);
+    gpr[utils::RA(instr)] = result;
+    cr0_update(true, result);
 }
 } // namespace weee::core

core/broadway/mmio/vi.cpp

@@ -55,10 +55,10 @@ void video_interface::write32(ircolib::u32 addr, ircolib::u32 value) {
         bboi.raw = value;
         break;
     case 0x1c:
-        tfbl.raw = value;
+        tfbl.raw = value & 0x1ffffe00;
         break;
     case 0x24:
-        bfbl.raw = value;
+        bfbl.raw = value & 0x10fffe00;
         break;
     case 0x4c:
     case 0x50:

core/broadway/mmio/vi.hpp

@@ -8,6 +8,14 @@ struct video_interface {
     video_interface(mem &);
     void write16(ircolib::u32, ircolib::u16);
     void write32(ircolib::u32, ircolib::u32);
+    ircolib::u32 xfb_top_addr() {
+        auto addr = tfbl.fbb;
+        if (tfbl.page) {
+            addr <<= 5;
+        }
+
+        return addr + tfbl.xof;
+    }
 
     union DCR {
         struct {
@@ -80,26 +88,15 @@ struct video_interface {
         ircolib::u32 raw;
     } bbei, bboi;
 
-    union TFBL {
+    union FBR {
         struct {
-            unsigned : 9;
-            unsigned fbb : 15;
+            unsigned : 3;
+            unsigned page : 1;
             unsigned xof : 4;
-            unsigned : 4;
+            unsigned fbb : 24;
         };
-
         ircolib::u32 raw;
-    } tfbl;
-
-    union BFBL {
-        struct {
-            unsigned : 9;
-            unsigned fbb : 15;
-            unsigned y : 8;
-        };
-
-        ircolib::u32 raw;
-    } bfbl;
+    } tfbl, bfbl;
 
     union FCT012 {
         struct {