Removed get context/set context calls from the CPU interface entirely.

Pointer-ified the TMS99xx core (missed that one!)

src/emu/cpu/adsp2100/adsp2100.c

@@ -1887,8 +1887,6 @@ static CPU_GET_INFO( adsp21xx )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						/* set per CPU */						break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							/* set per CPU */						break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(adsp21xx);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(adsp21xx);				break;

src/emu/cpu/alph8201/alph8201.c

@@ -932,8 +932,6 @@ static CPU_GET_INFO( alpha8xxx )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(alpha8201);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(alpha8201);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(alpha8201);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(alpha8201);			break;

src/emu/cpu/apexc/apexc.c

@@ -911,8 +911,6 @@ CPU_GET_INFO( apexc )
 	case CPUINFO_INT_REGISTER + APEXC_ML_FULL:		info->i = effective_address(cpustate, cpustate->ml);	break;
 
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(apexc);			break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(apexc);				break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(apexc);				break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(apexc);			break;

src/emu/cpu/arm/arm.c

@@ -1508,8 +1508,6 @@ CPU_GET_INFO( arm )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(arm);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(arm);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(arm);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(arm);				break;

src/emu/cpu/arm7/arm7.c

@@ -304,8 +304,6 @@ CPU_GET_INFO( arm7 )
 
         /* --- the following bits of info are returned as pointers to data or functions --- */
         case CPUINFO_PTR_SET_INFO:              info->setinfo = CPU_SET_INFO_NAME(arm7);                  break;
-        case CPUINFO_PTR_GET_CONTEXT:           info->getcontext = CPU_GET_CONTEXT_NAME(dummy);            break;
-        case CPUINFO_PTR_SET_CONTEXT:           info->setcontext = CPU_SET_CONTEXT_NAME(dummy);            break;
         case CPUINFO_PTR_INIT:                  info->init = CPU_INIT_NAME(arm7);                         break;
         case CPUINFO_PTR_RESET:                 info->reset = CPU_RESET_NAME(arm7);                       break;
         case CPUINFO_PTR_EXIT:                  info->exit = CPU_EXIT_NAME(arm7);                         break;

src/emu/cpu/asap/asap.c

@@ -1767,8 +1767,6 @@ CPU_GET_INFO( asap )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(asap);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(asap);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(asap);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(asap);				break;

src/emu/cpu/ccpu/ccpu.c

@@ -771,8 +771,6 @@ CPU_GET_INFO( ccpu )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(ccpu);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(ccpu);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(ccpu);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;								break;

src/emu/cpu/cdp1802/cdp1802.c

@@ -1041,8 +1041,6 @@ CPU_GET_INFO( cdp1802 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cdp1802);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cdp1802);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cdp1802);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(cdp1802);			break;

src/emu/cpu/cop400/cop410.c

@@ -442,8 +442,6 @@ CPU_GET_INFO( cop410 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cop410);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cop410);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cop410);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(cop410);			break;

src/emu/cpu/cop400/cop420.c

@@ -527,8 +527,6 @@ CPU_GET_INFO( cop420 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cop420);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cop420);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cop420);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(cop420);			break;

src/emu/cpu/cop400/cop440.c

@@ -549,8 +549,6 @@ CPU_GET_INFO( cop444 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cop444);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cop444);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cop444);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(cop444);			break;

src/emu/cpu/cp1610/cp1610.c

@@ -3483,8 +3483,6 @@ CPU_GET_INFO( cp1610 )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cp1610);		break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cp1610);				break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cp1610);				break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(cp1610);			break;

src/emu/cpu/cubeqcpu/cubeqcpu.c

@@ -1881,8 +1881,6 @@ CPU_GET_INFO( cquestsnd )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cquestsnd);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cquestsnd);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cquestsnd);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(cquestsnd);			break;
@@ -1999,8 +1997,6 @@ CPU_GET_INFO( cquestrot )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cquestrot);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cquestrot);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cquestrot);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(cquestrot);			break;
@@ -2119,8 +2115,6 @@ CPU_GET_INFO( cquestlin )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(cquestlin);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(cquestlin);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(cquestlin);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(cquestlin);			break;

src/emu/cpu/dsp32/dsp32.c

@@ -807,8 +807,6 @@ CPU_GET_INFO( dsp32c )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(dsp32c);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(dsp32c);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(dsp32c);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(dsp32c);				break;

src/emu/cpu/dsp56k/dsp56k.c

@@ -351,7 +351,7 @@ static void set_irq_line(int irqline, int state)
 /***************************************************************************
     CONTEXT SWITCHING
 ***************************************************************************/
-
+/*
 static CPU_GET_CONTEXT( dsp56k )
 {
 	if (dst)
@@ -366,7 +366,7 @@ static CPU_SET_CONTEXT( dsp56k )
 
 	check_irqs();
 }
-
+*/
 
 
 /***************************************************************************
@@ -671,8 +671,6 @@ CPU_GET_INFO( dsp56k )
 
 		// --- the following bits of info are returned as pointers to data or functions ---
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(dsp56k);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dsp56k);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dsp56k);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(dsp56k);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(dsp56k);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(dsp56k);				break;

src/emu/cpu/e132xs/e132xs.c

@@ -5014,8 +5014,6 @@ static CPU_GET_INFO( hyperstone )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(hyperstone);	break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = NULL;						break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(hyperstone);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(hyperstone);			break;

src/emu/cpu/f8/f8.c

@@ -2108,8 +2108,6 @@ CPU_GET_INFO( f8 )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(f8);			break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(f8);					break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(f8);					break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(f8);				break;

src/emu/cpu/g65816/g65816.c

@@ -454,8 +454,6 @@ CPU_GET_INFO( g65816 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(g65816);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(g65816);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(g65816);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(g65816);				break;

src/emu/cpu/h6280/h6280.c

@@ -478,8 +478,6 @@ CPU_GET_INFO( h6280 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(h6280);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(h6280);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(h6280);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(h6280);				break;

src/emu/cpu/h83002/h8_16.c

@@ -542,8 +542,6 @@ CPU_GET_INFO( h8_3002 )
 	switch(state) {
 	// Interface functions and variables
 	case CPUINFO_PTR_SET_INFO:					info->setinfo     = CPU_SET_INFO_NAME(h8);		break;
-	case CPUINFO_PTR_GET_CONTEXT:				info->getcontext  = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:				info->setcontext  = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:						info->init        = CPU_INIT_NAME(h8);			break;
 	case CPUINFO_PTR_RESET:						info->reset       = CPU_RESET_NAME(h8);			break;
 	case CPUINFO_PTR_EXIT:						info->exit        = 0;							break;

src/emu/cpu/h83002/h8_8.c

@@ -518,8 +518,6 @@ CPU_GET_INFO( h8_3334 )
 	switch(state) {
 	// Interface functions and variables
 	case CPUINFO_PTR_SET_INFO:			info->setinfo     = CPU_SET_INFO_NAME(h8);				break;
-	case CPUINFO_PTR_GET_CONTEXT:			info->getcontext  = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:			info->setcontext  = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:				info->init        = CPU_INIT_NAME(h8bit);					break;
 	case CPUINFO_PTR_RESET:				info->reset       = CPU_RESET_NAME(h8bit);					break;
 	case CPUINFO_PTR_EXIT:				info->exit        = 0;							break;

src/emu/cpu/hd6309/hd6309.c

@@ -1299,8 +1299,6 @@ CPU_GET_INFO( hd6309 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(hd6309);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(hd6309);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(hd6309);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(hd6309);				break;

src/emu/cpu/i386/i386.c

@@ -960,8 +960,6 @@ CPU_GET_INFO( i386 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:	      				info->setinfo = CPU_SET_INFO_NAME(i386);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:		      				info->init = CPU_INIT_NAME(i386);					break;
 		case CPUINFO_PTR_RESET:		      				info->reset = CPU_RESET_NAME(i386);				break;
 		case CPUINFO_PTR_EXECUTE:	      				info->execute = CPU_EXECUTE_NAME(i386);			break;

src/emu/cpu/i8085/i8085.c

@@ -1728,8 +1728,6 @@ CPU_GET_INFO( i8085 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(i8085);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(i8085);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(i8085);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(i8085);				break;

src/emu/cpu/i86/i286.c

@@ -431,8 +431,6 @@ CPU_GET_INFO( i80286 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(i80286);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(i80286);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(i80286);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;						break;

src/emu/cpu/i86/i86.c

@@ -439,8 +439,6 @@ CPU_GET_INFO( i8086 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(i8086);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(i8086);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(i8086);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(i8086);				break;

src/emu/cpu/i8x41/i8x41.c

@@ -1254,8 +1254,6 @@ CPU_GET_INFO( i8041 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(i8x41);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(i8x41);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(i8x41);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(i8x41);				break;

src/emu/cpu/i960/i960.c

@@ -2114,8 +2114,6 @@ CPU_GET_INFO( i960 )
 	switch(state) {
 		// Interface functions and variables
 	case CPUINFO_PTR_SET_INFO:					info->setinfo     = CPU_SET_INFO_NAME(i960);	break;
-	case CPUINFO_PTR_GET_CONTEXT:				info->getcontext  = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:				info->setcontext  = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:						info->init        = CPU_INIT_NAME(i960);		break;
 	case CPUINFO_PTR_RESET:						info->reset       = CPU_RESET_NAME(i960);		break;
 	case CPUINFO_PTR_EXIT:						info->exit        = 0;							break;

src/emu/cpu/jaguar/jaguar.c

@@ -1568,8 +1568,6 @@ CPU_GET_INFO( jaguargpu )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(jaguargpu);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(jaguargpu);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(jaguar);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(jaguar);					break;

src/emu/cpu/konami/konami.c

@@ -579,8 +579,6 @@ CPU_GET_INFO( konami )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(konami);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(konami);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(konami);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(konami);				break;

src/emu/cpu/lh5801/lh5801.c

@@ -221,8 +221,6 @@ CPU_GET_INFO( lh5801 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(lh5801);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(lh5801);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(lh5801);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;						break;

src/emu/cpu/lr35902/lr35902.c

@@ -454,8 +454,6 @@ CPU_GET_INFO( lr35902 )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(lr35902);		break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(lr35902);				break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(lr35902);			break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(lr35902);		break;

src/emu/cpu/m37710/m37710.c

@@ -1111,8 +1111,6 @@ CPU_GET_INFO( m37710 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m37710);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m37710);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m37710);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m37710);				break;

src/emu/cpu/m6502/m4510.c

@@ -493,8 +493,6 @@ CPU_GET_INFO( m4510 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m4510);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m4510);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m4510);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m4510);				break;

src/emu/cpu/m6502/m6502.c

@@ -739,8 +739,6 @@ CPU_GET_INFO( m6502 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m6502);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m6502);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m6502);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m6502);				break;

src/emu/cpu/m6502/m6509.c

@@ -363,8 +363,6 @@ CPU_GET_INFO( m6509 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m6509);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m6509);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m6509);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m6509);				break;

src/emu/cpu/m6502/m65ce02.c

@@ -308,8 +308,6 @@ CPU_GET_INFO( m65ce02 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m65ce02);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m65ce02);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m65ce02);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m65ce02);				break;

src/emu/cpu/m6800/m6800.c

@@ -2721,8 +2721,6 @@ CPU_GET_INFO( m6800 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m6800);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m6800);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m6800);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m6800);				break;

src/emu/cpu/m68000/m68kcpu.c

@@ -646,8 +646,6 @@ static CPU_GET_INFO( m68k )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:					/* set per-core */								break;
-		case CPUINFO_PTR_GET_CONTEXT:				info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:				info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:						/* set per-core */								break;
 		case CPUINFO_PTR_RESET:						info->reset = CPU_RESET_NAME(m68k);				break;
 		case CPUINFO_PTR_EXECUTE:					info->execute = CPU_EXECUTE_NAME(m68k);			break;

src/emu/cpu/m6805/m6805.c

@@ -927,8 +927,6 @@ CPU_GET_INFO( m6805 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m6805);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m6805);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m6805);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m6805);				break;

src/emu/cpu/m6809/m6809.c

@@ -1137,8 +1137,6 @@ CPU_GET_INFO( m6809 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(m6809);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(m6809);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(m6809);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(m6809);				break;

src/emu/cpu/mb86233/mb86233.c

@@ -1689,8 +1689,6 @@ CPU_GET_INFO( mb86233 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mb86233);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(mb86233);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(mb86233);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;						break;

src/emu/cpu/mb88xx/mb88xx.c

@@ -829,8 +829,6 @@ CPU_GET_INFO( mb88 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mb88);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(mb88);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(mb88);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;						break;

src/emu/cpu/mc68hc11/mc68hc11.c

@@ -449,8 +449,6 @@ CPU_GET_INFO( mc68hc11 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mc68hc11);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(hc11);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(hc11);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(hc11);					break;

src/emu/cpu/mcs48/mcs48.c

@@ -1077,8 +1077,6 @@ static CPU_GET_INFO( mcs48 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:								info->setinfo = CPU_SET_INFO_NAME(mcs48);			break;
-		case CPUINFO_PTR_GET_CONTEXT:							info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:							info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:									/*info->init = CPU_INIT_NAME(i8039);*/			break;
 		case CPUINFO_PTR_RESET:									info->reset = CPU_RESET_NAME(mcs48);				break;
 		case CPUINFO_PTR_EXECUTE:								info->execute = CPU_EXECUTE_NAME(mcs48);			break;

src/emu/cpu/mcs51/mcs51.c

@@ -2508,8 +2508,6 @@ static CPU_GET_INFO( mcs51 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mcs51);				break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(mcs51);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(mcs51);		break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(mcs51);			break;

src/emu/cpu/minx/minx.c

@@ -340,8 +340,6 @@ CPU_GET_INFO( minx )
 	case CPUINFO_INT_REGISTER + MINX_YI:						info->i = minx_get_reg( state - CPUINFO_INT_REGISTER ); break;
 	case CPUINFO_INT_PREVIOUSPC:								info->i = 0x0000; break;
 	case CPUINFO_PTR_SET_INFO:									info->setinfo = CPU_SET_INFO_NAME(minx); break;
-	case CPUINFO_PTR_GET_CONTEXT:								info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-	case CPUINFO_PTR_SET_CONTEXT:								info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 	case CPUINFO_PTR_INIT:										info->init = CPU_INIT_NAME(minx); break;
 	case CPUINFO_PTR_RESET:										info->reset = CPU_RESET_NAME(minx); break;
 	case CPUINFO_PTR_EXIT:										info->exit = CPU_EXIT_NAME(minx); break;

src/emu/cpu/mips/mips3.c

@@ -244,20 +244,6 @@ static void check_irqs(void)
     CORE CALLBACKS
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( mips3 )
-{
-	if (dst != NULL)
-		*(mips3_regs *)dst = mips3;
-}
-
-
-static CPU_SET_CONTEXT( mips3 )
-{
-	if (src != NULL)
-		mips3 = *(mips3_regs *)src;
-}
-
-
 static CPU_RESET( mips3 )
 {
 	/* common reset */
@@ -2128,8 +2114,6 @@ CPU_GET_INFO( mips3 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mips3);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(mips3);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(mips3);	break;
 		case CPUINFO_PTR_INIT:							/* provided per-CPU */					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(mips3);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(mips3);			break;

src/emu/cpu/mips/mips3com.c

@@ -526,8 +526,6 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info)
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						/* provided by core */					break;
-		case CPUINFO_PTR_GET_CONTEXT:					/* provided by core */					break;
-		case CPUINFO_PTR_SET_CONTEXT:					/* provided by core */					break;
 		case CPUINFO_PTR_INIT:							/* provided by core */					break;
 		case CPUINFO_PTR_RESET:							/* provided by core */					break;
 		case CPUINFO_PTR_EXIT:							/* provided by core */					break;

src/emu/cpu/mips/mips3drc.c

@@ -610,8 +610,6 @@ static CPU_GET_INFO( mips3 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(mips3);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							/* provided per-CPU */							break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(mips3);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(mips3);				break;

src/emu/cpu/mips/psx.c

@@ -4188,8 +4188,6 @@ CPU_GET_INFO( psxcpu )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(psxcpu);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(psxcpu);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(psxcpu);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(psxcpu);					break;

src/emu/cpu/mips/r3000.c

@@ -1242,8 +1242,6 @@ static CPU_GET_INFO( r3000 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(r3000);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(r3000);				break;
 		case CPUINFO_PTR_RESET:							/* provided per-CPU */							break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(r3000);				break;

src/emu/cpu/nec/nec.c

@@ -1369,8 +1369,6 @@ static CPU_GET_INFO( nec )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(nec);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							/* set per-CPU */						break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(nec);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(nec);					break;

src/emu/cpu/pdp1/pdp1.c

@@ -1014,8 +1014,6 @@ CPU_GET_INFO( pdp1 )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(pdp1);			break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(pdp1);					break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(pdp1);				break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(pdp1);			break;

src/emu/cpu/pdp1/tx0.c

@@ -495,8 +495,6 @@ CPU_GET_INFO( tx0_64kw )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tx0);			break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tx0_64kw);			break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tx0);				break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(tx0_64kw);		break;
@@ -623,8 +621,6 @@ CPU_GET_INFO( tx0_8kw )
 
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tx0);			break;
-	case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-	case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 	case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tx0_8kw);	break;
 	case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tx0);		break;
 	case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(tx0_8kw);	break;

src/emu/cpu/pic16c5x/pic16c5x.c

@@ -996,8 +996,6 @@ static CPU_GET_INFO( pic16C5x )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(pic16C5x);	break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(pic16C5x);			break;
 		case CPUINFO_PTR_RESET:							/* set per-CPU */								break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(pic16C5x);			break;

src/emu/cpu/powerpc/ppc.c

@@ -1713,21 +1713,6 @@ static CPU_EXIT( ppc604 )
 
 
 
-static CPU_GET_CONTEXT( ppc )
-{
-	/* copy the context */
-	if (dst)
-		*(PPC_REGS *)dst = ppc;
-}
-
-
-static CPU_SET_CONTEXT( ppc )
-{
-	/* copy the context */
-	if (src)
-		ppc = *(PPC_REGS *)src;
-}
-
 /**************************************************************************
  * Generic set_info
  **************************************************************************/
@@ -1891,8 +1876,6 @@ static CPU_GET_INFO( ppc )
 
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(ppc);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(ppc);		break;
 		case CPUINFO_PTR_BURN:							info->burn = NULL;						break;
 		case CPUINFO_PTR_DISASSEMBLE:					info->disassemble = CPU_DISASSEMBLE_NAME(ppc);			break;
 		case CPUINFO_PTR_INSTRUCTION_COUNTER:			info->icount = &ppc_icount;				break;

src/emu/cpu/powerpc/ppccom.c

@@ -1158,8 +1158,6 @@ void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info)
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						/* provided by core */					break;
-		case CPUINFO_PTR_GET_CONTEXT:					/* provided by core */					break;
-		case CPUINFO_PTR_SET_CONTEXT:					/* provided by core */					break;
 		case CPUINFO_PTR_INIT:							/* provided by core */					break;
 		case CPUINFO_PTR_RESET:							/* provided by core */					break;
 		case CPUINFO_PTR_EXIT:							/* provided by core */					break;

src/emu/cpu/powerpc/ppcdrc.c

@@ -805,8 +805,6 @@ static CPU_GET_INFO( ppcdrc )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(ppcdrc);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);break;
 		case CPUINFO_PTR_INIT:							/* provided per-CPU */							break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(ppcdrc);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(ppcdrc);				break;

src/emu/cpu/rsp/rsp.c

@@ -2989,8 +2989,6 @@ CPU_GET_INFO( rsp )
         case CPUINFO_INT_REGISTER + RSP_STEPCNT:        info->i = cpustate->step_count;               break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(rsp);			break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(rsp);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(rsp);				break;

src/emu/cpu/s2650/s2650.c

@@ -1557,8 +1557,6 @@ CPU_GET_INFO( s2650 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(s2650);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(s2650);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(s2650);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(s2650);				break;

src/emu/cpu/saturn/saturn.c

@@ -359,8 +359,6 @@ CPU_GET_INFO( saturn )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(saturn);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(saturn);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(saturn);					break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(saturn);				break;

src/emu/cpu/sc61860/sc61860.c

@@ -203,8 +203,6 @@ CPU_GET_INFO( sc61860 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(sc61860);				break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);			break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);			break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(sc61860);						break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(sc61860);					break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(sc61860);				break;

src/emu/cpu/se3208/se3208.c

@@ -1880,8 +1880,6 @@ CPU_GET_INFO( SE3208 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(SE3208);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(SE3208);		break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(SE3208);	break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(SE3208);		break;

src/emu/cpu/sh2/sh2.c

@@ -2239,20 +2239,6 @@ static CPU_EXECUTE( sh2 )
 	return cycles - sh2_icount;
 }
 
-/* Get registers, return context size */
-static CPU_GET_CONTEXT( sh2 )
-{
-	if( dst )
-		*(SH2 **)dst = sh2;
-}
-
-/* Set registers */
-static CPU_SET_CONTEXT( sh2 )
-{
-	if( src )
-		sh2 = *(SH2 **)src;
-}
-
 static CPU_DISASSEMBLE( sh2 )
 {
 	return DasmSH2( buffer, pc, (oprom[0] << 8) | oprom[1] );
@@ -2412,8 +2398,6 @@ CPU_GET_INFO( sh2 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(sh2);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(sh2);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(sh2);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(sh2);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(sh2);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(sh2);			break;

src/emu/cpu/sh2/sh2drc.c

@@ -3482,8 +3482,6 @@ CPU_GET_INFO( sh2 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(sh2);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(sh2);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(sh2);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(sh2);					break;

src/emu/cpu/sh4/sh4.c

@@ -3694,8 +3694,6 @@ CPU_GET_INFO( sh4 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(sh4);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(sh4);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(sh4);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(sh4);			break;

src/emu/cpu/sharc/sharc.c

@@ -1197,8 +1197,6 @@ static CPU_GET_INFO( sharc )
 		case CPUINFO_INT_REGISTER + SHARC_B15:			info->i = cpustate->dag2.b[7];				break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(sharc);		break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(sharc);	break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(sharc);		break;

src/emu/cpu/sm8500/sm8500.c

@@ -485,8 +485,6 @@ CPU_GET_INFO( sm8500 )
 
 
 	case CPUINFO_PTR_SET_INFO:				info->setinfo = CPU_SET_INFO_NAME(sm8500); break;
-	case CPUINFO_PTR_GET_CONTEXT:				info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-	case CPUINFO_PTR_SET_CONTEXT:				info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 	case CPUINFO_PTR_INIT:					info->init = CPU_INIT_NAME(sm8500); break;
 	case CPUINFO_PTR_RESET:					info->reset = CPU_RESET_NAME(sm8500); break;
 	case CPUINFO_PTR_EXIT:					info->exit = CPU_EXIT_NAME(sm8500); break;

src/emu/cpu/spc700/spc700.c

@@ -1650,8 +1650,6 @@ CPU_GET_INFO( spc700 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:					info->setinfo = CPU_SET_INFO_NAME(spc700);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:						info->init = CPU_INIT_NAME(spc700);			break;
 		case CPUINFO_PTR_RESET:						info->reset = CPU_RESET_NAME(spc700);			break;
 		case CPUINFO_PTR_EXIT:						info->exit = CPU_EXIT_NAME(spc700);			break;

src/emu/cpu/ssp1601/ssp1601.c

@@ -864,8 +864,6 @@ CPU_GET_INFO( ssp1601 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(ssp1601);	break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(ssp1601);			break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(ssp1601);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(ssp1601);			break;

src/emu/cpu/t11/t11.c

@@ -450,8 +450,6 @@ CPU_GET_INFO( t11 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(t11);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(t11);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(t11);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(t11);			break;

src/emu/cpu/tlcs90/tlcs90.c

@@ -2780,8 +2780,6 @@ CPU_GET_INFO( tmp90840 )
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 
 		case CPUINFO_PTR_SET_INFO:									info->setinfo = CPU_SET_INFO_NAME(t90);		break;
-		case CPUINFO_PTR_GET_CONTEXT:								info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:								info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:										info->init = CPU_INIT_NAME(t90);				break;
 		case CPUINFO_PTR_RESET:										info->reset = CPU_RESET_NAME(t90);			break;
 		case CPUINFO_PTR_EXIT:										info->exit = CPU_EXIT_NAME(t90);				break;

src/emu/cpu/tms32010/tms32010.c

@@ -914,8 +914,6 @@ CPU_GET_INFO( tms32010 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tms32010);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tms32010);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms32010);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(tms32010);				break;

src/emu/cpu/tms32025/tms32025.c

@@ -2094,7 +2094,7 @@ static CPU_EXECUTE( tms32025 )
 	return (cycles - tms32025_icount);
 }
 
-
+#if 0
 /****************************************************************************
  *  Get all registers in given buffer
  ****************************************************************************/
@@ -2121,7 +2121,7 @@ static CPU_SET_CONTEXT( tms32025 )
 		memcpy(&tms32025_pgmmap[500], &R.pgmmap_save, sizeof(R.pgmmap_save));
 	}
 }
-
+#endif
 
 /****************************************************************************
  *  Set IRQ line state
@@ -2387,8 +2387,6 @@ CPU_GET_INFO( tms32025 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tms32025);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(tms32025); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(tms32025); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tms32025);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms32025);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(tms32025);				break;

src/emu/cpu/tms32031/tms32031.c

@@ -776,8 +776,6 @@ CPU_GET_INFO( tms32031 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tms32031);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tms32031);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms32031);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(tms32031);				break;

src/emu/cpu/tms32051/tms32051.c

@@ -624,8 +624,6 @@ static CPU_GET_INFO( tms )
 		case CPUINFO_INT_REGISTER + TMS32051_AR7:		info->i = cpustate->ar[7];					break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tms);					break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(tms);					break;

src/emu/cpu/tms34010/tms34010.c

@@ -1784,8 +1784,6 @@ CPU_GET_INFO( tms34010 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(tms34010);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(tms34010);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms34010);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(tms34010);				break;
@@ -1874,8 +1872,6 @@ CPU_GET_INFO( tms34020 )
 		case CPUINFO_INT_CLOCK_DIVIDER:					info->i = 4;							break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy); break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy); break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(tms34020);			break;
 		case CPUINFO_PTR_DISASSEMBLE:					info->disassemble = CPU_DISASSEMBLE_NAME(tms34020);		break;
 

src/emu/cpu/tms7000/tms7000.c

@@ -300,8 +300,6 @@ CPU_GET_INFO( tms7000 )
 
         /* --- the following bits of info are returned as pointers to data or functions --- */
         case CPUINFO_PTR_SET_INFO:	info->setinfo = CPU_SET_INFO_NAME(tms7000);	break;
-        case CPUINFO_PTR_GET_CONTEXT:	info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-        case CPUINFO_PTR_SET_CONTEXT:	info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
         case CPUINFO_PTR_INIT:	info->init = CPU_INIT_NAME(tms7000);	break;
         case CPUINFO_PTR_RESET:	info->reset = CPU_RESET_NAME(tms7000);	break;
         case CPUINFO_PTR_EXECUTE:	info->execute = CPU_EXECUTE_NAME(tms7000);	break;

src/emu/cpu/tms9900/99xxstat.h

@@ -5,52 +5,52 @@
 ************************************************************************/
 
 /*
-    remember that the OP ST bit is maintained in lastparity
+    remember that the OP ST bit is maintained in cpustate->lastparity
 */
 
 /*
-    setstat sets the ST_OP bit according to lastparity
+    setstat sets the ST_OP bit according to cpustate->lastparity
 
     It must be called before reading the ST register.
 */
 
-static void setstat(void)
+static void setstat(tms99xx_state *cpustate)
 {
 	int i;
 	UINT8 a;
 
-	I.STATUS &= ~ ST_OP;
+	cpustate->STATUS &= ~ ST_OP;
 
 	/* We set the parity bit. */
-	a = lastparity;
+	a = cpustate->lastparity;
 
 	for (i=0; i<8; i++)     /* 8 bits to test */
 	{
 		if (a & 1)  /* If current bit is set */
-			I.STATUS ^= ST_OP;  /* we toggle the ST_OP bit */
+			cpustate->STATUS ^= ST_OP;  /* we toggle the ST_OP bit */
 
 		a >>= 1;    /* Next bit. */
 	}
 }
 
 /*
-    getstat sets emulator's lastparity variable according to 9900's STATUS bits.
+    getstat sets emulator's cpustate->lastparity variable according to 9900's STATUS bits.
     It must be called on interrupt return, or when, for some reason,
     the emulated program sets the STATUS register directly.
 */
-static void getstat(void)
+static void getstat(tms99xx_state *cpustate)
 {
 #if (USE_ST_MASK)
-	I.STATUS &= ST_MASK;  /* unused bits are forced to 0 */
+	cpustate->STATUS &= ST_MASK;  /* unused bits are forced to 0 */
 #endif
 
-	if (I.STATUS & ST_OP)
+	if (cpustate->STATUS & ST_OP)
-		lastparity = 1;
+		cpustate->lastparity = 1;
 	else
-		lastparity = 0;
+		cpustate->lastparity = 0;
 
 #if HAS_MAPPING
-	I.cur_map = (I.STATUS & ST_MF) ? 1 : 0;
+	cpustate->cur_map = (cpustate->STATUS & ST_MF) ? 1 : 0;
 #endif
 }
 
@@ -134,96 +134,96 @@ INLINE INT16 arithmetic_right_shift(INT16 val, int c)
 /*
     Set lae
 */
-INLINE void setst_lae(INT16 val)
+INLINE void setst_lae(tms99xx_state *cpustate, INT16 val)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
 
 	if (val > 0)
-		I.STATUS |= (ST_LGT | ST_AGT);
+		cpustate->STATUS |= (ST_LGT | ST_AGT);
 	else if (val < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 }
 
 
 /*
     Set laep (BYTE)
 */
-INLINE void setst_byte_laep(INT8 val)
+INLINE void setst_byte_laep(tms99xx_state *cpustate, INT8 val)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
 
 	if (val > 0)
-		I.STATUS |= (ST_LGT | ST_AGT);
+		cpustate->STATUS |= (ST_LGT | ST_AGT);
 	else if (val < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
-	lastparity = val;
+	cpustate->lastparity = val;
 }
 
 /*
     For COC, CZC, and TB
 */
-INLINE void setst_e(UINT16 val, UINT16 to)
+INLINE void setst_e(tms99xx_state *cpustate, UINT16 val, UINT16 to)
 {
 	if (val == to)
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 	else
-		I.STATUS &= ~ ST_EQ;
+		cpustate->STATUS &= ~ ST_EQ;
 }
 
 /*
     For CI, C, CB
 */
-INLINE void setst_c_lae(UINT16 to, UINT16 val)
+INLINE void setst_c_lae(tms99xx_state *cpustate, UINT16 to, UINT16 val)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
 
 	if (val == to)
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 	else
 	{
 		if ( ((INT16) val) > ((INT16) to) )
-			I.STATUS |= ST_AGT;
+			cpustate->STATUS |= ST_AGT;
 		if ( ((UINT16) val) > ((UINT16) to) )
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	}
 }
 
 /*
     Set laeco for add
 */
-INLINE INT16 setst_add_laeco(int a, int b)
+INLINE INT16 setst_add_laeco(tms99xx_state *cpustate, int a, int b)
 {
 	UINT32 res;
 	INT16 res2;
 
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
 
 	res = (a & 0xffff) + (b & 0xffff);
 
 	if (res & 0x10000)
-		I.STATUS |= ST_C;
+		cpustate->STATUS |= ST_C;
 
 	if ((res ^ b) & (res ^ a) & 0x8000)
-		I.STATUS |= ST_OV;
+		cpustate->STATUS |= ST_OV;
 
 #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)
 	if (((a & b) | ((a | b) & ~ res)) & 0x0800)
-		I.STATUS |= ST_DC;
+		cpustate->STATUS |= ST_DC;
 #endif
 
 	res2 = (INT16) res;
 
 	if (res2 > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (res2 < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return res2;
 }
@@ -232,34 +232,34 @@ INLINE INT16 setst_add_laeco(int a, int b)
 /*
     Set laeco for subtract
 */
-INLINE INT16 setst_sub_laeco(int a, int b)
+INLINE INT16 setst_sub_laeco(tms99xx_state *cpustate, int a, int b)
 {
 	UINT32 res;
 	INT16 res2;
 
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
 
 	res = (a & 0xffff) - (b & 0xffff);
 
 	if (! (res & 0x10000))
-		I.STATUS |= ST_C;
+		cpustate->STATUS |= ST_C;
 
 	if ((a ^ b) & (a ^ res) & 0x8000)
-		I.STATUS |= ST_OV;
+		cpustate->STATUS |= ST_OV;
 
 #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)
 	if (((a & ~ b) | ((a | ~ b) & ~ res)) & 0x0800)
-		I.STATUS |= ST_DC;
+		cpustate->STATUS |= ST_DC;
 #endif
 
 	res2 = (INT16) res;
 
 	if (res2 > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (res2 < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return res2;
 }
@@ -268,36 +268,36 @@ INLINE INT16 setst_sub_laeco(int a, int b)
 /*
     Set laecop for add (BYTE)
 */
-INLINE INT8 setst_addbyte_laecop(int a, int b)
+INLINE INT8 setst_addbyte_laecop(tms99xx_state *cpustate, int a, int b)
 {
 	unsigned int res;
 	INT8 res2;
 
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV | ST_OP);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV | ST_OP);
 
 	res = (a & 0xff) + (b & 0xff);
 
 	if (res & 0x100)
-		I.STATUS |= ST_C;
+		cpustate->STATUS |= ST_C;
 
 	if ((res ^ b) & (res ^ a) & 0x80)
-		I.STATUS |= ST_OV;
+		cpustate->STATUS |= ST_OV;
 
 #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)
 	if (((a & b) | ((a | b) & ~ res)) & 0x08)
-		I.STATUS |= ST_DC;
+		cpustate->STATUS |= ST_DC;
 #endif
 
 	res2 = (INT8) res;
 
 	if (res2 > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (res2 < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
-	lastparity = res2;
+	cpustate->lastparity = res2;
 
 	return res2;
 }
@@ -306,36 +306,36 @@ INLINE INT8 setst_addbyte_laecop(int a, int b)
 /*
     Set laecop for subtract (BYTE)
 */
-INLINE INT8 setst_subbyte_laecop(int a, int b)
+INLINE INT8 setst_subbyte_laecop(tms99xx_state *cpustate, int a, int b)
 {
 	unsigned int res;
 	INT8 res2;
 
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV | ST_OP);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV | ST_OP);
 
 	res = (a & 0xff) - (b & 0xff);
 
 	if (! (res & 0x100))
-		I.STATUS |= ST_C;
+		cpustate->STATUS |= ST_C;
 
 	if ((a ^ b) & (a ^ res) & 0x80)
-		I.STATUS |= ST_OV;
+		cpustate->STATUS |= ST_OV;
 
 #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)
 	if (((a & ~ b) | ((a | ~ b) & ~ res)) & 0x08)
-		I.STATUS |= ST_DC;
+		cpustate->STATUS |= ST_DC;
 #endif
 
 	res2 = (INT8) res;
 
 	if (res2 > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (res2 < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
-	lastparity = res2;
+	cpustate->lastparity = res2;
 
 	return res2;
 }
@@ -345,20 +345,20 @@ INLINE INT8 setst_subbyte_laecop(int a, int b)
 /*
     For NEG
 */
-INLINE void setst_laeo(INT16 val)
+INLINE void setst_laeo(tms99xx_state *cpustate, INT16 val)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_OV);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_OV);
 
 	if (val > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (val < 0)
 	{
-	I.STATUS |= ST_LGT;
+	cpustate->STATUS |= ST_LGT;
 	if (((UINT16) val) == 0x8000)
-		I.STATUS |= ST_OV;
+		cpustate->STATUS |= ST_OV;
 	}
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 }
 
 
@@ -366,24 +366,24 @@ INLINE void setst_laeo(INT16 val)
 /*
     Meat of SRA
 */
-INLINE UINT16 setst_sra_laec(INT16 a, UINT16 c)
+INLINE UINT16 setst_sra_laec(tms99xx_state *cpustate, INT16 a, UINT16 c)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
 
 	if (c != 0)
 	{
 		a = arithmetic_right_shift(a, c-1);
 		if (a & 1)  // The carry bit equals the last bit that is shifted out
-			I.STATUS |= ST_C;
+			cpustate->STATUS |= ST_C;
 		a = arithmetic_right_shift(a, 1);
 	}
 
 	if (a > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (a < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return a;
 }
@@ -392,24 +392,24 @@ INLINE UINT16 setst_sra_laec(INT16 a, UINT16 c)
 /*
     Meat of SRL.  Same algorithm as SRA, except that we fills in with 0s.
 */
-INLINE UINT16 setst_srl_laec(UINT16 a,UINT16 c)
+INLINE UINT16 setst_srl_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
 
 	if (c != 0)
 	{
 		a = logical_right_shift(a, c-1);
 		if (a & 1)
-			I.STATUS |= ST_C;
+			cpustate->STATUS |= ST_C;
 		a = logical_right_shift(a, 1);
 	}
 
 	if (((INT16) a) > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (((INT16) a) < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return a;
 }
@@ -418,23 +418,23 @@ INLINE UINT16 setst_srl_laec(UINT16 a,UINT16 c)
 //
 // Meat of SRC
 //
-INLINE UINT16 setst_src_laec(UINT16 a,UINT16 c)
+INLINE UINT16 setst_src_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
 
 	if (c != 0)
 	{
 		a = logical_right_shift(a, c) | (a << (16-c));
 		if (a & 0x8000) // The carry bit equals the last bit that is shifted out
-			I.STATUS |= ST_C;
+			cpustate->STATUS |= ST_C;
 	}
 
 	if (((INT16) a) > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (((INT16) a) < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return a;
 }
@@ -443,9 +443,9 @@ INLINE UINT16 setst_src_laec(UINT16 a,UINT16 c)
 //
 // Meat of SLA
 //
-INLINE UINT16 setst_sla_laeco(UINT16 a, UINT16 c)
+INLINE UINT16 setst_sla_laeco(tms99xx_state *cpustate, UINT16 a, UINT16 c)
 {
-	I.STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
+	cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
 
 	if (c != 0)
 	{
@@ -458,22 +458,22 @@ INLINE UINT16 setst_sla_laeco(UINT16 a, UINT16 c)
 
 			if (ousted_bits)        // If ousted_bits is neither all 0s
 				if (ousted_bits ^ mask)   // nor all 1s,
-					I.STATUS |= ST_OV;  // we set overflow
+					cpustate->STATUS |= ST_OV;  // we set overflow
 		}
 
 		a <<= c-1;
 		if (a & 0x8000) // The carry bit equals the last bit that is shifted out
-			I.STATUS |= ST_C;
+			cpustate->STATUS |= ST_C;
 
 		a <<= 1;
 	}
 
 	if (((INT16) a) > 0)
-		I.STATUS |= ST_LGT | ST_AGT;
+		cpustate->STATUS |= ST_LGT | ST_AGT;
 	else if (((INT16) a) < 0)
-		I.STATUS |= ST_LGT;
+		cpustate->STATUS |= ST_LGT;
 	else
-		I.STATUS |= ST_EQ;
+		cpustate->STATUS |= ST_EQ;
 
 	return a;
 }

src/emu/cpu/tms9900/tms9900.h

@@ -46,6 +46,12 @@ enum
 	TMS9900_R12, TMS9900_R13, TMS9900_R14, TMS9900_R15
 };
 
+typedef void (*ti99xx_idle_func)(const device_config *device, int state);
+typedef void (*ti99xx_rset_func)(const device_config *device);
+typedef void (*ti99xx_lrex_func)(const device_config *device);
+typedef void (*ti99xx_ckon_ckof_func)(const device_config *device, int state);
+typedef void (*ti99xx_error_interrupt_func)(const device_config *device, int state);
+
 #if (HAS_TI990_10)
 
 extern CPU_GET_INFO( ti990_10 );
@@ -53,14 +59,14 @@ extern CPU_GET_INFO( ti990_10 );
 /*
     structure with the parameters ti990_10_reset wants.
 */
+
 typedef struct ti990_10reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
-	void (*rset_callback)(void);
+	ti99xx_rset_func	rset_callback;
-	void (*lrex_callback)(void);
+	ti99xx_lrex_func	lrex_callback;
-	void (*ckon_ckof_callback)(int state);
+	ti99xx_ckon_ckof_func	ckon_ckof_callback;
-
+	ti99xx_error_interrupt_func	error_interrupt_callback;
-	void (*error_interrupt_callback)(int state);
 } ti990_10reset_param;
 
 /* accessor for the internal ROM */
@@ -84,7 +90,7 @@ extern CPU_GET_INFO( tms9900 );
 */
 typedef struct tms9900reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms9900reset_param;
 
 #endif
@@ -98,7 +104,7 @@ extern CPU_GET_INFO( tms9940 );
 */
 typedef struct tms9940reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms9940reset_param;
 
 #endif
@@ -112,7 +118,7 @@ extern CPU_GET_INFO( tms9980a );
 */
 typedef struct tms9980areset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms9980areset_param;
 
 #endif
@@ -126,7 +132,7 @@ extern CPU_GET_INFO( tms9985 );
 */
 typedef struct tms9985reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms9985reset_param;
 
 #endif
@@ -140,7 +146,7 @@ extern CPU_GET_INFO( tms9989 );
 */
 typedef struct tms9989reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms9989reset_param;
 
 #endif
@@ -158,7 +164,7 @@ typedef struct tms9995reset_param
        memory access */
 	int auto_wait_state;
 
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 
 	/* on the tms9995-mp9537, internal RAM and decrementer register are
         disabled.  This chip is used by the ti99/8 so that internal RAM does
@@ -184,7 +190,7 @@ extern CPU_GET_INFO( tms99000 );
 */
 typedef struct tms99000reset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms99000reset_param;
 
 #endif
@@ -198,7 +204,7 @@ extern CPU_GET_INFO( tms99105a );
 */
 typedef struct tms99105areset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms99105areset_param;
 
 #endif
@@ -212,7 +218,7 @@ extern CPU_GET_INFO( tms99110a );
 */
 typedef struct tms99110areset_param
 {
-	void (*idle_callback)(int state);
+	ti99xx_idle_func	idle_callback;
 } tms99110areset_param;
 
 #endif

src/emu/cpu/upd7810/upd7810.c

@@ -2088,8 +2088,6 @@ CPU_GET_INFO( upd7810 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(upd7810);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(upd7810);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(upd7810);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(upd7810);				break;

src/emu/cpu/v30mz/v30mz.c

@@ -1087,8 +1087,6 @@ CPU_GET_INFO( v30mz )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(nec);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);		break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);		break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(nec);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(nec);					break;
 		case CPUINFO_PTR_BURN:							info->burn = NULL;						break;

src/emu/cpu/v60/v60.c

@@ -656,8 +656,6 @@ CPU_GET_INFO( v60 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(v60);			break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(v60);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(v60);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(v60);				break;

src/emu/cpu/v810/v810.c

@@ -1218,8 +1218,6 @@ CPU_GET_INFO( v810 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(v810);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(v810);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(v810);				break;
 		case CPUINFO_PTR_EXIT:							info->exit = NULL;								break;

src/emu/cpu/z180/z180.c

@@ -2541,8 +2541,6 @@ CPU_GET_INFO( z180 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(z180);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(z180);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(z180);				break;
 		case CPUINFO_PTR_EXECUTE:						info->execute = CPU_EXECUTE_NAME(z180);			break;

src/emu/cpu/z80/z80.c

@@ -3630,8 +3630,6 @@ CPU_GET_INFO( z80 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:					info->setinfo = CPU_SET_INFO_NAME(z80);			break;
-		case CPUINFO_PTR_GET_CONTEXT:				info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:				info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:						info->init = CPU_INIT_NAME(z80);				break;
 		case CPUINFO_PTR_RESET:						info->reset = CPU_RESET_NAME(z80);				break;
 		case CPUINFO_PTR_EXIT:						info->exit = CPU_EXIT_NAME(z80);				break;

src/emu/cpu/z8000/z8000.c

@@ -568,8 +568,6 @@ CPU_GET_INFO( z8000 )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(z8000);		break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(z8000);				break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(z8000);			break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(z8000);				break;

src/emu/cpuintrf.c

@@ -982,14 +982,6 @@ void cpuintrf_init(running_machine *machine)
 		(*header->get_info)(NULL, CPUINFO_PTR_SET_INFO, &info);
 		header->set_info = info.setinfo;
 
-		info.getcontext = NULL;
-		(*header->get_info)(NULL, CPUINFO_PTR_GET_CONTEXT, &info);
-		header->get_context = info.getcontext;
-
-		info.setcontext = NULL;
-		(*header->get_info)(NULL, CPUINFO_PTR_SET_CONTEXT, &info);
-		header->set_context = info.setcontext;
-
 		info.init = NULL;
 		(*header->get_info)(NULL, CPUINFO_PTR_INIT, &info);
 		header->init = info.init;
@@ -1072,7 +1064,6 @@ void cpu_init(const device_config *device, int index, int clock, cpu_irq_callbac
 	classheader->space[ADDRESS_SPACE_IO] = memory_find_address_space(device, ADDRESS_SPACE_IO);
 
 	(*classheader->init)(device, index, clock, irqcallback);
-	(*classheader->get_context)(device->token);
 }
 
 
@@ -1368,8 +1359,6 @@ static CPU_INIT( dummy ) { }
 static CPU_RESET( dummy ) { }
 static CPU_EXIT( dummy ) { }
 static CPU_EXECUTE( dummy ) { return cycles; }
-CPU_GET_CONTEXT( dummy ) { }
-CPU_SET_CONTEXT( dummy ) { }
 
 static CPU_DISASSEMBLE( dummy )
 {
@@ -1415,8 +1404,6 @@ CPU_GET_INFO( dummy )
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case CPUINFO_PTR_SET_INFO:						info->setinfo = CPU_SET_INFO_NAME(dummy); break;
-		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = CPU_GET_CONTEXT_NAME(dummy);	break;
-		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = CPU_SET_CONTEXT_NAME(dummy);	break;
 		case CPUINFO_PTR_INIT:							info->init = CPU_INIT_NAME(dummy);		break;
 		case CPUINFO_PTR_RESET:							info->reset = CPU_RESET_NAME(dummy);	break;
 		case CPUINFO_PTR_EXIT:							info->exit = CPU_EXIT_NAME(dummy);		break;

src/emu/cpuintrf.h

@@ -131,8 +131,6 @@ enum
 		CPUINFO_PTR_EXIT = DEVINFO_FCT_STOP,				/* R/O: void (*exit)(const device_config *device) */
 
 		CPUINFO_PTR_SET_INFO = DEVINFO_FCT_CLASS_SPECIFIC,	/* R/O: void (*set_info)(const device_config *device, UINT32 state, INT64 data, void *ptr) */
-		CPUINFO_PTR_GET_CONTEXT,							/* R/O: void (*get_context)(void *buffer) */
-		CPUINFO_PTR_SET_CONTEXT,							/* R/O: void (*set_context)(void *buffer) */
 		CPUINFO_PTR_INIT,									/* R/O: void (*init)(const device_config *device, int index, int clock, int (*irqcallback)(const device_config *device, int)) */
 		CPUINFO_PTR_EXECUTE,								/* R/O: int (*execute)(const device_config *device, int cycles) */
 		CPUINFO_PTR_BURN,									/* R/O: void (*burn)(const device_config *device, int cycles) */
@@ -502,14 +500,6 @@ typedef enum _cpu_type cpu_type;
 #define CPU_VALIDITY_CHECK(name)		int CPU_VALIDITY_CHECK_NAME(name)(const game_driver *driver, const void *config)
 #define CPU_VALIDITY_CHECK_CALL(name)	CPU_VALIDITY_CHECK_NAME(name)(driver, config)
 
-#define CPU_GET_CONTEXT_NAME(name)	cpu_get_context_##name
-#define CPU_GET_CONTEXT(name)		void CPU_GET_CONTEXT_NAME(name)(void *dst)
-#define CPU_GET_CONTEXT_CALL(name)	CPU_GET_CONTEXT_NAME(name)(buffer)
-
-#define CPU_SET_CONTEXT_NAME(name)	cpu_set_context_##name
-#define CPU_SET_CONTEXT(name)		void CPU_SET_CONTEXT_NAME(name)(void *src)
-#define CPU_SET_CONTEXT_CALL(name)	CPU_SET_CONTEXT_NAME(name)(buffer)
-
 
 /* helpers for accessing common CPU state */
 #define cpu_get_context_size(cpu)			cpu_get_info_int(cpu, CPUINFO_INT_CONTEXT_SIZE)
@@ -607,8 +597,6 @@ typedef void (*cpu_debug_init_func)(const device_config *device);
 typedef offs_t (*cpu_disassemble_func)(const device_config *device, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
 typedef int (*cpu_validity_check_func)(const game_driver *driver, const void *config);
-typedef void (*cpu_get_context_func)(void *buffer);
-typedef void (*cpu_set_context_func)(void *buffer);
 
 
 /* cpuinfo union used to pass data to/from the get_info/set_info functions */
@@ -620,8 +608,6 @@ union _cpuinfo
 	char *					s;							/* generic strings */
 
 	cpu_set_info_func		setinfo;					/* CPUINFO_PTR_SET_INFO */
-	cpu_get_context_func	getcontext;					/* CPUINFO_PTR_GET_CONTEXT */
-	cpu_set_context_func	setcontext;					/* CPUINFO_PTR_SET_CONTEXT */
 	cpu_init_func			init;						/* CPUINFO_PTR_INIT */
 	cpu_reset_func			reset;						/* CPUINFO_PTR_RESET */
 	cpu_exit_func			exit;						/* CPUINFO_PTR_EXIT */
@@ -654,8 +640,6 @@ struct _cpu_class_header
 	/* table of core functions */
 	cpu_get_info_func		get_info;
 	cpu_set_info_func		set_info;
-	cpu_get_context_func	get_context;
-	cpu_set_context_func	set_context;
 	cpu_init_func			init;
 	cpu_reset_func			reset;
 	cpu_exit_func			exit;
@@ -743,10 +727,6 @@ genf *cputype_get_info_fct(cpu_type cputype, UINT32 state);
 const char *cputype_get_info_string(cpu_type cputype, UINT32 state);
 
 
-/* temporary */
-extern CPU_GET_CONTEXT( dummy );
-extern CPU_SET_CONTEXT( dummy );
-
 
 /***************************************************************************
     INLINE FUNCTIONS

src/emu/validity.c

@@ -757,9 +757,7 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p
 		}
 
 		/* check the CPU for incompleteness */
-		if (cputype_get_info_fct(cpu->type, CPUINFO_PTR_GET_CONTEXT) == NULL ||
+		if (cputype_get_info_fct(cpu->type, CPUINFO_PTR_RESET) == NULL ||
-			cputype_get_info_fct(cpu->type, CPUINFO_PTR_SET_CONTEXT) == NULL ||
-			cputype_get_info_fct(cpu->type, CPUINFO_PTR_RESET) == NULL ||
 			cputype_get_info_fct(cpu->type, CPUINFO_PTR_EXECUTE) == NULL)
 		{
 			mame_printf_error("%s: %s uses an incomplete CPU\n", driver->source_file, driver->name);