JailDoctor/gameboy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JailDoctor/gameboy:784150fe885b107c5b649163369915155a48ff64
Branches Tags
JailDoctor/gameboy:master
..
compare: JailDoctor/gameboy:master
Branches Tags
JailDoctor/gameboy:master

6 Commits
784150fe88 .. master

Author SHA1 Message Date
JailDoctor 35afea447b - [CHG] Més neteja de basura 
- [FIX] Intentant arreglar un "pop" que fa el só al inici, he descobert que no fa falta més sincronització que la del àudio!
- [CHG] De fet, ara en compte de fer 20 cicles de cpu cada iteració, faig un cicle per iteració i nomes refresque events cada 125ms. No detecte canvis, pero seria molt més net. A vore que tal.
- [NEW] Comence la classe directora "gameboy"
 2026-06-04 23:00:14 +02:00
JailDoctor 8ba37d215a - [CHG] Pasada la gestió de tags de memòria de sm83 a debug 
- [CHG] Netejada l'interficie debug->sm83
- [CHG] Un poc més de neteja de codi en general
 2026-06-04 19:07:30 +02:00
JailDoctor ed2c014c7e - [CHG] Gestió de interrupcions pasada a "mem" (futur "bus") 
- [CHG] Reorganitzacions i neteja de codi
- [NEW] Constants del espai io en la seua pròpia capçalera
- [NEW] Comentaris en algunes parts menys obvies del codi
- [CHG] Alguns defines passats a constexpr
- [CHG] display::init() no feia més que cridar a display::reinit(). Concretats els dos en display::init()
- [ONGOING] Passant la responsabilitat de tornar el foco a la finestra principal (que estaba en el mòdul debug) al gestor de finestres.
 2026-06-04 13:44:50 +02:00
JailDoctor 2fe0ce6152 - [CHG] Tot el codi mogut a la carpeta "source" 2026-06-03 18:07:16 +02:00
JailDoctor 88a02d49f7 - [CHG] Separat mòdul "gbscreen" en mòduls "ppu" i "display" 
- [CHG] Constants de interrupcions tretes a la seua propia capçalera
- [CHG] Renombrat mòdul APU a apu
 2026-06-03 12:10:42 +02:00
JailDoctor 816b12e3b8 - [FIX] Més neteja: llevats els refresh de gbscreen que no s'usaven 2026-06-03 11:37:46 +02:00
36 changed files with 757 additions and 813 deletions
Expand all files Collapse all files
Makefile
+3 -3
View File
@@ -1,5 +1,5 @@
compile:
g++ -g *.cpp -lSDL2 -o gb
g++ -g source/*.cpp -lSDL2 -o gb
run: compile
./gb tetris.gb
@@ -11,7 +11,7 @@ debug1: compile
gdb -ex run gb
release:
g++ -O3 *.cpp -lSDL2 -o gb
g++ -O3 source/*.cpp -lSDL2 -o gb
profile:
g++ -g *.cpp -lSDL2 -o gb -pg
g++ -g source/*.cpp -lSDL2 -o gb -pg
gbscreen.h
-25
View File
@@ -1,25 +0,0 @@
#pragma once
#include <SDL2/SDL.h>
namespace gbscreen
{
void init(int mode);
void reinit();
void focus();
void refresh(const uint32_t dt, const bool full=false);
void fullrefresh();
void debugrefresh();
void redraw(const bool present=true);
void present();
void setTitle(const char* title);
void incZoom();
void decZoom();
void toggleFullscreen();
const bool getFullscreen();
void toggleFullRefresh();
const bool getFullRefresh();
//SDL_Renderer *getrenderer();
}
lagueirtofile
+1 -1
View File
@@ -2,5 +2,5 @@
cppflags = -g
libs = -lSDL2
executable = gb
sourcepath = .
sourcepath = source
buildpath = build
APU.cpp → source/apu.cpp
+7 -6
View File
@@ -1,7 +1,7 @@
#include "APU.h"
#include "apu.h"
#include <SDL2/SDL.h>
//#include "audio_viewer.h"
namespace APU
namespace apu
{
#define SAMPLING_FREQ 44100
#define AUDIO_BUFFER_SIZE 2048
@@ -10,9 +10,7 @@ namespace APU
SDL_AudioDeviceID sdlAudioDevice;
uint8_t sound_buffer[AUDIO_BUFFER_SIZE];
uint16_t sound_pos=0;
uint16_t sound_start=0;
float t_sound = 0.0f;
uint32_t samples_generated=0;
#define CH1 channels[0]
#define CH2 channels[1]
@@ -87,9 +85,11 @@ namespace APU
void init()
{
for (int i=0; i<AUDIO_BUFFER_SIZE; ++i) sound_buffer[i] = 128;
SDL_AudioSpec audioSpec{SAMPLING_FREQ, AUDIO_U8, 1, 0, AUDIO_BUFFER_SIZE, 0, 0, NULL, NULL};
sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
resume();
SDL_QueueAudio(sdlAudioDevice, sound_buffer, 2000);
}
void reset()
@@ -428,7 +428,8 @@ namespace APU
if (sound_pos>=1000) {
SDL_QueueAudio(sdlAudioDevice, sound_buffer, sound_pos);
sound_pos = 0;
while (SDL_GetQueuedAudioSize(sdlAudioDevice) > 4096 ) {}
while (SDL_GetQueuedAudioSize(sdlAudioDevice) > 4096 ) { SDL_Delay(1); }
}
}
}
APU.h → source/apu.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include <stdint.h>
namespace APU
namespace apu
{
uint8_t readRegister(uint16_t address);
void writeRegister(uint16_t address, uint8_t value);
audio_viewer.cpp → source/audio_viewer.cpp
View File
audio_viewer.h → source/audio_viewer.h
View File
debug.cpp → source/debug.cpp
+76 -47
View File
@@ -4,11 +4,12 @@
#include "sm83.h"
#include "sm83dis.h"
#include "mem.h"
#include "APU.h"
#include "ppu.h"
#include "apu.h"
//#include "z80analyze.h"
#include "ui.h"
#include "ui_window.h"
#include "gbscreen.h"
#include "display.h"
#define RESIZING_NONE 0
#define RESIZING_MEMORY 1
@@ -27,6 +28,8 @@ namespace debug
int con_h = 6;
int sym_h = 14;
uint8_t tags[65536];
int resizing_type = RESIZING_MEMORY;
bool resizing = false;
@@ -107,10 +110,9 @@ namespace debug
con_y = win_h - con_h;
sym_h = win_h - sym_y;
debug::refresh();
gbscreen::redraw();
} else if (e->window.event == SDL_WINDOWEVENT_CLOSE) {
hide();
gbscreen::focus();
//display::focus();
}
}
if (e->type == SDL_MOUSEWHEEL) {
@@ -304,10 +306,63 @@ namespace debug
void processCommand();
uint8_t getTag(uint16_t address)
{
return tags[address];
}
void setTag(uint16_t address, uint8_t value)
{
tags[address] = value;
}
void onInstructionExecute(uint16_t address)
{
uint8_t &tag = tags[address];
if ( !(tag & MEMTAG_IGNORE) ) tag |= MEMTAG_INST;
tag |= (!(tag&MEMTAG_TOUCHED) ? MEMTAG_TREPEAT : MEMTAG_TINST);
setcursor(sm83::getPC());
history::store();
}
void onMemRead(uint16_t address, bool code)
{
if (isbreak(address, 2)) stop();
uint8_t &tag = tags[address];
if ( tag & MEMTAG_IGNORE) return;
if ( code ) {
tag |= MEMTAG_CODE;
} else if ( !(tag & MEMTAG_INST) ) {
tag |= MEMTAG_DATA;
}
}
void onMemWrite(uint16_t address)
{
if (isbreak(address, 4)) stop();
mem_modified[address] = true;
uint8_t &tag = tags[address];
if ( tag & MEMTAG_IGNORE ) return;
if ( !(tag & MEMTAG_INST) ) {
tag |= ( MEMTAG_DATA | MEMTAG_TDATA );
}
}
void init()
{
is_debugging = is_paused = false;
for (int i=0; i<65536; ++i) breakpoints[i]=0;
for (int i=0; i<65536; ++i) {
breakpoints[i]=0;
tags[i] = MEMTAG_NONE;
}
if (!cur_df) cur_df = SDL_GetCursor();
if (!cur_ns) cur_ns = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
if (!cur_we) cur_we = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
@@ -350,7 +405,7 @@ namespace debug
void pause()
{
APU::silence();
apu::silence();
is_paused = true;
breakpoints[sm83::getPC()] &= ~8;
}
@@ -358,20 +413,19 @@ namespace debug
void stop()
{
//history::gototop();
gbscreen::setTitle(" (stopped)");
display::setTitle(" (stopped)");
pause();
is_debugging = true;
show();
gbscreen::redraw(true);
//if ( gbscreen::getFullRefresh()) gbscreen::fullrefresh();
display::redraw(true);
}
void cont() {
gbscreen::setTitle("");
display::setTitle("");
is_debugging = is_paused = false;
refresh();
gbscreen::focus();
APU::resume();
display::focus();
apu::resume();
}
const bool debugging() { return is_debugging; }
@@ -381,10 +435,9 @@ namespace debug
uint16_t find_previous_opcode(uint16_t pc)
{
pc--;
uint8_t tag = mem::getTag(pc);
if ( !(tag & (MEMTAG_CODE | MEMTAG_INST) ) ) return pc;
if ( !(tags[pc] & (MEMTAG_CODE | MEMTAG_INST) ) ) return pc;
while ( !(mem::getTag(pc) & MEMTAG_INST) ) pc--;
while ( !(tags[pc] & MEMTAG_INST) ) pc--;
return pc;
@@ -410,7 +463,7 @@ namespace debug
void printDissasemblerLine(const uint16_t address, const int line, const bool heuristics=false)
{
uint8_t colors[4] = { COLOR_RED, COLOR_CYAN, COLOR_WHITE, COLOR_WHITE};
const uint8_t tag = mem::getTag(address);
const uint8_t &tag = tags[address];
if ( !(tag & (MEMTAG_TINST | MEMTAG_TREPEAT)) ) colors[3]=COLOR_GRAY;
if ( !(tag & MEMTAG_TOUCHED) ) colors[1]=COLOR_GRAY;
@@ -428,7 +481,7 @@ namespace debug
const int opcodesize = sm83dis::getOpcodeSize(address);
for (int i=0; i<opcodesize; ++i) {
const uint8_t tag = mem::getTag(address+i);
const uint8_t &tag = tags[address+i];
const uint32_t color = !(tag & MEMTAG_KNOWN) ? COLOR_GRAY : (tag & MEMTAG_DATA) ? ( (tag & (MEMTAG_CODE|MEMTAG_INST)) ? COLOR_MAGENTA : COLOR_BLUE ) : COLOR_GREEN;
ui::printrect(19+i*3,line,2,1,color);
}
@@ -608,7 +661,7 @@ namespace debug
ui::printtxt(1,i, tohex(mem_viewer_cursor, 4), COLOR_CYAN);
for (int j=0; j<16; ++j) {
const uint8_t tag = mem::getTag(mem_viewer_cursor);
const uint8_t &tag = tags[mem_viewer_cursor];
const uint32_t color = !(tag & MEMTAG_KNOWN) ? COLOR_GRAY : (tag & MEMTAG_DATA) ? ( (tag & (MEMTAG_CODE|MEMTAG_INST)) ? COLOR_MAGENTA : COLOR_BLUE ) : COLOR_GREEN;
ui::printrect(6+j*3,i,2,1,color);
ui::printrect(54+j,i,1,1,color);
@@ -780,8 +833,8 @@ namespace debug
uint8_t dt = sm83::step();
//zx_tape::update(dt);
//zx_ula::sound_update(dt);
gbscreen::refresh(dt);
gbscreen::redraw();
ppu::refresh(dt);
display::redraw();
//z80analyze::refresh();
} else if (strcmp(cmd, "c")==0 || strcmp(cmd, "cont")==0) {
sm83::step();
@@ -886,7 +939,7 @@ namespace debug
getcmd();
int address = getnum(cmd);
if (address<0 || address>=65536) { sendToConsoleLog("Illegal address"); return; }
if ( !(mem::getTag(address) & MEMTAG_INST) ) address = find_previous_opcode(address);
if ( !(tags[address] & MEMTAG_INST) ) address = find_previous_opcode(address);
debug::setcursor(address);
} else if (strcmp(cmd, "sym")==0 || strcmp(cmd, "symbol")==0) {
getcmd();
@@ -938,7 +991,7 @@ namespace debug
} else if (strcmp(cmd, "ignore")==0) {
getcmd();
const int address = getnum(cmd);
mem::setTag(address, mem::getTag(address) | MEMTAG_IGNORE);
tags[address] |= MEMTAG_IGNORE;
} else if (strcmp(cmd, "search")==0) {
getcmd();
if (strcmp(cmd, "next")==0) {
@@ -979,30 +1032,6 @@ namespace debug
return t;
}
void setmemmodified(const uint16_t addr)
{
mem_modified[addr] = true;
}
void loadngo(const char* filename, const char* addr)
{
/*
int address = getnum(addr);
if (address<0 || address>65536) { sendToConsoleLog("Illegal offset"); return; }
FILE *f = fopen(filename, "rb");
fseek(f, 0, SEEK_END);
int size = ftell(f);
fseek(f, 0, SEEK_SET);
uint32_t memsize;
uint8_t *memory = mem::getRawPointer(&memsize);
fread(memory+address, size, 1, f);
fclose(f);
sm83::setPC(address);
is_debugging = is_paused = false;
*/
}
void savestate(const char *filename)
{
uint8_t *regs = sm83::getRegs();
@@ -1026,7 +1055,7 @@ namespace debug
void setcursor(const uint16_t address)
{
//if (!debugging()) return;
if ( !(mem::getTag(address) & MEMTAG_INST) )
if ( !(tags[address] & MEMTAG_INST) )
cursor = find_previous_opcode(address);
else
cursor = address;
debug.h → source/debug.h
+20 -3
View File
@@ -3,6 +3,26 @@
namespace debug
{
#define MEMTAG_NONE 0x00
#define MEMTAG_DATA 0x01
#define MEMTAG_INST 0x02
#define MEMTAG_CODE 0x04
#define MEMTAG_IGNORE 0x08
#define MEMTAG_TDATA 0x10
#define MEMTAG_TINST 0x20
#define MEMTAG_TREPEAT 0x40
#define MEMTAG_MODIFIED 0x80
#define MEMTAG_KNOWN 0x07
#define MEMTAG_TOUCHED 0x70
uint8_t getTag(uint16_t address);
void setTag(uint16_t address, uint8_t value);
void onInstructionExecute(uint16_t address);
void onMemRead(uint16_t address, bool code=false);
void onMemWrite(uint16_t address);
void init();
void show();
void focus();
@@ -13,7 +33,6 @@ namespace debug
void cont();
const bool debugging();
const bool paused();
void setmemmodified(const uint16_t addr);
void refresh();
void sendToConsole(const char* text);
@@ -29,8 +48,6 @@ namespace debug
void savestate(const char *filename);
void loadstate(const char *filename);
void loadngo(const char* filename, const char* addr);
void setcursor(const uint16_t address);
void cursorfwd();
void cursorback();
source/display.cpp
+207
View File
@@ -0,0 +1,207 @@
#include "display.h"
#include <cstring>
#include "sm83.h"
#include "ppu.h"
#include <SDL2/SDL.h>
#include "ui_window.h"
#include "debug.h"
#include "ui.h"
namespace display
{
uint32_t palette[2][4] = {
{ 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 },
{ 0xA0AA05, 0x749527, 0x487F49, 0x2E4326/*0x1D6A6B*/ }
};
SDL_Window *win = nullptr;
SDL_Renderer *ren = nullptr;
SDL_Texture *tex = nullptr;
SDL_Texture *uitex = nullptr;
uint8_t zoom = 3;
uint8_t use_palette=1;
bool fullscreen = false;
int fullscreen_scale = 1;
SDL_Rect dest_rect;
bool eventHandler(SDL_Event *e)
{
if (e->type==SDL_WINDOWEVENT) {
if (e->window.event==SDL_WINDOWEVENT_CLOSE) {
return false;
} else if ((e->window.event==SDL_WINDOWEVENT_SHOWN) || (e->window.event==SDL_WINDOWEVENT_EXPOSED)) {
redraw();
}
}
if (!debug::debugging()) {
if (debug::paused()) {
if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
const uint8_t dt = sm83::step();
debug::cont();
ppu::refresh(dt);
}
}
} else {
if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
debug::pause();
display::redraw();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F1) {
display::decZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F2) {
display::incZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F3) {
display::toggleFullscreen();
} else if (e->key.keysym.scancode==SDL_SCANCODE_Q && e->key.keysym.mod & KMOD_CTRL) {
return false;
}
}
}
}
if (e->type == SDL_MOUSEMOTION) {
SDL_ShowCursor(true);
}
return true;
}
void init()
{
if (win) ui::window::unregisterWindow(SDL_GetWindowID(win));
if (tex) SDL_DestroyTexture(tex);
if (uitex) SDL_DestroyTexture(uitex);
if (ren) SDL_DestroyRenderer(ren);
if (win) SDL_DestroyWindow(win);
const int z = fullscreen ? 1 : zoom;
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);
tex = SDL_CreateTexture(ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 160, 144);
uitex = ui::createtexture(ren);
ui::window::registerWindow(SDL_GetWindowID(win), eventHandler);
if (fullscreen)
{
int w, h;
SDL_GetWindowSize(win, &w, &h);
fullscreen_scale = h/144;
dest_rect.w = 160 * fullscreen_scale;
dest_rect.h = 144 * fullscreen_scale;
dest_rect.x = (w - dest_rect.w)/2;
dest_rect.y = (h - dest_rect.h)/2;
}
else
{
dest_rect.x = dest_rect.y = 0;
dest_rect.w = 160 * zoom;
dest_rect.h = 144 * zoom;
}
focus();
}
void focus()
{
if (win)
{
SDL_RaiseWindow(win);
redraw();
}
}
void redraw(const bool present)
{
//if (zx_tape::getplaying() && zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD)) return;
ui::setrenderer(ren, uitex);
const uint8_t *ppu_pixels = ppu::getpixels();
Uint32* pixels;
int pitch;
SDL_LockTexture(tex, NULL, (void**)&pixels, &pitch);
for (int i=0; i<160*144;++i) *(pixels++) = palette[use_palette][ppu_pixels[i]];
SDL_UnlockTexture(tex);
if (fullscreen)
{
SDL_SetRenderDrawColor(ren, 0, 0, 0, 255);
SDL_RenderClear(ren);
}
// Pintem la textura a pantalla
SDL_RenderCopy(ren, tex, NULL, &dest_rect);
// Pintem les ralles dels pixels
if (zoom>2 || fullscreen) {
SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor(ren, 160, 170, 5, 96);
const float scale = fullscreen ? fullscreen_scale : zoom;
for (int i=0;i<144;++i) SDL_RenderDrawLine(ren, dest_rect.x, dest_rect.y+i*scale, dest_rect.x+159*scale, dest_rect.y+i*scale);
for (int i=0;i<160;++i) SDL_RenderDrawLine(ren, dest_rect.x+i*scale, dest_rect.y, dest_rect.x+i*scale, dest_rect.y+143*scale);
}
if (present)
SDL_RenderPresent(ren);
else
{
SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor(ren, 0, 0, 0, 128);
SDL_Rect rect {0,0,160*zoom,144*zoom};
if (fullscreen) SDL_GetWindowSize(win, &rect.w, &rect.h);
SDL_RenderFillRect(ren, &rect);
}
}
void present()
{
SDL_RenderPresent(ren);
}
void setTitle(const char* title)
{
char tmp[256];
strcpy(tmp, "Gameboy Screen");
strcat(tmp, title);
SDL_SetWindowTitle(win, tmp);
}
void setZoom(const int value)
{
if (fullscreen) return;
if (value < 1) return;
SDL_DisplayMode dm;
SDL_GetCurrentDisplayMode(0, &dm);
if (160*value > dm.w) return;
if (144*value > dm.h) return;
zoom = value;
init();
}
void incZoom()
{
if (fullscreen) return;
setZoom(zoom+1);
}
void decZoom()
{
if (fullscreen) return;
setZoom(zoom-1);
}
void toggleFullscreen()
{
fullscreen = !fullscreen;
init();
}
const bool getFullscreen()
{
return fullscreen;
}
}
source/display.h
+15
View File
@@ -0,0 +1,15 @@
#pragma once
namespace display
{
void init();
void focus();
void redraw(const bool present=true);
void present();
void setTitle(const char* title);
void incZoom();
void decZoom();
void toggleFullscreen();
const bool getFullscreen();
}
source/gameboy.cpp
+16
View File
@@ -0,0 +1,16 @@
#include "gameboy.h"
gameboy::gameboy(const std::string &rom_file)
{
}
gameboy::~gameboy()
{
}
void gameboy::step()
{
}
source/gameboy.h
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include <string>
class gameboy
{
public:
gameboy(const std::string &rom_file);
~gameboy();
void step();
private:
};
source/interrupts.h
+14
View File
@@ -0,0 +1,14 @@
#pragma once
#include <stdint.h>
namespace gb
{
namespace interrupts
{
constexpr uint8_t VBLANK = 0x01;
constexpr uint8_t LCD = 0x02;
constexpr uint8_t TIMER = 0x04;
constexpr uint8_t SERIAL = 0x08;
constexpr uint8_t JOYPAD = 0x10;
}
}
source/io_constants.h
+3
View File
@@ -0,0 +1,3 @@
#pragma once
#define io_interrupts_address 0xff0f
main.cpp → source/main.cpp
+53 -49
View File
@@ -3,9 +3,10 @@
#include "sm83.h"
#include "mem.h"
#include "ppu.h"
#include "sm83dis.h"
#include "debug.h"
#include "gbscreen.h"
#include "display.h"
#include <SDL2/SDL.h>
#include <string.h>
#include "ui.h"
@@ -21,31 +22,25 @@ namespace actions
{
const uint8_t dt = sm83::step();
debug::cont();
gbscreen::refresh(dt);
ppu::refresh(dt);
}
int decZoom(int value)
{
gbscreen::decZoom();
display::decZoom();
return 0;
}
int incZoom(int value)
{
gbscreen::incZoom();
display::incZoom();
return 0;
}
int fullscreen(int value)
{
gbscreen::toggleFullscreen();
return gbscreen::getFullscreen();
}
int fullrefresh(int value)
{
gbscreen::toggleFullRefresh();
return gbscreen::getFullRefresh();
display::toggleFullscreen();
return display::getFullscreen();
}
int showAnalyzer(int value)
@@ -57,13 +52,17 @@ namespace actions
int main(int argc, char *argv[])
{
// Control de paràmetres
if (argc < 2) { printf("ABORTING: No rom specified.\n"); exit(1); }
// Velocitat de rellotge
const uint32_t clock = 4194304;
const uint32_t update_freq = clock >> 3;
// Inicia SDL
SDL_Init(SDL_INIT_EVERYTHING);
// Carrega la rom
FILE *f = fopen(argv[1], "rb");
if (!f) { printf("ABORTING: Rom not found.\n"); exit(1); }
fseek(f, 0, SEEK_END);
@@ -73,14 +72,18 @@ int main(int argc, char *argv[])
fread(buffer, filesize, 1, f);
fclose(f);
// i mem inicialitza el mbc
mem::init(buffer, filesize);
// Iniciem tots els sistemes
sm83dis::loadSymbols();
sm83::reset();
gbscreen::init(0);
ppu::init();
display::init();
debug::init();
// Iniciem el menú princpal (ací? perqué? No es de display.h?)
ui::menu::init();
ui::menu::setexitcallback(actions::exitMenu);
@@ -94,26 +97,21 @@ int main(int argc, char *argv[])
menu = ui::menu::addsubmenu("SCREEN");
ui::menu::addoption(menu, "DEC ZOOM", actions::decZoom);
ui::menu::addoption(menu, "INC ZOOM", actions::incZoom);
ui::menu::addbooloption(menu, "FULLSCREEN", gbscreen::getFullscreen(), actions::fullscreen);
ui::menu::addseparator(menu);
ui::menu::addbooloption(menu, "FULL REFRESH", gbscreen::getFullRefresh(), actions::fullrefresh);
ui::menu::addbooloption(menu, "FULLSCREEN", display::getFullscreen(), actions::fullscreen);
menu = ui::menu::addsubmenu("EMULATION");
ui::menu::addbooloption(menu, "STOP ON INVALID OP", sm83::getOption(SM83_OPTION_STOP_ON_INVALID), actions::decZoom);
ui::menu::addoption(menu, "SHOW ANALYZER", actions::showAnalyzer);
//zx_ula::sound_init();
//debug::stop();
bool should_exit = false;
SDL_Event e;
time = SDL_GetTicks();
t_states = 0;
uint8_t wait = 125;
while (!should_exit)
{
if (wait==0) {
while (SDL_PollEvent(&e))
{
bool result = true;
@@ -131,12 +129,12 @@ int main(int argc, char *argv[])
debug::history::gototop();
const uint8_t dt = sm83::step();
debug::cont();
gbscreen::refresh(dt);
ppu::refresh(dt);
}
} else if (e.key.keysym.scancode==SDL_SCANCODE_F8) {
if (!debug::debugging()) {
debug::stop();
gbscreen::redraw();
display::redraw();
} else {
debug::show();
}
@@ -146,9 +144,8 @@ int main(int argc, char *argv[])
debug::history::gototop();
const uint8_t dt = sm83::step();
debug::refresh();
//gbscreen::fullrefresh();
gbscreen::refresh(dt);
gbscreen::redraw();
ppu::refresh(dt);
display::redraw();
//z80analyze::refresh();
}
} else if (e.key.keysym.scancode==SDL_SCANCODE_F11) {
@@ -157,8 +154,8 @@ int main(int argc, char *argv[])
debug::history::gototop();
const uint8_t dt = debug::next();
debug::refresh();
gbscreen::refresh(dt);
gbscreen::redraw();
ppu::refresh(dt);
display::redraw();
//z80analyze::refresh();
}
} else if (e.key.keysym.scancode==SDL_SCANCODE_F12) {
@@ -167,8 +164,8 @@ int main(int argc, char *argv[])
debug::history::gototop();
const uint8_t dt = debug::stepout();
debug::refresh();
gbscreen::refresh(dt);
gbscreen::redraw();
ppu::refresh(dt);
display::redraw();
//z80analyze::refresh();
}
}
@@ -179,41 +176,48 @@ int main(int argc, char *argv[])
if (!result)
should_exit = true; break;
}
}
if (!debug::debugging() && !debug::paused()) {
bool fastload=false;
// En cada bucle fem 10 pasos de la CPU, sino s'ofega
for (int i=0;i<20;++i) {
// En cada pas de bucle fem 10 pasos de la CPU, sino s'ofega
//for (int i=0;i<20;++i) {
if (debug::isbreak(sm83::getPC(), 9)) {
debug::stop();
gbscreen::redraw();
display::redraw();
break;
} else {
uint8_t dt = sm83::step();
t_states += dt;
//zx_ula::sound_update(dt);
gbscreen::refresh(dt);
ppu::refresh(dt);
if (debug::debugging()) break;
}
}
//}
if (t_states>=update_freq)
{
while (SDL_GetTicks()<(time+125)) {}
t_states -= update_freq;
time = SDL_GetTicks();
//z80analyze::refresh();
}
//z80analyze::refresh(true);
// Sincronització:
// la frequència del rellotge diu quants t_states pot executar per segon.
// update_freq es la freq del rellotge / 8. Per tant, el nombre de t_states que
// pot executar cada 125 ms. Ací comprobem si ja havem executat eixe nombre
// de t_states i, si ho havem fet, esperem fins que passen 125ms des de l'ultima
// vegada que ho comprobarem.
//if (t_states>=update_freq)
//{
// while (SDL_GetTicks()<(time+125)) {}
// t_states -= update_freq;
// time = SDL_GetTicks();
//}
} else if (!debug::debugging() && debug::paused()) {
gbscreen::redraw(false);
display::redraw(false);
ui::menu::show();
gbscreen::present();
display::present();
}
if (wait == 0) {
ui::setClicked(false);
wait = 125;
} else {
wait--;
}
ui::setClicked(false);
}
return 0;
mbc1.cpp → source/mbc1.cpp
View File
mbc1.h → source/mbc1.h
View File
mbc3.cpp → source/mbc3.cpp
View File
mbc3.h → source/mbc3.h
View File
mbc_none.cpp → source/mbc_none.cpp
View File
mbc_none.h → source/mbc_none.h
View File
mem.cpp → source/mem.cpp
+11 -19
View File
@@ -3,8 +3,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <SDL2/SDL.h>
#include "APU.h"
#include "apu.h"
#include "io_constants.h"
#include "mbc_none.h"
#include "mbc1.h"
#include "mbc3.h"
@@ -28,8 +28,6 @@ namespace mem
uint8_t wram[8192];
uint8_t hram[512];
uint8_t tags[65536];
char *title = nullptr;
uint8_t mapper_type = 0;
uint32_t rom_size = 0;
@@ -86,7 +84,7 @@ namespace mem
break;
};
APU::init();
apu::init();
}
void reset()
@@ -102,10 +100,9 @@ namespace mem
for (int i=0; i<8192; ++i) { vram[i] = 0; }
for (int i=0; i<8192; ++i) { wram[i] = 0; }
for (int i=0; i<512; ++i) { hram[i] = 0; }
for (int i=0; i<65536; ++i) { tags[i] = MEMTAG_NONE; }
resetMbc();
APU::reset();
apu::reset();
}
uint8_t getKeypad(uint8_t value)
@@ -144,7 +141,7 @@ namespace mem
} else {
if (address==0xFF00) {
hram[address - 0XFE00] = getKeypad(hram[address - 0XFE00]);
} else if (address>=0xFF10 && address<=0xFF3F) { return APU::readRegister(address); }
} else if (address>=0xFF10 && address<=0xFF3F) { return apu::readRegister(address); }
return hram[address - 0XFE00];
}
}
@@ -174,7 +171,7 @@ namespace mem
sm83::processInterrupts();
return;
} else if (address>=0xFF10 && address<=0xFF3F) { // APU
APU::writeRegister(address, value);
apu::writeRegister(address, value);
return;
} else if ( (address==0xFF46) ) { // OAM DMA
mem::init_dma_transfer(value);
@@ -183,14 +180,9 @@ namespace mem
}
}
uint8_t getTag(uint16_t address)
void requestInterrupt(uint8_t type)
{
return tags[address];
}
void setTag(uint16_t address, uint8_t value)
{
tags[address] = value;
mem::writeMem(io_interrupts_address, mem::readMem(io_interrupts_address) | type);
}
void saveState(FILE* f)
@@ -235,7 +227,7 @@ namespace mem
div_counter -= 256;
bool bitset = DIV&0x10;
DIV++;
if (bitset && !(DIV&0x10)) APU::incDIVAPU();
if (bitset && !(DIV&0x10)) apu::incDIVAPU();
}
// Timer
@@ -248,14 +240,14 @@ namespace mem
TIMA++;
else {
TIMA = TMA;
sm83::interrupt(INTERRUPT_TIMER);
mem::requestInterrupt(gb::interrupts::TIMER);
}
}
}
// APU
APU::update(dt);
apu::update(dt);
// OAM DMA
if (dma_pos<160) {
mem.h → source/mem.h
+2 -17
View File
@@ -3,19 +3,6 @@
#include <stdio.h>
namespace mem
{
#define MEMTAG_NONE 0x00
#define MEMTAG_DATA 0x01
#define MEMTAG_INST 0x02
#define MEMTAG_CODE 0x04
#define MEMTAG_IGNORE 0x08
#define MEMTAG_TDATA 0x10
#define MEMTAG_TINST 0x20
#define MEMTAG_TREPEAT 0x40
#define MEMTAG_MODIFIED 0x80
#define MEMTAG_KNOWN 0x07
#define MEMTAG_TOUCHED 0x70
#define MBC_NONE 0
#define MBC1 1
#define MBC2 2
@@ -29,10 +16,8 @@ namespace mem
uint8_t readMem(uint16_t address);
void writeMem(uint16_t address, uint8_t value);
uint8_t getTag(uint16_t address);
void setTag(uint16_t address, uint8_t value);
void requestInterrupt(uint8_t type);
void saveState(FILE* f);
void loadState(FILE* f);
gbscreen.cpp → source/ppu.cpp
+16 -256
View File
@@ -1,46 +1,22 @@
#include "gbscreen.h"
#include <cstring>
#include "sm83.h"
#include "ppu.h"
#include "mem.h"
#include "audio_viewer.h"
//#include "zx_ula.h"
#include <SDL2/SDL.h>
#include "ui_window.h"
#include "debug.h"
#include "ui.h"
#include "interrupts.h"
#include "display.h"
namespace gbscreen
namespace ppu
{
struct oam_entry_t
{
uint8_t y, x, tile, attr;
};
uint32_t palette[2][4] = {
{ 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 },
{ 0xA0AA05, 0x749527, 0x487F49, 0x2E4326/*0x1D6A6B*/ }
};
SDL_Window *win = nullptr;
SDL_Renderer *ren = nullptr;
SDL_Texture *tex = nullptr;
SDL_Texture *uitex = nullptr;
uint32_t t_states_total = 70224;
uint32_t t_states_per_scanline = 456;
uint32_t vsync_lines = 10;
uint8_t zoom = 3;
uint8_t use_palette=1;
bool fullscreen = false;
bool full_refresh = true;
int fullscreen_scale = 1;
SDL_Rect dest_rect;
//uint32_t time=0;
uint32_t t_screen = 0;
uint8_t gb_pixels[160*144];
uint8_t pixels[160*144];
uint16_t dots_in_scanline = 0;
uint8_t line_buffer[160];
@@ -69,88 +45,10 @@ namespace gbscreen
#define WY (*_WY)
#define WX (*_WX)
#define IF 0xff0f
bool last_interrupt_lcd_state = false;
bool eventHandler(SDL_Event *e)
void init()
{
if (e->type==SDL_WINDOWEVENT) {
if (e->window.event==SDL_WINDOWEVENT_CLOSE) {
return false;
} else if ((e->window.event==SDL_WINDOWEVENT_SHOWN) || (e->window.event==SDL_WINDOWEVENT_EXPOSED)) {
redraw();
}
}
if (!debug::debugging()) {
if (debug::paused()) {
if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
const uint8_t dt = sm83::step();
debug::cont();
gbscreen::refresh(dt);
}
}
} else {
if (e->type == SDL_KEYDOWN) {
if (e->key.keysym.scancode==SDL_SCANCODE_ESCAPE) {
debug::pause();
gbscreen::redraw();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F1) {
gbscreen::decZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F2) {
gbscreen::incZoom();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F3) {
gbscreen::toggleFullscreen();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F6) {
//zx_tape::play();
} else if (e->key.keysym.scancode==SDL_SCANCODE_F7) {
//zx_tape::rewind();
} else if (e->key.keysym.scancode==SDL_SCANCODE_Q && e->key.keysym.mod & KMOD_CTRL) {
return false;
}
}
}
}
if (e->type == SDL_MOUSEMOTION) {
SDL_ShowCursor(true);
}
return true;
}
void reinit()
{
if (win) ui::window::unregisterWindow(SDL_GetWindowID(win));
if (tex) SDL_DestroyTexture(tex);
if (uitex) SDL_DestroyTexture(uitex);
if (ren) SDL_DestroyRenderer(ren);
if (win) SDL_DestroyWindow(win);
const int z = fullscreen ? 1 : zoom;
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);
tex = SDL_CreateTexture(ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 160, 144);
uitex = ui::createtexture(ren);
ui::window::registerWindow(SDL_GetWindowID(win), eventHandler);
if (fullscreen)
{
int w, h;
SDL_GetWindowSize(win, &w, &h);
fullscreen_scale = h/144;
dest_rect.w = 160 * fullscreen_scale;
dest_rect.h = 144 * fullscreen_scale;
dest_rect.x = (w - dest_rect.w)/2;
dest_rect.y = (h - dest_rect.h)/2;
}
else
{
dest_rect.x = dest_rect.y = 0;
dest_rect.w = 160 * zoom;
dest_rect.h = 144 * zoom;
}
_LCDC = mem::rawHram(0xff40);
_STAT = mem::rawHram(0xff41);
_SCY = mem::rawHram(0xff42);
@@ -164,24 +62,8 @@ namespace gbscreen
oam = (oam_entry_t*)mem::rawHram(0xfe00);
vram = mem::rawVram();
focus();
}
void init(int mode)
{
reinit();
}
void focus()
{
if (win)
{
SDL_RaiseWindow(win);
redraw();
}
}
void fill_line_buffer_bkg()
{
if ((LCDC & 0x1) == 0) {
@@ -324,13 +206,11 @@ namespace gbscreen
if ( (STAT&0x3)==3) {
uint16_t current_pixel = dots_in_scanline-80;
if (current_pixel<160) {
//uint8_t pixel = gb_pixels[current_pixel+LY*160];
gb_pixels[current_pixel+LY*160] = line_buffer[current_pixel];// > line_buffer[current_pixel] ? pixel-1 : line_buffer[current_pixel];
pixels[current_pixel+LY*160] = line_buffer[current_pixel];
}
}
// gestió de en quin dot i linea estem, i tot el que ha de passar
//uint8_t interrupts = 0x00;
bool current_interrupt_lcd_state = false;
dots_in_scanline++;
if ( (dots_in_scanline==80) && (LY<144) )
@@ -340,7 +220,7 @@ namespace gbscreen
else if ( (dots_in_scanline==252) && (LY<144) )
{
STAT = (STAT & 0xFC); // Set mode 0
if (STAT&0x08) current_interrupt_lcd_state = true; // interrupts |= INTERRUPT_LCD;
if (STAT&0x08) current_interrupt_lcd_state = true;
}
else if (dots_in_scanline==456)
{
@@ -350,17 +230,16 @@ namespace gbscreen
if (LY==144)
{
// Set vblank interrupt
mem::writeMem(IF, mem::readMem(IF) | INTERRUPT_VBLANK);
mem::requestInterrupt(gb::interrupts::VBLANK);
STAT = (STAT & 0xFC) | 0x01; // Set mode 1
//interrupts |= INTERRUPT_VBLANK;
if (STAT&0x10) current_interrupt_lcd_state = true; //interrupts |= INTERRUPT_LCD;
if (STAT&0x10) current_interrupt_lcd_state = true;
}
else
{
if (LY<144)
{
STAT = (STAT & 0xFC) | 0x02; // Set mode 2
if (STAT&0x20) current_interrupt_lcd_state = true; // interrupts |= INTERRUPT_LCD;
if (STAT&0x20) current_interrupt_lcd_state = true;
fill_line_buffer_bkg();
fill_line_buffer_win();
fill_line_buffer_obj();
@@ -369,7 +248,7 @@ namespace gbscreen
if (LY==LYC)
{
STAT = (STAT & 0xFB) | 0x04;
if (STAT&0x40) current_interrupt_lcd_state = true; // interrupts |= INTERRUPT_LCD;
if (STAT&0x40) current_interrupt_lcd_state = true;
}
else
{
@@ -379,8 +258,7 @@ namespace gbscreen
if (!last_interrupt_lcd_state && current_interrupt_lcd_state)
{
mem::writeMem(IF, mem::readMem(IF) | INTERRUPT_LCD);
//sm83::interrupt(interrupts);
mem::requestInterrupt(gb::interrupts::LCD);
}
last_interrupt_lcd_state = current_interrupt_lcd_state;
@@ -388,131 +266,13 @@ namespace gbscreen
if (t_screen>=t_states_total)
{
t_screen-=t_states_total;
redraw();
display::redraw();
}
}
}
void fullrefresh()
const uint8_t *getpixels()
{
uint32_t tmp = t_screen;
t_screen = 0;
refresh(t_states_total, true);
t_screen = tmp;
return pixels;
}
void debugrefresh(const uint32_t dt)
{
/*if (full_refresh) fullrefresh(); else*/ refresh(dt);
redraw();
}
void redraw(const bool present)
{
//if (zx_tape::getplaying() && zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD)) return;
ui::setrenderer(ren, uitex);
Uint32* pixels;
int pitch;
SDL_LockTexture(tex, NULL, (void**)&pixels, &pitch);
for (int i=0; i<160*144;++i) *(pixels++) = palette[use_palette][gb_pixels[i]];
SDL_UnlockTexture(tex);
if (fullscreen)
{
SDL_SetRenderDrawColor(ren, 0, 0, 0, 255);
SDL_RenderClear(ren);
}
// Pintem la textura a pantalla
SDL_RenderCopy(ren, tex, NULL, &dest_rect);
// Pintem les ralles dels pixels
if (zoom>2 || fullscreen) {
SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor(ren, 160, 170, 5, 96);
const float scale = fullscreen ? fullscreen_scale : zoom;
for (int i=0;i<144;++i) SDL_RenderDrawLine(ren, dest_rect.x, dest_rect.y+i*scale, dest_rect.x+159*scale, dest_rect.y+i*scale);
for (int i=0;i<160;++i) SDL_RenderDrawLine(ren, dest_rect.x+i*scale, dest_rect.y, dest_rect.x+i*scale, dest_rect.y+143*scale);
}
if (present)
SDL_RenderPresent(ren);
else
{
SDL_SetRenderDrawBlendMode(ren, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor(ren, 0, 0, 0, 128);
SDL_Rect rect {0,0,160*zoom,144*zoom};
if (fullscreen) SDL_GetWindowSize(win, &rect.w, &rect.h);
SDL_RenderFillRect(ren, &rect);
}
//audio_viewer::refresh();
}
void present()
{
SDL_RenderPresent(ren);
}
void setTitle(const char* title)
{
char tmp[256];
strcpy(tmp, "Gameboy Screen");
strcat(tmp, title);
SDL_SetWindowTitle(win, tmp);
}
void setZoom(const int value)
{
if (fullscreen) return;
if (value < 1) return;
SDL_DisplayMode dm;
SDL_GetCurrentDisplayMode(0, &dm);
if (160*value > dm.w) return;
if (144*value > dm.h) return;
zoom = value;
reinit();
}
void incZoom()
{
if (fullscreen) return;
setZoom(zoom+1);
}
void decZoom()
{
if (fullscreen) return;
setZoom(zoom-1);
}
void toggleFullscreen()
{
fullscreen = !fullscreen;
reinit();
}
const bool getFullscreen()
{
return fullscreen;
}
void toggleFullRefresh()
{
full_refresh = !full_refresh;
}
const bool getFullRefresh()
{
return full_refresh;
}
//SDL_Renderer *getrenderer()
//{
// return ren;
//}
}
source/ppu.h
+9
View File
@@ -0,0 +1,9 @@
#pragma once
#include <stdint.h>
namespace ppu
{
void init();
void refresh(const uint32_t dt, const bool full=false);
const uint8_t *getpixels();
}
sm83.cpp → source/sm83.cpp
+287 -378
View File
@@ -46,10 +46,6 @@ namespace sm83
uint8_t *_rIME = &regs[12];
bool halted = false;
bool exit_from_halt = false;
int pending_ei = 0;
#define rA (*_rA)
#define rF (*_rF)
#define rB (*_rB)
@@ -71,41 +67,26 @@ namespace sm83
#define EX(a,b) {auto temp=a;a=b;b=temp;}
bool reading_m1 = false;
bool halted = false;
bool exit_from_halt = false;
int pending_ei = 0;
uint8_t READ_MEM_8(const uint16_t addr, const bool code=false)
{
if (debug::isbreak(addr, 2)) debug::stop();
t+=4;
const uint8_t tag = mem::getTag(addr);
if ( !(tag&MEMTAG_IGNORE) ) {
if (!code) {
if ( tag & MEMTAG_INST ) {
} else {
mem::setTag(addr, tag | MEMTAG_DATA);
}
} else {
if ( (reading_m1) && ( tag & MEMTAG_DATA ) ) {
}
}
}
reading_m1 = false;
debug::onMemRead(addr, code);
return mem::readMem(addr);
}
uint8_t READ_MEM_8()
{
const uint8_t data = READ_MEM_8(rPC, true);
const uint8_t tag = mem::getTag(rPC);
if ( !(tag & MEMTAG_IGNORE) ) mem::setTag(rPC, tag | MEMTAG_CODE);
rPC++;
return data;
}
uint8_t READ_M1()
{
reading_m1 = true;
return READ_MEM_8();
}
@@ -125,19 +106,7 @@ namespace sm83
{
t+=4;
mem::writeMem(addr, value);
if (debug::isbreak(addr, 4)) debug::stop();
debug::setmemmodified(addr);
const uint8_t tag = mem::getTag(addr);
if ( !(tag & MEMTAG_IGNORE) ) {
if ( tag & MEMTAG_INST ) {
//printf("WARNING! WRITING DATA OVER CODE!!! $%4X\n", addr);
//z80debug::stop();
} else {
mem::setTag(addr, tag | MEMTAG_DATA | MEMTAG_TDATA);
}
}
debug::onMemWrite(addr);
return value;
}
@@ -502,19 +471,6 @@ namespace sm83
{
POP(_rPC);
if (cond != cUnconditional) t += 4;
/*if (options[Z80_OPTION_BREAK_ON_RET]) {
if (calls_stacked>0) {
calls_stacked--;
printf("RET: calls still stacked: %i\n", calls_stacked);
} else {
printf("RET: BREAK\n");
options[Z80_OPTION_BREAK_ON_RET] = false;
z80debug::setcursor(rPC);
z80debug::history::store();
z80debug::stop();
}
}*/
}
}
@@ -534,28 +490,22 @@ namespace sm83
DI();
PUSH(rPC);
//t+=20;
if (*IF & INTERRUPT_VBLANK) {
if (*IF & gb::interrupts::VBLANK) {
rPC = 0x40;
*IF = *IF & ~INTERRUPT_VBLANK;
} else if (*IF & INTERRUPT_LCD) {
*IF = *IF & ~gb::interrupts::VBLANK;
} else if (*IF & gb::interrupts::LCD) {
rPC = 0x48;
*IF = *IF & ~INTERRUPT_LCD;
} else if (*IF & INTERRUPT_TIMER) {
*IF = *IF & ~gb::interrupts::LCD;
} else if (*IF & gb::interrupts::TIMER) {
rPC = 0x50;
*IF = *IF & ~INTERRUPT_TIMER;
} else if (*IF & INTERRUPT_SERIAL) {
*IF = *IF & ~gb::interrupts::TIMER;
} else if (*IF & gb::interrupts::SERIAL) {
rPC = 0x58;
*IF = *IF & ~INTERRUPT_SERIAL;
} else if (*IF & INTERRUPT_JOYPAD) {
*IF = *IF & ~gb::interrupts::SERIAL;
} else if (*IF & gb::interrupts::JOYPAD) {
rPC = 0x60;
*IF = *IF & ~INTERRUPT_JOYPAD;
*IF = *IF & ~gb::interrupts::JOYPAD;
}
/*if (options[Z80_OPTION_BREAK_ON_INTERRUPT]) {
printf("Break on interrupt! 0x%2x, PC: 0x%2x\n", address, rPC);
z80debug::setcursor(rPC);
z80debug::history::store();
z80debug::stop();
}*/
}
void RETI()
@@ -602,13 +552,7 @@ namespace sm83
halted = true;
}
}
/*if (exit_from_halt) {
exit_from_halt = false;
halted = false;
} else {*/
//printf("HALT\n");
rPC--;
//}
rPC--;
}
void STOP()
@@ -616,15 +560,6 @@ namespace sm83
HALT();
}
void interrupt(uint8_t type)
{
const uint8_t IE = mem::readMem(0xffff);
//if (IE & type) exit_from_halt = true;
const uint8_t IF = mem::readMem(0xff0f);
mem::writeMem(0xff0f, IF | type);
//processInterrupts();
}
static inline const uint8_t RLC(const uint8_t v)
{
const uint8_t res = (v>>7) | (v<<1);
@@ -739,21 +674,9 @@ namespace sm83
rHL--;
}
void INVALID(uint8_t opcode)
{
printf("INVALID OPCODE AT: %04x\n", current_opcode_address);
//if (options[Z80_OPTION_STOP_ON_INVALID]) z80debug::stop();
}
bool opcode_ignored = false;
void IgnoreOpcode()
{
debug::setcursor(rPC);
debug::history::store();
debug::stop();
/*t-=3;
rPC--;
opcode_ignored=true;*/
}
void reset()
@@ -779,304 +702,292 @@ namespace sm83
uint32_t step()
{
do {
opcode_ignored = false;
current_opcode_address = rPC;
t = 0;
const uint8_t opcode = READ_M1();
current_opcode_address = rPC;
t = 0;
const uint8_t opcode = READ_M1();
uint16_t tmp;
uint8_t tag = mem::getTag(current_opcode_address);
if ( !(tag & MEMTAG_IGNORE) )
tag = tag | MEMTAG_INST;
mem::setTag(current_opcode_address, tag | (!(tag&MEMTAG_TOUCHED) ? MEMTAG_TREPEAT : MEMTAG_TINST) );
switch (opcode)
{
case 0x00: /* NOP */ break;
case 0x01: rBC = READ_MEM_16(); break;
case 0x02: WRITE_MEM_8(rBC, rA); break;
case 0x03: INC16(_rBC); break;
case 0x04: INC8(_rB); break;
case 0x05: DEC8(_rB); break;
case 0x06: rB = READ_MEM_8(); break;
case 0x07: RLCA(); break;
case 0x08: WRITE_MEM_16(READ_MEM_16(), rSP);break;
case 0x09: ADD16(_rHL, rBC); break;
case 0x0A: rA = READ_MEM_8(rBC); break;
case 0x0B: DEC16(_rBC); break;
case 0x0C: INC8(_rC); break;
case 0x0D: DEC8(_rC); break;
case 0x0E: rC = READ_MEM_8(); break;
case 0x0F: RRCA(); break;
uint16_t tmp;
case 0x10: STOP(); break;
case 0x11: rDE = READ_MEM_16(); break;
case 0x12: WRITE_MEM_8(rDE, rA); break;
case 0x13: INC16(_rDE); break;
case 0x14: INC8(_rD); break;
case 0x15: DEC8(_rD); break;
case 0x16: rD = READ_MEM_8(); break;
case 0x17: RLA(); break;
case 0x18: JR(); break;
case 0x19: ADD16(_rHL, rDE); break;
case 0x1A: rA = READ_MEM_8(rDE); break;
case 0x1B: DEC16(_rDE); break;
case 0x1C: INC8(_rE); break;
case 0x1D: DEC8(_rE); break;
case 0x1E: rE = READ_MEM_8(); break;
case 0x1F: RRA(); break;
case 0x20: JR(cNZ); break;
case 0x21: rHL = READ_MEM_16(); break;
case 0x22: LDI_HL_A(); break;
case 0x23: INC16(_rHL); break;
case 0x24: INC8(_rH); break;
case 0x25: DEC8(_rH); break;
case 0x26: rH = READ_MEM_8(); break;
case 0x27: DAA(); break;
case 0x28: JR(cZ); break;
case 0x29: ADD16(_rHL, rHL); break;
case 0x2A: LDI_A_HL(); break;
case 0x2B: DEC16(_rHL); break;
case 0x2C: INC8(_rL); break;
case 0x2D: DEC8(_rL); break;
case 0x2E: rL = READ_MEM_8(); break;
case 0x2F: CPL(); break;
case 0x30: JR(cNC); break;
case 0x31: rSP = READ_MEM_16(); break;
case 0x32: LDD_HL_A(); break;
case 0x33: INC16(_rSP); break;
case 0x34: INCMEM8(rHL); break;
case 0x35: DECMEM8(rHL); break;
case 0x36: WRITE_MEM_8(rHL, READ_MEM_8()); break;
case 0x37: SCF(); break;
case 0x38: JR(cC); break;
case 0x39: ADD16(_rHL, rSP); break;
case 0x3A: LDD_A_HL(); break;
case 0x3B: DEC16(_rSP); break;
case 0x3C: INC8(_rA); break;
case 0x3D: DEC8(_rA); break;
case 0x3E: rA = READ_MEM_8(); break;
case 0x3F: CCF(); break;
case 0x40: rB = rB; break;
case 0x41: rB = rC; break;
case 0x42: rB = rD; break;
case 0x43: rB = rE; break;
case 0x44: rB = rH; break;
case 0x45: rB = rL; break;
case 0x46: rB = READ_MEM_8(rHL); break;
case 0x47: rB = rA; break;
case 0x48: rC = rB; break;
case 0x49: rC = rC; break;
case 0x4A: rC = rD; break;
case 0x4B: rC = rE; break;
case 0x4C: rC = rH; break;
case 0x4D: rC = rL; break;
case 0x4E: rC = READ_MEM_8(rHL); break;
case 0x4F: rC = rA; break;
case 0x50: rD = rB; break;
case 0x51: rD = rC; break;
case 0x52: rD = rD; break;
case 0x53: rD = rE; break;
case 0x54: rD = rH; break;
case 0x55: rD = rL; break;
case 0x56: rD = READ_MEM_8(rHL); break;
case 0x57: rD = rA; break;
case 0x58: rE = rB; break;
case 0x59: rE = rC; break;
case 0x5A: rE = rD; break;
case 0x5B: rE = rE; break;
case 0x5C: rE = rH; break;
case 0x5D: rE = rL; break;
case 0x5E: rE = READ_MEM_8(rHL); break;
case 0x5F: rE = rA; break;
//if (opcode!=0xED && opcode!=0xCB && opcode!=0xDD && opcode!=0xFD ) z80debug::useOpcode(opcode, 0);
case 0x60: rH = rB; break;
case 0x61: rH = rC; break;
case 0x62: rH = rD; break;
case 0x63: rH = rE; break;
case 0x64: rH = rH; break;
case 0x65: rH = rL; break;
case 0x66: rH = READ_MEM_8(rHL); break;
case 0x67: rH = rA; break;
case 0x68: rL = rB; break;
case 0x69: rL = rC; break;
case 0x6A: rL = rD; break;
case 0x6B: rL = rE; break;
case 0x6C: rL = rH; break;
case 0x6D: rL = rL; break;
case 0x6E: rL = READ_MEM_8(rHL); break;
case 0x6F: rL = rA; break;
case 0x70: WRITE_MEM_8(rHL, rB); break;
case 0x71: WRITE_MEM_8(rHL, rC); break;
case 0x72: WRITE_MEM_8(rHL, rD); break;
case 0x73: WRITE_MEM_8(rHL, rE); break;
case 0x74: WRITE_MEM_8(rHL, rH); break;
case 0x75: WRITE_MEM_8(rHL, rL); break;
case 0x76: HALT(); break;
case 0x77: WRITE_MEM_8(rHL, rA); break;
case 0x78: rA = rB; break;
case 0x79: rA = rC; break;
case 0x7A: rA = rD; break;
case 0x7B: rA = rE; break;
case 0x7C: rA = rH; break;
case 0x7D: rA = rL; break;
case 0x7E: rA = READ_MEM_8(rHL); break;
case 0x7F: rA = rA; break;
case 0x80: ADD8(rB); break;
case 0x81: ADD8(rC); break;
case 0x82: ADD8(rD); break;
case 0x83: ADD8(rE); break;
case 0x84: ADD8(rH); break;
case 0x85: ADD8(rL); break;
case 0x86: ADD8(READ_MEM_8(rHL)); break;
case 0x87: ADD8(rA); break;
case 0x88: ADC8(rB); break;
case 0x89: ADC8(rC); break;
case 0x8A: ADC8(rD); break;
case 0x8B: ADC8(rE); break;
case 0x8C: ADC8(rH); break;
case 0x8D: ADC8(rL); break;
case 0x8E: ADC8(READ_MEM_8(rHL)); break;
case 0x8F: ADC8(rA); break;
switch (opcode)
{
case 0x00: /* NOP */ break;
case 0x01: rBC = READ_MEM_16(); break;
case 0x02: WRITE_MEM_8(rBC, rA); break;
case 0x03: INC16(_rBC); break;
case 0x04: INC8(_rB); break;
case 0x05: DEC8(_rB); break;
case 0x06: rB = READ_MEM_8(); break;
case 0x07: RLCA(); break;
case 0x08: WRITE_MEM_16(READ_MEM_16(), rSP);break;
case 0x09: ADD16(_rHL, rBC); break;
case 0x0A: rA = READ_MEM_8(rBC); break;
case 0x0B: DEC16(_rBC); break;
case 0x0C: INC8(_rC); break;
case 0x0D: DEC8(_rC); break;
case 0x0E: rC = READ_MEM_8(); break;
case 0x0F: RRCA(); break;
case 0x90: SUB8(rB); break;
case 0x91: SUB8(rC); break;
case 0x92: SUB8(rD); break;
case 0x93: SUB8(rE); break;
case 0x94: SUB8(rH); break;
case 0x95: SUB8(rL); break;
case 0x96: SUB8(READ_MEM_8(rHL)); break;
case 0x97: SUB8(rA); break;
case 0x98: SBC8(rB); break;
case 0x99: SBC8(rC); break;
case 0x9A: SBC8(rD); break;
case 0x9B: SBC8(rE); break;
case 0x9C: SBC8(rH); break;
case 0x9D: SBC8(rL); break;
case 0x9E: SBC8(READ_MEM_8(rHL)); break;
case 0x9F: SBC8(rA); break;
case 0x10: STOP(); break;
case 0x11: rDE = READ_MEM_16(); break;
case 0x12: WRITE_MEM_8(rDE, rA); break;
case 0x13: INC16(_rDE); break;
case 0x14: INC8(_rD); break;
case 0x15: DEC8(_rD); break;
case 0x16: rD = READ_MEM_8(); break;
case 0x17: RLA(); break;
case 0x18: JR(); break;
case 0x19: ADD16(_rHL, rDE); break;
case 0x1A: rA = READ_MEM_8(rDE); break;
case 0x1B: DEC16(_rDE); break;
case 0x1C: INC8(_rE); break;
case 0x1D: DEC8(_rE); break;
case 0x1E: rE = READ_MEM_8(); break;
case 0x1F: RRA(); break;
case 0xA0: AND(rB); break;
case 0xA1: AND(rC); break;
case 0xA2: AND(rD); break;
case 0xA3: AND(rE); break;
case 0xA4: AND(rH); break;
case 0xA5: AND(rL); break;
case 0xA6: AND(READ_MEM_8(rHL)); break;
case 0xA7: AND(rA); break;
case 0xA8: XOR(rB); break;
case 0xA9: XOR(rC); break;
case 0xAA: XOR(rD); break;
case 0xAB: XOR(rE); break;
case 0xAC: XOR(rH); break;
case 0xAD: XOR(rL); break;
case 0xAE: XOR(READ_MEM_8(rHL)); break;
case 0xAF: XOR(rA); break;
case 0x20: JR(cNZ); break;
case 0x21: rHL = READ_MEM_16(); break;
case 0x22: LDI_HL_A(); break;
case 0x23: INC16(_rHL); break;
case 0x24: INC8(_rH); break;
case 0x25: DEC8(_rH); break;
case 0x26: rH = READ_MEM_8(); break;
case 0x27: DAA(); break;
case 0x28: JR(cZ); break;
case 0x29: ADD16(_rHL, rHL); break;
case 0x2A: LDI_A_HL(); break;
case 0x2B: DEC16(_rHL); break;
case 0x2C: INC8(_rL); break;
case 0x2D: DEC8(_rL); break;
case 0x2E: rL = READ_MEM_8(); break;
case 0x2F: CPL(); break;
case 0xB0: OR(rB); break;
case 0xB1: OR(rC); break;
case 0xB2: OR(rD); break;
case 0xB3: OR(rE); break;
case 0xB4: OR(rH); break;
case 0xB5: OR(rL); break;
case 0xB6: OR(READ_MEM_8(rHL)); break;
case 0xB7: OR(rA); break;
case 0xB8: CP(rB); break;
case 0xB9: CP(rC); break;
case 0xBA: CP(rD); break;
case 0xBB: CP(rE); break;
case 0xBC: CP(rH); break;
case 0xBD: CP(rL); break;
case 0xBE: CP(READ_MEM_8(rHL)); break;
case 0xBF: CP(rA); break;
case 0x30: JR(cNC); break;
case 0x31: rSP = READ_MEM_16(); break;
case 0x32: LDD_HL_A(); break;
case 0x33: INC16(_rSP); break;
case 0x34: INCMEM8(rHL); break;
case 0x35: DECMEM8(rHL); break;
case 0x36: WRITE_MEM_8(rHL, READ_MEM_8()); break;
case 0x37: SCF(); break;
case 0x38: JR(cC); break;
case 0x39: ADD16(_rHL, rSP); break;
case 0x3A: LDD_A_HL(); break;
case 0x3B: DEC16(_rSP); break;
case 0x3C: INC8(_rA); break;
case 0x3D: DEC8(_rA); break;
case 0x3E: rA = READ_MEM_8(); break;
case 0x3F: CCF(); break;
case 0xC0: RET(cNZ); break;
case 0xC1: POP(_rBC); break;
case 0xC2: JP(cNZ, READ_MEM_16()); break;
case 0xC3: JP(cUnconditional, READ_MEM_16());break;
case 0xC4: CALL(cNZ, READ_MEM_16()); break;
case 0xC5: PUSH(rBC); break;
case 0xC6: ADD8(READ_MEM_8()); break;
case 0xC7: RST(0x00); break;
case 0xC8: RET(cZ); break;
case 0xC9: RET(cUnconditional); break;
case 0xCA: JP(cZ, READ_MEM_16()); break;
case 0xCB: BIT_INSTRUCTIONS(); break;
case 0xCC: CALL(cZ, READ_MEM_16()); break;
case 0xCD: CALL(cUnconditional, READ_MEM_16());break;
case 0xCE: ADC8(READ_MEM_8()); break;
case 0xCF: RST(0x08); break;
case 0x40: rB = rB; break;
case 0x41: rB = rC; break;
case 0x42: rB = rD; break;
case 0x43: rB = rE; break;
case 0x44: rB = rH; break;
case 0x45: rB = rL; break;
case 0x46: rB = READ_MEM_8(rHL); break;
case 0x47: rB = rA; break;
case 0x48: rC = rB; break;
case 0x49: rC = rC; break;
case 0x4A: rC = rD; break;
case 0x4B: rC = rE; break;
case 0x4C: rC = rH; break;
case 0x4D: rC = rL; break;
case 0x4E: rC = READ_MEM_8(rHL); break;
case 0x4F: rC = rA; break;
case 0xD0: RET(cNC); break;
case 0xD1: POP(_rDE); break;
case 0xD2: JP(cNC, READ_MEM_16()); break;
case 0xD3: IgnoreOpcode(); break;
case 0xD4: CALL(cNC, READ_MEM_16()); break;
case 0xD5: PUSH(rDE); break;
case 0xD6: SUB8(READ_MEM_8()); break;
case 0xD7: RST(0x10); break;
case 0xD8: RET(cC); break;
case 0xD9: RETI(); break;
case 0xDA: JP(cC, READ_MEM_16()); break;
case 0xDB: IgnoreOpcode(); break;
case 0xDC: CALL(cC, READ_MEM_16()); break;
case 0xDD: IgnoreOpcode(); break;
case 0xDE: SBC8(READ_MEM_8()); break;
case 0xDF: RST(0x18); break;
case 0x50: rD = rB; break;
case 0x51: rD = rC; break;
case 0x52: rD = rD; break;
case 0x53: rD = rE; break;
case 0x54: rD = rH; break;
case 0x55: rD = rL; break;
case 0x56: rD = READ_MEM_8(rHL); break;
case 0x57: rD = rA; break;
case 0x58: rE = rB; break;
case 0x59: rE = rC; break;
case 0x5A: rE = rD; break;
case 0x5B: rE = rE; break;
case 0x5C: rE = rH; break;
case 0x5D: rE = rL; break;
case 0x5E: rE = READ_MEM_8(rHL); break;
case 0x5F: rE = rA; break;
case 0x60: rH = rB; break;
case 0x61: rH = rC; break;
case 0x62: rH = rD; break;
case 0x63: rH = rE; break;
case 0x64: rH = rH; break;
case 0x65: rH = rL; break;
case 0x66: rH = READ_MEM_8(rHL); break;
case 0x67: rH = rA; break;
case 0x68: rL = rB; break;
case 0x69: rL = rC; break;
case 0x6A: rL = rD; break;
case 0x6B: rL = rE; break;
case 0x6C: rL = rH; break;
case 0x6D: rL = rL; break;
case 0x6E: rL = READ_MEM_8(rHL); break;
case 0x6F: rL = rA; break;
case 0x70: WRITE_MEM_8(rHL, rB); break;
case 0x71: WRITE_MEM_8(rHL, rC); break;
case 0x72: WRITE_MEM_8(rHL, rD); break;
case 0x73: WRITE_MEM_8(rHL, rE); break;
case 0x74: WRITE_MEM_8(rHL, rH); break;
case 0x75: WRITE_MEM_8(rHL, rL); break;
case 0x76: HALT(); break;
case 0x77: WRITE_MEM_8(rHL, rA); break;
case 0x78: rA = rB; break;
case 0x79: rA = rC; break;
case 0x7A: rA = rD; break;
case 0x7B: rA = rE; break;
case 0x7C: rA = rH; break;
case 0x7D: rA = rL; break;
case 0x7E: rA = READ_MEM_8(rHL); break;
case 0x7F: rA = rA; break;
case 0x80: ADD8(rB); break;
case 0x81: ADD8(rC); break;
case 0x82: ADD8(rD); break;
case 0x83: ADD8(rE); break;
case 0x84: ADD8(rH); break;
case 0x85: ADD8(rL); break;
case 0x86: ADD8(READ_MEM_8(rHL)); break;
case 0x87: ADD8(rA); break;
case 0x88: ADC8(rB); break;
case 0x89: ADC8(rC); break;
case 0x8A: ADC8(rD); break;
case 0x8B: ADC8(rE); break;
case 0x8C: ADC8(rH); break;
case 0x8D: ADC8(rL); break;
case 0x8E: ADC8(READ_MEM_8(rHL)); break;
case 0x8F: ADC8(rA); break;
case 0xE0: WRITE_MEM_8(READ_MEM_8()|0xff00, rA);break;
case 0xE1: POP(_rHL); break;
case 0xE2: WRITE_MEM_8(rC|0xff00, rA); break;
case 0xE3: IgnoreOpcode(); break;
case 0xE4: IgnoreOpcode(); break;
case 0xE5: PUSH(rHL); break;
case 0xE6: AND(READ_MEM_8()); break;
case 0xE7: RST(0x20); break;
case 0xE8: ADD16(_rSP, (int8_t)READ_MEM_8());break; /*[TODO] es correcte? ha de ser signed*/
case 0xE9: JP(cUnconditional, rHL, true); break;
case 0xEA: WRITE_MEM_8(READ_MEM_16(), rA); break;
case 0xEB: IgnoreOpcode(); break;
case 0xEC: IgnoreOpcode(); break;
case 0xED: IgnoreOpcode(); break;
case 0xEE: XOR(READ_MEM_8()); break;
case 0xEF: RST(0x28); break;
case 0x90: SUB8(rB); break;
case 0x91: SUB8(rC); break;
case 0x92: SUB8(rD); break;
case 0x93: SUB8(rE); break;
case 0x94: SUB8(rH); break;
case 0x95: SUB8(rL); break;
case 0x96: SUB8(READ_MEM_8(rHL)); break;
case 0x97: SUB8(rA); break;
case 0x98: SBC8(rB); break;
case 0x99: SBC8(rC); break;
case 0x9A: SBC8(rD); break;
case 0x9B: SBC8(rE); break;
case 0x9C: SBC8(rH); break;
case 0x9D: SBC8(rL); break;
case 0x9E: SBC8(READ_MEM_8(rHL)); break;
case 0x9F: SBC8(rA); break;
case 0xA0: AND(rB); break;
case 0xA1: AND(rC); break;
case 0xA2: AND(rD); break;
case 0xA3: AND(rE); break;
case 0xA4: AND(rH); break;
case 0xA5: AND(rL); break;
case 0xA6: AND(READ_MEM_8(rHL)); break;
case 0xA7: AND(rA); break;
case 0xA8: XOR(rB); break;
case 0xA9: XOR(rC); break;
case 0xAA: XOR(rD); break;
case 0xAB: XOR(rE); break;
case 0xAC: XOR(rH); break;
case 0xAD: XOR(rL); break;
case 0xAE: XOR(READ_MEM_8(rHL)); break;
case 0xAF: XOR(rA); break;
case 0xB0: OR(rB); break;
case 0xB1: OR(rC); break;
case 0xB2: OR(rD); break;
case 0xB3: OR(rE); break;
case 0xB4: OR(rH); break;
case 0xB5: OR(rL); break;
case 0xB6: OR(READ_MEM_8(rHL)); break;
case 0xB7: OR(rA); break;
case 0xB8: CP(rB); break;
case 0xB9: CP(rC); break;
case 0xBA: CP(rD); break;
case 0xBB: CP(rE); break;
case 0xBC: CP(rH); break;
case 0xBD: CP(rL); break;
case 0xBE: CP(READ_MEM_8(rHL)); break;
case 0xBF: CP(rA); break;
case 0xC0: RET(cNZ); break;
case 0xC1: POP(_rBC); break;
case 0xC2: JP(cNZ, READ_MEM_16()); break;
case 0xC3: JP(cUnconditional, READ_MEM_16());break;
case 0xC4: CALL(cNZ, READ_MEM_16()); break;
case 0xC5: PUSH(rBC); break;
case 0xC6: ADD8(READ_MEM_8()); break;
case 0xC7: RST(0x00); break;
case 0xC8: RET(cZ); break;
case 0xC9: RET(cUnconditional); break;
case 0xCA: JP(cZ, READ_MEM_16()); break;
case 0xCB: BIT_INSTRUCTIONS(); break;
case 0xCC: CALL(cZ, READ_MEM_16()); break;
case 0xCD: CALL(cUnconditional, READ_MEM_16());break;
case 0xCE: ADC8(READ_MEM_8()); break;
case 0xCF: RST(0x08); break;
case 0xD0: RET(cNC); break;
case 0xD1: POP(_rDE); break;
case 0xD2: JP(cNC, READ_MEM_16()); break;
case 0xD3: IgnoreOpcode(); break;
case 0xD4: CALL(cNC, READ_MEM_16()); break;
case 0xD5: PUSH(rDE); break;
case 0xD6: SUB8(READ_MEM_8()); break;
case 0xD7: RST(0x10); break;
case 0xD8: RET(cC); break;
case 0xD9: RETI(); break;
case 0xDA: JP(cC, READ_MEM_16()); break;
case 0xDB: IgnoreOpcode(); break;
case 0xDC: CALL(cC, READ_MEM_16()); break;
case 0xDD: IgnoreOpcode(); break;
case 0xDE: SBC8(READ_MEM_8()); break;
case 0xDF: RST(0x18); break;
case 0xE0: WRITE_MEM_8(READ_MEM_8()|0xff00, rA);break;
case 0xE1: POP(_rHL); break;
case 0xE2: WRITE_MEM_8(rC|0xff00, rA); break;
case 0xE3: IgnoreOpcode(); break;
case 0xE4: IgnoreOpcode(); break;
case 0xE5: PUSH(rHL); break;
case 0xE6: AND(READ_MEM_8()); break;
case 0xE7: RST(0x20); break;
case 0xE8: ADD16(_rSP, (int8_t)READ_MEM_8());break; /*[TODO] es correcte? ha de ser signed*/
case 0xE9: JP(cUnconditional, rHL, true); break;
case 0xEA: WRITE_MEM_8(READ_MEM_16(), rA); break;
case 0xEB: IgnoreOpcode(); break;
case 0xEC: IgnoreOpcode(); break;
case 0xED: IgnoreOpcode(); break;
case 0xEE: XOR(READ_MEM_8()); break;
case 0xEF: RST(0x28); break;
case 0xF0: rA = READ_MEM_8(READ_MEM_8()|0xff00);break;
case 0xF1: POP(_rAF); break;
case 0xF2: rA = READ_MEM_8(rC|0xff00); break;
case 0xF3: DI(); break;
case 0xF4: IgnoreOpcode(); break;
case 0xF5: PUSH(rAF); break;
case 0xF6: OR(READ_MEM_8()); break;
case 0xF7: RST(0x30); break;
case 0xF8: rHL = rSP + (int8_t)READ_MEM_8();break; /*[TODO] es correcte? ha de ser signed*/
case 0xF9: rSP = rHL; t+=2; break;
case 0xFA: rA = READ_MEM_8(READ_MEM_16()); break;
case 0xFB: EI(); break;
case 0xFC: IgnoreOpcode(); break;
case 0xFD: IgnoreOpcode(); break;
case 0xFE: CP(READ_MEM_8()); break;
case 0xFF: RST(0x38); break;
}
} while (opcode_ignored);
case 0xF0: rA = READ_MEM_8(READ_MEM_8()|0xff00);break;
case 0xF1: POP(_rAF); break;
case 0xF2: rA = READ_MEM_8(rC|0xff00); break;
case 0xF3: DI(); break;
case 0xF4: IgnoreOpcode(); break;
case 0xF5: PUSH(rAF); break;
case 0xF6: OR(READ_MEM_8()); break;
case 0xF7: RST(0x30); break;
case 0xF8: rHL = rSP + (int8_t)READ_MEM_8();break; /*[TODO] es correcte? ha de ser signed*/
case 0xF9: rSP = rHL; t+=2; break;
case 0xFA: rA = READ_MEM_8(READ_MEM_16()); break;
case 0xFB: EI(); break;
case 0xFC: IgnoreOpcode(); break;
case 0xFD: IgnoreOpcode(); break;
case 0xFE: CP(READ_MEM_8()); break;
case 0xFF: RST(0x38); break;
}
if (pending_ei==2) { pending_ei=0; actualEI(); }
if (pending_ei==1) pending_ei=2;
debug::setcursor(rPC);
debug::history::store();
debug::onInstructionExecute(current_opcode_address);
mem::update_mapped(t);
return t;
}
@@ -1084,8 +995,6 @@ namespace sm83
{
const uint8_t opcode = READ_M1();
//z80debug::useOpcode(opcode, 2);
switch (opcode)
{
case 0x00: rB = RLC(rB); break;
sm83.h → source/sm83.h
+1 -7
View File
@@ -1,15 +1,10 @@
#pragma once
#include <stdint.h>
#include "interrupts.h"
namespace sm83
{
#define INTERRUPT_VBLANK 0x01
#define INTERRUPT_LCD 0x02
#define INTERRUPT_TIMER 0x04
#define INTERRUPT_SERIAL 0x08
#define INTERRUPT_JOYPAD 0x10
#define SM83_OPTION_STOP_ON_INVALID 0
#define SM83_OPTION_BREAK_ON_INTERRUPT 1
#define SM83_OPTION_BREAK_ON_RET 2
@@ -21,7 +16,6 @@ namespace sm83
uint32_t getClock();
void processInterrupts();
void interrupt(uint8_t type);
uint32_t step();
sm83dis.cpp → source/sm83dis.cpp
-1
View File
@@ -1,5 +1,4 @@
#include "sm83dis.h"
#include "sm83.h"
#include "mem.h"
#include <string.h>
#include <stdio.h>
sm83dis.h → source/sm83dis.h
View File
ui.cpp → source/ui.cpp
View File
ui.h → source/ui.h
View File
ui_menu.cpp → source/ui_menu.cpp
View File
ui_menu.h → source/ui_menu.h
View File
ui_window.cpp → source/ui_window.cpp
View File
ui_window.h → source/ui_window.h
View File