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'
276 lines
5.5 KiB
C++
276 lines
5.5 KiB
C++
auto R65816::op_read_const_b(fp op) {
|
|
L rd.l = op_readpc();
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_const_w(fp op) {
|
|
rd.l = op_readpc();
|
|
L rd.h = op_readpc();
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_bit_const_b() {
|
|
L rd.l = op_readpc();
|
|
regs.p.z = ((rd.l & regs.a.l) == 0);
|
|
}
|
|
|
|
auto R65816::op_read_bit_const_w() {
|
|
rd.l = op_readpc();
|
|
L rd.h = op_readpc();
|
|
regs.p.z = ((rd.w & regs.a.w) == 0);
|
|
}
|
|
|
|
auto R65816::op_read_addr_b(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
L rd.l = op_readdbr(aa.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_addr_w(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
rd.l = op_readdbr(aa.w + 0);
|
|
L rd.h = op_readdbr(aa.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_addrx_b(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io_cond4(aa.w, aa.w + regs.x.w);
|
|
L rd.l = op_readdbr(aa.w + regs.x.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_addrx_w(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io_cond4(aa.w, aa.w + regs.x.w);
|
|
rd.l = op_readdbr(aa.w + regs.x.w + 0);
|
|
L rd.h = op_readdbr(aa.w + regs.x.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_addry_b(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io_cond4(aa.w, aa.w + regs.y.w);
|
|
L rd.l = op_readdbr(aa.w + regs.y.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_addry_w(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
op_io_cond4(aa.w, aa.w + regs.y.w);
|
|
rd.l = op_readdbr(aa.w + regs.y.w + 0);
|
|
L rd.h = op_readdbr(aa.w + regs.y.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_long_b(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
L rd.l = op_readlong(aa.d);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_long_w(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
rd.l = op_readlong(aa.d + 0);
|
|
L rd.h = op_readlong(aa.d + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_longx_b(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
L rd.l = op_readlong(aa.d + regs.x.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_longx_w(fp op) {
|
|
aa.l = op_readpc();
|
|
aa.h = op_readpc();
|
|
aa.b = op_readpc();
|
|
rd.l = op_readlong(aa.d + regs.x.w + 0);
|
|
L rd.h = op_readlong(aa.d + regs.x.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_dp_b(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
L rd.l = op_readdp(dp);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_dp_w(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
rd.l = op_readdp(dp + 0);
|
|
L rd.h = op_readdp(dp + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_dpr_b(fp op, reg16_t& reg) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
L rd.l = op_readdp(dp + reg.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_dpr_w(fp op, reg16_t& reg) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
op_io();
|
|
rd.l = op_readdp(dp + reg.w + 0);
|
|
L rd.h = op_readdp(dp + reg.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idp_b(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
L rd.l = op_readdbr(aa.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idp_w(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
rd.l = op_readdbr(aa.w + 0);
|
|
L rd.h = op_readdbr(aa.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idpx_b(fp op) {
|
|
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 rd.l = op_readdbr(aa.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idpx_w(fp op) {
|
|
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);
|
|
rd.l = op_readdbr(aa.w + 0);
|
|
L rd.h = op_readdbr(aa.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idpy_b(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
op_io_cond4(aa.w, aa.w + regs.y.w);
|
|
L rd.l = op_readdbr(aa.w + regs.y.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_idpy_w(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
op_io_cond4(aa.w, aa.w + regs.y.w);
|
|
rd.l = op_readdbr(aa.w + regs.y.w + 0);
|
|
L rd.h = op_readdbr(aa.w + regs.y.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_ildp_b(fp op) {
|
|
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 rd.l = op_readlong(aa.d);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_ildp_w(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
rd.l = op_readlong(aa.d + 0);
|
|
L rd.h = op_readlong(aa.d + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_ildpy_b(fp op) {
|
|
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 rd.l = op_readlong(aa.d + regs.y.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_ildpy_w(fp op) {
|
|
dp = op_readpc();
|
|
op_io_cond2();
|
|
aa.l = op_readdp(dp + 0);
|
|
aa.h = op_readdp(dp + 1);
|
|
aa.b = op_readdp(dp + 2);
|
|
rd.l = op_readlong(aa.d + regs.y.w + 0);
|
|
L rd.h = op_readlong(aa.d + regs.y.w + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_sr_b(fp op) {
|
|
sp = op_readpc();
|
|
op_io();
|
|
L rd.l = op_readsp(sp);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_sr_w(fp op) {
|
|
sp = op_readpc();
|
|
op_io();
|
|
rd.l = op_readsp(sp + 0);
|
|
L rd.h = op_readsp(sp + 1);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_isry_b(fp op) {
|
|
sp = op_readpc();
|
|
op_io();
|
|
aa.l = op_readsp(sp + 0);
|
|
aa.h = op_readsp(sp + 1);
|
|
op_io();
|
|
L rd.l = op_readdbr(aa.w + regs.y.w);
|
|
call(op);
|
|
}
|
|
|
|
auto R65816::op_read_isry_w(fp op) {
|
|
sp = op_readpc();
|
|
op_io();
|
|
aa.l = op_readsp(sp + 0);
|
|
aa.h = op_readsp(sp + 1);
|
|
op_io();
|
|
rd.l = op_readdbr(aa.w + regs.y.w + 0);
|
|
L rd.h = op_readdbr(aa.w + regs.y.w + 1);
|
|
call(op);
|
|
}
|