--- xmil/pccore.c 2004/08/02 11:48:13 1.2 +++ xmil/pccore.c 2004/08/13 06:49:30 1.31 @@ -4,74 +4,59 @@ #include "soundmng.h" #include "sysmng.h" #include "timemng.h" +#include "xmilver.h" #include "z80core.h" #include "pccore.h" #include "iocore.h" -#include "x1_io.h" -#include "x1_crtc.h" -#include "x1_vram.h" -#include "x1_fdc.h" -#include "draw.h" +#include "nevent.h" +#include "ievent.h" +#include "timing.h" +#include "calendar.h" +#include "keystat.h" +#include "palettes.h" +#include "makescrn.h" #include "sound.h" #include "sndctrl.h" -#include "menu.h" #include "font.h" -#include "juliet.h" -#include "xmilver.h" #include "fddfile.h" -#include "calendar.h" -#include "timing.h" #include "defrom.res" -#include "keystat.h" const OEMCHAR xmilversion[] = OEMTEXT(XMILVER_CORE); - XMILCFG xmilcfg = { 0, 0, 1, 0, 1, 2, 0, 1, - 22050, 1000, 0, 80, - 0, 0, - 0, 0, - 0, 0, 0, - 1, - 1, 0}; - - PCCORE pccore = {250, 0, 1, 1, 0}; - BYTE mMAIN[0x10000]; - BYTE mBIOS[0x8000]; - BYTE mBANK[16][0x8000]; -// BYTE KNJ_FNT[0x4bc00]; - BYTE GRP_RAM[0x20000]; - BYTE TXT_RAM[0x01800]; - WORD v_cnt; - int s_cnt; - - BYTE *RAM0r; - BYTE *RAM0w; - BYTE lastmem; - DWORD h_cntbase; - BRESULT soundrenewal; - + XMILCFG xmilcfg = { 2, 1, 0x03, + 1, 0, 0, 0, + 22050, 500, 0, 0, 80, + 0, 0, 0, 0}; + + PCCORE pccore; + CORESTAT corestat; + UINT8 mMAIN[0x10000]; + UINT8 mBIOS[0x8000]; +#if defined(SUPPORT_BANKMEM) + UINT8 mBANK[16][0x8000]; +#endif + UINT8 *RAM0r; + UINT8 *RAM0w; -/*********************************************************************** - IPL-ROM LOAD -***********************************************************************/ +// ---- -void ipl_load(void) { +static void ipl_load(void) { FILEH hdl; ZeroMemory(mBIOS, sizeof(mBIOS)); - memcpy(mBIOS, DEFROM, sizeof(DEFROM)); + CopyMemory(mBIOS, DEFROM, sizeof(DEFROM)); if (pccore.ROM_TYPE >= 2) { - if ((hdl = file_open_c("IPLROM.X1T")) != FILEH_INVALID) { + if ((hdl = file_open_c(OEMTEXT("IPLROM.X1T"))) != FILEH_INVALID) { file_read(hdl, mBIOS, 0x8000); file_close(hdl); } } else if (pccore.ROM_TYPE == 1) { - if ((hdl = file_open_c("IPLROM.X1")) != FILEH_INVALID) { + if ((hdl = file_open_c(OEMTEXT("IPLROM.X1"))) != FILEH_INVALID) { file_read(hdl, mBIOS, 0x8000); file_close(hdl); } @@ -79,27 +64,47 @@ void ipl_load(void) { } -/*********************************************************************** - FONT-ROM LOAD -***********************************************************************/ +// ---- -void fnt_load(void) { +void pccore_initialize(void) { + + fddfile_initialize(); + sndctrl_initialize(); + makescrn_initialize(); font_load(NULL, TRUE); + + crtc_initialize(); + pcg_initialize(); + ppi_initialize(); } +void pccore_deinitialize(void) { -/*********************************************************************** - 初期化 -***********************************************************************/ - -BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_SW, BYTE DIP_SW) { - - pccore.HSYNC_CLK = 250; - pccore.ROM_SW = 1; - pccore.ROM_TYPE = ROM_TYPE; - pccore.SOUND_SW = SOUND_SW; - pccore.DIP_SW = DIP_SW; + sndctrl_deinitialize(); + + fddfile_eject(0); + fddfile_eject(1); + fddfile_eject(2); + fddfile_eject(3); +} + +void pccore_reset(void) { + + soundmng_stop(); + if (corestat.soundrenewal) { + corestat.soundrenewal = 0; + sndctrl_deinitialize(); + sndctrl_initialize(); + } + + pccore.baseclock = 2000000; + pccore.multiple = 2; + pccore.realclock = pccore.baseclock * pccore.multiple; + + pccore.ROM_TYPE = xmilcfg.ROM_TYPE; + pccore.SOUND_SW = xmilcfg.SOUND_SW; + pccore.DIP_SW = xmilcfg.DIP_SW; // スクリーンモードの変更... if (pccore.ROM_TYPE >= 3) { @@ -111,87 +116,29 @@ BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_ scrnmng_setcolormode(FALSE); } - textdrawproc_renewal(); - ipl_load(); + sysmng_cpureset(); + + sound_changeclock(); + sound_reset(); Z80_RESET(); + nevent_allreset(); + ievent_reset(); + calendar_reset(); + iocore_reset(); + + ipl_load(); - lastmem = 0x78; RAM0r = mBIOS; RAM0w = mMAIN; - h_cntbase = 0; - sysmng_cpureset(); - - calendar_initialize(); - - init_fdc(); - subcpu_reset(); - ppi_reset(); - init_crtc(); - init_vram(); - - cgrom_reset(); - cmt_reset(); - ctc_reset(); - dmac_reset(); - pcg_reset(); - sio_reset(); - sndboard_reset(); + pal_reset(); + makescrn_reset(); timing_reset(); - return(SUCCESS); -} - - - -/*********************************************************************** - 実行／終了 -***********************************************************************/ - -static BYTE keyintcnt = 0; -static BYTE flame = 0; -static BYTE inttiming = 0; - -void pccore_initialize(void) { - - sndctrl_initialize(); - - init_draw(); - fnt_load(); - - pcg_initialize(); - ppi_initialize(); - - reset_x1(xmilcfg.ROM_TYPE, xmilcfg.SOUND_SW, xmilcfg.DIP_SW); -// keystat_initialize(); -// keystat_reset(); -} - -void pccore_reset(void) { - - soundmng_stop(); - if (soundrenewal) { - soundrenewal = 0; - sndctrl_deinitialize(); - sndctrl_initialize(); - } - reset_x1(xmilcfg.ROM_TYPE, xmilcfg.SOUND_SW, xmilcfg.DIP_SW); soundmng_play(); } -void pccore_deinitialize(void) { - - sndctrl_deinitialize(); - -// keyboard_term(); - - fdd_eject(0); - fdd_eject(1); - fdd_eject(2); - fdd_eject(3); -} - // ---- @@ -227,71 +174,60 @@ void iptrace_out(void) { #endif +void neitem_disp(UINT id) { -void x1r_exec(void) { + corestat.vsync = 1; + if (xmilcfg.DISPSYNC & 1) { + scrnupdate(); + } + nevent_set(id, corestat.syncclock, neitem_vsync, NEVENT_RELATIVE); +} -extern BYTE disp_flashscreen; +void neitem_vsync(UINT id) { - v_cnt = 0; - s_cnt = 0; - xmilcfg.DISPSYNC &= 1; - inttiming = xmilcfg.CPU8MHz & 1; -// TRACEOUT(("*sync")); - - while(s_cnt < 266) { - while(h_cnt < pccore.HSYNC_CLK) { -#if defined(TRACE) -// TRACEOUT(("%.4x", Z80_PC)); -// if (Z80_PC == 0x8198) { -// TRACEOUT(("---->sound")); -// } -// if (Z80_PC == 0x8188) { -// TRACEOUT(("-- poll sound")); -// } -#endif -#if IPTRACE + corestat.vsync = 2; + (void)id; +} + + +// ---- + +// #define SINGLESTEPONLY + +void pccore_exec(BRESULT draw) { + + SINT32 frameclock; + SINT32 dispclock; + + corestat.drawframe = draw; + soundmng_sync(); + + frameclock = 266 * RASTER_CLOCK * pccore.multiple / 2; + dispclock = min(frameclock, crtc.e.dispclock); + corestat.dispclock = dispclock; + corestat.syncclock = frameclock - dispclock; + corestat.vsync = 0; + nevent_set(NEVENT_FRAMES, dispclock, neitem_disp, NEVENT_RELATIVE); + do { +#if !defined(SINGLESTEPONLY) + if (CPU_REMCLOCK > 0) { + Z80_EXECUTE(); + } +#else + while(CPU_REMCLOCK > 0) { +#if defined(TRACE) && IPTRACE treip[trpos & (IPTRACE - 1)] = Z80_PC; trpos++; #endif - Z80_EXECUTE(); - z80dmap(); + Z80_STEP(); } - h_cnt -= pccore.HSYNC_CLK; - h_cntbase += pccore.HSYNC_CLK; - inttiming ^= 2; - if (inttiming != 3) { - if (xmilcfg.SOUNDPLY) { - sound_makesample(pcmbufsize[s_cnt]); - juliet2_exec(); - } - s_cnt++; - x1_ctc_int(); - if (!((++keyintcnt) & 15)) { - x1_sub_int(); - if (xmilcfg.MOUSE_SW) { - sio_int(); - } - } - } - v_cnt++; - if (crtc.CRT_YL == v_cnt) { -// TRACEOUT(("--->sync")); - pcg.r.vsync = 1; - if (xmilcfg.DISPSYNC == 1) { - xmilcfg.DISPSYNC |= 0x80; - scrnupdate(); - } - } - } - if (++flame >= 60) { - flame = 0; - calendar_inc(); - } - if (!xmilcfg.SOUNDPLY) { - sound_makesample(framesoundcnt); - } - if (!(xmilcfg.DISPSYNC & 0x80)) { - scrnupdate(); - } +#endif + nevent_progress(); + ievent_progress(); + } while(corestat.vsync < 2); + + scrnupdate(); + sound_sync(); + fdc_callback(); }