Macintosh-Tools
/
gb6
mirror of https://github.com/mlaux/gb6.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reenable rendering for now

This commit is contained in:
Matthew Laux 2022-08-02 15:11:51 -05:00
parent 2b6a315b0e
commit a9ecd14598
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/emulator.c
View File

@ -26,9 +26,6 @@ int emulator_main(int argc, char *argv[])
lcd_new(&lcd);
// this might be too much abstraction but it'll let me
// test the cpu, rom, and dmg independently and use the cpu
// for other non-GB stuff
dmg_new(&dmg, &cpu, &rom, &lcd);
cpu.dmg = &dmg;
// cpu_bind_mem_model(&cpu, &dmg, dmg_read, dmg_write);

3
cli/imgui_example.cpp
View File

@ -152,9 +152,6 @@ int main(int argc, char *argv[])
lcd_new(&lcd);
// this might be too much abstraction but it'll let me
// test the cpu, rom, and dmg independently and use the cpu
// for other non-GB stuff
dmg_new(&dmg, &cpu, &rom, &lcd);
cpu.dmg = &dmg;
// cpu_bind_mem_model(&cpu, &dmg, dmg_read, dmg_write);

24
src/dmg.c
View File

@ -262,22 +262,22 @@ void dmg_step(void *_dmg)
dmg_request_interrupt(dmg, INT_LCDSTAT);
}
// int lcdc = lcd_read(dmg->lcd, REG_LCDC);
// if (lcdc & LCDC_ENABLE_BG) {
// render_background(dmg, lcdc);
// }
int lcdc = lcd_read(dmg->lcd, REG_LCDC);
if (lcdc & LCDC_ENABLE_BG) {
render_background(dmg, lcdc);
}
// if (lcdc & LCDC_ENABLE_WINDOW) {
// // printf("window\n");
// }
if (lcdc & LCDC_ENABLE_WINDOW) {
// printf("window\n");
}
// lcd_apply_scroll(dmg->lcd);
lcd_apply_scroll(dmg->lcd);
// if (lcdc & LCDC_ENABLE_OBJ) {
// render_objs(dmg);
// }
if (lcdc & LCDC_ENABLE_OBJ) {
render_objs(dmg);
}
// lcd_draw(dmg->lcd);
lcd_draw(dmg->lcd);
}
} else {
int scan = lcd_read(dmg->lcd, REG_LY);

2
system6/CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.9)
include_directories(../src)
set(CMAKE_CXX_FLAGS "-O3")
set(CMAKE_C_FLAGS "-O3")
add_application(Emulator
../src/bootstrap.c

9
system6/emulator.c
View File

@ -89,7 +89,7 @@ void Render(void)
MoveTo(10, 180);
char debug[128];
double ms = execTime / 600.0;
sprintf(debug, "10000 insn %d ticks, %f ms per instruction", execTime, ms);
sprintf(debug, "10000 in %d ticks, %.2f ms per instruction", execTime, ms);
C2PStr(debug);
DrawString(debug);
}
@ -102,6 +102,13 @@ void Render(void)
// 0.000695 second per instruction
// 0.695 ms per instruction
// REAL GB:
// 4194304 Hz
// 1048576 NOPs per second
// 174763 CALL 16s per second
// 0.001 ms per NOP
// 0.006 ms per CALL 16
void StartEmulation(void)
{
g_wp = NewWindow(0, &windowBounds, WINDOW_TITLE, true,