git subrepo pull --force deps/lightrec
[pcsx_rearmed.git] / deps / lightrec / emitter.c
index 99f6756..275ed2a 100644 (file)
@@ -21,12 +21,42 @@ static void rec_SPECIAL(struct lightrec_cstate *state, const struct block *block
 static void rec_REGIMM(struct lightrec_cstate *state, const struct block *block, u16 offset);
 static void rec_CP0(struct lightrec_cstate *state, const struct block *block, u16 offset);
 static void rec_CP2(struct lightrec_cstate *state, const struct block *block, u16 offset);
+static void rec_META(struct lightrec_cstate *state, const struct block *block, u16 offset);
+static void rec_cp2_do_mtc2(struct lightrec_cstate *state,
+                           const struct block *block, u16 offset, u8 reg, u8 in_reg);
+static void rec_cp2_do_mfc2(struct lightrec_cstate *state,
+                           const struct block *block, u16 offset,
+                           u8 reg, u8 out_reg);
 
-static void unknown_opcode(struct lightrec_cstate *state, const struct block *block, u16 offset)
+static void
+lightrec_jump_to_fn(jit_state_t *_jit, void (*fn)(void))
+{
+       /* Prevent jit_jmpi() from using our cycles register as a temporary */
+       jit_live(LIGHTREC_REG_CYCLE);
+
+       jit_patch_abs(jit_jmpi(), fn);
+}
+
+static void
+lightrec_jump_to_eob(struct lightrec_cstate *state, jit_state_t *_jit)
+{
+       lightrec_jump_to_fn(_jit, state->state->eob_wrapper_func);
+}
+
+static void
+lightrec_jump_to_ds_check(struct lightrec_cstate *state, jit_state_t *_jit)
+{
+       lightrec_jump_to_fn(_jit, state->state->ds_check_func);
+}
+
+static void update_ra_register(struct regcache *reg_cache, jit_state_t *_jit,
+                              u8 ra_reg, u32 pc, u32 link)
 {
-       pr_warn("Unknown opcode: 0x%08x at PC 0x%08x\n",
-               block->opcode_list[offset].c.opcode,
-               block->pc + (offset << 2));
+       u8 link_reg;
+
+       link_reg = lightrec_alloc_reg_out(reg_cache, _jit, ra_reg, 0);
+       lightrec_load_imm(reg_cache, _jit, link_reg, pc, link);
+       lightrec_free_reg(reg_cache, link_reg);
 }
 
 static void lightrec_emit_end_of_block(struct lightrec_cstate *state,
@@ -35,110 +65,119 @@ static void lightrec_emit_end_of_block(struct lightrec_cstate *state,
                                       u32 link, bool update_cycles)
 {
        struct regcache *reg_cache = state->reg_cache;
-       u32 cycles = state->cycles;
        jit_state_t *_jit = block->_jit;
        const struct opcode *op = &block->opcode_list[offset],
-                           *next = &block->opcode_list[offset + 1];
+                           *ds = get_delay_slot(block->opcode_list, offset);
+       u32 cycles = state->cycles + lightrec_cycles_of_opcode(state->state, op->c);
 
        jit_note(__FILE__, __LINE__);
 
-       if (link) {
-               /* Update the $ra register */
-               u8 link_reg = lightrec_alloc_reg_out(reg_cache, _jit, ra_reg, 0);
-               jit_movi(link_reg, link);
-               lightrec_free_reg(reg_cache, link_reg);
-       }
+       if (link && ra_reg != reg_new_pc)
+               update_ra_register(reg_cache, _jit, ra_reg, block->pc, link);
 
-       if (reg_new_pc < 0) {
-               reg_new_pc = lightrec_alloc_reg(reg_cache, _jit, JIT_V0);
-               lightrec_lock_reg(reg_cache, _jit, reg_new_pc);
+       if (reg_new_pc < 0)
+               lightrec_load_next_pc_imm(reg_cache, _jit, block->pc, imm);
+       else
+               lightrec_load_next_pc(reg_cache, _jit, reg_new_pc);
 
-               jit_movi(reg_new_pc, imm);
+       if (link && ra_reg == reg_new_pc) {
+               /* Handle the special case: JALR $r0, $r0
+                * In that case the target PC should be the old value of the
+                * register. */
+               update_ra_register(reg_cache, _jit, ra_reg, block->pc, link);
        }
 
        if (has_delay_slot(op->c) &&
-           !(op->flags & (LIGHTREC_NO_DS | LIGHTREC_LOCAL_BRANCH))) {
-               cycles += lightrec_cycles_of_opcode(next->c);
+           !op_flag_no_ds(op->flags) && !op_flag_local_branch(op->flags)) {
+               cycles += lightrec_cycles_of_opcode(state->state, ds->c);
 
                /* Recompile the delay slot */
-               if (next->c.opcode)
+               if (ds->c.opcode)
                        lightrec_rec_opcode(state, block, offset + 1);
        }
 
-       /* Store back remaining registers */
-       lightrec_storeback_regs(reg_cache, _jit);
-
-       jit_movr(JIT_V0, reg_new_pc);
+       /* Clean the remaining registers */
+       lightrec_clean_regs(reg_cache, _jit);
 
        if (cycles && update_cycles) {
                jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, cycles);
                pr_debug("EOB: %u cycles\n", cycles);
        }
 
-       if (offset + !!(op->flags & LIGHTREC_NO_DS) < block->nb_ops - 1)
-               state->branches[state->nb_branches++] = jit_jmpi();
+       if (op_flag_load_delay(ds->flags)
+           && opcode_is_load(ds->c) && !state->no_load_delay) {
+               /* If the delay slot is a load opcode, its target register
+                * will be written after the first opcode of the target is
+                * executed. Handle this by jumping to a special section of
+                * the dispatcher. It expects the loaded value to be in
+                * REG_TEMP, and the target register number to be in JIT_V1.*/
+               jit_movi(JIT_V1, ds->c.i.rt);
+
+               lightrec_jump_to_ds_check(state, _jit);
+       } else {
+               lightrec_jump_to_eob(state, _jit);
+       }
+
+       lightrec_regcache_reset(reg_cache);
 }
 
-void lightrec_emit_eob(struct lightrec_cstate *state, const struct block *block,
-                      u16 offset, bool after_op)
+void lightrec_emit_jump_to_interpreter(struct lightrec_cstate *state,
+                                      const struct block *block, u16 offset)
 {
        struct regcache *reg_cache = state->reg_cache;
        jit_state_t *_jit = block->_jit;
-       union code c = block->opcode_list[offset].c;
-       u32 cycles = state->cycles;
 
-       if (!after_op)
-               cycles -= lightrec_cycles_of_opcode(c);
+       lightrec_clean_regs(reg_cache, _jit);
 
-       lightrec_storeback_regs(reg_cache, _jit);
+       /* Call the interpreter with the block's address in JIT_V1 and the
+        * PC (which might have an offset) in JIT_V0. */
+       lightrec_load_imm(reg_cache, _jit, JIT_V0, block->pc,
+                         block->pc + (offset << 2));
+       if (lightrec_store_next_pc()) {
+             jit_stxi_i(offsetof(struct lightrec_state, next_pc),
+                        LIGHTREC_REG_STATE, JIT_V0);
+       }
 
-       jit_movi(JIT_V0, block->pc + (offset << 2));
-       jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, cycles);
+       jit_movi(JIT_V1, (uintptr_t)block);
 
-       state->branches[state->nb_branches++] = jit_jmpi();
+       jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, state->cycles);
+       lightrec_jump_to_fn(_jit, state->state->interpreter_func);
 }
 
-static u8 get_jr_jalr_reg(struct lightrec_cstate *state, const struct block *block, u16 offset)
+static void lightrec_emit_eob(struct lightrec_cstate *state,
+                             const struct block *block, u16 offset)
 {
        struct regcache *reg_cache = state->reg_cache;
        jit_state_t *_jit = block->_jit;
-       const struct opcode *op = &block->opcode_list[offset],
-                           *next = &block->opcode_list[offset + 1];
-       u8 rs = lightrec_request_reg_in(reg_cache, _jit, op->r.rs, JIT_V0);
-
-       /* If the source register is already mapped to JIT_R0 or JIT_R1, and the
-        * delay slot is a I/O operation, unload the register, since JIT_R0 and
-        * JIT_R1 are explicitely used by the I/O opcode generators. */
-       if ((rs == JIT_R0 || rs == JIT_R1) &&
-           !(op->flags & LIGHTREC_NO_DS) &&
-           opcode_is_io(next->c) &&
-           !(next->flags & (LIGHTREC_NO_INVALIDATE | LIGHTREC_DIRECT_IO))) {
-               lightrec_unload_reg(reg_cache, _jit, rs);
-               lightrec_free_reg(reg_cache, rs);
 
-               rs = lightrec_request_reg_in(reg_cache, _jit, op->r.rs, JIT_V0);
+       lightrec_clean_regs(reg_cache, _jit);
+
+       lightrec_load_imm(reg_cache, _jit, JIT_V0, block->pc,
+                         block->pc + (offset << 2));
+       if (lightrec_store_next_pc()) {
+             jit_stxi_i(offsetof(struct lightrec_state, next_pc),
+                        LIGHTREC_REG_STATE, JIT_V0);
        }
 
-       lightrec_lock_reg(reg_cache, _jit, rs);
+       jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, state->cycles);
 
-       return rs;
+       lightrec_jump_to_eob(state, _jit);
 }
 
 static void rec_special_JR(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
-       u8 rs = get_jr_jalr_reg(state, block, offset);
+       union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       lightrec_emit_end_of_block(state, block, offset, rs, 0, 31, 0, true);
+       lightrec_emit_end_of_block(state, block, offset, c.r.rs, 0, 31, 0, true);
 }
 
 static void rec_special_JALR(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
-       u8 rs = get_jr_jalr_reg(state, block, offset);
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       lightrec_emit_end_of_block(state, block, offset, rs, 0, c.r.rd,
+       lightrec_emit_end_of_block(state, block, offset, c.r.rs, 0, c.r.rd,
                                   get_branch_pc(block, offset, 2), true);
 }
 
@@ -162,94 +201,148 @@ static void rec_JAL(struct lightrec_cstate *state, const struct block *block, u1
                                   31, get_branch_pc(block, offset, 2), true);
 }
 
+static void lightrec_do_early_unload(struct lightrec_cstate *state,
+                                    const struct block *block, u16 offset)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       const struct opcode *op = &block->opcode_list[offset];
+       jit_state_t *_jit = block->_jit;
+       unsigned int i;
+       u8 reg;
+       struct {
+               u8 reg, op;
+       } reg_ops[3] = {
+               { op->r.rd, LIGHTREC_FLAGS_GET_RD(op->flags), },
+               { op->i.rt, LIGHTREC_FLAGS_GET_RT(op->flags), },
+               { op->i.rs, LIGHTREC_FLAGS_GET_RS(op->flags), },
+       };
+
+       for (i = 0; i < ARRAY_SIZE(reg_ops); i++) {
+               reg = reg_ops[i].reg;
+
+               switch (reg_ops[i].op) {
+               case LIGHTREC_REG_UNLOAD:
+                       lightrec_clean_reg_if_loaded(reg_cache, _jit, reg, true);
+                       break;
+
+               case LIGHTREC_REG_DISCARD:
+                       lightrec_discard_reg_if_loaded(reg_cache, reg);
+                       break;
+
+               case LIGHTREC_REG_CLEAN:
+                       lightrec_clean_reg_if_loaded(reg_cache, _jit, reg, false);
+                       break;
+               default:
+                       break;
+               };
+       }
+}
+
 static void rec_b(struct lightrec_cstate *state, const struct block *block, u16 offset,
-                 jit_code_t code, u32 link, bool unconditional, bool bz)
+                 jit_code_t code, jit_code_t code2, u32 link, bool unconditional, bool bz)
 {
        struct regcache *reg_cache = state->reg_cache;
        struct native_register *regs_backup;
        jit_state_t *_jit = block->_jit;
        struct lightrec_branch *branch;
        const struct opcode *op = &block->opcode_list[offset],
-                           *next = &block->opcode_list[offset + 1];
+                           *ds = get_delay_slot(block->opcode_list, offset);
        jit_node_t *addr;
-       u8 link_reg;
-       u32 target_offset, cycles = state->cycles;
-       bool is_forward = (s16)op->i.imm >= -1;
+       bool is_forward = (s16)op->i.imm >= 0;
+       int op_cycles = lightrec_cycles_of_opcode(state->state, op->c);
+       u32 target_offset, cycles = state->cycles + op_cycles;
+       bool no_indirection = false;
        u32 next_pc;
+       u8 rs, rt;
 
        jit_note(__FILE__, __LINE__);
 
-       if (!(op->flags & LIGHTREC_NO_DS))
-               cycles += lightrec_cycles_of_opcode(next->c);
+       if (!op_flag_no_ds(op->flags))
+               cycles += lightrec_cycles_of_opcode(state->state, ds->c);
+
+       state->cycles = -op_cycles;
+
+       if (!unconditional) {
+               rs = lightrec_alloc_reg_in(reg_cache, _jit, op->i.rs, REG_EXT);
+               rt = bz ? 0 : lightrec_alloc_reg_in(reg_cache,
+                                                   _jit, op->i.rt, REG_EXT);
+
+               /* Unload dead registers before evaluating the branch */
+               if (OPT_EARLY_UNLOAD)
+                       lightrec_do_early_unload(state, block, offset);
 
-       state->cycles = 0;
+               if (op_flag_local_branch(op->flags) &&
+                   (op_flag_no_ds(op->flags) || !ds->opcode) &&
+                   is_forward && !lightrec_has_dirty_regs(reg_cache))
+                       no_indirection = true;
+
+               if (no_indirection)
+                       pr_debug("Using no indirection for branch at offset 0x%hx\n", offset << 2);
+       }
 
        if (cycles)
                jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, cycles);
 
        if (!unconditional) {
-               u8 rs = lightrec_alloc_reg_in(reg_cache, _jit, op->i.rs, REG_EXT),
-                  rt = bz ? 0 : lightrec_alloc_reg_in(reg_cache,
-                                                      _jit, op->i.rt, REG_EXT);
-
                /* Generate the branch opcode */
-               addr = jit_new_node_pww(code, NULL, rs, rt);
+               if (!no_indirection)
+                       addr = jit_new_node_pww(code, NULL, rs, rt);
 
                lightrec_free_regs(reg_cache);
                regs_backup = lightrec_regcache_enter_branch(reg_cache);
        }
 
-       if (op->flags & LIGHTREC_LOCAL_BRANCH) {
-               if (next && !(op->flags & LIGHTREC_NO_DS)) {
-                       /* Recompile the delay slot */
-                       if (next->opcode)
-                               lightrec_rec_opcode(state, block, offset + 1);
+       if (op_flag_local_branch(op->flags)) {
+               /* Recompile the delay slot */
+               if (!op_flag_no_ds(op->flags) && ds->opcode) {
+                       /* Never handle load delays with local branches. */
+                       state->no_load_delay = true;
+                       lightrec_rec_opcode(state, block, offset + 1);
                }
 
-               if (link) {
-                       /* Update the $ra register */
-                       link_reg = lightrec_alloc_reg_out(reg_cache, _jit, 31, 0);
-                       jit_movi(link_reg, link);
-                       lightrec_free_reg(reg_cache, link_reg);
-               }
+               if (link)
+                       update_ra_register(reg_cache, _jit, 31, block->pc, link);
 
-               /* Store back remaining registers */
-               lightrec_storeback_regs(reg_cache, _jit);
+               /* Clean remaining registers */
+               lightrec_clean_regs(reg_cache, _jit);
 
                target_offset = offset + 1 + (s16)op->i.imm
-                       - !!(OPT_SWITCH_DELAY_SLOTS && (op->flags & LIGHTREC_NO_DS));
+                       - !!op_flag_no_ds(op->flags);
                pr_debug("Adding local branch to offset 0x%x\n",
                         target_offset << 2);
                branch = &state->local_branches[
                        state->nb_local_branches++];
 
                branch->target = target_offset;
-               if (is_forward)
-                       branch->branch = jit_jmpi();
+
+               if (no_indirection)
+                       branch->branch = jit_new_node_pww(code2, NULL, rs, rt);
+               else if (is_forward)
+                       branch->branch = jit_b();
                else
                        branch->branch = jit_bgti(LIGHTREC_REG_CYCLE, 0);
        }
 
-       if (!(op->flags & LIGHTREC_LOCAL_BRANCH) || !is_forward) {
+       if (!op_flag_local_branch(op->flags) || !is_forward) {
                next_pc = get_branch_pc(block, offset, 1 + (s16)op->i.imm);
+               state->no_load_delay = op_flag_local_branch(op->flags);
                lightrec_emit_end_of_block(state, block, offset, -1, next_pc,
                                           31, link, false);
        }
 
        if (!unconditional) {
-               jit_patch(addr);
+               if (!no_indirection)
+                       jit_patch(addr);
+
                lightrec_regcache_leave_branch(reg_cache, regs_backup);
 
-               if (bz && link) {
-                       /* Update the $ra register */
-                       link_reg = lightrec_alloc_reg_out(reg_cache, _jit,
-                                                         31, REG_EXT);
-                       jit_movi(link_reg, (s32)link);
-                       lightrec_free_reg(reg_cache, link_reg);
-               }
+               if (bz && link)
+                       update_ra_register(reg_cache, _jit, 31, block->pc, link);
 
-               if (!(op->flags & LIGHTREC_NO_DS) && next->opcode)
+               if (!op_flag_no_ds(op->flags) && ds->opcode) {
+                       state->no_load_delay = true;
                        lightrec_rec_opcode(state, block, offset + 1);
+               }
        }
 }
 
@@ -261,9 +354,9 @@ static void rec_BNE(struct lightrec_cstate *state,
        _jit_name(block->_jit, __func__);
 
        if (c.i.rt == 0)
-               rec_b(state, block, offset, jit_code_beqi, 0, false, true);
+               rec_b(state, block, offset, jit_code_beqi, jit_code_bnei, 0, false, true);
        else
-               rec_b(state, block, offset, jit_code_beqr, 0, false, false);
+               rec_b(state, block, offset, jit_code_beqr, jit_code_bner, 0, false, false);
 }
 
 static void rec_BEQ(struct lightrec_cstate *state,
@@ -274,9 +367,9 @@ static void rec_BEQ(struct lightrec_cstate *state,
        _jit_name(block->_jit, __func__);
 
        if (c.i.rt == 0)
-               rec_b(state, block, offset, jit_code_bnei, 0, c.i.rs == 0, true);
+               rec_b(state, block, offset, jit_code_bnei, jit_code_beqi, 0, c.i.rs == 0, true);
        else
-               rec_b(state, block, offset, jit_code_bner, 0, c.i.rs == c.i.rt, false);
+               rec_b(state, block, offset, jit_code_bner, jit_code_beqr, 0, c.i.rs == c.i.rt, false);
 }
 
 static void rec_BLEZ(struct lightrec_cstate *state,
@@ -285,28 +378,28 @@ static void rec_BLEZ(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_bgti, 0, c.i.rs == 0, true);
+       rec_b(state, block, offset, jit_code_bgti, jit_code_blei, 0, c.i.rs == 0, true);
 }
 
 static void rec_BGTZ(struct lightrec_cstate *state,
                     const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_blei, 0, false, true);
+       rec_b(state, block, offset, jit_code_blei, jit_code_bgti, 0, false, true);
 }
 
 static void rec_regimm_BLTZ(struct lightrec_cstate *state,
                            const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_bgei, 0, false, true);
+       rec_b(state, block, offset, jit_code_bgei, jit_code_blti, 0, false, true);
 }
 
 static void rec_regimm_BLTZAL(struct lightrec_cstate *state,
                              const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_bgei,
+       rec_b(state, block, offset, jit_code_bgei, jit_code_blti,
              get_branch_pc(block, offset, 2), false, true);
 }
 
@@ -316,7 +409,7 @@ static void rec_regimm_BGEZ(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_blti, 0, !c.i.rs, true);
+       rec_b(state, block, offset, jit_code_blti, jit_code_bgei, 0, !c.i.rs, true);
 }
 
 static void rec_regimm_BGEZAL(struct lightrec_cstate *state,
@@ -324,11 +417,41 @@ static void rec_regimm_BGEZAL(struct lightrec_cstate *state,
 {
        const struct opcode *op = &block->opcode_list[offset];
        _jit_name(block->_jit, __func__);
-       rec_b(state, block, offset, jit_code_blti,
+       rec_b(state, block, offset, jit_code_blti, jit_code_bgei,
              get_branch_pc(block, offset, 2),
              !op->i.rs, true);
 }
 
+static void rec_alloc_rs_rd(struct regcache *reg_cache,
+                           jit_state_t *_jit,
+                           const struct opcode *op,
+                           u8 rs, u8 rd,
+                           u8 in_flags, u8 out_flags,
+                           u8 *rs_out, u8 *rd_out)
+{
+       bool unload, discard;
+       u32 unload_flags;
+
+       if (OPT_EARLY_UNLOAD) {
+               unload_flags = LIGHTREC_FLAGS_GET_RS(op->flags);
+               unload = unload_flags == LIGHTREC_REG_UNLOAD;
+               discard = unload_flags == LIGHTREC_REG_DISCARD;
+       }
+
+       if (OPT_EARLY_UNLOAD && rs && rd != rs && (unload || discard)) {
+               rs = lightrec_alloc_reg_in(reg_cache, _jit, rs, in_flags);
+               lightrec_remap_reg(reg_cache, _jit, rs, rd, discard);
+               lightrec_set_reg_out_flags(reg_cache, rs, out_flags);
+               rd = rs;
+       } else {
+               rs = lightrec_alloc_reg_in(reg_cache, _jit, rs, in_flags);
+               rd = lightrec_alloc_reg_out(reg_cache, _jit, rd, out_flags);
+       }
+
+       *rs_out = rs;
+       *rd_out = rd;
+}
+
 static void rec_alu_imm(struct lightrec_cstate *state, const struct block *block,
                        u16 offset, jit_code_t code, bool slti)
 {
@@ -341,8 +464,9 @@ static void rec_alu_imm(struct lightrec_cstate *state, const struct block *block
                out_flags |= REG_ZEXT;
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, REG_EXT);
-       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt, out_flags);
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.i.rs, c.i.rt, REG_EXT, out_flags, &rs, &rt);
 
        jit_new_node_www(code, rt, rs, (s32)(s16) c.i.imm);
 
@@ -359,10 +483,11 @@ static void rec_alu_special(struct lightrec_cstate *state, const struct block *b
        u8 rd, rt, rs;
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, REG_EXT);
+
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, REG_EXT);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd,
-                                   out_ext ? REG_EXT | REG_ZEXT : 0);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rs, c.r.rd, REG_EXT,
+                       out_ext ? REG_EXT | REG_ZEXT : 0, &rs, &rd);
 
        jit_new_node_www(code, rd, rs, rt);
 
@@ -380,17 +505,17 @@ static void rec_alu_shiftv(struct lightrec_cstate *state, const struct block *bl
        u8 rd, rt, rs, temp, flags = 0;
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
 
        if (code == jit_code_rshr)
                flags = REG_EXT;
        else if (code == jit_code_rshr_u)
                flags = REG_ZEXT;
 
-       rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, flags);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, flags);
+       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rt, c.r.rd, flags, flags, &rt, &rd);
 
-       if (rs != rd && rt != rd) {
+       if (rt != rd) {
                jit_andi(rd, rs, 0x1f);
                jit_new_node_www(code, rd, rt, rd);
        } else {
@@ -405,11 +530,40 @@ static void rec_alu_shiftv(struct lightrec_cstate *state, const struct block *bl
        lightrec_free_reg(reg_cache, rd);
 }
 
+static void rec_movi(struct lightrec_cstate *state,
+                    const struct block *block, u16 offset)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       union code c = block->opcode_list[offset].c;
+       jit_state_t *_jit = block->_jit;
+       u16 flags = REG_EXT;
+       s32 value = (s32)(s16) c.i.imm;
+       u8 rt;
+
+       if (block->opcode_list[offset].flags & LIGHTREC_MOVI)
+               value += (s32)((u32)state->movi_temp[c.i.rt] << 16);
+
+       if (value >= 0)
+               flags |= REG_ZEXT;
+
+       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt, flags);
+
+       jit_movi(rt, value);
+
+       lightrec_free_reg(reg_cache, rt);
+}
+
 static void rec_ADDIU(struct lightrec_cstate *state,
                      const struct block *block, u16 offset)
 {
+       const struct opcode *op = &block->opcode_list[offset];
+
        _jit_name(block->_jit, __func__);
-       rec_alu_imm(state, block, offset, jit_code_addi, false);
+
+       if (op->i.rs && !(op->flags & LIGHTREC_MOVI))
+               rec_alu_imm(state, block, offset, jit_code_addi, false);
+       else
+               rec_movi(state, block, offset);
 }
 
 static void rec_ADDI(struct lightrec_cstate *state,
@@ -417,7 +571,7 @@ static void rec_ADDI(struct lightrec_cstate *state,
 {
        /* TODO: Handle the exception? */
        _jit_name(block->_jit, __func__);
-       rec_alu_imm(state, block, offset, jit_code_addi, false);
+       rec_ADDIU(state, block, offset);
 }
 
 static void rec_SLTIU(struct lightrec_cstate *state,
@@ -444,9 +598,9 @@ static void rec_ANDI(struct lightrec_cstate *state,
 
        _jit_name(block->_jit, __func__);
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
-       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt,
-                                   REG_EXT | REG_ZEXT);
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.i.rs, c.i.rt, 0, REG_EXT | REG_ZEXT, &rs, &rt);
 
        /* PSX code uses ANDI 0xff / ANDI 0xffff a lot, which are basically
         * casts to uint8_t / uint16_t. */
@@ -470,8 +624,9 @@ static void rec_alu_or_xor(struct lightrec_cstate *state, const struct block *bl
        u8 rs, rt, flags;
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
-       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt, 0);
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.i.rs, c.i.rt, 0, 0, &rs, &rt);
 
        flags = lightrec_get_reg_in_flags(reg_cache, rs);
        lightrec_set_reg_out_flags(reg_cache, rt, flags);
@@ -486,8 +641,24 @@ static void rec_alu_or_xor(struct lightrec_cstate *state, const struct block *bl
 static void rec_ORI(struct lightrec_cstate *state,
                    const struct block *block, u16 offset)
 {
-       _jit_name(block->_jit, __func__);
-       rec_alu_or_xor(state, block, offset, jit_code_ori);
+       const struct opcode *op = &block->opcode_list[offset];
+       struct regcache *reg_cache = state->reg_cache;
+       jit_state_t *_jit = block->_jit;
+       s32 val;
+       u8 rt;
+
+       _jit_name(_jit, __func__);
+
+       if (op->flags & LIGHTREC_MOVI) {
+               rt = lightrec_alloc_reg_out(reg_cache, _jit, op->i.rt, REG_EXT);
+
+               val = ((u32)state->movi_temp[op->i.rt] << 16) | op->i.imm;
+               jit_movi(rt, val);
+
+               lightrec_free_reg(reg_cache, rt);
+       } else {
+               rec_alu_or_xor(state, block, offset, jit_code_ori);
+       }
 }
 
 static void rec_XORI(struct lightrec_cstate *state,
@@ -505,6 +676,11 @@ static void rec_LUI(struct lightrec_cstate *state,
        jit_state_t *_jit = block->_jit;
        u8 rt, flags = REG_EXT;
 
+       if (block->opcode_list[offset].flags & LIGHTREC_MOVI) {
+               state->movi_temp[c.i.rt] = c.i.imm;
+               return;
+       }
+
        jit_name(__func__);
        jit_note(__FILE__, __LINE__);
 
@@ -558,9 +734,10 @@ static void rec_special_AND(struct lightrec_cstate *state,
 
        _jit_name(block->_jit, __func__);
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
+
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, 0);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, 0);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rs, c.r.rd, 0, 0, &rs, &rd);
 
        flags_rs = lightrec_get_reg_in_flags(reg_cache, rs);
        flags_rt = lightrec_get_reg_in_flags(reg_cache, rt);
@@ -592,9 +769,10 @@ static void rec_special_or_nor(struct lightrec_cstate *state,
        u8 rd, rt, rs, flags_rs, flags_rt, flags_rd = 0;
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
+
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, 0);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, 0);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rs, c.r.rd, 0, 0, &rs, &rd);
 
        flags_rs = lightrec_get_reg_in_flags(reg_cache, rs);
        flags_rt = lightrec_get_reg_in_flags(reg_cache, rt);
@@ -604,10 +782,8 @@ static void rec_special_or_nor(struct lightrec_cstate *state,
        if (!nor)
                flags_rd = REG_ZEXT & flags_rs & flags_rt;
 
-       /* E(rd) = (E(rs) & E(rt)) | (E(rt) & !Z(rt)) | (E(rs) & !Z(rs)) */
-       if ((REG_EXT & flags_rs & flags_rt) ||
-           (flags_rt & (REG_EXT | REG_ZEXT) == REG_EXT) ||
-           (flags_rs & (REG_EXT | REG_ZEXT) == REG_EXT))
+       /* E(rd) = E(rs) & E(rt) */
+       if (REG_EXT & flags_rs & flags_rt)
                flags_rd |= REG_EXT;
 
        lightrec_set_reg_out_flags(reg_cache, rd, flags_rd);
@@ -647,9 +823,10 @@ static void rec_special_XOR(struct lightrec_cstate *state,
        _jit_name(block->_jit, __func__);
 
        jit_note(__FILE__, __LINE__);
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
+
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, 0);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, 0);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rs, c.r.rd, 0, 0, &rs, &rd);
 
        flags_rs = lightrec_get_reg_in_flags(reg_cache, rs);
        flags_rt = lightrec_get_reg_in_flags(reg_cache, rt);
@@ -710,7 +887,7 @@ static void rec_alu_shift(struct lightrec_cstate *state, const struct block *blo
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
-       u8 rd, rt, flags = 0;
+       u8 rd, rt, flags = 0, out_flags = 0;
 
        jit_note(__FILE__, __LINE__);
 
@@ -719,13 +896,14 @@ static void rec_alu_shift(struct lightrec_cstate *state, const struct block *blo
        else if (code == jit_code_rshi_u)
                flags = REG_ZEXT;
 
-       rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, flags);
-
        /* Input reg is zero-extended, if we SRL at least by one bit, we know
         * the output reg will be both zero-extended and sign-extended. */
+       out_flags = flags;
        if (code == jit_code_rshi_u && c.r.imm)
-               flags |= REG_EXT;
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, flags);
+               out_flags |= REG_EXT;
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.r.rt, c.r.rd, flags, out_flags, &rt, &rd);
 
        jit_new_node_www(code, rd, rt, c.r.imm);
 
@@ -759,7 +937,7 @@ static void rec_alu_mult(struct lightrec_cstate *state,
 {
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
-       u16 flags = block->opcode_list[offset].flags;
+       u32 flags = block->opcode_list[offset].flags;
        u8 reg_lo = get_mult_div_lo(c);
        u8 reg_hi = get_mult_div_hi(c);
        jit_state_t *_jit = block->_jit;
@@ -775,18 +953,18 @@ static void rec_alu_mult(struct lightrec_cstate *state,
        rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, rflags);
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, rflags);
 
-       if (!(flags & LIGHTREC_NO_LO))
+       if (!op_flag_no_lo(flags))
                lo = lightrec_alloc_reg_out(reg_cache, _jit, reg_lo, 0);
        else if (__WORDSIZE == 32)
                lo = lightrec_alloc_reg_temp(reg_cache, _jit);
 
-       if (!(flags & LIGHTREC_NO_HI))
+       if (!op_flag_no_hi(flags))
                hi = lightrec_alloc_reg_out(reg_cache, _jit, reg_hi, REG_EXT);
 
        if (__WORDSIZE == 32) {
                /* On 32-bit systems, do a 32*32->64 bit operation, or a 32*32->32 bit
                 * operation if the MULT was detected a 32-bit only. */
-               if (!(flags & LIGHTREC_NO_HI)) {
+               if (!op_flag_no_hi(flags)) {
                        if (is_signed)
                                jit_qmulr(lo, hi, rs, rt);
                        else
@@ -796,23 +974,23 @@ static void rec_alu_mult(struct lightrec_cstate *state,
                }
        } else {
                /* On 64-bit systems, do a 64*64->64 bit operation. */
-               if (flags & LIGHTREC_NO_LO) {
+               if (op_flag_no_lo(flags)) {
                        jit_mulr(hi, rs, rt);
                        jit_rshi(hi, hi, 32);
                } else {
                        jit_mulr(lo, rs, rt);
 
                        /* The 64-bit output value is in $lo, store the upper 32 bits in $hi */
-                       if (!(flags & LIGHTREC_NO_HI))
+                       if (!op_flag_no_hi(flags))
                                jit_rshi(hi, lo, 32);
                }
        }
 
        lightrec_free_reg(reg_cache, rs);
        lightrec_free_reg(reg_cache, rt);
-       if (!(flags & LIGHTREC_NO_LO) || __WORDSIZE == 32)
+       if (!op_flag_no_lo(flags) || __WORDSIZE == 32)
                lightrec_free_reg(reg_cache, lo);
-       if (!(flags & LIGHTREC_NO_HI))
+       if (!op_flag_no_hi(flags))
                lightrec_free_reg(reg_cache, hi);
 }
 
@@ -821,13 +999,13 @@ static void rec_alu_div(struct lightrec_cstate *state,
 {
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
-       u16 flags = block->opcode_list[offset].flags;
-       bool no_check = flags & LIGHTREC_NO_DIV_CHECK;
+       u32 flags = block->opcode_list[offset].flags;
+       bool no_check = op_flag_no_div_check(flags);
        u8 reg_lo = get_mult_div_lo(c);
        u8 reg_hi = get_mult_div_hi(c);
        jit_state_t *_jit = block->_jit;
        jit_node_t *branch, *to_end;
-       u8 lo, hi, rs, rt, rflags = 0;
+       u8 lo = 0, hi = 0, rs, rt, rflags = 0;
 
        jit_note(__FILE__, __LINE__);
 
@@ -839,22 +1017,22 @@ static void rec_alu_div(struct lightrec_cstate *state,
        rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, rflags);
        rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, rflags);
 
-       if (!(flags & LIGHTREC_NO_LO))
+       if (!op_flag_no_lo(flags))
                lo = lightrec_alloc_reg_out(reg_cache, _jit, reg_lo, 0);
 
-       if (!(flags & LIGHTREC_NO_HI))
+       if (!op_flag_no_hi(flags))
                hi = lightrec_alloc_reg_out(reg_cache, _jit, reg_hi, 0);
 
        /* Jump to special handler if dividing by zero  */
        if (!no_check)
                branch = jit_beqi(rt, 0);
 
-       if (flags & LIGHTREC_NO_LO) {
+       if (op_flag_no_lo(flags)) {
                if (is_signed)
                        jit_remr(hi, rs, rt);
                else
                        jit_remr_u(hi, rs, rt);
-       } else if (flags & LIGHTREC_NO_HI) {
+       } else if (op_flag_no_hi(flags)) {
                if (is_signed)
                        jit_divr(lo, rs, rt);
                else
@@ -867,24 +1045,22 @@ static void rec_alu_div(struct lightrec_cstate *state,
        }
 
        if (!no_check) {
-               lightrec_regcache_mark_live(reg_cache, _jit);
-
                /* Jump above the div-by-zero handler */
-               to_end = jit_jmpi();
+               to_end = jit_b();
 
                jit_patch(branch);
 
-               if (!(flags & LIGHTREC_NO_LO)) {
+               if (!op_flag_no_lo(flags)) {
                        if (is_signed) {
-                               jit_lti(lo, rs, 0);
+                               jit_ltr(lo, rs, rt);
                                jit_lshi(lo, lo, 1);
                                jit_subi(lo, lo, 1);
                        } else {
-                               jit_movi(lo, 0xffffffff);
+                               jit_subi(lo, rt, 1);
                        }
                }
 
-               if (!(flags & LIGHTREC_NO_HI))
+               if (!op_flag_no_hi(flags))
                        jit_movr(hi, rs);
 
                jit_patch(to_end);
@@ -893,10 +1069,10 @@ static void rec_alu_div(struct lightrec_cstate *state,
        lightrec_free_reg(reg_cache, rs);
        lightrec_free_reg(reg_cache, rt);
 
-       if (!(flags & LIGHTREC_NO_LO))
+       if (!op_flag_no_lo(flags))
                lightrec_free_reg(reg_cache, lo);
 
-       if (!(flags & LIGHTREC_NO_HI))
+       if (!op_flag_no_hi(flags))
                lightrec_free_reg(reg_cache, hi);
 }
 
@@ -929,14 +1105,16 @@ static void rec_special_DIVU(struct lightrec_cstate *state,
 }
 
 static void rec_alu_mv_lo_hi(struct lightrec_cstate *state,
-                            const struct block *block, u8 dst, u8 src)
+                            const struct block *block, u16 offset,
+                            u8 dst, u8 src)
 {
        struct regcache *reg_cache = state->reg_cache;
        jit_state_t *_jit = block->_jit;
 
        jit_note(__FILE__, __LINE__);
-       src = lightrec_alloc_reg_in(reg_cache, _jit, src, 0);
-       dst = lightrec_alloc_reg_out(reg_cache, _jit, dst, REG_EXT);
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       src, dst, 0, REG_EXT, &src, &dst);
 
        jit_extr_i(dst, src);
 
@@ -950,7 +1128,7 @@ static void rec_special_MFHI(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_alu_mv_lo_hi(state, block, c.r.rd, REG_HI);
+       rec_alu_mv_lo_hi(state, block, offset, c.r.rd, REG_HI);
 }
 
 static void rec_special_MTHI(struct lightrec_cstate *state,
@@ -959,7 +1137,7 @@ static void rec_special_MTHI(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_alu_mv_lo_hi(state, block, REG_HI, c.r.rs);
+       rec_alu_mv_lo_hi(state, block, offset, REG_HI, c.r.rs);
 }
 
 static void rec_special_MFLO(struct lightrec_cstate *state,
@@ -968,7 +1146,7 @@ static void rec_special_MFLO(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_alu_mv_lo_hi(state, block, c.r.rd, REG_LO);
+       rec_alu_mv_lo_hi(state, block, offset, c.r.rd, REG_LO);
 }
 
 static void rec_special_MTLO(struct lightrec_cstate *state,
@@ -977,34 +1155,48 @@ static void rec_special_MTLO(struct lightrec_cstate *state,
        union code c = block->opcode_list[offset].c;
 
        _jit_name(block->_jit, __func__);
-       rec_alu_mv_lo_hi(state, block, REG_LO, c.r.rs);
+       rec_alu_mv_lo_hi(state, block, offset, REG_LO, c.r.rs);
 }
 
-static void call_to_c_wrapper(struct lightrec_cstate *state, const struct block *block,
-                             u32 arg, bool with_arg, enum c_wrappers wrapper)
+static void call_to_c_wrapper(struct lightrec_cstate *state,
+                             const struct block *block, u32 arg,
+                             enum c_wrappers wrapper)
 {
        struct regcache *reg_cache = state->reg_cache;
        jit_state_t *_jit = block->_jit;
-       u8 tmp, tmp2, tmp3;
+       s8 tmp, tmp2;
 
-       if (with_arg)
-               tmp3 = lightrec_alloc_reg(reg_cache, _jit, JIT_R1);
-       tmp2 = lightrec_alloc_reg(reg_cache, _jit, JIT_R0);
-       tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+       /* Make sure JIT_R1 is not mapped; it will be used in the C wrapper. */
+       tmp2 = lightrec_alloc_reg(reg_cache, _jit, JIT_R1);
+
+       tmp = lightrec_get_reg_with_value(reg_cache,
+                                         (intptr_t) state->state->wrappers_eps[wrapper]);
+       if (tmp < 0) {
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+               jit_ldxi(tmp, LIGHTREC_REG_STATE,
+                        offsetof(struct lightrec_state, wrappers_eps[wrapper]));
 
-       jit_ldxi(tmp, LIGHTREC_REG_STATE,
-                offsetof(struct lightrec_state, c_wrapper));
-       jit_ldxi(tmp2, LIGHTREC_REG_STATE,
-                offsetof(struct lightrec_state, c_wrappers[wrapper]));
-       if (with_arg)
-               jit_movi(tmp3, arg);
+               lightrec_temp_set_value(reg_cache, tmp,
+                                       (intptr_t) state->state->wrappers_eps[wrapper]);
+       }
+
+       lightrec_free_reg(reg_cache, tmp2);
+
+#ifdef __mips__
+       /* On MIPS, register t9 is always used as the target register for JALR.
+        * Therefore if it does not contain the target address we must
+        * invalidate it. */
+       if (tmp != _T9)
+               lightrec_unload_reg(reg_cache, _jit, _T9);
+#endif
 
+       jit_prepare();
+       jit_pushargi(arg);
+
+       lightrec_regcache_mark_live(reg_cache, _jit);
        jit_callr(tmp);
 
        lightrec_free_reg(reg_cache, tmp);
-       lightrec_free_reg(reg_cache, tmp2);
-       if (with_arg)
-               lightrec_free_reg(reg_cache, tmp3);
        lightrec_regcache_mark_live(reg_cache, _jit);
 }
 
@@ -1015,9 +1207,10 @@ static void rec_io(struct lightrec_cstate *state,
        struct regcache *reg_cache = state->reg_cache;
        jit_state_t *_jit = block->_jit;
        union code c = block->opcode_list[offset].c;
-       u16 flags = block->opcode_list[offset].flags;
-       bool is_tagged = flags & (LIGHTREC_HW_IO | LIGHTREC_DIRECT_IO);
+       u32 flags = block->opcode_list[offset].flags;
+       bool is_tagged = LIGHTREC_FLAGS_GET_IO_MODE(flags);
        u32 lut_entry;
+       u8 zero;
 
        jit_note(__FILE__, __LINE__);
 
@@ -1028,63 +1221,240 @@ static void rec_io(struct lightrec_cstate *state,
        else if (load_rt)
                lightrec_clean_reg_if_loaded(reg_cache, _jit, c.i.rt, false);
 
+       if (op_flag_load_delay(flags) && !state->no_load_delay) {
+               /* Clear state->in_delay_slot_n. This notifies the lightrec_rw
+                * wrapper that it should write the REG_TEMP register instead of
+                * the actual output register of the opcode. */
+               zero = lightrec_alloc_reg_in(reg_cache, _jit, 0, 0);
+               jit_stxi_c(offsetof(struct lightrec_state, in_delay_slot_n),
+                           LIGHTREC_REG_STATE, zero);
+               lightrec_free_reg(reg_cache, zero);
+       }
+
        if (is_tagged) {
-               call_to_c_wrapper(state, block, c.opcode, true, C_WRAPPER_RW);
+               call_to_c_wrapper(state, block, c.opcode, C_WRAPPER_RW);
        } else {
                lut_entry = lightrec_get_lut_entry(block);
                call_to_c_wrapper(state, block, (lut_entry << 16) | offset,
-                                 true, C_WRAPPER_RW_GENERIC);
+                                 C_WRAPPER_RW_GENERIC);
+       }
+}
+
+static u32 rec_ram_mask(struct lightrec_state *state)
+{
+       return (RAM_SIZE << (state->mirrors_mapped * 2)) - 1;
+}
+
+static u32 rec_io_mask(const struct lightrec_state *state)
+{
+       u32 length = state->maps[PSX_MAP_HW_REGISTERS].length;
+
+       return 0x1f800000 | GENMASK(31 - clz32(length - 1), 0);
+}
+
+static void rec_store_memory(struct lightrec_cstate *cstate,
+                            const struct block *block,
+                            u16 offset, jit_code_t code,
+                            jit_code_t swap_code,
+                            uintptr_t addr_offset, u32 addr_mask,
+                            bool invalidate)
+{
+       const struct lightrec_state *state = cstate->state;
+       struct regcache *reg_cache = cstate->reg_cache;
+       struct opcode *op = &block->opcode_list[offset];
+       jit_state_t *_jit = block->_jit;
+       union code c = op->c;
+       u8 rs, rt, tmp, tmp2, tmp3, addr_reg, addr_reg2;
+       s16 imm = (s16)c.i.imm;
+       s32 simm = (s32)imm << (1 - lut_is_32bit(state));
+       s32 lut_offt = offsetof(struct lightrec_state, code_lut);
+       bool no_mask = op_flag_no_mask(op->flags);
+       bool add_imm = c.i.imm &&
+               ((!state->mirrors_mapped && !no_mask) || (invalidate &&
+               ((imm & 0x3) || simm + lut_offt != (s16)(simm + lut_offt))));
+       bool need_tmp = !no_mask || add_imm || invalidate;
+       bool swc2 = c.i.op == OP_SWC2;
+       u8 in_reg = swc2 ? REG_TEMP : c.i.rt;
+       s8 reg_imm;
+
+       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
+       if (need_tmp)
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+       addr_reg = rs;
+
+       if (add_imm) {
+               jit_addi(tmp, addr_reg, (s16)c.i.imm);
+               lightrec_free_reg(reg_cache, rs);
+               addr_reg = tmp;
+               imm = 0;
+       } else if (simm) {
+               lut_offt += simm;
+       }
+
+       if (!no_mask) {
+               reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                            addr_mask);
+
+               jit_andr(tmp, addr_reg, reg_imm);
+               addr_reg = tmp;
+
+               lightrec_free_reg(reg_cache, reg_imm);
+       }
+
+       if (addr_offset) {
+               reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                            addr_offset);
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+               jit_addr(tmp2, addr_reg, reg_imm);
+               addr_reg2 = tmp2;
+
+               lightrec_free_reg(reg_cache, reg_imm);
+       } else {
+               addr_reg2 = addr_reg;
+       }
+
+       rt = lightrec_alloc_reg_in(reg_cache, _jit, in_reg, 0);
+
+       if (is_big_endian() && swap_code && in_reg) {
+               tmp3 = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               jit_new_node_ww(swap_code, tmp3, rt);
+               jit_new_node_www(code, imm, addr_reg2, tmp3);
+
+               lightrec_free_reg(reg_cache, tmp3);
+       } else {
+               jit_new_node_www(code, imm, addr_reg2, rt);
+       }
+
+       lightrec_free_reg(reg_cache, rt);
+
+       if (invalidate) {
+               tmp3 = lightrec_alloc_reg_in(reg_cache, _jit, 0, 0);
+
+               if (c.i.op != OP_SW) {
+                       jit_andi(tmp, addr_reg, ~3);
+                       addr_reg = tmp;
+               }
+
+               if (!lut_is_32bit(state)) {
+                       jit_lshi(tmp, addr_reg, 1);
+                       addr_reg = tmp;
+               }
+
+               if (addr_reg == rs && c.i.rs == 0) {
+                       addr_reg = LIGHTREC_REG_STATE;
+               } else {
+                       jit_add_state(tmp, addr_reg);
+                       addr_reg = tmp;
+               }
+
+               if (lut_is_32bit(state))
+                       jit_stxi_i(lut_offt, addr_reg, tmp3);
+               else
+                       jit_stxi(lut_offt, addr_reg, tmp3);
+
+               lightrec_free_reg(reg_cache, tmp3);
        }
+
+       if (addr_offset)
+               lightrec_free_reg(reg_cache, tmp2);
+       if (need_tmp)
+               lightrec_free_reg(reg_cache, tmp);
+       lightrec_free_reg(reg_cache, rs);
+}
+
+static void rec_store_ram(struct lightrec_cstate *cstate,
+                         const struct block *block,
+                         u16 offset, jit_code_t code,
+                         jit_code_t swap_code, bool invalidate)
+{
+       struct lightrec_state *state = cstate->state;
+
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       return rec_store_memory(cstate, block, offset, code, swap_code,
+                               state->offset_ram, rec_ram_mask(state),
+                               invalidate);
+}
+
+static void rec_store_scratch(struct lightrec_cstate *cstate,
+                             const struct block *block, u16 offset,
+                             jit_code_t code, jit_code_t swap_code)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       return rec_store_memory(cstate, block, offset, code, swap_code,
+                               cstate->state->offset_scratch,
+                               0x1fffffff, false);
+}
+
+static void rec_store_io(struct lightrec_cstate *cstate,
+                        const struct block *block, u16 offset,
+                        jit_code_t code, jit_code_t swap_code)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       return rec_store_memory(cstate, block, offset, code, swap_code,
+                               cstate->state->offset_io,
+                               rec_io_mask(cstate->state), false);
 }
 
 static void rec_store_direct_no_invalidate(struct lightrec_cstate *cstate,
                                           const struct block *block,
-                                          u16 offset, jit_code_t code)
+                                          u16 offset, jit_code_t code,
+                                          jit_code_t swap_code)
 {
        struct lightrec_state *state = cstate->state;
        struct regcache *reg_cache = cstate->reg_cache;
        union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
        jit_node_t *to_not_ram, *to_end;
-       u8 tmp, tmp2, rs, rt;
+       bool swc2 = c.i.op == OP_SWC2;
+       u8 tmp, tmp2 = 0, rs, rt, in_reg = swc2 ? REG_TEMP : c.i.rt;
+       u32 addr_mask;
+       s32 reg_imm;
        s16 imm;
 
        jit_note(__FILE__, __LINE__);
        rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
        tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
 
-       if (state->offset_ram || state->offset_scratch)
-               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+       if (state->mirrors_mapped)
+               addr_mask = 0x1f800000 | (4 * RAM_SIZE - 1);
+       else
+               addr_mask = 0x1f800000 | (RAM_SIZE - 1);
+
+       reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit, addr_mask);
 
        /* Convert to KUNSEG and avoid RAM mirrors */
-       if (state->mirrors_mapped) {
-               imm = (s16)c.i.imm;
-               jit_andi(tmp, rs, 0x1f800000 | (4 * RAM_SIZE - 1));
-       } else if (c.i.imm) {
+       if (!state->mirrors_mapped && c.i.imm) {
                imm = 0;
                jit_addi(tmp, rs, (s16)c.i.imm);
-               jit_andi(tmp, tmp, 0x1f800000 | (RAM_SIZE - 1));
+               jit_andr(tmp, tmp, reg_imm);
        } else {
-               imm = 0;
-               jit_andi(tmp, rs, 0x1f800000 | (RAM_SIZE - 1));
+               imm = (s16)c.i.imm;
+               jit_andr(tmp, rs, reg_imm);
        }
 
        lightrec_free_reg(reg_cache, rs);
+       lightrec_free_reg(reg_cache, reg_imm);
 
        if (state->offset_ram != state->offset_scratch) {
-               to_not_ram = jit_bmsi(tmp, BIT(28));
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
 
-               lightrec_regcache_mark_live(reg_cache, _jit);
+               to_not_ram = jit_bmsi(tmp, BIT(28));
 
                jit_movi(tmp2, state->offset_ram);
 
-               to_end = jit_jmpi();
+               to_end = jit_b();
                jit_patch(to_not_ram);
 
                jit_movi(tmp2, state->offset_scratch);
                jit_patch(to_end);
        } else if (state->offset_ram) {
-               jit_movi(tmp2, state->offset_ram);
+               tmp2 = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                         state->offset_ram);
        }
 
        if (state->offset_ram || state->offset_scratch) {
@@ -1092,15 +1462,25 @@ static void rec_store_direct_no_invalidate(struct lightrec_cstate *cstate,
                lightrec_free_reg(reg_cache, tmp2);
        }
 
-       rt = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rt, 0);
-       jit_new_node_www(code, imm, tmp, rt);
+       rt = lightrec_alloc_reg_in(reg_cache, _jit, in_reg, 0);
+
+       if (is_big_endian() && swap_code && in_reg) {
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               jit_new_node_ww(swap_code, tmp2, rt);
+               jit_new_node_www(code, imm, tmp, tmp2);
+
+               lightrec_free_reg(reg_cache, tmp2);
+       } else {
+               jit_new_node_www(code, imm, tmp, rt);
+       }
 
        lightrec_free_reg(reg_cache, rt);
        lightrec_free_reg(reg_cache, tmp);
 }
 
 static void rec_store_direct(struct lightrec_cstate *cstate, const struct block *block,
-                            u16 offset, jit_code_t code)
+                            u16 offset, jit_code_t code, jit_code_t swap_code)
 {
        struct lightrec_state *state = cstate->state;
        u32 ram_size = state->mirrors_mapped ? RAM_SIZE * 4 : RAM_SIZE;
@@ -1108,7 +1488,11 @@ static void rec_store_direct(struct lightrec_cstate *cstate, const struct block
        union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
        jit_node_t *to_not_ram, *to_end;
-       u8 tmp, tmp2, tmp3, rs, rt;
+       bool swc2 = c.i.op == OP_SWC2;
+       u8 tmp, tmp2, tmp3, masked_reg, rs, rt;
+       u8 in_reg = swc2 ? REG_TEMP : c.i.rt;
+       u32 addr_mask = 0x1f800000 | (ram_size - 1);
+       s32 reg_imm;
 
        jit_note(__FILE__, __LINE__);
 
@@ -1116,38 +1500,52 @@ static void rec_store_direct(struct lightrec_cstate *cstate, const struct block
        tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
        tmp3 = lightrec_alloc_reg_in(reg_cache, _jit, 0, 0);
 
+       reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit, addr_mask);
+
        /* Convert to KUNSEG and avoid RAM mirrors */
        if (c.i.imm) {
                jit_addi(tmp2, rs, (s16)c.i.imm);
-               jit_andi(tmp2, tmp2, 0x1f800000 | (ram_size - 1));
+               jit_andr(tmp2, tmp2, reg_imm);
        } else {
-               jit_andi(tmp2, rs, 0x1f800000 | (ram_size - 1));
+               jit_andr(tmp2, rs, reg_imm);
        }
 
        lightrec_free_reg(reg_cache, rs);
+       lightrec_free_reg(reg_cache, reg_imm);
        tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
 
-       to_not_ram = jit_bgti(tmp2, ram_size);
-
-       lightrec_regcache_mark_live(reg_cache, _jit);
+       if (state->offset_ram != state->offset_scratch) {
+               to_not_ram = jit_bgti(tmp2, ram_size);
+               masked_reg = tmp2;
+       } else {
+               jit_lti_u(tmp, tmp2, ram_size);
+               jit_movnr(tmp, tmp2, tmp);
+               masked_reg = tmp;
+       }
 
        /* Compute the offset to the code LUT */
-       jit_andi(tmp, tmp2, (RAM_SIZE - 1) & ~3);
-       if (__WORDSIZE == 64)
+       if (c.i.op == OP_SW)
+               jit_andi(tmp, masked_reg, RAM_SIZE - 1);
+       else
+               jit_andi(tmp, masked_reg, (RAM_SIZE - 1) & ~3);
+
+       if (!lut_is_32bit(state))
                jit_lshi(tmp, tmp, 1);
-       jit_addr(tmp, LIGHTREC_REG_STATE, tmp);
+       jit_add_state(tmp, tmp);
 
        /* Write NULL to the code LUT to invalidate any block that's there */
-       jit_stxi(offsetof(struct lightrec_state, code_lut), tmp, tmp3);
+       if (lut_is_32bit(state))
+               jit_stxi_i(offsetof(struct lightrec_state, code_lut), tmp, tmp3);
+       else
+               jit_stxi(offsetof(struct lightrec_state, code_lut), tmp, tmp3);
 
        if (state->offset_ram != state->offset_scratch) {
                jit_movi(tmp, state->offset_ram);
 
-               to_end = jit_jmpi();
+               to_end = jit_b();
+               jit_patch(to_not_ram);
        }
 
-       jit_patch(to_not_ram);
-
        if (state->offset_ram || state->offset_scratch)
                jit_movi(tmp, state->offset_scratch);
 
@@ -1160,51 +1558,100 @@ static void rec_store_direct(struct lightrec_cstate *cstate, const struct block
        lightrec_free_reg(reg_cache, tmp);
        lightrec_free_reg(reg_cache, tmp3);
 
-       rt = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rt, 0);
-       jit_new_node_www(code, 0, tmp2, rt);
+       rt = lightrec_alloc_reg_in(reg_cache, _jit, in_reg, 0);
+
+       if (is_big_endian() && swap_code && in_reg) {
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               jit_new_node_ww(swap_code, tmp, rt);
+               jit_new_node_www(code, 0, tmp2, tmp);
+
+               lightrec_free_reg(reg_cache, tmp);
+       } else {
+               jit_new_node_www(code, 0, tmp2, rt);
+       }
 
        lightrec_free_reg(reg_cache, rt);
        lightrec_free_reg(reg_cache, tmp2);
 }
 
 static void rec_store(struct lightrec_cstate *state,
-                     const struct block *block, u16 offset, jit_code_t code)
+                     const struct block *block, u16 offset,
+                     jit_code_t code, jit_code_t swap_code)
 {
-       u16 flags = block->opcode_list[offset].flags;
+       u32 flags = block->opcode_list[offset].flags;
+       u32 mode = LIGHTREC_FLAGS_GET_IO_MODE(flags);
+       bool no_invalidate = op_flag_no_invalidate(flags) ||
+               (state->state->opt_flags & LIGHTREC_OPT_INV_DMA_ONLY);
+       union code c = block->opcode_list[offset].c;
+       bool is_swc2 = c.i.op == OP_SWC2;
+
+       if (is_swc2) {
+               switch (mode) {
+               case LIGHTREC_IO_RAM:
+               case LIGHTREC_IO_SCRATCH:
+               case LIGHTREC_IO_DIRECT:
+               case LIGHTREC_IO_DIRECT_HW:
+                       rec_cp2_do_mfc2(state, block, offset, c.i.rt, REG_TEMP);
+                       break;
+               default:
+                       break;
+               }
+       }
 
-       if (flags & LIGHTREC_NO_INVALIDATE) {
-               rec_store_direct_no_invalidate(state, block, offset, code);
-       } else if (flags & LIGHTREC_DIRECT_IO) {
-               if (state->state->invalidate_from_dma_only)
-                       rec_store_direct_no_invalidate(state, block, offset, code);
-               else
-                       rec_store_direct(state, block, offset, code);
-       } else {
+       switch (mode) {
+       case LIGHTREC_IO_RAM:
+               rec_store_ram(state, block, offset, code,
+                             swap_code, !no_invalidate);
+               break;
+       case LIGHTREC_IO_SCRATCH:
+               rec_store_scratch(state, block, offset, code, swap_code);
+               break;
+       case LIGHTREC_IO_DIRECT:
+               if (no_invalidate) {
+                       rec_store_direct_no_invalidate(state, block, offset,
+                                                      code, swap_code);
+               } else {
+                       rec_store_direct(state, block, offset, code, swap_code);
+               }
+               break;
+       case LIGHTREC_IO_DIRECT_HW:
+               rec_store_io(state, block, offset, code, swap_code);
+               break;
+       default:
                rec_io(state, block, offset, true, false);
+               return;
        }
+
+       if (is_swc2)
+               lightrec_discard_reg_if_loaded(state->reg_cache, REG_TEMP);
 }
 
 static void rec_SB(struct lightrec_cstate *state,
                   const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_store(state, block, offset, jit_code_stxi_c);
+       rec_store(state, block, offset, jit_code_stxi_c, 0);
 }
 
 static void rec_SH(struct lightrec_cstate *state,
                   const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_store(state, block, offset, jit_code_stxi_s);
+       rec_store(state, block, offset,
+                 jit_code_stxi_s, jit_code_bswapr_us);
 }
 
 static void rec_SW(struct lightrec_cstate *state,
                   const struct block *block, u16 offset)
 
 {
-       _jit_name(block->_jit, __func__);
-       rec_store(state, block, offset, jit_code_stxi_i);
-}
+       union code c = block->opcode_list[offset].c;
+
+       _jit_name(block->_jit, c.i.op == OP_SWC2 ? "rec_SWC2" : "rec_SW");
+       rec_store(state, block, offset,
+                 jit_code_stxi_i, jit_code_bswapr_ui);
+}
 
 static void rec_SWL(struct lightrec_cstate *state,
                    const struct block *block, u16 offset)
@@ -1220,25 +1667,141 @@ static void rec_SWR(struct lightrec_cstate *state,
        rec_io(state, block, offset, true, false);
 }
 
-static void rec_SWC2(struct lightrec_cstate *state,
-                    const struct block *block, u16 offset)
+static void rec_load_memory(struct lightrec_cstate *cstate,
+                           const struct block *block, u16 offset,
+                           jit_code_t code, jit_code_t swap_code, bool is_unsigned,
+                           uintptr_t addr_offset, u32 addr_mask)
 {
-       _jit_name(block->_jit, __func__);
-       rec_io(state, block, offset, false, false);
+       struct regcache *reg_cache = cstate->reg_cache;
+       struct opcode *op = &block->opcode_list[offset];
+       bool load_delay = op_flag_load_delay(op->flags) && !cstate->no_load_delay;
+       jit_state_t *_jit = block->_jit;
+       u8 rs, rt, out_reg, addr_reg, flags = REG_EXT;
+       bool no_mask = op_flag_no_mask(op->flags);
+       union code c = op->c;
+       s8 reg_imm;
+       s16 imm;
+
+       if (load_delay || c.i.op == OP_LWC2)
+               out_reg = REG_TEMP;
+       else if (c.i.rt)
+               out_reg = c.i.rt;
+       else
+               return;
+
+       if (is_unsigned)
+               flags |= REG_ZEXT;
+
+       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
+       rt = lightrec_alloc_reg_out(reg_cache, _jit, out_reg, flags);
+
+       if (!cstate->state->mirrors_mapped && c.i.imm && !no_mask) {
+               jit_addi(rt, rs, (s16)c.i.imm);
+               addr_reg = rt;
+               imm = 0;
+       } else {
+               addr_reg = rs;
+               imm = (s16)c.i.imm;
+       }
+
+       if (!no_mask) {
+               reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                            addr_mask);
+
+               jit_andr(rt, addr_reg, reg_imm);
+               addr_reg = rt;
+
+               lightrec_free_reg(reg_cache, reg_imm);
+       }
+
+       if (addr_offset) {
+               reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                            addr_offset);
+
+               jit_addr(rt, addr_reg, reg_imm);
+               addr_reg = rt;
+
+               lightrec_free_reg(reg_cache, reg_imm);
+       }
+
+       jit_new_node_www(code, rt, addr_reg, imm);
+
+       if (is_big_endian() && swap_code) {
+               jit_new_node_ww(swap_code, rt, rt);
+
+               if (c.i.op == OP_LH)
+                       jit_extr_s(rt, rt);
+               else if (c.i.op == OP_LW && __WORDSIZE == 64)
+                       jit_extr_i(rt, rt);
+       }
+
+       lightrec_free_reg(reg_cache, rs);
+       lightrec_free_reg(reg_cache, rt);
+}
+
+static void rec_load_ram(struct lightrec_cstate *cstate,
+                        const struct block *block, u16 offset,
+                        jit_code_t code, jit_code_t swap_code, bool is_unsigned)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       rec_load_memory(cstate, block, offset, code, swap_code, is_unsigned,
+                       cstate->state->offset_ram, rec_ram_mask(cstate->state));
+}
+
+static void rec_load_bios(struct lightrec_cstate *cstate,
+                         const struct block *block, u16 offset,
+                         jit_code_t code, jit_code_t swap_code, bool is_unsigned)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       rec_load_memory(cstate, block, offset, code, swap_code, is_unsigned,
+                       cstate->state->offset_bios, 0x1fffffff);
+}
+
+static void rec_load_scratch(struct lightrec_cstate *cstate,
+                            const struct block *block, u16 offset,
+                            jit_code_t code, jit_code_t swap_code, bool is_unsigned)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       rec_load_memory(cstate, block, offset, code, swap_code, is_unsigned,
+                       cstate->state->offset_scratch, 0x1fffffff);
+}
+
+static void rec_load_io(struct lightrec_cstate *cstate,
+                       const struct block *block, u16 offset,
+                       jit_code_t code, jit_code_t swap_code, bool is_unsigned)
+{
+       _jit_note(block->_jit, __FILE__, __LINE__);
+
+       rec_load_memory(cstate, block, offset, code, swap_code, is_unsigned,
+                       cstate->state->offset_io, rec_io_mask(cstate->state));
 }
 
-static void rec_load_direct(struct lightrec_cstate *cstate, const struct block *block,
-                           u16 offset, jit_code_t code, bool is_unsigned)
+static void rec_load_direct(struct lightrec_cstate *cstate,
+                           const struct block *block, u16 offset,
+                           jit_code_t code, jit_code_t swap_code,
+                           bool is_unsigned)
 {
        struct lightrec_state *state = cstate->state;
        struct regcache *reg_cache = cstate->reg_cache;
-       union code c = block->opcode_list[offset].c;
+       struct opcode *op = &block->opcode_list[offset];
+       bool load_delay = op_flag_load_delay(op->flags) && !cstate->no_load_delay;
        jit_state_t *_jit = block->_jit;
        jit_node_t *to_not_ram, *to_not_bios, *to_end, *to_end2;
-       u8 tmp, rs, rt, addr_reg, flags = REG_EXT;
+       u8 tmp, rs, rt, out_reg, addr_reg, flags = REG_EXT;
+       union code c = op->c;
+       s32 addr_mask;
+       u32 reg_imm;
+       s8 offt_reg;
        s16 imm;
 
-       if (!c.i.rt)
+       if (load_delay || c.i.op == OP_LWC2)
+               out_reg = REG_TEMP;
+       else if (c.i.rt)
+               out_reg = c.i.rt;
+       else
                return;
 
        if (is_unsigned)
@@ -1246,7 +1809,7 @@ static void rec_load_direct(struct lightrec_cstate *cstate, const struct block *
 
        jit_note(__FILE__, __LINE__);
        rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
-       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt, flags);
+       rt = lightrec_alloc_reg_out(reg_cache, _jit, out_reg, flags);
 
        if ((state->offset_ram == state->offset_bios &&
            state->offset_ram == state->offset_scratch &&
@@ -1266,29 +1829,46 @@ static void rec_load_direct(struct lightrec_cstate *cstate, const struct block *
 
        if (state->offset_ram == state->offset_bios &&
            state->offset_ram == state->offset_scratch) {
+               if (!state->mirrors_mapped)
+                       addr_mask = 0x1f800000 | (RAM_SIZE - 1);
+               else
+                       addr_mask = 0x1fffffff;
+
+               reg_imm = lightrec_alloc_reg_temp_with_value(reg_cache, _jit,
+                                                            addr_mask);
                if (!state->mirrors_mapped) {
                        jit_andi(tmp, addr_reg, BIT(28));
                        jit_rshi_u(tmp, tmp, 28 - 22);
-                       jit_ori(tmp, tmp, 0x1f800000 | (RAM_SIZE - 1));
+                       jit_orr(tmp, tmp, reg_imm);
                        jit_andr(rt, addr_reg, tmp);
                } else {
-                       jit_andi(rt, addr_reg, 0x1fffffff);
+                       jit_andr(rt, addr_reg, reg_imm);
                }
 
-               if (state->offset_ram)
-                       jit_movi(tmp, state->offset_ram);
+               lightrec_free_reg(reg_cache, reg_imm);
+
+               if (state->offset_ram) {
+                       offt_reg = lightrec_get_reg_with_value(reg_cache,
+                                                              state->offset_ram);
+                       if (offt_reg < 0) {
+                               jit_movi(tmp, state->offset_ram);
+                               lightrec_temp_set_value(reg_cache, tmp,
+                                                       state->offset_ram);
+                       } else {
+                               lightrec_free_reg(reg_cache, tmp);
+                               tmp = offt_reg;
+                       }
+               }
        } else {
                to_not_ram = jit_bmsi(addr_reg, BIT(28));
 
-               lightrec_regcache_mark_live(reg_cache, _jit);
-
                /* Convert to KUNSEG and avoid RAM mirrors */
                jit_andi(rt, addr_reg, RAM_SIZE - 1);
 
                if (state->offset_ram)
                        jit_movi(tmp, state->offset_ram);
 
-               to_end = jit_jmpi();
+               to_end = jit_b();
 
                jit_patch(to_not_ram);
 
@@ -1301,7 +1881,7 @@ static void rec_load_direct(struct lightrec_cstate *cstate, const struct block *
                jit_movi(tmp, state->offset_bios);
 
                if (state->offset_bios != state->offset_scratch) {
-                       to_end2 = jit_jmpi();
+                       to_end2 = jit_b();
 
                        jit_patch(to_not_bios);
 
@@ -1322,44 +1902,78 @@ static void rec_load_direct(struct lightrec_cstate *cstate, const struct block *
 
        jit_new_node_www(code, rt, rt, imm);
 
+       if (is_big_endian() && swap_code) {
+               jit_new_node_ww(swap_code, rt, rt);
+
+               if (c.i.op == OP_LH)
+                       jit_extr_s(rt, rt);
+               else if (c.i.op == OP_LW && __WORDSIZE == 64)
+                       jit_extr_i(rt, rt);
+       }
+
        lightrec_free_reg(reg_cache, addr_reg);
        lightrec_free_reg(reg_cache, rt);
        lightrec_free_reg(reg_cache, tmp);
 }
 
 static void rec_load(struct lightrec_cstate *state, const struct block *block,
-                    u16 offset, jit_code_t code, bool is_unsigned)
+                    u16 offset, jit_code_t code, jit_code_t swap_code,
+                    bool is_unsigned)
 {
-       u16 flags = block->opcode_list[offset].flags;
+       const struct opcode *op = &block->opcode_list[offset];
+       u32 flags = op->flags;
 
-       if (flags & LIGHTREC_DIRECT_IO)
-               rec_load_direct(state, block, offset, code, is_unsigned);
-       else
+       switch (LIGHTREC_FLAGS_GET_IO_MODE(flags)) {
+       case LIGHTREC_IO_RAM:
+               rec_load_ram(state, block, offset, code, swap_code, is_unsigned);
+               break;
+       case LIGHTREC_IO_BIOS:
+               rec_load_bios(state, block, offset, code, swap_code, is_unsigned);
+               break;
+       case LIGHTREC_IO_SCRATCH:
+               rec_load_scratch(state, block, offset, code, swap_code, is_unsigned);
+               break;
+       case LIGHTREC_IO_DIRECT_HW:
+               rec_load_io(state, block, offset, code, swap_code, is_unsigned);
+               break;
+       case LIGHTREC_IO_DIRECT:
+               rec_load_direct(state, block, offset, code, swap_code, is_unsigned);
+               break;
+       default:
                rec_io(state, block, offset, false, true);
+               return;
+       }
+
+       if (op->i.op == OP_LWC2) {
+               rec_cp2_do_mtc2(state, block, offset, op->i.rt, REG_TEMP);
+               lightrec_discard_reg_if_loaded(state->reg_cache, REG_TEMP);
+       }
 }
 
 static void rec_LB(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_load(state, block, offset, jit_code_ldxi_c, false);
+       rec_load(state, block, offset, jit_code_ldxi_c, 0, false);
 }
 
 static void rec_LBU(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_load(state, block, offset, jit_code_ldxi_uc, true);
+       rec_load(state, block, offset, jit_code_ldxi_uc, 0, true);
 }
 
 static void rec_LH(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
+       jit_code_t code = is_big_endian() ? jit_code_ldxi_us : jit_code_ldxi_s;
+
        _jit_name(block->_jit, __func__);
-       rec_load(state, block, offset, jit_code_ldxi_s, false);
+       rec_load(state, block, offset, code, jit_code_bswapr_us, false);
 }
 
 static void rec_LHU(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_load(state, block, offset, jit_code_ldxi_us, true);
+       rec_load(state, block, offset, jit_code_ldxi_us, jit_code_bswapr_us, true);
 }
 
 static void rec_LWL(struct lightrec_cstate *state, const struct block *block, u16 offset)
@@ -1376,61 +1990,81 @@ static void rec_LWR(struct lightrec_cstate *state, const struct block *block, u1
 
 static void rec_LW(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
-       _jit_name(block->_jit, __func__);
-       rec_load(state, block, offset, jit_code_ldxi_i, false);
-}
+       union code c = block->opcode_list[offset].c;
+       jit_code_t code;
 
-static void rec_LWC2(struct lightrec_cstate *state, const struct block *block, u16 offset)
-{
-       _jit_name(block->_jit, __func__);
-       rec_io(state, block, offset, false, false);
+       if (is_big_endian() && __WORDSIZE == 64)
+               code = jit_code_ldxi_ui;
+       else
+               code = jit_code_ldxi_i;
+
+       _jit_name(block->_jit, c.i.op == OP_LWC2 ? "rec_LWC2" : "rec_LW");
+       rec_load(state, block, offset, code, jit_code_bswapr_ui, false);
 }
 
-static void rec_break_syscall(struct lightrec_cstate *state,
-                             const struct block *block, u16 offset, bool is_break)
+static void rec_exit_early(struct lightrec_cstate *state,
+                          const struct block *block, u16 offset,
+                          u32 exit_code, u32 pc)
 {
+       struct regcache *reg_cache = state->reg_cache;
+       jit_state_t *_jit = block->_jit;
+       u8 tmp;
+
        _jit_note(block->_jit, __FILE__, __LINE__);
 
-       if (is_break)
-               call_to_c_wrapper(state, block, 0, false, C_WRAPPER_BREAK);
-       else
-               call_to_c_wrapper(state, block, 0, false, C_WRAPPER_SYSCALL);
+       tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
 
-       /* TODO: the return address should be "pc - 4" if we're a delay slot */
-       lightrec_emit_end_of_block(state, block, offset, -1,
-                                  get_ds_pc(block, offset, 0),
-                                  31, 0, true);
+       jit_movi(tmp, exit_code);
+       jit_stxi_i(offsetof(struct lightrec_state, exit_flags),
+                  LIGHTREC_REG_STATE, tmp);
+
+       jit_ldxi_i(tmp, LIGHTREC_REG_STATE,
+                  offsetof(struct lightrec_state, target_cycle));
+       jit_subr(tmp, tmp, LIGHTREC_REG_CYCLE);
+       jit_movi(LIGHTREC_REG_CYCLE, 0);
+       jit_stxi_i(offsetof(struct lightrec_state, target_cycle),
+                  LIGHTREC_REG_STATE, tmp);
+       jit_stxi_i(offsetof(struct lightrec_state, current_cycle),
+                  LIGHTREC_REG_STATE, tmp);
+
+       lightrec_free_reg(reg_cache, tmp);
+
+       lightrec_emit_end_of_block(state, block, offset, -1, pc, 31, 0, true);
 }
 
 static void rec_special_SYSCALL(struct lightrec_cstate *state,
                                const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_break_syscall(state, block, offset, false);
+
+       /* TODO: the return address should be "pc - 4" if we're a delay slot */
+       rec_exit_early(state, block, offset, LIGHTREC_EXIT_SYSCALL,
+                      get_ds_pc(block, offset, 0));
 }
 
 static void rec_special_BREAK(struct lightrec_cstate *state,
                              const struct block *block, u16 offset)
 {
        _jit_name(block->_jit, __func__);
-       rec_break_syscall(state, block, offset, true);
+       rec_exit_early(state, block, offset, LIGHTREC_EXIT_BREAK,
+                      get_ds_pc(block, offset, 0));
 }
 
-static void rec_mfc(struct lightrec_cstate *state,
-                   const struct block *block, u16 offset)
+static void rec_mfc(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
 
        jit_note(__FILE__, __LINE__);
-       lightrec_clean_reg_if_loaded(reg_cache, _jit, c.i.rt, true);
 
-       call_to_c_wrapper(state, block, c.opcode, true, C_WRAPPER_MFC);
+       if (c.i.op != OP_SWC2)
+               lightrec_clean_reg_if_loaded(reg_cache, _jit, c.i.rt, true);
+
+       call_to_c_wrapper(state, block, c.opcode, C_WRAPPER_MFC);
 }
 
-static void rec_mtc(struct lightrec_cstate *state,
-                   const struct block *block, u16 offset)
+static void rec_mtc(struct lightrec_cstate *state, const struct block *block, u16 offset)
 {
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
@@ -1439,11 +2073,12 @@ static void rec_mtc(struct lightrec_cstate *state,
        jit_note(__FILE__, __LINE__);
        lightrec_clean_reg_if_loaded(reg_cache, _jit, c.i.rs, false);
        lightrec_clean_reg_if_loaded(reg_cache, _jit, c.i.rt, false);
+       lightrec_clean_reg_if_loaded(reg_cache, _jit, REG_TEMP, false);
 
-       call_to_c_wrapper(state, block, c.opcode, true, C_WRAPPER_MTC);
+       call_to_c_wrapper(state, block, c.opcode, C_WRAPPER_MTC);
 
        if (c.i.op == OP_CP0 &&
-           !(block->opcode_list[offset].flags & LIGHTREC_NO_DS) &&
+           !op_flag_no_ds(block->opcode_list[offset].flags) &&
            (c.r.rd == 12 || c.r.rd == 13))
                lightrec_emit_end_of_block(state, block, offset, -1,
                                           get_ds_pc(block, offset, 1),
@@ -1468,13 +2103,16 @@ rec_mfc0(struct lightrec_cstate *state, const struct block *block, u16 offset)
        lightrec_free_reg(reg_cache, rt);
 }
 
-static bool block_in_bios(const struct lightrec_cstate *state,
-                         const struct block *block)
+static bool block_uses_icache(const struct lightrec_cstate *state,
+                             const struct block *block)
 {
-       const struct lightrec_mem_map *bios = &state->state->maps[PSX_MAP_BIOS];
+       const struct lightrec_mem_map *map = &state->state->maps[PSX_MAP_KERNEL_USER_RAM];
        u32 pc = kunseg(block->pc);
 
-       return pc >= bios->pc && pc < bios->pc + bios->length;
+       if (pc < map->pc || pc >= map->pc + map->length)
+               return false;
+
+       return (block->pc >> 28) < 0xa;
 }
 
 static void
@@ -1483,7 +2121,8 @@ rec_mtc0(struct lightrec_cstate *state, const struct block *block, u16 offset)
        struct regcache *reg_cache = state->reg_cache;
        const union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
-       u8 rt, tmp, tmp2, status;
+       u8 rt, tmp = 0, tmp2, status;
+       jit_node_t *to_end;
 
        jit_note(__FILE__, __LINE__);
 
@@ -1499,10 +2138,11 @@ rec_mtc0(struct lightrec_cstate *state, const struct block *block, u16 offset)
                break;
        }
 
-       if (block_in_bios(state, block) && c.r.rd == 12) {
-               /* If we are running code from the BIOS, handle writes to the
-                * Status register in C. BIOS code may toggle bit 16 which will
-                * map/unmap the RAM, while game code cannot do that. */
+       if (!block_uses_icache(state, block) && c.r.rd == 12) {
+               /* If we are not running code from the RAM through kuseg or
+                * kseg0, handle writes to the Status register in C; as the
+                * code may toggle bit 16 which isolates the cache. Code
+                * running from kuseg or kseg0 in RAM cannot do that. */
                rec_mtc(state, block, offset);
                return;
        }
@@ -1518,13 +2158,13 @@ rec_mtc0(struct lightrec_cstate *state, const struct block *block, u16 offset)
                tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
                jit_ldxi_i(tmp, LIGHTREC_REG_STATE,
                           offsetof(struct lightrec_state, regs.cp0[13]));
+
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
        }
 
        if (c.r.rd == 12) {
                status = rt;
        } else if (c.r.rd == 13) {
-               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
-
                /* Cause = (Cause & ~0x0300) | (value & 0x0300) */
                jit_andi(tmp2, rt, 0x0300);
                jit_ori(tmp, tmp, 0x0300);
@@ -1544,20 +2184,41 @@ rec_mtc0(struct lightrec_cstate *state, const struct block *block, u16 offset)
                jit_andi(tmp, tmp, 0x0300);
                jit_nei(tmp, tmp, 0);
                jit_andr(tmp, tmp, status);
-               jit_stxi_i(offsetof(struct lightrec_state, exit_flags),
-                          LIGHTREC_REG_STATE, tmp);
-
-               lightrec_free_reg(reg_cache, tmp);
        }
 
-       if (c.r.rd == 13)
-               lightrec_free_reg(reg_cache, tmp2);
+       if (c.r.rd == 12) {
+               /* Exit dynarec in case we unmask a hardware interrupt.
+                * exit_flags = !(~status & 0x401) */
+
+               jit_comr(tmp2, status);
+               jit_andi(tmp2, tmp2, 0x401);
+               jit_eqi(tmp2, tmp2, 0);
+               jit_orr(tmp, tmp, tmp2);
+       }
 
        lightrec_free_reg(reg_cache, rt);
 
-       if (!(block->opcode_list[offset].flags & LIGHTREC_NO_DS) &&
-           (c.r.rd == 12 || c.r.rd == 13))
-               lightrec_emit_eob(state, block, offset + 1, true);
+       if (c.r.rd == 12 || c.r.rd == 13) {
+               to_end = jit_beqi(tmp, 0);
+
+               jit_ldxi_i(tmp2, LIGHTREC_REG_STATE,
+                          offsetof(struct lightrec_state, target_cycle));
+               jit_subr(tmp2, tmp2, LIGHTREC_REG_CYCLE);
+               jit_movi(LIGHTREC_REG_CYCLE, 0);
+               jit_stxi_i(offsetof(struct lightrec_state, target_cycle),
+                          LIGHTREC_REG_STATE, tmp2);
+               jit_stxi_i(offsetof(struct lightrec_state, current_cycle),
+                          LIGHTREC_REG_STATE, tmp2);
+
+
+               jit_patch(to_end);
+       }
+
+       if (!op_flag_no_ds(block->opcode_list[offset].flags) &&
+           (c.r.rd == 12 || c.r.rd == 13)) {
+               state->cycles += lightrec_cycles_of_opcode(state->state, c);
+               lightrec_emit_eob(state, block, offset + 1);
+       }
 }
 
 static void rec_cp0_MFC0(struct lightrec_cstate *state,
@@ -1588,32 +2249,287 @@ static void rec_cp0_CTC0(struct lightrec_cstate *state,
        rec_mtc0(state, block, offset);
 }
 
+static unsigned int cp2d_i_offset(u8 reg)
+{
+       return offsetof(struct lightrec_state, regs.cp2d[reg]);
+}
+
+static unsigned int cp2d_s_offset(u8 reg)
+{
+       return cp2d_i_offset(reg) + is_big_endian() * 2;
+}
+
+static unsigned int cp2c_i_offset(u8 reg)
+{
+       return offsetof(struct lightrec_state, regs.cp2c[reg]);
+}
+
+static unsigned int cp2c_s_offset(u8 reg)
+{
+       return cp2c_i_offset(reg) + is_big_endian() * 2;
+}
+
+static void rec_cp2_do_mfc2(struct lightrec_cstate *state,
+                           const struct block *block, u16 offset,
+                           u8 reg, u8 out_reg)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       jit_state_t *_jit = block->_jit;
+       const u32 zext_regs = 0x300f0080;
+       u8 rt, tmp, tmp2, tmp3, out, flags;
+       unsigned int i;
+
+       _jit_name(block->_jit, __func__);
+
+       if (state->state->ops.cop2_notify) {
+               /* We must call cop2_notify, handle that in C. */
+               rec_mfc(state, block, offset);
+               return;
+       }
+
+       flags = (zext_regs & BIT(reg)) ? REG_ZEXT : REG_EXT;
+       rt = lightrec_alloc_reg_out(reg_cache, _jit, out_reg, flags);
+
+       if (reg == 15)
+               reg = 14;
+
+       switch (reg) {
+       case 1:
+       case 3:
+       case 5:
+       case 8:
+       case 9:
+       case 10:
+       case 11:
+               jit_ldxi_s(rt, LIGHTREC_REG_STATE, cp2d_s_offset(reg));
+               break;
+       case 7:
+       case 16:
+       case 17:
+       case 18:
+       case 19:
+               jit_ldxi_us(rt, LIGHTREC_REG_STATE, cp2d_s_offset(reg));
+               break;
+       case 28:
+       case 29:
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+               tmp3 = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               for (i = 0; i < 3; i++) {
+                       out = i == 0 ? rt : tmp;
+
+                       jit_ldxi_s(tmp, LIGHTREC_REG_STATE, cp2d_s_offset(9 + i));
+                       jit_movi(tmp2, 0x1f);
+                       jit_rshi(out, tmp, 7);
+
+                       jit_ltr(tmp3, tmp2, out);
+                       jit_movnr(out, tmp2, tmp3);
+
+                       jit_gei(tmp2, out, 0);
+                       jit_movzr(out, tmp2, tmp2);
+
+                       if (i > 0) {
+                               jit_lshi(tmp, tmp, 5 * i);
+                               jit_orr(rt, rt, tmp);
+                       }
+               }
+
+
+               lightrec_free_reg(reg_cache, tmp);
+               lightrec_free_reg(reg_cache, tmp2);
+               lightrec_free_reg(reg_cache, tmp3);
+               break;
+       default:
+               jit_ldxi_i(rt, LIGHTREC_REG_STATE, cp2d_i_offset(reg));
+               break;
+       }
+
+       lightrec_free_reg(reg_cache, rt);
+}
+
 static void rec_cp2_basic_MFC2(struct lightrec_cstate *state,
                               const struct block *block, u16 offset)
 {
-       _jit_name(block->_jit, __func__);
-       rec_mfc(state, block, offset);
+       const union code c = block->opcode_list[offset].c;
+
+       rec_cp2_do_mfc2(state, block, offset, c.r.rd, c.r.rt);
 }
 
 static void rec_cp2_basic_CFC2(struct lightrec_cstate *state,
                               const struct block *block, u16 offset)
 {
+       struct regcache *reg_cache = state->reg_cache;
+       const union code c = block->opcode_list[offset].c;
+       jit_state_t *_jit = block->_jit;
+       u8 rt;
+
+       _jit_name(block->_jit, __func__);
+
+       if (state->state->ops.cop2_notify) {
+               /* We must call cop2_notify, handle that in C. */
+               rec_mfc(state, block, offset);
+               return;
+       }
+
+       switch (c.r.rd) {
+       case 4:
+       case 12:
+       case 20:
+       case 26:
+       case 27:
+       case 29:
+       case 30:
+               rt = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rt, REG_EXT);
+               jit_ldxi_s(rt, LIGHTREC_REG_STATE, cp2c_s_offset(c.r.rd));
+               break;
+       default:
+               rt = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rt, REG_ZEXT);
+               jit_ldxi_ui(rt, LIGHTREC_REG_STATE, cp2c_i_offset(c.r.rd));
+               break;
+       }
+
+       lightrec_free_reg(reg_cache, rt);
+}
+
+static void rec_cp2_do_mtc2(struct lightrec_cstate *state,
+                           const struct block *block, u16 offset,
+                           u8 reg, u8 in_reg)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       jit_state_t *_jit = block->_jit;
+       u8 rt, tmp, tmp2, flags = 0;
+
        _jit_name(block->_jit, __func__);
-       rec_mfc(state, block, offset);
+
+       if (state->state->ops.cop2_notify) {
+               /* We must call cop2_notify, handle that in C. */
+               rec_mtc(state, block, offset);
+               return;
+       }
+
+       if (reg == 31)
+               return;
+
+       if (reg == 30)
+               flags |= REG_EXT;
+
+       rt = lightrec_alloc_reg_in(reg_cache, _jit, in_reg, flags);
+
+       switch (reg) {
+       case 15:
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+               jit_ldxi_i(tmp, LIGHTREC_REG_STATE, cp2d_i_offset(13));
+
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+               jit_ldxi_i(tmp2, LIGHTREC_REG_STATE, cp2d_i_offset(14));
+
+               jit_stxi_i(cp2d_i_offset(12), LIGHTREC_REG_STATE, tmp);
+               jit_stxi_i(cp2d_i_offset(13), LIGHTREC_REG_STATE, tmp2);
+               jit_stxi_i(cp2d_i_offset(14), LIGHTREC_REG_STATE, rt);
+
+               lightrec_free_reg(reg_cache, tmp);
+               lightrec_free_reg(reg_cache, tmp2);
+               break;
+       case 28:
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               jit_lshi(tmp, rt, 7);
+               jit_andi(tmp, tmp, 0xf80);
+               jit_stxi_s(cp2d_s_offset(9), LIGHTREC_REG_STATE, tmp);
+
+               jit_lshi(tmp, rt, 2);
+               jit_andi(tmp, tmp, 0xf80);
+               jit_stxi_s(cp2d_s_offset(10), LIGHTREC_REG_STATE, tmp);
+
+               jit_rshi(tmp, rt, 3);
+               jit_andi(tmp, tmp, 0xf80);
+               jit_stxi_s(cp2d_s_offset(11), LIGHTREC_REG_STATE, tmp);
+
+               lightrec_free_reg(reg_cache, tmp);
+               break;
+       case 30:
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               /* if (rt < 0) rt = ~rt; */
+               jit_rshi(tmp, rt, 31);
+               jit_xorr(tmp, rt, tmp);
+
+               /* Count leading zeros */
+               jit_clzr(tmp, tmp);
+               if (__WORDSIZE != 32)
+                       jit_subi(tmp, tmp, __WORDSIZE - 32);
+
+               jit_stxi_i(cp2d_i_offset(31), LIGHTREC_REG_STATE, tmp);
+
+               lightrec_free_reg(reg_cache, tmp);
+               fallthrough;
+       default:
+               jit_stxi_i(cp2d_i_offset(reg), LIGHTREC_REG_STATE, rt);
+               break;
+       }
+
+       lightrec_free_reg(reg_cache, rt);
 }
 
 static void rec_cp2_basic_MTC2(struct lightrec_cstate *state,
                               const struct block *block, u16 offset)
 {
-       _jit_name(block->_jit, __func__);
-       rec_mtc(state, block, offset);
+       const union code c = block->opcode_list[offset].c;
+
+       rec_cp2_do_mtc2(state, block, offset, c.r.rd, c.r.rt);
 }
 
 static void rec_cp2_basic_CTC2(struct lightrec_cstate *state,
                               const struct block *block, u16 offset)
 {
+       struct regcache *reg_cache = state->reg_cache;
+       const union code c = block->opcode_list[offset].c;
+       jit_state_t *_jit = block->_jit;
+       u8 rt, tmp, tmp2;
+
        _jit_name(block->_jit, __func__);
-       rec_mtc(state, block, offset);
+
+       if (state->state->ops.cop2_notify) {
+               /* We must call cop2_notify, handle that in C. */
+               rec_mtc(state, block, offset);
+               return;
+       }
+
+       rt = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rt, 0);
+
+       switch (c.r.rd) {
+       case 4:
+       case 12:
+       case 20:
+       case 26:
+       case 27:
+       case 29:
+       case 30:
+               jit_stxi_s(cp2c_s_offset(c.r.rd), LIGHTREC_REG_STATE, rt);
+               break;
+       case 31:
+               tmp = lightrec_alloc_reg_temp(reg_cache, _jit);
+               tmp2 = lightrec_alloc_reg_temp(reg_cache, _jit);
+
+               jit_andi(tmp, rt, 0x7f87e000);
+               jit_nei(tmp, tmp, 0);
+               jit_lshi(tmp, tmp, 31);
+
+               jit_andi(tmp2, rt, 0x7ffff000);
+               jit_orr(tmp, tmp2, tmp);
+
+               jit_stxi_i(cp2c_i_offset(31), LIGHTREC_REG_STATE, tmp);
+
+               lightrec_free_reg(reg_cache, tmp);
+               lightrec_free_reg(reg_cache, tmp2);
+               break;
+
+       default:
+               jit_stxi_i(cp2c_i_offset(c.r.rd), LIGHTREC_REG_STATE, rt);
+       }
+
+       lightrec_free_reg(reg_cache, rt);
 }
 
 static void rec_cp0_RFE(struct lightrec_cstate *state,
@@ -1665,31 +2581,82 @@ static void rec_CP(struct lightrec_cstate *state,
        jit_name(__func__);
        jit_note(__FILE__, __LINE__);
 
-       call_to_c_wrapper(state, block, c.opcode, true, C_WRAPPER_CP);
+       call_to_c_wrapper(state, block, c.opcode, C_WRAPPER_CP);
 }
 
 static void rec_meta_MOV(struct lightrec_cstate *state,
                         const struct block *block, u16 offset)
 {
        struct regcache *reg_cache = state->reg_cache;
-       union code c = block->opcode_list[offset].c;
+       const struct opcode *op = &block->opcode_list[offset];
+       union code c = op->c;
        jit_state_t *_jit = block->_jit;
+       bool unload_rd;
+       bool unload_rs, discard_rs;
        u8 rs, rd;
 
        _jit_name(block->_jit, __func__);
        jit_note(__FILE__, __LINE__);
-       if (c.r.rs)
-               rs = lightrec_alloc_reg_in(reg_cache, _jit, c.r.rs, 0);
-       rd = lightrec_alloc_reg_out(reg_cache, _jit, c.r.rd, REG_EXT);
 
-       if (c.r.rs == 0)
-               jit_movi(rd, 0);
-       else
-               jit_extr_i(rd, rs);
+       unload_rs = OPT_EARLY_UNLOAD
+               && LIGHTREC_FLAGS_GET_RS(op->flags) == LIGHTREC_REG_UNLOAD;
+       discard_rs = OPT_EARLY_UNLOAD
+               && LIGHTREC_FLAGS_GET_RS(op->flags) == LIGHTREC_REG_DISCARD;
+
+       if ((unload_rs || discard_rs) && c.m.rs) {
+               /* If the source register is going to be unloaded or discarded,
+                * then we can simply mark its host register as now pointing to
+                * the destination register. */
+               pr_debug("Remap %s to %s at offset 0x%x\n",
+                        lightrec_reg_name(c.m.rs), lightrec_reg_name(c.m.rd),
+                        offset << 2);
+               rs = lightrec_alloc_reg_in(reg_cache, _jit, c.m.rs, 0);
+               lightrec_remap_reg(reg_cache, _jit, rs, c.m.rd, discard_rs);
+               lightrec_free_reg(reg_cache, rs);
+               return;
+       }
+
+       unload_rd = OPT_EARLY_UNLOAD
+               && LIGHTREC_FLAGS_GET_RD(op->flags) == LIGHTREC_REG_UNLOAD;
+
+       if (c.m.rs && !lightrec_reg_is_loaded(reg_cache, c.m.rs)) {
+               /* The source register is not yet loaded - we can load its value
+                * from the register cache directly into the target register. */
+               rd = lightrec_alloc_reg_out(reg_cache, _jit, c.m.rd, REG_EXT);
+
+               jit_ldxi_i(rd, LIGHTREC_REG_STATE,
+                          offsetof(struct lightrec_state, regs.gpr) + (c.m.rs << 2));
+
+               lightrec_free_reg(reg_cache, rd);
+       } else if (unload_rd) {
+               /* If the destination register will be unloaded right after the
+                * MOV meta-opcode, we don't actually need to write any host
+                * register - we can just store the source register directly to
+                * the register cache, at the offset corresponding to the
+                * destination register. */
+               lightrec_discard_reg_if_loaded(reg_cache, c.m.rd);
+
+               rs = lightrec_alloc_reg_in(reg_cache, _jit, c.m.rs, 0);
+
+               jit_stxi_i(offsetof(struct lightrec_state, regs.gpr)
+                          + (c.m.rd << 2), LIGHTREC_REG_STATE, rs);
 
-       if (c.r.rs)
                lightrec_free_reg(reg_cache, rs);
-       lightrec_free_reg(reg_cache, rd);
+       } else {
+               if (c.m.rs)
+                       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.m.rs, 0);
+
+               rd = lightrec_alloc_reg_out(reg_cache, _jit, c.m.rd, REG_EXT);
+
+               if (c.m.rs == 0) {
+                       jit_movi(rd, 0);
+               } else {
+                       jit_extr_i(rd, rs);
+                       lightrec_free_reg(reg_cache, rs);
+               }
+
+               lightrec_free_reg(reg_cache, rd);
+       }
 }
 
 static void rec_meta_EXTC_EXTS(struct lightrec_cstate *state,
@@ -1699,21 +2666,116 @@ static void rec_meta_EXTC_EXTS(struct lightrec_cstate *state,
        struct regcache *reg_cache = state->reg_cache;
        union code c = block->opcode_list[offset].c;
        jit_state_t *_jit = block->_jit;
-       u8 rs, rt;
+       u8 rs, rd;
 
        _jit_name(block->_jit, __func__);
        jit_note(__FILE__, __LINE__);
 
-       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, 0);
-       rt = lightrec_alloc_reg_out(reg_cache, _jit, c.i.rt, REG_EXT);
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.m.rs, c.m.rd, 0, REG_EXT, &rs, &rd);
 
-       if (c.i.op == OP_META_EXTC)
-               jit_extr_c(rt, rs);
+       if (c.m.op == OP_META_EXTC)
+               jit_extr_c(rd, rs);
        else
-               jit_extr_s(rt, rs);
+               jit_extr_s(rd, rs);
 
        lightrec_free_reg(reg_cache, rs);
-       lightrec_free_reg(reg_cache, rt);
+       lightrec_free_reg(reg_cache, rd);
+}
+
+static void rec_meta_MULT2(struct lightrec_cstate *state,
+                          const struct block *block,
+                          u16 offset)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       union code c = block->opcode_list[offset].c;
+       jit_state_t *_jit = block->_jit;
+       u8 reg_lo = get_mult_div_lo(c);
+       u8 reg_hi = get_mult_div_hi(c);
+       u32 flags = block->opcode_list[offset].flags;
+       bool is_signed = c.i.op == OP_META_MULT2;
+       u8 rs, lo, hi, rflags = 0, hiflags = 0;
+       unsigned int i;
+
+       if (!op_flag_no_hi(flags) && c.r.op < 32) {
+               rflags = is_signed ? REG_EXT : REG_ZEXT;
+               hiflags = is_signed ? REG_EXT : (REG_EXT | REG_ZEXT);
+       }
+
+       _jit_name(block->_jit, __func__);
+       jit_note(__FILE__, __LINE__);
+
+       rs = lightrec_alloc_reg_in(reg_cache, _jit, c.i.rs, rflags);
+
+       /*
+        * We must handle the case where one of the output registers is our rs
+        * input register. Thanksfully, computing LO/HI can be done in any
+        * order. Here, we make sure that the computation that overwrites the
+        * input register is always performed last.
+        */
+       for (i = 0; i < 2; i++) {
+               if ((!i ^ (reg_lo == c.i.rs)) && !op_flag_no_lo(flags)) {
+                       lo = lightrec_alloc_reg_out(reg_cache, _jit, reg_lo, 0);
+
+                       if (c.r.op < 32)
+                               jit_lshi(lo, rs, c.r.op);
+                       else
+                               jit_movi(lo, 0);
+
+                       lightrec_free_reg(reg_cache, lo);
+                       continue;
+               }
+
+               if ((!!i ^ (reg_lo == c.i.rs)) && !op_flag_no_hi(flags)) {
+                       hi = lightrec_alloc_reg_out(reg_cache, _jit,
+                                                   reg_hi, hiflags);
+
+                       if (c.r.op >= 32)
+                               jit_lshi(hi, rs, c.r.op - 32);
+                       else if (is_signed)
+                               jit_rshi(hi, rs, 32 - c.r.op);
+                       else
+                               jit_rshi_u(hi, rs, 32 - c.r.op);
+
+                       lightrec_free_reg(reg_cache, hi);
+               }
+       }
+
+       lightrec_free_reg(reg_cache, rs);
+
+       _jit_name(block->_jit, __func__);
+       jit_note(__FILE__, __LINE__);
+}
+
+static void rec_meta_COM(struct lightrec_cstate *state,
+                        const struct block *block, u16 offset)
+{
+       struct regcache *reg_cache = state->reg_cache;
+       union code c = block->opcode_list[offset].c;
+       jit_state_t *_jit = block->_jit;
+       u8 rd, rs, flags;
+
+       jit_note(__FILE__, __LINE__);
+
+       rec_alloc_rs_rd(reg_cache, _jit, &block->opcode_list[offset],
+                       c.m.rs, c.m.rd, 0, 0, &rs, &rd);
+
+       flags = lightrec_get_reg_in_flags(reg_cache, rs);
+
+       lightrec_set_reg_out_flags(reg_cache, rd,
+                                  flags & REG_EXT);
+
+       jit_comr(rd, rs);
+
+       lightrec_free_reg(reg_cache, rs);
+       lightrec_free_reg(reg_cache, rd);
+}
+
+static void unknown_opcode(struct lightrec_cstate *state,
+                          const struct block *block, u16 offset)
+{
+       rec_exit_early(state, block, offset, LIGHTREC_EXIT_UNKNOWN_OP,
+                      block->pc + (offset << 2));
 }
 
 static const lightrec_rec_func_t rec_standard[64] = {
@@ -1748,12 +2810,12 @@ static const lightrec_rec_func_t rec_standard[64] = {
        [OP_SWL]                = rec_SWL,
        [OP_SW]                 = rec_SW,
        [OP_SWR]                = rec_SWR,
-       [OP_LWC2]               = rec_LWC2,
-       [OP_SWC2]               = rec_SWC2,
+       [OP_LWC2]               = rec_LW,
+       [OP_SWC2]               = rec_SW,
 
-       [OP_META_MOV]           = rec_meta_MOV,
-       [OP_META_EXTC]          = rec_meta_EXTC_EXTS,
-       [OP_META_EXTS]          = rec_meta_EXTC_EXTS,
+       [OP_META]               = rec_META,
+       [OP_META_MULT2]         = rec_meta_MULT2,
+       [OP_META_MULTU2]        = rec_meta_MULT2,
 };
 
 static const lightrec_rec_func_t rec_special[64] = {
@@ -1813,6 +2875,14 @@ static const lightrec_rec_func_t rec_cp2_basic[64] = {
        [OP_CP2_BASIC_CTC2]     = rec_cp2_basic_CTC2,
 };
 
+static const lightrec_rec_func_t rec_meta[64] = {
+       SET_DEFAULT_ELM(rec_meta, unknown_opcode),
+       [OP_META_MOV]           = rec_meta_MOV,
+       [OP_META_EXTC]          = rec_meta_EXTC_EXTS,
+       [OP_META_EXTS]          = rec_meta_EXTC_EXTS,
+       [OP_META_COM]           = rec_meta_COM,
+};
+
 static void rec_SPECIAL(struct lightrec_cstate *state,
                        const struct block *block, u16 offset)
 {
@@ -1866,6 +2936,18 @@ static void rec_CP2(struct lightrec_cstate *state,
        rec_CP(state, block, offset);
 }
 
+static void rec_META(struct lightrec_cstate *state,
+                    const struct block *block, u16 offset)
+{
+       union code c = block->opcode_list[offset].c;
+       lightrec_rec_func_t f = rec_meta[c.m.op];
+
+       if (!HAS_DEFAULT_ELM && unlikely(!f))
+               unknown_opcode(state, block, offset);
+       else
+               (*f)(state, block, offset);
+}
+
 void lightrec_rec_opcode(struct lightrec_cstate *state,
                         const struct block *block, u16 offset)
 {
@@ -1874,9 +2956,11 @@ void lightrec_rec_opcode(struct lightrec_cstate *state,
        const struct opcode *op = &block->opcode_list[offset];
        jit_state_t *_jit = block->_jit;
        lightrec_rec_func_t f;
+       u16 unload_offset;
 
-       if (op->flags & LIGHTREC_SYNC) {
-               jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, state->cycles);
+       if (op_flag_sync(op->flags)) {
+               if (state->cycles)
+                       jit_subi(LIGHTREC_REG_CYCLE, LIGHTREC_REG_CYCLE, state->cycles);
                state->cycles = 0;
 
                lightrec_storeback_regs(reg_cache, _jit);
@@ -1897,16 +2981,12 @@ void lightrec_rec_opcode(struct lightrec_cstate *state,
                        (*f)(state, block, offset);
        }
 
-       if (unlikely(op->flags & LIGHTREC_UNLOAD_RD)) {
-               lightrec_clean_reg_if_loaded(reg_cache, _jit, op->r.rd, true);
-               pr_debug("Cleaning RD reg %s\n", lightrec_reg_name(op->r.rd));
-       }
-       if (unlikely(op->flags & LIGHTREC_UNLOAD_RS)) {
-               lightrec_clean_reg_if_loaded(reg_cache, _jit, op->i.rs, true);
-               pr_debug("Cleaning RS reg %s\n", lightrec_reg_name(op->i.rt));
-       }
-       if (unlikely(op->flags & LIGHTREC_UNLOAD_RT)) {
-               lightrec_clean_reg_if_loaded(reg_cache, _jit, op->i.rt, true);
-               pr_debug("Cleaning RT reg %s\n", lightrec_reg_name(op->i.rt));
+       if (OPT_EARLY_UNLOAD) {
+               unload_offset = offset +
+                       (has_delay_slot(op->c) && !op_flag_no_ds(op->flags));
+
+               lightrec_do_early_unload(state, block, unload_offset);
        }
+
+       state->no_load_delay = false;
 }