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

- Enorme reestructuració del codi per a que el fluxe comence a ser mes racional

Browse Source 
- [NEW] mòdul zx_system per a gestionar la vida i canvi de systemes (48K, 128K...)
This commit is contained in:
Raimon Zamora
2025-07-30 13:01:01 +02:00
parent 2775da3d53
commit 1db0c52e1a
15 changed files with 257 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
main.cpp
View File

@@ -1,5 +1,6 @@
#include <stdint.h>
#include <stdio.h>
#include "zx_system.h"
#include "z80.h"
#include "z80dis.h"
#include "z80debug.h"
@@ -14,8 +15,6 @@
#include "z80analyze.h"
#include "ui_window.h"
#include "zx_mem.h"
//#include "zx_48mem.h"
//#include "zx_128mem.h"
#include "z80viewer.h"
//#include "zx_128bankviewer.h"
//#include "zx_128pageviewer.h"
@@ -23,7 +22,6 @@
#include "ay_viewer.h"
#include "file.h"
//uint8_t memory[65536];
uint32_t time = 0;
uint32_t t_states = 0;
@@ -77,43 +75,34 @@ namespace actions
z80analyze::show();
return 0;
}
int mode48K(int value)
{
zx_system::reset(ZX_48K);
return 0;
}
int mode128K(int value)
{
zx_system::reset(ZX_128K);
return 0;
}
int reset(int value)
{
z80::reset();
return 0;
}
int exit(int value)
{
zx_system::shutdown();
return 0;
}
}
int main(int argc, char *argv[])
void init_menu()
{
//const uint32_t clock = 3500000;
const uint32_t clock = 3546900;
const uint32_t update_freq = clock / 10;
file::setConfigFolder("z80");
//new zx_48mem();
//new zx_128mem();
mem::init(ZX_128K);
z80dis::loadSymbols();
z80::setClock(clock);
z80::reset();
z80::connect_port(0xfe, 0x0001, zx_ula::port_in, zx_ula::port_out);
audio::init();
SDL_Init(SDL_INIT_EVERYTHING);
z80debug::init();
//zxscreen::init(SCREEN_MODE_48K);
zxscreen::init(SCREEN_MODE_128K);
//ay_viewer *v = new ay_viewer();
//v->show();
//z80viewer::registerViewer("AY", v);
//z80viewer *v = new zx_128bankviewer();
//v->show();
//z80viewer::registerViewer("128BANK", v);
//v = new zx_128pageviewer();
//v->show();
//z80viewer::registerViewer("128PAGE", v);
ui::menu::init();
ui::menu::setexitcallback(actions::exitMenu);
@@ -123,6 +112,14 @@ int main(int argc, char *argv[])
ui::menu::addseparator(menu);
ui::menu::addoption(menu, "LOAD STATE", nullptr);
ui::menu::addoption(menu, "SAVE STATE", nullptr);
ui::menu::addseparator(menu);
ui::menu::addoption(menu, "EXIT", actions::exit);
menu = ui::menu::addsubmenu("SYSTEM");
ui::menu::addoption(menu, "ZX 48K", actions::mode48K);
ui::menu::addoption(menu, "ZX 128K/+2", actions::mode128K);
ui::menu::addseparator(menu);
ui::menu::addoption(menu, "RESET", actions::reset);
menu = ui::menu::addsubmenu("TAPE");
ui::menu::addbooloption(menu, "FAST LOAD", zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD), actions::fastload);
@@ -138,30 +135,36 @@ int main(int argc, char *argv[])
menu = ui::menu::addsubmenu("EMULATION");
ui::menu::addbooloption(menu, "STOP ON INVALID OP", z80::getOption(Z80_OPTION_STOP_ON_INVALID), actions::decZoom);
ui::menu::addoption(menu, "SHOW ANALYZER", actions::showAnalyzer);
}
speaker::init();
speaker::register_source(zx_ula::get_sample);
speaker::register_source(audio::get_sample);
int main(int argc, char *argv[])
{
file::setConfigFolder("z80");
SDL_Init(SDL_INIT_EVERYTHING);
init_menu();
z80debug::init();
//uint32_t update_freq =
zx_system::init(ZX_48K);
zx_tape::load("ROBOCOP1.TAP");
if (argc==3) { z80debug::loadngo(argv[1], argv[2]); }
//if (argc==3) { z80debug::loadngo(argv[1], argv[2]); }
z80debug::stop();
//z80debug::stop();
bool should_exit = false;
SDL_Event e;
time = SDL_GetTicks();
t_states = 0;
while (!should_exit)
while (!zx_system::shuttingDown())
{
while (SDL_PollEvent(&e))
{
bool result = true;
if (e.type == SDL_QUIT) { should_exit=true; break; }
if (e.type == SDL_QUIT) { zx_system::shutdown(); break; }
if (e.type == SDL_MOUSEBUTTONDOWN) result = ui::window::sendEvent(e.button.windowID, &e);
if (e.type == SDL_MOUSEBUTTONUP) result = ui::window::sendEvent(e.button.windowID, &e);
if (e.type == SDL_MOUSEMOTION) result = ui::window::sendEvent(e.motion.windowID, &e);
@@ -224,10 +227,11 @@ int main(int argc, char *argv[])
if (e.type == SDL_MOUSEBUTTONUP && e.button.button==1) ui::setClicked(true);
if (!result)
should_exit = true; break;
zx_system::shutdown(); break;
}
if (!z80debug::debugging() && !z80debug::paused()) {
/*
//if (z80::getPC()==0x05C8) zx_tape::go_berserk();
bool fastload=false;
if (zx_tape::getplaying() && zx_tape::getOption(ZXTAPE_OPTION_FAST_LOAD)) { fastload=true; time = SDL_GetTicks(); }
@@ -245,7 +249,9 @@ int main(int argc, char *argv[])
//zxscreen::refresh(dt);
}
if (fastload) { printf("%i\n", SDL_GetTicks()-time); t_states=0; }
// En cada bucle fem 10 pasos de la CPU, sino s'ofega
*/
// En cada bucle fem 10 pasos de la CPU, sino s'ofega (jo en veig 5)
for (int i=0;i<5;++i) {
if (z80debug::isbreak(z80::getPC(), 9)) {
z80debug::stop();
@@ -254,23 +260,21 @@ int main(int argc, char *argv[])
} else {
uint8_t dt = z80::step();
t_states += dt;
zx_tape::update(dt);
audio::update(dt);
speaker::update(dt);
zx_system::update(dt);
//zx_tape::update(dt);
//audio::update(dt);
//speaker::update(dt);
zxscreen::refresh(dt);
if (z80debug::debugging()) break;
}
}
uint32_t update_freq = z80::getClock()/10;
if (t_states>=update_freq)
{
//if (SDL_GetTicks()>=time+1000)
//printf("%i\n", SDL_GetTicks()-(time+1000));
//else
// printf("%i\n", SDL_GetTicks()-(time+1000));
//t_states = 0;
//printf("%i: %i\n", SDL_GetTicks()-(time+1000), t_states);
// Esperem a que es compleixca el temps corresponent als t states executats
while (SDL_GetTicks()<time+100) {}
t_states -= update_freq;
time = SDL_GetTicks();
z80analyze::refresh();
@@ -279,7 +283,7 @@ int main(int argc, char *argv[])
z80analyze::refresh(true);
} else if (!z80debug::debugging() && z80debug::paused()) {
} else if (/*!z80debug::debugging() &&*/ z80debug::paused()) {
zxscreen::redraw(false);
ui::menu::show();
zxscreen::present();