sinamas/gambatte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgambatte/ppu: extract loadTileDataByte query functions

Browse Source 
reduce duplication.
This commit is contained in:
sinamas 2013-02-22 20:01:11 +01:00
parent 9f04bbc226
commit f01b9a47a9
1 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libgambatte/src/video/ppu.cpp
View File

@ -191,6 +191,28 @@ namespace M2 {
} }
*/ */
static int loadTileDataByte0(PPUPriv const &p) {
unsigned const yoffset = p.winDrawState & WIN_DRAW_STARTED
? p.winYPos
: p.scy + p.lyCounter.ly();
return p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2];
}
static int loadTileDataByte1(PPUPriv const &p) {
unsigned const yoffset = p.winDrawState & WIN_DRAW_STARTED
? p.winYPos
: p.scy + p.lyCounter.ly();
return p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2 + 1];
}
namespace M3Start { namespace M3Start {
static void f0(PPUPriv &p) { static void f0(PPUPriv &p) {
p.xpos = 0; p.xpos = 0;
@ -227,28 +249,11 @@ namespace M3Start {
break; break;
case 2: case 2:
{ p.reg0 = loadTileDataByte0(p);
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED
? p.winYPos
: p.scy + p.lyCounter.ly();
p.reg0 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2];
}
break; break;
case 4: case 4:
{ {
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED int const r1 = loadTileDataByte1(p);
? p.winYPos
: p.scy + p.lyCounter.ly();
const unsigned r1 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2 + 1];
p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0] p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0]
+ (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2; + (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2;
} }
@ -929,15 +934,7 @@ namespace StartWindowDraw {
} }
static void f2(PPUPriv &p) { static void f2(PPUPriv &p) {
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED p.reg0 = loadTileDataByte0(p);
? p.winYPos
: p.scy + p.lyCounter.ly();
p.reg0 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2];
inc(f3_, p); inc(f3_, p);
} }
@ -946,13 +943,7 @@ namespace StartWindowDraw {
} }
static void f4(PPUPriv &p) { static void f4(PPUPriv &p) {
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED int const r1 = loadTileDataByte1(p);
? p.winYPos
: p.scy + p.lyCounter.ly();
const unsigned r1 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2 + 1];
p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0] p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0]
+ (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2; + (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2;
@ -1109,15 +1100,7 @@ namespace Tile {
if ((p.winDrawState & WIN_DRAW_START) && handleWinDrawStartReq(p)) if ((p.winDrawState & WIN_DRAW_START) && handleWinDrawStartReq(p))
return StartWindowDraw::f0(p); return StartWindowDraw::f0(p);
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED p.reg0 = loadTileDataByte0(p);
? p.winYPos
: p.scy + p.lyCounter.ly();
p.reg0 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2];
inc(f3_, p); inc(f3_, p);
} }
@ -1132,13 +1115,7 @@ namespace Tile {
if ((p.winDrawState & WIN_DRAW_START) && handleWinDrawStartReq(p)) if ((p.winDrawState & WIN_DRAW_START) && handleWinDrawStartReq(p))
return StartWindowDraw::f0(p); return StartWindowDraw::f0(p);
const unsigned yoffset = p.winDrawState & WIN_DRAW_STARTED int const r1 = loadTileDataByte1(p);
? p.winYPos
: p.scy + p.lyCounter.ly();
const unsigned r1 = p.vram[0x1000 + (p.nattrib << 10 & 0x2000)
- ((p.reg1 * 32 | p.lcdc << 8) & 0x1000)
+ p.reg1 * 16
+ ((-(p.nattrib >> 6 & 1) ^ yoffset) & 7) * 2 + 1];
p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0] p.ntileword = (expand_lut + (p.nattrib << 3 & 0x100))[p.reg0]
+ (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2; + (expand_lut + (p.nattrib << 3 & 0x100))[r1 ] * 2;