Changed all driver_data structs into classes with a simple

constructor and a static allocation function.

Changed MDRV_DRIVER_DATA to reference driver_data::alloc
instead of just providing a size. This function is called
to allocate the driver data. This allows objects to be
embedded in the state data and be properly initialized.

Ideally, new driver_data constructors should perform
initialization actions in the constructor, but for now
most just use auto_alloc_clear() to blast everything to
zero.

Moved driver data allocation after device list construction
so that devices can be found when the driver data is
constructed.

src/emu/mame.c

@@ -1303,13 +1303,13 @@ running_machine::running_machine(const game_driver *driver)
 		basename = mame_strdup(driver->name);
 		config = machine_config_alloc(driver->machine_config);
 
-		/* allocate the driver data */
-		if (config->driver_data_size != 0)
-			driver_data = auto_alloc_array_clear(this, UINT8, config->driver_data_size);
-
 		/* attach this machine to all the devices in the configuration */
 		devicelist.import_config_list(config->devicelist, *this);
 
+		/* allocate the driver data (after devices) */
+		if (config->driver_data_alloc != NULL)
+			driver_data = (*config->driver_data_alloc)(*this);
+
 		/* find devices */
 		firstcpu = cpu_first(this);
 		primary_screen = video_screen_first(this);

src/emu/mconfig.c

@@ -188,8 +188,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
 
 			/* core parameters */
 			case MCONFIG_TOKEN_DRIVER_DATA:
-				TOKEN_UNGET_UINT32(tokens);
-				TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->driver_data_size, 24);
+				config->driver_data_alloc = TOKEN_GET_PTR(tokens, driver_data_alloc);
 				break;
 
 			case MCONFIG_TOKEN_QUANTUM_TIME:

src/emu/mconfig.h

@@ -89,6 +89,7 @@ typedef void   (*video_reset_func)(running_machine *machine);
 typedef void   (*palette_init_func)(running_machine *machine, const UINT8 *color_prom);
 typedef void   (*video_eof_func)(running_machine *machine);
 typedef UINT32 (*video_update_func)(running_device *screen, bitmap_t *bitmap, const rectangle *cliprect);
+typedef void * (*driver_data_alloc_func)(running_machine &machine);
 
 
 
@@ -192,7 +193,7 @@ struct gfx_decode_entry;
 typedef struct _machine_config machine_config;
 struct _machine_config
 {
-	UINT32					driver_data_size;		/* amount of memory needed for driver_data */
+	driver_data_alloc_func	driver_data_alloc;		/* allocator for driver data */
 
 	attotime				minimum_quantum;		/* minimum scheduling quantum */
 	const char *			perfect_cpu_quantum;	/* tag of CPU to use for "perfect" scheduling */
@@ -247,6 +248,7 @@ union machine_config_token
 	palette_init_func palette_init;
 	video_eof_func video_eof;
 	video_update_func video_update;
+	driver_data_alloc_func driver_data_alloc;
 };
 
 
@@ -276,8 +278,9 @@ union machine_config_token
 
 
 /* core parameters */
-#define MDRV_DRIVER_DATA(_struct) \
-	TOKEN_UINT32_PACK2(MCONFIG_TOKEN_DRIVER_DATA, 8, sizeof(_struct), 24),
+#define MDRV_DRIVER_DATA(_class) \
+	TOKEN_UINT32_PACK1(MCONFIG_TOKEN_DRIVER_DATA, 8), \
+	TOKEN_PTR(driver_data_alloc, _class::alloc),
 
 #define MDRV_QUANTUM_TIME(_time) \
 	TOKEN_UINT32_PACK1(MCONFIG_TOKEN_QUANTUM_TIME, 8), \

src/emu/memory.h

@@ -897,8 +897,9 @@ union _addrmap64_token
 	TOKEN_UINT32_PACK1(ADDRMAP_TOKEN_BASEPTR, 8), \
 	TOKEN_PTR(memptr, _base),
 
+#define myoffsetof(_struct, _member)  ((FPTR)&((_struct *)0x1000)->_member - 0x1000)
 #define AM_BASE_MEMBER(_struct, _member) \
-	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_MEMBER, 8, offsetof(_struct, _member), 24),
+	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_MEMBER, 8, myoffsetof(_struct, _member), 24),
 
 #define AM_BASE_GENERIC(_member) \
 	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_GENERIC, 8, offsetof(generic_pointers, _member), 24),
@@ -908,7 +909,7 @@ union _addrmap64_token
 	TOKEN_PTR(sizeptr, _size),
 
 #define AM_SIZE_MEMBER(_struct, _member) \
-	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_SIZE_MEMBER, 8, offsetof(_struct, _member), 24),
+	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_SIZE_MEMBER, 8, myoffsetof(_struct, _member), 24),
 
 #define AM_SIZE_GENERIC(_member) \
 	TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_SIZE_GENERIC, 8, offsetof(generic_pointers, _member##_size), 24),

src/emu/validity.c

@@ -1426,18 +1426,6 @@ static int validate_devices(int drivnum, const machine_config *config, const iop
 					error |= validate_tag(driver, "bank", entry->write.tag);
 				if (entry->share != NULL)
 					error |= validate_tag(driver, "share", entry->share);
-
-				/* if there are base or size members, check that they are within bounds */
-				if (entry->baseptroffs_plus1 != 0 && (entry->baseptroffs_plus1 - 1) >= config->driver_data_size)
-				{
-					mame_printf_error("%s: %s device '%s' %s space memory map has an out of bounds AM_BASE_MEMBER entry\n", driver->source_file, driver->name, devconfig->tag.cstr(), address_space_names[spacenum]);
-					error = TRUE;
-				}
-				if (entry->sizeptroffs_plus1 != 0 && (entry->sizeptroffs_plus1 - 1) >= config->driver_data_size)
-				{
-					mame_printf_error("%s: %s device '%s' %s space memory map has an out of bounds AM_SIZE_MEMBER entry\n", driver->source_file, driver->name, devconfig->tag.cstr(), address_space_names[spacenum]);
-					error = TRUE;
-				}
 			}
 
 			/* release the address map */

src/mame/drivers/1945kiii.c

@@ -47,9 +47,13 @@ Notes:
 #define MASTER_CLOCK	XTAL_16MHz
 
 
-typedef struct _k3_state k3_state;
-struct _k3_state
+class k3_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, k3_state(machine)); }
+
+	k3_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  spriteram_1;
 	UINT16 *  spriteram_2;

src/mame/drivers/2mindril.c

@@ -49,9 +49,13 @@ DAC               -26.6860Mhz
 #include "sound/2610intf.h"
 
 
-typedef struct __2mindril_state _2mindril_state;
-struct __2mindril_state
+class _2mindril_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _2mindril_state(machine)); }
+
+	_2mindril_state(running_machine &machine) { }
+
 	/* memory pointers */
 	UINT16 *      map1ram;
 	UINT16 *      map2ram;

src/mame/drivers/39in1.c

@@ -27,9 +27,13 @@
 #include "machine/pxa255.h"
 #include "sound/dmadac.h"
 
-typedef struct __39in1_state _39in1_state;
-struct __39in1_state
+class _39in1_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _39in1_state(machine)); }
+
+	_39in1_state(running_machine &machine) { }
+
 	UINT32 seed;
 	UINT32 magic;
 	UINT32 state;

src/mame/drivers/ace.c

@@ -43,9 +43,13 @@ A1                   2101            2101
 #define MASTER_CLOCK XTAL_18MHz
 
 
-typedef struct _ace_state ace_state;
-struct _ace_state
+class ace_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ace_state(machine)); }
+
+	ace_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT8 *  ram2;
 	UINT8 *  scoreram;

src/mame/drivers/adp.c

@@ -152,9 +152,13 @@ Video board has additional chips:
 #include "machine/microtch.h"
 #include "machine/68681.h"
 
-typedef struct _adp_state adp_state;
-struct _adp_state
+class adp_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, adp_state(machine)); }
+
+	adp_state(running_machine &machine) { }
+	
 	/* misc */
 	UINT8 mux_data;
 	UINT8 register_active;

src/mame/drivers/albazc.c

@@ -14,9 +14,13 @@ TODO:
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
-typedef struct _albazc_state albazc_state;
-struct _albazc_state
+class albazc_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazc_state(machine)); }
+
+	albazc_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT8 *  spriteram1;
 	UINT8 *  spriteram2;

src/mame/drivers/albazg.c

@@ -61,9 +61,13 @@ Code disassembling
 #include "machine/8255ppi.h"
 
 
-typedef struct _albazg_state albazg_state;
-struct _albazg_state
+class albazg_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazg_state(machine)); }
+
+	albazg_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  cus_ram;
 	UINT8 *  videoram;

src/mame/drivers/astinvad.c

@@ -41,9 +41,13 @@ enum
 };
 
 
-typedef struct _astinvad_state astinvad_state;
-struct _astinvad_state
+class astinvad_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astinvad_state(machine)); }
+
+	astinvad_state(running_machine &machine) { }
+	
 	UINT8 *    colorram;
 	UINT8 *    videoram;
 	size_t     videoram_size;

src/mame/drivers/astrocorp.c

@@ -24,9 +24,13 @@ To do:
 #include "machine/ticket.h"
 #include "sound/okim6295.h"
 
-typedef struct _astrocorp_state astrocorp_state;
-struct _astrocorp_state
+class astrocorp_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrocorp_state(machine)); }
+
+	astrocorp_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *   spriteram;
 	UINT16 *   paletteram;

src/mame/drivers/attckufo.c

@@ -46,9 +46,13 @@ LOIPOIO-B
 #include "sound/mos6560.h"
 
 
-typedef struct _attckufo_state attckufo_state;
-struct _attckufo_state
+class attckufo_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, attckufo_state(machine)); }
+
+	attckufo_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *      mainram;
 	UINT8 *      tileram;

src/mame/drivers/beaminv.c

@@ -55,9 +55,13 @@ Stephh's notes (based on the games Z80 code and some tests) :
 #include "cpu/z80/z80.h"
 
 
-typedef struct _beaminv_state beaminv_state;
-struct _beaminv_state
+class beaminv_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beaminv_state(machine)); }
+
+	beaminv_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *    videoram;
 	size_t     videoram_size;

src/mame/drivers/bigfghtr.c

@@ -117,9 +117,13 @@ Notes:
 #include "sound/3812intf.h"
 
 
-typedef struct _bigfghtr_state bigfghtr_state;
-struct _bigfghtr_state
+class bigfghtr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigfghtr_state(machine)); }
+
+	bigfghtr_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT16 *      text_videoram;
 	UINT16 *      bg_videoram;

src/mame/drivers/boxer.c

@@ -20,9 +20,13 @@
  *
  *************************************/
 
-typedef struct _boxer_state boxer_state;
-struct _boxer_state
+class boxer_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boxer_state(machine)); }
+
+	boxer_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 * tile_ram;
 	UINT8 * sprite_ram;

src/mame/drivers/calorie.c

@@ -83,9 +83,13 @@ Notes:
 #include "sound/ay8910.h"
 
 
-typedef struct _calorie_state calorie_state;
-struct _calorie_state
+class calorie_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, calorie_state(machine)); }
+
+	calorie_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  fg_ram;
 	UINT8 *  sprites;

src/mame/drivers/cball.c

@@ -8,9 +8,13 @@
 #include "cpu/m6800/m6800.h"
 
 
-typedef struct _cball_state cball_state;
-struct _cball_state
+class cball_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cball_state(machine)); }
+
+	cball_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  video_ram;
 

src/mame/drivers/chanbara.c

@@ -51,9 +51,13 @@ ToDo:
 #include "sound/2203intf.h"
 
 
-typedef struct _chanbara_state chanbara_state;
-struct _chanbara_state
+class chanbara_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chanbara_state(machine)); }
+
+	chanbara_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	UINT8 *  videoram2;

src/mame/drivers/chinsan.c

@@ -47,9 +47,13 @@ MM63.10N
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
-typedef struct _chinsan_state chinsan_state;
-struct _chinsan_state
+class chinsan_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chinsan_state(machine)); }
+
+	chinsan_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  video;
 

src/mame/drivers/clayshoo.c

@@ -17,9 +17,13 @@
 #include "machine/8255ppi.h"
 
 
-typedef struct _clayshoo_state clayshoo_state;
-struct _clayshoo_state
+class clayshoo_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, clayshoo_state(machine)); }
+
+	clayshoo_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *   videoram;
 	size_t    videoram_size;

src/mame/drivers/cntsteer.c

@@ -29,9 +29,13 @@
 #include "sound/dac.h"
 
 
-typedef struct _cntsteer_state cntsteer_state;
-struct _cntsteer_state
+class cntsteer_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cntsteer_state(machine)); }
+
+	cntsteer_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	UINT8 *  videoram2;

src/mame/drivers/cultures.c

@@ -14,9 +14,13 @@
 
 #define MCLK 16000000
 
-typedef struct _cultures_state cultures_state;
-struct _cultures_state
+class cultures_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cultures_state(machine)); }
+
+	cultures_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *   bg0_videoram;
 	UINT8 *   paletteram;

src/mame/drivers/dacholer.c

@@ -24,9 +24,13 @@
 #include "sound/ay8910.h"
 
 
-typedef struct _dacholer_state dacholer_state;
-struct _dacholer_state
+class dacholer_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dacholer_state(machine)); }
+
+	dacholer_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  bgvideoram;
 	UINT8 *  fgvideoram;

src/mame/drivers/ddayjlc.c

@@ -56,9 +56,13 @@ $842f = lives
 #include "sound/ay8910.h"
 
 
-typedef struct _ddayjlc_state ddayjlc_state;
-struct _ddayjlc_state
+class ddayjlc_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddayjlc_state(machine)); }
+
+	ddayjlc_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  bgram;
 	UINT8 *  mainram;

src/mame/drivers/ddealer.c

@@ -113,9 +113,13 @@ Few words about protection:
 #include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 
-typedef struct _ddealer_state ddealer_state;
-struct _ddealer_state
+class ddealer_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddealer_state(machine)); }
+
+	ddealer_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  mcu_shared_ram;
 	UINT16 *  work_ram;

src/mame/drivers/destroyr.c

@@ -9,9 +9,13 @@ Atari Destroyer Driver
 #include "deprecat.h"
 
 
-typedef struct _destroyr_state destroyr_state;
-struct _destroyr_state
+class destroyr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, destroyr_state(machine)); }
+
+	destroyr_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *        major_obj_ram;
 	UINT8 *        minor_obj_ram;

src/mame/drivers/discoboy.c

@@ -43,9 +43,13 @@ Notes:
 
 
 
-typedef struct _discoboy_state discoboy_state;
-struct _discoboy_state
+class discoboy_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, discoboy_state(machine)); }
+
+	discoboy_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  ram_1;
 	UINT8 *  ram_2;

src/mame/drivers/diverboy.c

@@ -53,9 +53,13 @@
 
 
 
-typedef struct _diverboy_state diverboy_state;
-struct _diverboy_state
+class diverboy_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, diverboy_state(machine)); }
+
+	diverboy_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  spriteram;
 //  UINT16 *  paletteram;   // currently this uses generic palette handling

src/mame/drivers/dominob.c

@@ -64,9 +64,13 @@ Notes:
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
-typedef struct _dominob_state dominob_state;
-struct _dominob_state
+class dominob_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dominob_state(machine)); }
+
+	dominob_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  spriteram;
 	UINT8 *  videoram;

src/mame/drivers/dorachan.c

@@ -16,9 +16,13 @@ Todo:
 #define NUM_PENS	(8)
 
 
-typedef struct _dorachan_state dorachan_state;
-struct _dorachan_state
+class dorachan_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dorachan_state(machine)); }
+
+	dorachan_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	size_t   videoram_size;

src/mame/drivers/dotrikun.c

@@ -24,9 +24,13 @@ SOUND : (none)
 #include "cpu/z80/z80.h"
 
 
-typedef struct _dotrikun_state dotrikun_state;
-struct _dotrikun_state
+class dotrikun_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dotrikun_state(machine)); }
+
+	dotrikun_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *        videoram;
 	size_t         videoram_size;

src/mame/drivers/dreamwld.c

@@ -90,9 +90,13 @@ Stephh's notes (based on the game M68EC020 code and some tests) :
 
 #define MASTER_CLOCK 32000000
 
-typedef struct _dreamwld_state dreamwld_state;
-struct _dreamwld_state
+class dreamwld_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dreamwld_state(machine)); }
+
+	dreamwld_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT32 *  bg_videoram;
 	UINT32 *  bg2_videoram;

src/mame/drivers/drtomy.c

@@ -11,9 +11,13 @@ similar hardware.
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
-typedef struct _drtomy_state drtomy_state;
-struct _drtomy_state
+class drtomy_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drtomy_state(machine)); }
+
+	drtomy_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  spriteram;
 	UINT16 *  videoram_bg;

src/mame/drivers/dunhuang.c

@@ -58,9 +58,13 @@ Notes:
 #define DUNHUANG_DEBUG	0
 
 
-typedef struct _dunhuang_state dunhuang_state;
-struct _dunhuang_state
+class dunhuang_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dunhuang_state(machine)); }
+
+	dunhuang_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *        videoram;
 	UINT16 *        videoram2;

src/mame/drivers/dwarfd.c

@@ -278,9 +278,13 @@ uPC1352C @ N3
 #include "cpu/i8085/i8085.h"
 #include "sound/ay8910.h"
 
-typedef struct _dwarfd_state dwarfd_state;
-struct _dwarfd_state
+class dwarfd_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dwarfd_state(machine)); }
+
+	dwarfd_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  dw_ram;
 	UINT8 *  videobuf;

src/mame/drivers/dynadice.c

@@ -37,9 +37,13 @@ dy_6.bin (near Z80)
 #include "sound/ay8910.h"
 
 
-typedef struct _dynadice_state dynadice_state;
-struct _dynadice_state
+class dynadice_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynadice_state(machine)); }
+
+	dynadice_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 //  UINT8 *  nvram;     // currently this uses generic nvram handling

src/mame/drivers/egghunt.c

@@ -45,9 +45,13 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f
 #include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 
-typedef struct _egghunt_state egghunt_state;
-struct _egghunt_state
+class egghunt_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, egghunt_state(machine)); }
+
+	egghunt_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *   bgram;
 	UINT8 *   atram;

src/mame/drivers/embargo.c

@@ -8,9 +8,13 @@
 #include "cpu/s2650/s2650.h"
 
 
-typedef struct _embargo_state embargo_state;
-struct _embargo_state
+class embargo_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, embargo_state(machine)); }
+
+	embargo_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	size_t   videoram_size;

src/mame/drivers/enigma2.c

@@ -54,9 +54,13 @@ TODO:
 #define NUM_PENS	(8)
 
 
-typedef struct _enigma2_state enigma2_state;
-struct _enigma2_state
+class enigma2_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, enigma2_state(machine)); }
+
+	enigma2_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 

src/mame/drivers/f-32.c

@@ -17,9 +17,13 @@
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
-typedef struct _mosaicf2_state mosaicf2_state;
-struct _mosaicf2_state
+class mosaicf2_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaicf2_state(machine)); }
+
+	mosaicf2_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT32 *  videoram;
 };

src/mame/drivers/flyball.c

@@ -11,9 +11,13 @@ Atari Flyball Driver
 
 
 
-typedef struct _flyball_state flyball_state;
-struct _flyball_state
+class flyball_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flyball_state(machine)); }
+
+	flyball_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  rombase;
 	UINT8 *  playfield_ram;

src/mame/drivers/galaxi.c

@@ -44,9 +44,13 @@ Notes:
 #include "sound/okim6295.h"
 #include "galaxi.lh"
 
-typedef struct _galaxi_state galaxi_state;
-struct _galaxi_state
+class galaxi_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galaxi_state(machine)); }
+
+	galaxi_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  bg1_ram;
 	UINT16 *  bg2_ram;

src/mame/drivers/go2000.c

@@ -34,9 +34,13 @@ Notes:
 #include "cpu/z80/z80.h"
 #include "sound/dac.h"
 
-typedef struct _go2000_state go2000_state;
-struct _go2000_state
+class go2000_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, go2000_state(machine)); }
+
+	go2000_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  videoram;
 	UINT16 *  videoram2;

src/mame/drivers/good.c

@@ -35,9 +35,13 @@ voice.rom - VOICE ROM
 #include "sound/okim6295.h"
 
 
-typedef struct _good_state good_state;
-struct _good_state
+class good_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, good_state(machine)); }
+
+	good_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *  bg_tilemapram;
 	UINT16 *  fg_tilemapram;

src/mame/drivers/gstream.c

@@ -126,9 +126,13 @@ RAM4 is HMC HM6264LP-70
 #include "cpu/e132xs/e132xs.h"
 #include "sound/okim6295.h"
 
-typedef struct _gstream_state gstream_state;
-struct _gstream_state
+class gstream_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gstream_state(machine)); }
+
+	gstream_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT32 *  vram;
 	UINT32 *  workram;

src/mame/drivers/hotblock.c

@@ -45,9 +45,13 @@ so it could be by them instead
 #include "cpu/i86/i86.h"
 #include "sound/ay8910.h"
 
-typedef struct _hotblock_state hotblock_state;
-struct _hotblock_state
+class hotblock_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hotblock_state(machine)); }
+
+	hotblock_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  vram;
 	UINT8 *  pal;

src/mame/drivers/imolagp.c

@@ -83,9 +83,13 @@ Known issues:
 #define HLE_COM
 
 
-typedef struct _imolagp_state imolagp_state;
-struct _imolagp_state
+class imolagp_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, imolagp_state(machine)); }
+
+	imolagp_state(running_machine &machine) { }
+	
 	UINT8 *slave_workram; // used only ifdef HLE_COM
 
 #ifdef HLE_COM

src/mame/drivers/jangou.c

@@ -33,9 +33,13 @@ $c088-$c095 player tiles
 
 #define MASTER_CLOCK	XTAL_19_968MHz
 
-typedef struct _jangou_state jangou_state;
-struct _jangou_state
+class jangou_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jangou_state(machine)); }
+
+	jangou_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT8        *blit_buffer;
 	UINT8        pen_data[0x10];

src/mame/drivers/jantotsu.c

@@ -99,9 +99,13 @@ dumped by sayu
 #include "sound/sn76496.h"
 #include "sound/msm5205.h"
 
-typedef struct _jantotsu_state jantotsu_state;
-struct _jantotsu_state
+class jantotsu_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jantotsu_state(machine)); }
+
+	jantotsu_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT8    *bitmap;
 	UINT8    vram_bank, col_bank;

src/mame/drivers/jollyjgr.c

@@ -102,9 +102,13 @@ Notes:
 #include "sound/ay8910.h"
 
 
-typedef struct _jollyjgr_state jollyjgr_state;
-struct _jollyjgr_state
+class jollyjgr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jollyjgr_state(machine)); }
+
+	jollyjgr_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	UINT8 *  colorram;

src/mame/drivers/jongkyo.c

@@ -32,9 +32,13 @@
 #define JONGKYO_CLOCK 18432000
 
 
-typedef struct _jongkyo_state jongkyo_state;
-struct _jongkyo_state
+class jongkyo_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jongkyo_state(machine)); }
+
+	jongkyo_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	UINT8 *  videoram2;

src/mame/drivers/koikoi.c

@@ -45,9 +45,13 @@ to prevent disabling inputs.
 
 static const int input_tab[]= { 0x22, 0x64, 0x44, 0x68, 0x30, 0x50, 0x70, 0x48, 0x28, 0x21, 0x41, 0x82, 0x81, 0x42 };
 
-typedef struct _koikoi_state koikoi_state;
-struct _koikoi_state
+class koikoi_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, koikoi_state(machine)); }
+
+	koikoi_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 

src/mame/drivers/laserbas.c

@@ -20,9 +20,13 @@
 #include "cpu/z80/z80.h"
 #include "deprecat.h"
 
-typedef struct _laserbas_state laserbas_state;
-struct _laserbas_state
+class laserbas_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbas_state(machine)); }
+
+	laserbas_state(running_machine &machine) { }
+	
 	/* video-related */
 	UINT8    *vram1;
 	UINT8    *vram2;

src/mame/drivers/lastfght.c

@@ -66,9 +66,13 @@ Notes:
 #include "deprecat.h"
 #include "cpu/h83002/h8.h"
 
-typedef struct _lastfght_state lastfght_state;
-struct _lastfght_state
+class lastfght_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastfght_state(machine)); }
+
+	lastfght_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  colorram;
 //  UINT8 *  nvram; // currently this uses generic nvram handling

src/mame/drivers/looping.c

@@ -95,9 +95,13 @@ static UINT8 *cop_io;
  *
  *************************************/
 
-typedef struct _looping_state looping_state;
-struct _looping_state
+class looping_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, looping_state(machine)); }
+
+	looping_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *		videoram;
 	UINT8 *		colorram;

src/mame/drivers/m14.c

@@ -54,9 +54,13 @@ Dumped by Chackn
 #include "cpu/i8085/i8085.h"
 
 
-typedef struct _m14_state m14_state;
-struct _m14_state
+class m14_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m14_state(machine)); }
+
+	m14_state(running_machine &machine) { }
+	
 	/* video-related */
 	tilemap_t  *m14_tilemap;
 	UINT8 *  video_ram;

src/mame/drivers/m63.c

@@ -121,9 +121,13 @@ Dip locations verified for:
 #include "sound/ay8910.h"
 #include "sound/samples.h"
 
-typedef struct _m63_state m63_state;
-struct _m63_state
+class m63_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m63_state(machine)); }
+
+	m63_state(running_machine &machine) { }
+	
 	UINT8 *  videoram;
 	UINT8 *  colorram;
 	UINT8 *  spriteram;

src/mame/drivers/m79amb.c

@@ -58,9 +58,13 @@ and two large (paddles pretending to be) guns.
 #include "includes/m79amb.h"
 #include "cpu/i8085/i8085.h"
 
-typedef struct _m79amb_state m79amb_state;
-struct _m79amb_state
+class m79amb_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m79amb_state(machine)); }
+
+	m79amb_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *        videoram;
 	UINT8 *        mask;

src/mame/drivers/marinedt.c

@@ -97,9 +97,13 @@ p2 ink doesn't always light up in test mode
 #include "emu.h"
 #include "cpu/z80/z80.h"
 
-typedef struct _marinedt_state marinedt_state;
-struct _marinedt_state
+class marinedt_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, marinedt_state(machine)); }
+
+	marinedt_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *     tx_tileram;
 

src/mame/drivers/maygay1b.c

@@ -45,8 +45,7 @@ static int  SRSEL;
 static UINT8 Lamps[256];      // 256 multiplexed lamps
 static int optic_pattern;
 
-typedef struct _i8279_state i8279_state;
-struct _i8279_state
+struct i8279_state
 {
 	UINT8		command;
 	UINT8		mode;

src/mame/drivers/mayumi.c

@@ -13,9 +13,13 @@
 #define MCLK 10000000
 
 
-typedef struct _mayumi_state mayumi_state;
-struct _mayumi_state
+class mayumi_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mayumi_state(machine)); }
+
+	mayumi_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *    videoram;
 //	UINT8 *    nvram;		// this currently uses generic nvram handlers

src/mame/drivers/mazerbla.c

@@ -48,9 +48,13 @@ TO DO:
 #define SOUND_CLOCK XTAL_14_31818MHz
 
 
-typedef struct _mazerbla_state mazerbla_state;
-struct _mazerbla_state
+class mazerbla_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mazerbla_state(machine)); }
+
+	mazerbla_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *   cfb_ram;
 	UINT8 *   videoram;

src/mame/drivers/meijinsn.c

@@ -65,9 +65,13 @@ SOFT  PSG & VOICE  BY M.C & S.H
 #include "video/resnet.h"
 #include "sound/ay8910.h"
 
-typedef struct _meijinsn_state meijinsn_state;
-struct _meijinsn_state
+class meijinsn_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, meijinsn_state(machine)); }
+
+	meijinsn_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *   shared_ram;
 	UINT16 *   videoram;

src/mame/drivers/mgolf.c

@@ -7,9 +7,13 @@
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
 
-typedef struct _mgolf_state mgolf_state;
-struct _mgolf_state
+class mgolf_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mgolf_state(machine)); }
+
+	mgolf_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8*   video_ram;
 

src/mame/drivers/minivadr.c

@@ -14,9 +14,13 @@ Japan). It has no sound.
 #include "cpu/z80/z80.h"
 
 
-typedef struct _minivadr_state minivadr_state;
-struct _minivadr_state
+class minivadr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, minivadr_state(machine)); }
+
+	minivadr_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *  videoram;
 	size_t   videoram_size;

src/mame/drivers/mirage.c

@@ -39,9 +39,13 @@ MR_01-.3A    [a0b758aa]
 #include "video/decodev.h"
 #include "sound/okim6295.h"
 
-typedef struct _mirage_state mirage_state;
-struct _mirage_state
+class mirage_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mirage_state(machine)); }
+
+	mirage_state(running_machine &machine) { }
+
 	/* memory pointers */
 	UINT16 *  pf1_rowscroll;
 	UINT16 *  pf2_rowscroll;

src/mame/drivers/mjsister.c

@@ -15,9 +15,13 @@
 #define MCLK 12000000
 
 
-typedef struct _mjsister_state mjsister_state;
-struct _mjsister_state
+class mjsister_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjsister_state(machine)); }
+
+	mjsister_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *     videoram0, *videoram1;
 

src/mame/drivers/mogura.c

@@ -5,9 +5,13 @@
 #include "sound/dac.h"
 #include "includes/konamipt.h"
 
-typedef struct _mogura_state mogura_state;
-struct _mogura_state
+class mogura_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mogura_state(machine)); }
+
+	mogura_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *   tileram;
 	UINT8 *   gfxram;

src/mame/drivers/mole.c

@@ -53,9 +53,13 @@
 #include "sound/ay8910.h"
 
 
-typedef struct _mole_state mole_state;
-struct _mole_state
+class mole_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mole_state(machine)); }
+
+	mole_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *     tileram;
 

src/mame/drivers/mwarr.c

@@ -46,9 +46,13 @@ Notes:
 #define SOUND_CLOCK      XTAL_45MHz
 
 
-typedef struct _mwarr_state mwarr_state;
-struct _mwarr_state
+class mwarr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mwarr_state(machine)); }
+
+	mwarr_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT16 *bg_videoram, *mlow_videoram, *mhigh_videoram, *tx_videoram, *sprites_buffer;
 	UINT16 *bg_scrollram, *mlow_scrollram, *mhigh_scrollram, *vidattrram;

src/mame/drivers/namcos21.c

@@ -331,8 +331,7 @@ static UINT16 pointram_control;
 
 
 #define DSP_BUF_MAX (4096*12)
-typedef struct _dsp_state dsp_state;
-struct _dsp_state
+struct dsp_state
 {
 	unsigned masterSourceAddr;
 	UINT16 slaveInputBuffer[DSP_BUF_MAX];

src/mame/drivers/nightgal.c

@@ -24,9 +24,13 @@ TODO:
 
 #define MASTER_CLOCK	XTAL_19_968MHz
 
-typedef struct _nightgal_state nightgal_state;
-struct _nightgal_state
+class nightgal_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nightgal_state(machine)); }
+
+	nightgal_state(running_machine &machine) { }
+
 	/* memory pointers */
 	UINT8 *    blit_buffer;
 

src/mame/drivers/nmg5.c

@@ -226,9 +226,13 @@ Stephh's notes (based on the games M68000 code and some tests) :
 #include "sound/3812intf.h"
 
 
-typedef struct _nmg5_state nmg5_state;
-struct _nmg5_state
+class nmg5_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nmg5_state(machine)); }
+
+	nmg5_state(running_machine &machine) { }
+
 	/* memory pointers */
 	UINT16 *    fg_videoram;
 	UINT16 *    bg_videoram;

src/mame/drivers/pachifev.c

@@ -59,10 +59,13 @@ just a guess:
 #define USE_MSM 0
 #define NUM_PLUNGER_REPEATS    50
 
-typedef struct _pachifev_state pachifev_state;
-
-struct _pachifev_state
+class pachifev_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pachifev_state(machine)); }
+
+	pachifev_state(running_machine &machine) { }
+
  /* controls related */
 
  int power;

src/mame/drivers/safarir.c

@@ -50,9 +50,13 @@ modified by Hau
 #include "cpu/i8085/i8085.h"
 #include "sound/samples.h"
 
-typedef struct _safarir_state safarir_state;
-struct _safarir_state
+class safarir_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, safarir_state(machine)); }
+
+	safarir_state(running_machine &machine) { }
+	
 	UINT8 *ram_1, *ram_2;
 	size_t ram_size;
 	UINT8 ram_bank;

src/mame/drivers/sbowling.c

@@ -45,9 +45,13 @@ PROMs : NEC B406 (1kx4) x2
 #include "sound/ay8910.h"
 
 
-typedef struct _sbowling_state sbowling_state;
-struct _sbowling_state
+class sbowling_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbowling_state(machine)); }
+
+	sbowling_state(running_machine &machine) { }
+	
 	int bgmap;
 	UINT8 *videoram;
 

src/mame/drivers/shougi.c

@@ -87,9 +87,13 @@ PROM  : Type MB7051
 #include "sound/ay8910.h"
 #include "video/resnet.h"
 
-typedef struct _shougi_state shougi_state;
-struct _shougi_state
+class shougi_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shougi_state(machine)); }
+
+	shougi_state(running_machine &machine) { }
+	
 	UINT8 *videoram;
 	int nmi_enabled;
 	//UINT8 *cpu_sharedram;

src/mame/drivers/skeetsht.c

@@ -17,9 +17,13 @@
  *
  *************************************/
 
-typedef struct _skeetsht_state skeetsht_state;
-struct _skeetsht_state
+class skeetsht_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skeetsht_state(machine)); }
+
+	skeetsht_state(running_machine &machine) { }
+	
 	UINT16 *tms_vram;
 	UINT8 porta_latch;
 	UINT8 ay_sel;

src/mame/drivers/skyarmy.c

@@ -24,9 +24,13 @@
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
-typedef struct _skyarmy_state skyarmy_state;
-struct _skyarmy_state
+class skyarmy_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyarmy_state(machine)); }
+
+	skyarmy_state(running_machine &machine) { }
+	
 	UINT8 *spriteram;
 	UINT8 *videoram;
 	UINT8 *colorram;

src/mame/drivers/sliver.c

@@ -76,9 +76,13 @@ Notes:
 #define x_offset 0x45
 #define y_offset 0x0d
 
-typedef struct _sliver_state sliver_state;
-struct _sliver_state
+class sliver_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sliver_state(machine)); }
+
+	sliver_state(running_machine &machine) { }
+	
 	UINT16 io_offset;
 	UINT16 io_reg[IO_SIZE];
 	UINT16 fifo[FIFO_SIZE];

src/mame/drivers/spaceg.c

@@ -173,9 +173,13 @@ Notes:
  *
  *************************************/
 
-typedef struct _spaceg_state spaceg_state;
-struct _spaceg_state
+class spaceg_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spaceg_state(machine)); }
+
+	spaceg_state(running_machine &machine) { }
+	
 	UINT8 *  videoram;
 	UINT8 *  unkram;
 	UINT8 *  io9400;

src/mame/drivers/spoker.c

@@ -18,9 +18,13 @@ TODO:
                                 Video Hardware
 ***************************************************************************/
 
-typedef struct _spoker_state spoker_state;
-struct _spoker_state
+class spoker_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spoker_state(machine)); }
+
+	spoker_state(running_machine &machine) { }
+	
 	UINT8   *bg_tile_ram;
 	tilemap_t *bg_tilemap;
 

src/mame/drivers/spool99.c

@@ -92,9 +92,13 @@ Note
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
 
-typedef struct _spool99_state spool99_state;
-struct _spool99_state
+class spool99_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spool99_state(machine)); }
+
+	spool99_state(running_machine &machine) { }
+	
 	UINT8 *main;
 	tilemap_t *sc0_tilemap;
 	UINT8 *cram;

src/mame/drivers/srmp5.c

@@ -62,9 +62,13 @@ This is not a bug (real machine behaves the same).
 
 #define SPRITE_DATA_GRANULARITY 0x80
 
-typedef struct _srmp5_state srmp5_state;
-struct _srmp5_state
+class srmp5_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp5_state(machine)); }
+
+	srmp5_state(running_machine &machine) { }
+	
 	UINT32 databank;
 	UINT16 *tileram;
 	UINT16 *palram;

src/mame/drivers/srmp6.c

@@ -71,9 +71,13 @@ Dumped 06/15/2000
 #include "deprecat.h"
 #include "sound/nile.h"
 
-typedef struct _srmp6_state srmp6_state;
-struct _srmp6_state
+class srmp6_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp6_state(machine)); }
+
+	srmp6_state(running_machine &machine) { }
+	
 	UINT16* tileram;
 	UINT16* dmaram;
 

src/mame/drivers/ssingles.c

@@ -150,9 +150,13 @@ Dumped by Chack'n
 #define NUM_PENS (4*8)
 #define VMEM_SIZE 0x100
 
-typedef struct _ssingles_state ssingles_state;
-struct _ssingles_state
+class ssingles_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ssingles_state(machine)); }
+
+	ssingles_state(running_machine &machine) { }
+	
 	UINT8 *videoram;
 	UINT8 *colorram;
 	UINT8 prot_data;

src/mame/drivers/sstrangr.c

@@ -12,9 +12,13 @@
 
 #define NUM_PENS	(8)
 
-typedef struct _sstrangr_state sstrangr_state;
-struct _sstrangr_state
+class sstrangr_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sstrangr_state(machine)); }
+
+	sstrangr_state(running_machine &machine) { }
+	
 	UINT8 *ram;
 	UINT8 flip_screen;
 	UINT8 *proms;

src/mame/drivers/sub.c

@@ -112,9 +112,13 @@ PCB2  (Top board, CPU board)
 
 #define MASTER_CLOCK			XTAL_18_432MHz
 
-typedef struct _sub_state sub_state;
-struct _sub_state
+class sub_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sub_state(machine)); }
+
+	sub_state(running_machine &machine) { }
+	
 	UINT8* vid;
 	UINT8* attr;
 	UINT8* scrolly;

src/mame/drivers/supdrapo.c

@@ -33,9 +33,13 @@ A3-1J
 #include "sound/ay8910.h"
 
 
-typedef struct _supdrapo_state supdrapo_state;
-struct _supdrapo_state
+class supdrapo_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supdrapo_state(machine)); }
+
+	supdrapo_state(running_machine &machine) { }
+	
 	UINT8 *char_bank;
 	UINT8 *col_line;
 	UINT8 *videoram;

src/mame/drivers/superdq.c

@@ -27,9 +27,13 @@
 #include "machine/laserdsc.h"
 #include "video/resnet.h"
 
-typedef struct _superdq_state superdq_state;
-struct _superdq_state
+class superdq_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, superdq_state(machine)); }
+
+	superdq_state(running_machine &machine) { }
+	
 	running_device *laserdisc;
 	UINT8 ld_in_latch;
 	UINT8 ld_out_latch;

src/mame/drivers/supertnk.c

@@ -105,9 +105,13 @@ CRU lines:
    every 8 bytes */
 #define NUM_PENS	(8)
 
-typedef struct _supertnk_state supertnk_state;
-struct _supertnk_state
+class supertnk_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supertnk_state(machine)); }
+
+	supertnk_state(running_machine &machine) { }
+	
 	UINT8 *videoram[3];
 	UINT8 rom_bank;
 	UINT8 bitplane_select;

src/mame/drivers/suprgolf.c

@@ -24,9 +24,13 @@
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
-typedef struct _suprgolf_state suprgolf_state;
-struct _suprgolf_state
+class suprgolf_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprgolf_state(machine)); }
+
+	suprgolf_state(running_machine &machine) { }
+	
 	tilemap_t *tilemap;
 	UINT8 *videoram;
 	UINT8 *paletteram;

src/mame/drivers/toratora.c

@@ -23,9 +23,13 @@ TODO:
 #include "sound/sn76477.h"
 
 
-typedef struct _toratora_state toratora_state;
-struct _toratora_state
+class toratora_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toratora_state(machine)); }
+
+	toratora_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *    videoram;
 	size_t     videoram_size;

src/mame/includes/1942.h

@@ -4,9 +4,13 @@
 
 ***************************************************************************/
 
-typedef struct __1942_state _1942_state;
-struct __1942_state
+class _1942_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1942_state(machine)); }
+
+	_1942_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 * fg_videoram;
 	UINT8 * bg_videoram;

src/mame/includes/1943.h

@@ -4,9 +4,13 @@
 
 ***************************************************************************/
 
-typedef struct __1943_state _1943_state;
-struct __1943_state
+class _1943_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1943_state(machine)); }
+
+	_1943_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 * videoram;
 	UINT8 * colorram;

src/mame/includes/20pacgal.h

@@ -7,9 +7,13 @@
 ***************************************************************************/
 
 
-typedef struct __20pacgal_state _20pacgal_state;
-struct __20pacgal_state
+class _20pacgal_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _20pacgal_state(machine)); }
+
+	_20pacgal_state(running_machine &machine) { }
+	
 	/* memory pointers */
 	UINT8 *char_gfx_ram;
 	UINT8 *sprite_gfx_ram;

src/mame/includes/4enraya.h

@@ -4,9 +4,13 @@
 
 *************************************************************************/
 
-typedef struct __4enraya_state _4enraya_state;
-struct __4enraya_state
+class _4enraya_state
 {
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _4enraya_state(machine)); }
+
+	_4enraya_state(running_machine &machine) { }
+
 	/* memory pointers */
 	UINT8 *    videoram;
 	size_t     videoram_size;