- [NEW] Implementada la gestió de registres i interrupcions de la pantalla, així com el renderitzat de tiles

- [FIX] Si una interrupció no està activada, no s'ha d'eixir de halt
- Hi ha algún bug per ahi que ho petat tot
This commit is contained in:
2025-01-17 15:39:18 +01:00
parent 155487376d
commit 7272414f29
4 changed files with 172 additions and 178 deletions

View File

@@ -6,7 +6,7 @@
//#include "z80analyze.h" //#include "z80analyze.h"
#include "ui.h" #include "ui.h"
#include "ui_window.h" #include "ui_window.h"
//#include "zx_screen.h" #include "gbscreen.h"
#define RESIZING_NONE 0 #define RESIZING_NONE 0
#define RESIZING_MEMORY 1 #define RESIZING_MEMORY 1
@@ -105,10 +105,10 @@ namespace debug
con_y = win_h - con_h; con_y = win_h - con_h;
sym_h = win_h - sym_y; sym_h = win_h - sym_y;
debug::refresh(); debug::refresh();
//zxscreen::redraw(); gbscreen::redraw();
} else if (e->window.event == SDL_WINDOWEVENT_CLOSE) { } else if (e->window.event == SDL_WINDOWEVENT_CLOSE) {
hide(); hide();
//zxscreen::focus(); gbscreen::focus();
} }
} }
if (e->type == SDL_MOUSEWHEEL) { if (e->type == SDL_MOUSEWHEEL) {
@@ -356,18 +356,18 @@ namespace debug
void stop() void stop()
{ {
//history::gototop(); //history::gototop();
//zxscreen::setTitle(" (stopped)"); gbscreen::setTitle(" (stopped)");
pause(); pause();
is_debugging = true; is_debugging = true;
show(); show();
//if ( zxscreen::getFullRefresh()) zxscreen::fullrefresh(); if ( gbscreen::getFullRefresh()) gbscreen::fullrefresh();
} }
void cont() { void cont() {
//zxscreen::setTitle(""); gbscreen::setTitle("");
is_debugging = is_paused = false; is_debugging = is_paused = false;
refresh(); refresh();
//zxscreen::focus(); gbscreen::focus();
//zx_ula::sound_enable(); //zx_ula::sound_enable();
} }
@@ -777,7 +777,7 @@ namespace debug
uint8_t dt = sm83::step(); uint8_t dt = sm83::step();
//zx_tape::update(dt); //zx_tape::update(dt);
//zx_ula::sound_update(dt); //zx_ula::sound_update(dt);
//zxscreen::fullrefresh(); gbscreen::fullrefresh();
//z80analyze::refresh(); //z80analyze::refresh();
} else if (strcmp(cmd, "c")==0 || strcmp(cmd, "cont")==0) { } else if (strcmp(cmd, "c")==0 || strcmp(cmd, "cont")==0) {
sm83::step(); sm83::step();

View File

@@ -7,7 +7,7 @@
#include "debug.h" #include "debug.h"
#include "ui.h" #include "ui.h"
namespace zxscreen namespace gbscreen
{ {
uint32_t palette[4] = { uint32_t palette[4] = {
0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000
@@ -31,72 +31,11 @@ namespace zxscreen
uint32_t t_screen = 0; uint32_t t_screen = 0;
int pixels_draw = 0;
uint8_t gb_pixels[160*144]; uint8_t gb_pixels[160*144];
uint8_t *ptr_pixel = gb_pixels; uint8_t *ptr_pixel = gb_pixels;
#define SCREEN_SYNC 0xFFFF uint16_t dots_in_scanline = 0;
#define SCREEN_BORDER 0xFFFE uint8_t line_buffer[160];
void create_tables()
{
uint32_t count = 0;
if (pixel_addr) free(pixel_addr);
if (color_addr) free(color_addr);
pixel_addr = (uint16_t*)malloc(t_states_total*sizeof(uint16_t));
color_addr = (uint16_t*)malloc(t_states_total*sizeof(uint16_t));
uint16_t *ptr_pixel = pixel_addr;
uint16_t *ptr_color = color_addr;
// vsync
for (int i=0; i<t_states_per_scanline*vsync_lines;++i) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_SYNC; } // En el 128K 16 passa a ser 15 i 224 passa a ser 228
// Upper border
for (int i=0; i<48;++i) {
// hsync
for (int j=0;j<t_states_per_scanline-176;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_SYNC; } // En el 128K 48 passsa a ser 52
//border
for (int j=0;j<176;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_BORDER; count+=2; }
}
// scanlines
for (uint8_t y=0; y<192; ++y)
{
// hsync
for (int j=0;j<t_states_per_scanline-176;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_SYNC; } // En el 128K 48 passsa a ser 52
// Left border
for (int j=0;j<24;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_BORDER; count+=2; }
// Actual screen
for (uint8_t x=0;x<32;++x)
{
uint16_t color = /*0x5800 +*/ x + (y>>3)*32;
uint16_t address = /*0x4000 |*/ (x&0x1f) | ((y&0x7)<<8) | ((y&0x38)<<2) | ((y&0xc0)<<5);
for (int i=7;i>0;i-=2)
{
*(ptr_pixel++) = (address & 0x1FFF) | (i << 13);
*(ptr_color++) = color;
count+=2;
}
}
// Right border
for (int j=0;j<24;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_BORDER; count+=2; }
}
// Lower border
for (int i=0; i<56;++i) {
// hsync
for (int j=0;j<t_states_per_scanline-176;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_SYNC; } // En el 128K 48 passsa a ser 52
//border
for (int j=0;j<176;++j) { *(ptr_pixel++) = 0; *(ptr_color++) = SCREEN_BORDER; count+=2; }
}
//printf("COUNT: %i\n", count);
}
bool eventHandler(SDL_Event *e) bool eventHandler(SDL_Event *e)
{ {
@@ -107,30 +46,30 @@ namespace zxscreen
redraw(); redraw();
} }
} }
if (!z80debug::debugging()) { if (!debug::debugging()) {
if (z80debug::paused()) { if (debug::paused()) {
if (e->type == SDL_KEYDOWN) { if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) { if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
const uint8_t dt = z80::step(); const uint8_t dt = sm83::step();
z80debug::cont(); debug::cont();
zxscreen::refresh(dt); gbscreen::refresh(dt);
} }
} }
} else { } else {
if (e->type == SDL_KEYDOWN) { if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) { if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
z80debug::pause(); debug::pause();
zxscreen::redraw(); gbscreen::redraw();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F1) { } else if (e->key.keysym.scancode==SDL_SCANCODE_F1) {
zxscreen::decZoom(); gbscreen::decZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F2) { } else if (e->key.keysym.scancode==SDL_SCANCODE_F2) {
zxscreen::incZoom(); gbscreen::incZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F3) { } else if (e->key.keysym.scancode==SDL_SCANCODE_F3) {
zxscreen::toggleFullscreen(); gbscreen::toggleFullscreen();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F6) { } else if (e->key.keysym.scancode==SDL_SCANCODE_F6) {
zx_tape::play(); //zx_tape::play();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F7) { } else if (e->key.keysym.scancode==SDL_SCANCODE_F7) {
zx_tape::rewind(); //zx_tape::rewind();
} }
} }
} }
@@ -151,9 +90,9 @@ namespace zxscreen
if (win) SDL_DestroyWindow(win); if (win) SDL_DestroyWindow(win);
const int z = fullscreen ? 1 : zoom; const int z = fullscreen ? 1 : zoom;
win = SDL_CreateWindow("ZX Spectrum Screen", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 352*z, 296*z, fullscreen?SDL_WINDOW_FULLSCREEN_DESKTOP:SDL_WINDOW_SHOWN); win = SDL_CreateWindow("Gameboy Screen", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 160*z, 144*z, fullscreen?SDL_WINDOW_FULLSCREEN_DESKTOP:SDL_WINDOW_SHOWN);
ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED); ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED);
tex = SDL_CreateTexture(ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 352, 296); tex = SDL_CreateTexture(ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 160, 144);
uitex = ui::createtexture(ren); uitex = ui::createtexture(ren);
ui::window::registerWindow(SDL_GetWindowID(win), eventHandler); ui::window::registerWindow(SDL_GetWindowID(win), eventHandler);
@@ -162,44 +101,24 @@ namespace zxscreen
{ {
int w, h; int w, h;
SDL_GetWindowSize(win, &w, &h); SDL_GetWindowSize(win, &w, &h);
fullscreen_scale = h/296; fullscreen_scale = h/144;
dest_rect.w = 352 * fullscreen_scale; dest_rect.w = 160 * fullscreen_scale;
dest_rect.h = 296 * fullscreen_scale; dest_rect.h = 144 * fullscreen_scale;
dest_rect.x = (w - dest_rect.w)/2; dest_rect.x = (w - dest_rect.w)/2;
dest_rect.y = (h - dest_rect.h)/2; dest_rect.y = (h - dest_rect.h)/2;
} }
else else
{ {
dest_rect.x = dest_rect.y = 0; dest_rect.x = dest_rect.y = 0;
dest_rect.w = 352 * zoom; dest_rect.w = 160 * zoom;
dest_rect.h = 296 * zoom; dest_rect.h = 144 * zoom;
} }
focus(); focus();
} }
void setBaseAddresses(const uint32_t pixeladdr, const uint32_t coloraddr)
{
pixel_base_addr = pixeladdr;
color_base_addr = coloraddr;
}
void init(int mode) void init(int mode)
{ {
zxscreen::mode = mode;
if (mode==SCREEN_MODE_48K) {
setBaseAddresses(0x4000, 0x5800);
t_states_total = 69888;
t_states_per_scanline = 224;
vsync_lines = 16;
} else if (mode==SCREEN_MODE_128K) {
setBaseAddresses(0x14000, 0x15800);
t_states_total = 70908;
t_states_per_scanline = 228;
vsync_lines = 15;
}
create_tables();
reinit(); reinit();
} }
@@ -212,55 +131,131 @@ namespace zxscreen
} }
} }
void refresh(const uint32_t dt, const bool full) void fill_line_buffer(uint8_t LY)
{ {
const uint8_t* pixel_mem = z80mem::get()->rawPtr(pixel_base_addr); const uint8_t LCDC = mem::readMem(0xff40);
const uint8_t* color_mem = z80mem::get()->rawPtr(color_base_addr); const uint8_t SCY = mem::readMem(0xff42);
const uint8_t border_color = zx_ula::get_border_color(); const uint8_t SCX = mem::readMem(0xff43);
const uint8_t ty = uint8_t(SCY+LY) >> 3;
const uint8_t ly = uint8_t(SCY+LY) & 0x7;
uint8_t tx = SCX >> 3;
uint8_t ox = SCX & 0x7;
for (int i=0;i<dt;++i) uint16_t tilemap_address = LCDC&0x8 ? 0x9c00 : 0x9800;
{ tilemap_address += tx + (ty<<5);
if (color_addr[t_screen] != SCREEN_SYNC) uint8_t tile = mem::readMem(tilemap_address);
{ uint16_t tile_address = 0x8000;
if (color_addr[t_screen] == SCREEN_BORDER) { if ( ((LCDC&0x10)==0) && (tile<128) ) tile_address = 0x9000;
*(ptr_pixel++) = border_color; tile_address = tile_address + (tile<<8);
*(ptr_pixel++) = border_color;
int pi = 0;
while(true) {
uint8_t a = mem::readMem(tile_address++);
uint8_t b = mem::readMem(tile_address++);
for (int i=0; i<8; ++i) {
if (ox==0) {
line_buffer[pi++] = (a&0x10 ? 1 : 0) + (b&0x10 ? 2 : 0 );
} else { } else {
uint8_t color = *(color_mem + color_addr[t_screen]); // z80mem::get()->readMem(color_base_addr + color_addr[t_screen]); ox--;
uint8_t c1 = color&0x7, c2 = (color>>3)&0x7;
if ((color&0x80) && flash) { c1=c2; c2=color&0x7; }
if ((color&0x40)) { c1 |= 0x8; c2 |= 0x8; }
uint16_t address = /*(0x4000) |*/ (pixel_addr[t_screen]&0x1FFF);
uint8_t mask = 1 << (pixel_addr[t_screen]>>13);
uint8_t block = *(pixel_mem + address); // z80mem::get()->readMem(pixel_base_addr + address);
*(ptr_pixel++)=(block&mask) ? c1 : c2;
mask>>=1;
*(ptr_pixel++)=(block&mask) ? c1 : c2;
} }
pixels_draw+=2; a<<1; b<<1;
} if (pi==160) return;
t_screen++;
if (t_screen>=t_states_total) {
pixels_draw=0;
t_flash++;
if (t_flash==16) { t_flash=0; flash = !flash; }
t_screen=0;
ptr_pixel = zx_pixels;
redraw();
if (!full) z80::interrupt();
} }
} }
}
void refresh(const uint32_t dt, const bool full)
{
const uint8_t LCDC = mem::readMem(0xff40);
if ((LCDC&0x80)==0) return;
uint8_t STAT = mem::readMem(0xff41);
uint8_t LY = mem::readMem(0xff44);
const uint8_t LYC = mem::readMem(0xff45);
for (int i=0;i<dt;++i)
{
// Açò va volcant els pixels del line_buffer en pantalla
uint16_t current_pixel = dots_in_scanline-80;
if (current_pixel<160) *(ptr_pixel++) = line_buffer[current_pixel];
// gestió de en quin dot i linea estem, i tot el que ha de passar
bool stat_interrupt = false;
dots_in_scanline++;
if ( (dots_in_scanline==80) && (LY<144) )
{
STAT = (STAT & 0xFC) | 0x3; // Set mode 3
}
else if ( (dots_in_scanline==252) && (LY<144) )
{
STAT = (STAT & 0xFC); // Set mode 0
if (STAT&0x08) stat_interrupt = true;
}
else if (dots_in_scanline==456)
{
dots_in_scanline = 0;
LY++;
if (LY==144)
{
STAT = (STAT & 0xFC) | 0x01; // Set mode 1
mem::writeMem(0xff41, STAT);
mem::writeMem(0xff44, LY);
sm83::interrupt(INTERRUPT_VBLANK);
if (STAT&0x10) stat_interrupt = true;
}
else
{
if (LY<144)
{
STAT = (STAT & 0xFC) | 0x02; // Set mode 2
if (STAT&0x20) stat_interrupt = true;
fill_line_buffer(LY);
}
else if (LY==154)
{
LY=0;
}
}
if (LY==LYC)
{
STAT = (STAT & 0xFB) | 0x40;
if (STAT&0x04) stat_interrupt = true;
}
else
{
STAT = (STAT & 0xFB);
}
}
if (stat_interrupt)
{
mem::writeMem(0xff41, STAT);
mem::writeMem(0xff44, LY);
sm83::interrupt(INTERRUPT_LCD);
}
t_screen++;
if (t_screen>=t_states_total)
{
t_screen=0;
ptr_pixel = gb_pixels;
redraw();
if (!full) sm83::interrupt(INTERRUPT_VBLANK);
}
}
mem::writeMem(0xff41, STAT);
mem::writeMem(0xff44, LY);
} }
void fullrefresh() void fullrefresh()
{ {
uint32_t tmp = t_screen; /*uint32_t tmp = t_screen;
t_screen = 0; t_screen = 0;
uint8_t * tmp_ptr = ptr_pixel; uint8_t * tmp_ptr = ptr_pixel;
ptr_pixel = zx_pixels; ptr_pixel = gb_pixels;
refresh(t_states_total, true); refresh(t_states_total, true);
ptr_pixel = tmp_ptr; ptr_pixel = tmp_ptr;
t_screen = tmp; t_screen = tmp;*/
} }
void debugrefresh(const uint32_t dt) void debugrefresh(const uint32_t dt)
@@ -270,14 +265,14 @@ namespace zxscreen
void redraw(const bool present) void redraw(const bool present)
{ {
if (zx_tape::getplaying() && zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD)) return; //if (zx_tape::getplaying() && zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD)) return;
ui::setrenderer(ren, uitex); ui::setrenderer(ren, uitex);
Uint32* pixels; Uint32* pixels;
int pitch; int pitch;
SDL_LockTexture(tex, NULL, (void**)&pixels, &pitch); SDL_LockTexture(tex, NULL, (void**)&pixels, &pitch);
for (int i=0; i<352*296;++i) *(pixels++) = palette[zx_pixels[i]]; for (int i=0; i<160*144;++i) *(pixels++) = palette[gb_pixels[i]];
SDL_UnlockTexture(tex); SDL_UnlockTexture(tex);
if (fullscreen) if (fullscreen)
@@ -295,7 +290,7 @@ namespace zxscreen
{ {
SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND); SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor(ren, 0, 0, 0, 128); SDL_SetRenderDrawColor(ren, 0, 0, 0, 128);
SDL_Rect rect {0,0,352*zoom,296*zoom}; SDL_Rect rect {0,0,160*zoom,144*zoom};
if (fullscreen) SDL_GetWindowSize(win, &rect.w, &rect.h); if (fullscreen) SDL_GetWindowSize(win, &rect.w, &rect.h);
SDL_RenderFillRect(ren, &rect); SDL_RenderFillRect(ren, &rect);
} }
@@ -310,7 +305,7 @@ namespace zxscreen
void setTitle(const char* title) void setTitle(const char* title)
{ {
char tmp[256]; char tmp[256];
strcpy(tmp, "ZX Spectrum Screen"); strcpy(tmp, "Gameboy Screen");
strcat(tmp, title); strcat(tmp, title);
SDL_SetWindowTitle(win, tmp); SDL_SetWindowTitle(win, tmp);
} }
@@ -321,8 +316,8 @@ namespace zxscreen
SDL_DisplayMode dm; SDL_DisplayMode dm;
SDL_GetCurrentDisplayMode(0, &dm); SDL_GetCurrentDisplayMode(0, &dm);
if (352*value > dm.w) return; if (160*value > dm.w) return;
if (296*value > dm.h) return; if (144*value > dm.h) return;
zoom = value; zoom = value;
reinit(); reinit();
@@ -359,7 +354,6 @@ namespace zxscreen
return full_refresh; return full_refresh;
} }
SDL_Renderer *getrenderer() SDL_Renderer *getrenderer()
{ {
return ren; return ren;

View File

@@ -6,7 +6,7 @@
#include "sm83dis.h" #include "sm83dis.h"
#include "debug.h" #include "debug.h"
//#include "zx_ula.h" //#include "zx_ula.h"
//#include "zx_screen.h" #include "gbscreen.h"
//#include "zx_tape.h" //#include "zx_tape.h"
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <string.h> #include <string.h>
@@ -24,31 +24,31 @@ namespace actions
{ {
const uint8_t dt = sm83::step(); const uint8_t dt = sm83::step();
debug::cont(); debug::cont();
//zxscreen::refresh(dt); gbscreen::refresh(dt);
} }
int decZoom(int value) int decZoom(int value)
{ {
//zxscreen::decZoom(); gbscreen::decZoom();
return 0; return 0;
} }
int incZoom(int value) int incZoom(int value)
{ {
//zxscreen::incZoom(); gbscreen::incZoom();
return 0; return 0;
} }
int fullscreen(int value) int fullscreen(int value)
{ {
//zxscreen::toggleFullscreen(); gbscreen::toggleFullscreen();
return 0; //zxscreen::getFullscreen(); return gbscreen::getFullscreen();
} }
int fullrefresh(int value) int fullrefresh(int value)
{ {
//zxscreen::toggleFullRefresh(); gbscreen::toggleFullRefresh();
return 0; //zxscreen::getFullRefresh(); return gbscreen::getFullRefresh();
} }
int showAnalyzer(int value) int showAnalyzer(int value)
@@ -79,8 +79,8 @@ int main(int argc, char *argv[])
sm83::reset(); sm83::reset();
SDL_Init(SDL_INIT_EVERYTHING); SDL_Init(SDL_INIT_EVERYTHING);
gbscreen::init(0);
debug::init(); debug::init();
//zxscreen::init(SCREEN_MODE_48K);
ui::menu::init(); ui::menu::init();
ui::menu::setexitcallback(actions::exitMenu); ui::menu::setexitcallback(actions::exitMenu);
@@ -95,9 +95,9 @@ int main(int argc, char *argv[])
menu = ui::menu::addsubmenu("SCREEN"); menu = ui::menu::addsubmenu("SCREEN");
ui::menu::addoption(menu, "DEC ZOOM", actions::decZoom); ui::menu::addoption(menu, "DEC ZOOM", actions::decZoom);
ui::menu::addoption(menu, "INC ZOOM", actions::incZoom); ui::menu::addoption(menu, "INC ZOOM", actions::incZoom);
ui::menu::addbooloption(menu, "FULLSCREEN", false /*zxscreen::getFullscreen()*/, actions::fullscreen); ui::menu::addbooloption(menu, "FULLSCREEN", gbscreen::getFullscreen(), actions::fullscreen);
ui::menu::addseparator(menu); ui::menu::addseparator(menu);
ui::menu::addbooloption(menu, "FULL REFRESH", false /*zxscreen::getFullRefresh()*/, actions::fullrefresh); ui::menu::addbooloption(menu, "FULL REFRESH", gbscreen::getFullRefresh(), actions::fullrefresh);
menu = ui::menu::addsubmenu("EMULATION"); menu = ui::menu::addsubmenu("EMULATION");
ui::menu::addbooloption(menu, "STOP ON INVALID OP", sm83::getOption(SM83_OPTION_STOP_ON_INVALID), actions::decZoom); ui::menu::addbooloption(menu, "STOP ON INVALID OP", sm83::getOption(SM83_OPTION_STOP_ON_INVALID), actions::decZoom);
@@ -132,12 +132,12 @@ int main(int argc, char *argv[])
debug::history::gototop(); debug::history::gototop();
const uint8_t dt = sm83::step(); const uint8_t dt = sm83::step();
debug::cont(); debug::cont();
//zxscreen::refresh(dt); gbscreen::refresh(dt);
} }
} else if (e.key.keysym.scancode==SDL_SCANCODE_F8) { } else if (e.key.keysym.scancode==SDL_SCANCODE_F8) {
if (!debug::debugging()) { if (!debug::debugging()) {
debug::stop(); debug::stop();
//zxscreen::redraw(); gbscreen::redraw();
} else { } else {
debug::show(); debug::show();
} }
@@ -147,8 +147,8 @@ int main(int argc, char *argv[])
debug::history::gototop(); debug::history::gototop();
const uint8_t dt = sm83::step(); const uint8_t dt = sm83::step();
debug::refresh(); debug::refresh();
//zxscreen::fullrefresh(); gbscreen::fullrefresh();
//zxscreen::redraw(); gbscreen::redraw();
//z80analyze::refresh(); //z80analyze::refresh();
} }
} else if (e.key.keysym.scancode==SDL_SCANCODE_F11) { } else if (e.key.keysym.scancode==SDL_SCANCODE_F11) {
@@ -157,8 +157,8 @@ int main(int argc, char *argv[])
debug::history::gototop(); debug::history::gototop();
const uint8_t dt = debug::next(); const uint8_t dt = debug::next();
debug::refresh(); debug::refresh();
//zxscreen::refresh(dt); gbscreen::refresh(dt);
//zxscreen::redraw(); gbscreen::redraw();
//z80analyze::refresh(); //z80analyze::refresh();
} }
} else if (e.key.keysym.scancode==SDL_SCANCODE_F12) { } else if (e.key.keysym.scancode==SDL_SCANCODE_F12) {
@@ -167,8 +167,8 @@ int main(int argc, char *argv[])
debug::history::gototop(); debug::history::gototop();
const uint8_t dt = debug::stepout(); const uint8_t dt = debug::stepout();
debug::refresh(); debug::refresh();
//zxscreen::refresh(dt); gbscreen::refresh(dt);
//zxscreen::redraw(); gbscreen::redraw();
//z80analyze::refresh(); //z80analyze::refresh();
} }
} }
@@ -188,13 +188,13 @@ int main(int argc, char *argv[])
for (int i=0;i<5;++i) { for (int i=0;i<5;++i) {
if (debug::isbreak(sm83::getPC(), 9)) { if (debug::isbreak(sm83::getPC(), 9)) {
debug::stop(); debug::stop();
//zxscreen::redraw(); gbscreen::redraw();
break; break;
} else { } else {
uint8_t dt = sm83::step(); uint8_t dt = sm83::step();
t_states += dt; t_states += dt;
//zx_ula::sound_update(dt); //zx_ula::sound_update(dt);
//zxscreen::refresh(dt); gbscreen::refresh(dt);
if (debug::debugging()) break; if (debug::debugging()) break;
} }
} }
@@ -210,9 +210,9 @@ int main(int argc, char *argv[])
} else if (!debug::debugging() && debug::paused()) { } else if (!debug::debugging() && debug::paused()) {
//zxscreen::redraw(false); gbscreen::redraw(false);
ui::menu::show(); ui::menu::show();
//zxscreen::present(); gbscreen::present();
} }
ui::setClicked(false); ui::setClicked(false);
} }

View File

@@ -550,10 +550,10 @@ namespace sm83
void interrupt(uint8_t type) void interrupt(uint8_t type)
{ {
exit_from_halt = true;
const uint8_t IE = mem::readMem(0xffff); const uint8_t IE = mem::readMem(0xffff);
if (IE & type) exit_from_halt = true;
const uint8_t IF = mem::readMem(0xff0f); const uint8_t IF = mem::readMem(0xff0f);
mem::writeMem(0xff0f, IF || (IE & type)); mem::writeMem(0xff0f, IF | (IE & type));
processInterrupts(); processInterrupts();
} }