mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 07:02:27 +01:00
83f684c66c
byuu says: Note: for Windows users, please go to nall/intrinsics.hpp line 60 and correct the typo from "DISPLAY_WINDOW" to "DISPLAY_WINDOWS" before compiling, otherwise things won't work at all. This will be a really major WIP for the core SNES emulation, so please test as thoroughly as possible. I rewrote the 65816 CPU core's dispatcher from a jump table to a switch table. This was so that I could pass class variables as parameters to opcodes without crazy theatrics. With that, I killed the regs.r[N] stuff, the flag_t operator|=, &=, ^= stuff, and all of the template versions of opcodes. I also removed some stupid pointless flag tests in xcn and pflag that would always be true. I sure hope that AWJ is happy with this; because this change was so that my flag assignments and branch tests won't need to build regs.P into a full 8-bit variable anymore. It does of course incur a slight performance hit when you pass in variables by-value to functions, but it should help with binary size (and thus cache) by reducing a lot of extra functions. (I know I could have used template parameters for some things even with a switch table, but chose not to for the aforementioned reasons.) Overall, it's about a ~1% speedup from the previous build. The CPU core instructions were never a bottleneck, but I did want to fix the P flag building stuff because that really was a dumb mistake v_v'
196 lines
4.1 KiB
C++
196 lines
4.1 KiB
C++
auto R65816::op_write_addr_b(reg16_t& reg) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
L op_writedbr(aa.w, reg);
|
|
}
|
|
|
|
auto R65816::op_write_addr_w(reg16_t& reg) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_writedbr(aa.w + 0, reg >> 0);
|
|
L op_writedbr(aa.w + 1, reg >> 8);
|
|
}
|
|
|
|
auto R65816::op_write_addrr_b(reg16_t& reg, reg16_t& idx) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io();
|
|
L op_writedbr(aa.w + idx, reg);
|
|
}
|
|
|
|
auto R65816::op_write_addrr_w(reg16_t& reg, reg16_t& idx) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io();
|
|
op_writedbr(aa.w + idx + 0, reg >> 0);
|
|
L op_writedbr(aa.w + idx + 1, reg >> 8);
|
|
}
|
|
|
|
auto R65816::op_write_longr_b(reg16_t& idx) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
L op_writelong(aa.d + idx, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_write_longr_w(reg16_t& idx) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
op_writelong(aa.d + idx + 0, regs.a.l);
|
|
L op_writelong(aa.d + idx + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_write_dp_b(reg16_t& reg) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
L op_writedp(dp, reg);
|
|
}
|
|
|
|
auto R65816::op_write_dp_w(reg16_t& reg) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_writedp(dp + 0, reg >> 0);
|
|
L op_writedp(dp + 1, reg >> 8);
|
|
}
|
|
|
|
auto R65816::op_write_dpr_b(reg16_t& reg, reg16_t& idx) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
L op_writedp(dp + idx, reg);
|
|
}
|
|
|
|
auto R65816::op_write_dpr_w(reg16_t& reg, reg16_t& idx) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
op_writedp(dp + idx + 0, reg >> 0);
|
|
L op_writedp(dp + idx + 1, reg >> 8);
|
|
}
|
|
|
|
auto R65816::op_sta_idp_b() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
L op_writedbr(aa.w, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_idp_w() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
op_writedbr(aa.w + 0, regs.a.l);
|
|
L op_writedbr(aa.w + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_ildp_b() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
L op_writelong(aa.d, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_ildp_w() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
op_writelong(aa.d + 0, regs.a.l);
|
|
L op_writelong(aa.d + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_idpx_b() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
aa.l = op_readdp(dp + regs.x.w + 0);
|
|
aa.h = op_readdp(dp + regs.x.w + 1);
|
|
L op_writedbr(aa.w, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_idpx_w() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
aa.l = op_readdp(dp + regs.x.w + 0);
|
|
aa.h = op_readdp(dp + regs.x.w + 1);
|
|
op_writedbr(aa.w + 0, regs.a.l);
|
|
L op_writedbr(aa.w + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_idpy_b() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
op_io();
|
|
L op_writedbr(aa.w + regs.y.w, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_idpy_w() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
op_io();
|
|
op_writedbr(aa.w + regs.y.w + 0, regs.a.l);
|
|
L op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_ildpy_b() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
L op_writelong(aa.d + regs.y.w, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_ildpy_w() {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
op_writelong(aa.d + regs.y.w + 0, regs.a.l);
|
|
L op_writelong(aa.d + regs.y.w + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_sr_b() {
|
|
sp = op_readpc();
|
|
op_io();
|
|
L op_writesp(sp, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_sr_w() {
|
|
sp = op_readpc();
|
|
op_io();
|
|
op_writesp(sp + 0, regs.a.l);
|
|
L op_writesp(sp + 1, regs.a.h);
|
|
}
|
|
|
|
auto R65816::op_sta_isry_b() {
|
|
sp = op_readpc();
|
|
op_io();
|
|
aa.l = op_readsp(sp + 0);
|
|
aa.h = op_readsp(sp + 1);
|
|
op_io();
|
|
L op_writedbr(aa.w + regs.y.w, regs.a.l);
|
|
}
|
|
|
|
auto R65816::op_sta_isry_w() {
|
|
sp = op_readpc();
|
|
op_io();
|
|
aa.l = op_readsp(sp + 0);
|
|
aa.h = op_readsp(sp + 1);
|
|
op_io();
|
|
op_writedbr(aa.w + regs.y.w + 0, regs.a.l);
|
|
L op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
|
|
}
|