diff --git a/sources/PPU/PPU.cpp b/sources/PPU/PPU.cpp index e55c829..da4f700 100644 --- a/sources/PPU/PPU.cpp +++ b/sources/PPU/PPU.cpp @@ -32,12 +32,9 @@ namespace ComSquare::PPU this->_mainScreen = {{{0}}}; this->_subScreen = {{{0}}}; this->_registers._isLowByte = true; - /*for (int i = 0; i < 512; i++) { - this->cgram->write(i, random() % 255); - */ //colors for the cgram - /* this->cgram->write(2, 0xE0); + this->cgram->write(2, 0xE0); this->cgram->write(3, 0x7F); this->cgram->write(4, 0x1F); // 0x1F this->cgram->write(6, 0xFF); @@ -77,17 +74,17 @@ namespace ComSquare::PPU 00,0x03,0x00,0x03,0x00,0x03,0x00,0x06,0x00,0x0c,0x00,0x18,0x00,0xf0,0x00,0xe0, 00,0x00,0x00,0x00,0x80,0x00,0xc0,0x00,0xe0,0x00,0xf0,0x00,0xf8,0x00,0xfc,0x00, 00,0x00,0x00,0x00,0x01,0x00,0x03,0x00,0x07,0x00,0x0f,00,0x1f,00,0x3f,00, -1 - }; */ - int *cgram_test = get_dump_cgram(); + }; + /*int *cgram_test = get_dump_cgram(); for (int i = 0; cgram_test[i] != -1; i++) { this->cgram->write(i, cgram_test[i]); - } + }*/ - int *vram_test = get_dump_vram(); + // int *vram_test = get_dump_vram(); for (int i = 0; vram_test[i] != -1; i++) { this->vram->write(i, vram_test[i]); } - /* int vram_test_2[] = {8, 00, 02, 00, 0x0A, 00, 02, 00, 0x0A, 00, 00, 00, 00, 00, 00, -1}; + int vram_test_2[] = {8, 00, 02, 00, 0x0A, 00, 02, 00, 0x0A, 00, 00, 00, 00, 00, 00, -1}; for (int i = 0; vram_test_2[i] != -1; i++) { this->vram->write(i + 0x8000, vram_test_2[i]); } @@ -145,9 +142,10 @@ namespace ComSquare::PPU //this->_registers._bgofs[2].raw = 0x03E0; //this->_registers._bgofs[3].raw = 0x03DF; this->_registers._t[0].enableWindowDisplayBg1 = true; - this->_registers._t[0].enableWindowDisplayBg2 = true; */ + this->_registers._t[0].enableWindowDisplayBg2 = true; - //registers + /* + //registers aladin this->_registers._bgmode.bgMode = 1; this->_backgrounds[0].setBpp(this->getBPP(1)); @@ -201,7 +199,7 @@ namespace ComSquare::PPU this->_registers._t[0].enableWindowDisplayBg2 = true; this->_registers._t[0].enableWindowDisplayBg3 = true; - +*/ } uint8_t PPU::read(uint24_t addr) diff --git a/tests/CPU/testDMA.cpp b/tests/CPU/testDMA.cpp index e661701..d286c9a 100644 --- a/tests/CPU/testDMA.cpp +++ b/tests/CPU/testDMA.cpp @@ -69,7 +69,7 @@ Test(DMA, VramWrite) } for(unsigned i = 0; i < 0x400; i++) { uint16_t value = snes.ppu->vram->_data[0x2000 * 2 + i * 2] | (snes.ppu->vram->_data[0x2000 * 2 + i * 2 + 1] << 8); - cr_assert_eq(value, (uint16_t)i, "The memory at %x should be %x but it was %x", 0x2000 + i, (uint16_t)i, value); + cr_expect_eq(value, (uint16_t)i, "The memory at %x should be %x but it was %x", 0x2000 + i, (uint16_t)i, value); } }