summaryrefslogtreecommitdiffstatshomepage
path: root/src/zexall
diff options
context:
space:
mode:
authorGravatarGravatar hap <happppp@users.noreply.github.com>2017-10-23 17:04:55 +0200
committerGravatarGravatar hap <happppp@users.noreply.github.com>2017-10-23 17:04:55 +0200
commitade358e294bc165d8e6b22a2a630d216e8020d16 (patch)
tree8955f5eeb1dda06c6139f6455e3e4dda252330d6 /src/zexall
parenta8f9b7bf56066c7045547a373b9ff76fef97f000 (diff)
zexall: misc cleanups to standalone driver (nw)
Diffstat (limited to 'src/zexall')
-rw-r--r--src/zexall/main.cpp3
-rw-r--r--src/zexall/zexall.cpp115
2 files changed, 55 insertions, 63 deletions
diff --git a/src/zexall/main.cpp b/src/zexall/main.cpp
index 38d20a6d873..5996f3b582b 100644
--- a/src/zexall/main.cpp
+++ b/src/zexall/main.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Miodrag Milanovic
/***************************************************************************
- main.c
+ main.cpp
Controls execution of the core ZEXALL system.
@@ -78,7 +78,6 @@ zexall_machine_manager* zexall_machine_manager::m_manager = nullptr;
int emulator_info::start_frontend(emu_options &options, osd_interface &osd, std::vector<std::string> &args)
{
- std::string error_string;
options.set_value(OSDOPTION_VIDEO, "none", OPTION_PRIORITY_MAXIMUM);
options.set_value(OSDOPTION_SOUND, "none", OPTION_PRIORITY_MAXIMUM);
//options.set_value(OPTION_DEBUG, true, OPTION_PRIORITY_MAXIMUM);
diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp
index 629aa3fca09..2429ae7622a 100644
--- a/src/zexall/zexall.cpp
+++ b/src/zexall/zexall.cpp
@@ -1,25 +1,13 @@
// license:BSD-3-Clause
-// copyright-holders:Jonathan Gevaryahu, Robbbert
+// copyright-holders:Jonathan Gevaryahu, Robbbert, Miodrag Milanovic
/******************************************************************************
-*
-* Self Contained zexall 'Z80 instruction exerciser' test driver
-* Zexall originally written by Frank Cringle for ZX Spectrum
-* Modularized Spectrum-independent Zexall binary supplied by Blargg
-* Serial interface binary/preloader at 0x0000-0x00FF written by Kevin 'kevtris' Horton
-*
-*
-* mem map:
-Ram 0000-FFFF (preloaded with binary)
-Special calls take place for three ram values (this interface was designed by kevtris):
-FFFD - 'ack' - shared ram with output device; z80 reads from here and considers the byte at FFFF read if this value incremented
-FFFE - 'req' - shared ram with output device; z80 writes an incrementing value to FFFE to indicate that there is a byte waiting at FFFF and hence requesting the output device on the other end do something about it, until FFFD is incremented by the output device to acknowledge receipt
-FFFF - 'data' - shared ram with output device; z80 writes the data to be sent to output device here
-One i/o port is used:
-0001 - bit 0 controls whether interrupt timer is enabled (1) or not (0), this is a holdover from a project of kevtris' and can be ignored.
+
+ This is a simplified version of the zexall driver, merely as an example for a standalone
+ emulator build. Video terminal and user interface is removed. For full notes and proper
+ emulation driver, see src/drivers/zexall.cpp.
******************************************************************************/
-/* Core includes */
#include "emu.h"
#include "cpu/z80/z80.h"
@@ -31,21 +19,17 @@ public:
zexall_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_main_ram(*this, "main_ram"),
- m_out_data(0),
- m_out_req(0),
- m_out_req_last(0),
- m_out_ack(0)
+ m_main_ram(*this, "main_ram")
{
}
- DECLARE_READ8_MEMBER( zexall_output_ack_r );
- DECLARE_READ8_MEMBER( zexall_output_req_r );
- DECLARE_READ8_MEMBER( zexall_output_data_r );
- DECLARE_WRITE8_MEMBER( zexall_output_ack_w );
- DECLARE_WRITE8_MEMBER( zexall_output_req_w );
- DECLARE_WRITE8_MEMBER( zexall_output_data_w );
- DECLARE_DRIVER_INIT(zexall);
+ DECLARE_READ8_MEMBER( output_ack_r );
+ DECLARE_READ8_MEMBER( output_req_r );
+ DECLARE_READ8_MEMBER( output_data_r );
+ DECLARE_WRITE8_MEMBER( output_ack_w );
+ DECLARE_WRITE8_MEMBER( output_req_w );
+ DECLARE_WRITE8_MEMBER( output_data_w );
+
private:
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_main_ram;
@@ -53,89 +37,101 @@ private:
uint8_t m_out_req; // byte written to 0xFFFE
uint8_t m_out_req_last; // old value at 0xFFFE before the most recent write
uint8_t m_out_ack; // byte written to 0xFFFC
- virtual void machine_reset() override;
std::string terminate_string;
+
+ virtual void machine_reset() override;
};
-DRIVER_INIT_MEMBER(zexall_state,zexall)
+
+/******************************************************************************
+ Machine Start/Reset
+******************************************************************************/
+
+void zexall_state::machine_reset()
{
+ // zerofill
m_out_ack = 0;
m_out_req = 0;
m_out_req_last = 0;
m_out_data = 0;
-}
+ terminate_string = "";
-void zexall_state::machine_reset()
-{
- // rom is self-modifying, so need to refresh it on each run
- // fill main ram with zexall code
+ // program is self-modifying, so need to refresh it on each run
memcpy(m_main_ram, zexall_program, 0x228a);
}
-READ8_MEMBER( zexall_state::zexall_output_ack_r )
+
+/******************************************************************************
+ I/O Handlers
+******************************************************************************/
+
+READ8_MEMBER( zexall_state::output_ack_r )
{
-// spit out the byte in out_byte if out_req is not equal to out_req_last
+ // spit out the byte in out_byte if out_req is not equal to out_req_last
if (m_out_req != m_out_req_last)
{
osd_printf_info("%c",m_out_data);
- if (m_out_data != 10 && m_out_data != 13) terminate_string += m_out_data; else terminate_string = "";
- if (terminate_string == "Tests complete") machine().schedule_exit();
+ if (m_out_data != 10 && m_out_data != 13)
+ terminate_string += m_out_data;
+ else
+ terminate_string = "";
+
+ if (terminate_string == "Tests complete")
+ machine().schedule_exit();
+
m_out_req_last = m_out_req;
m_out_ack++;
}
return m_out_ack;
}
-WRITE8_MEMBER( zexall_state::zexall_output_ack_w )
+WRITE8_MEMBER( zexall_state::output_ack_w )
{
m_out_ack = data;
}
-READ8_MEMBER( zexall_state::zexall_output_req_r )
+READ8_MEMBER( zexall_state::output_req_r )
{
return m_out_req;
}
-WRITE8_MEMBER( zexall_state::zexall_output_req_w )
+WRITE8_MEMBER( zexall_state::output_req_w )
{
m_out_req_last = m_out_req;
m_out_req = data;
}
-READ8_MEMBER( zexall_state::zexall_output_data_r )
+READ8_MEMBER( zexall_state::output_data_r )
{
return m_out_data;
}
-WRITE8_MEMBER( zexall_state::zexall_output_data_w )
+WRITE8_MEMBER( zexall_state::output_data_w )
{
m_out_data = data;
}
+
/******************************************************************************
Address Maps
******************************************************************************/
static ADDRESS_MAP_START(z80_mem, AS_PROGRAM, 8, zexall_state)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0xfffc) AM_RAM AM_SHARE("main_ram")
- AM_RANGE(0xfffd, 0xfffd) AM_READWRITE(zexall_output_ack_r,zexall_output_ack_w)
- AM_RANGE(0xfffe, 0xfffe) AM_READWRITE(zexall_output_req_r,zexall_output_req_w)
- AM_RANGE(0xffff, 0xffff) AM_READWRITE(zexall_output_data_r,zexall_output_data_w)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START(z80_io, AS_IO, 8, zexall_state)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0001, 0x0001) AM_NOP // really a disable/enable for some sort of interrupt timer on kev's hardware, which is completely irrelevant for the zexall test
+ AM_RANGE(0xfffd, 0xfffd) AM_READWRITE(output_ack_r, output_ack_w)
+ AM_RANGE(0xfffe, 0xfffe) AM_READWRITE(output_req_r, output_req_w)
+ AM_RANGE(0xffff, 0xffff) AM_READWRITE(output_data_r, output_data_w)
+ AM_RANGE(0x0000, 0xffff) AM_RAM AM_SHARE("main_ram")
ADDRESS_MAP_END
/******************************************************************************
Input Ports
******************************************************************************/
+
static INPUT_PORTS_START( zexall )
INPUT_PORTS_END
+
/******************************************************************************
Machine Drivers
******************************************************************************/
@@ -144,24 +140,21 @@ static MACHINE_CONFIG_START( zexall )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
MACHINE_CONFIG_END
-
/******************************************************************************
ROM Definitions
******************************************************************************/
ROM_START(zexall)
- ROM_REGION(0x0, "romcode", 0)
+ ROM_REGION(0x0, "maincpu", 0)
ROM_END
-
/******************************************************************************
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, zexall, "Frank Cringle & MESSDEV", "ZEXALL Z80 instruction set exerciser (modified for MESS)", MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, 0, "Frank Cringle / Kevin Horton", "Zexall (FPGA Z80 test interface)", MACHINE_NO_SOUND_HW )