diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index ce9a7d8efd9..50ef91c792f 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -548,14 +548,9 @@ static void set_irq_line(adsp2100_state *adsp, int irqline, int state)
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( adsp21xx )
-{
-}
+static CPU_GET_CONTEXT( adsp21xx ) { }
 
-
-static CPU_SET_CONTEXT( adsp21xx )
-{
-}
+static CPU_SET_CONTEXT( adsp21xx ) { }
 
 
 
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 24e9f33a65c..51154389486 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -117,13 +117,9 @@ static void set_irq_line(arm_state *cpustate, int irqline, int state)
     arm7_core_set_irq_line(cpustate, irqline, state);
 }
 
-static CPU_GET_CONTEXT( arm7 )
-{
-}
+static CPU_GET_CONTEXT( arm7 ) { }
 
-static CPU_SET_CONTEXT( arm7 )
-{
-}
+static CPU_SET_CONTEXT( arm7 ) { }
 
 static CPU_DISASSEMBLE( arm7 )
 {
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index 6a2212f1451..7ef6479e029 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -392,14 +392,10 @@ static void set_irq_line(asap_state *asap, int irqline, int state)
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( asap )
-{
-}
+static CPU_GET_CONTEXT( asap ) { }
 
 
-static CPU_SET_CONTEXT( asap )
-{
-}
+static CPU_SET_CONTEXT( asap ) { }
 
 
 
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index 5c3876acdcd..5500752812e 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -94,14 +94,10 @@ do { \
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( ccpu )
-{
-}
+static CPU_GET_CONTEXT( ccpu ) { }
 
 
-static CPU_SET_CONTEXT( ccpu )
-{
-}
+static CPU_SET_CONTEXT( ccpu ) { }
 
 
 
diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c
index ee640dbb242..842aafdb0ad 100644
--- a/src/emu/cpu/cdp1802/cdp1802.c
+++ b/src/emu/cpu/cdp1802/cdp1802.c
@@ -926,13 +926,9 @@ static CPU_INIT( cdp1802 )
 	state_save_register_item("cdp1802", device->tag, 0, cpustate->ef);
 }
 
-static CPU_GET_CONTEXT( cdp1802 )
-{
-}
+static CPU_GET_CONTEXT( cdp1802 ) { }
 
-static CPU_SET_CONTEXT( cdp1802 )
-{
-}
+static CPU_SET_CONTEXT( cdp1802 ) { }
 
 /**************************************************************************
  * Generic set_info
diff --git a/src/emu/cpu/cop400/cop410.c b/src/emu/cpu/cop400/cop410.c
index ed4f8b4dca5..8134cd6af4b 100644
--- a/src/emu/cpu/cop400/cop410.c
+++ b/src/emu/cpu/cop400/cop410.c
@@ -350,16 +350,12 @@ static CPU_EXECUTE( cop410 )
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( cop410 )
-{
-}
+static CPU_GET_CONTEXT( cop410 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( cop410 )
-{
-}
+static CPU_SET_CONTEXT( cop410 ) { }
 
 /**************************************************************************
  * Validity check
diff --git a/src/emu/cpu/cop400/cop420.c b/src/emu/cpu/cop400/cop420.c
index 7e8ae5b0562..39dfcf653b0 100644
--- a/src/emu/cpu/cop400/cop420.c
+++ b/src/emu/cpu/cop400/cop420.c
@@ -419,16 +419,12 @@ static CPU_EXECUTE( cop420 )
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( cop420 )
-{
-}
+static CPU_GET_CONTEXT( cop420 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( cop420 )
-{
-}
+static CPU_SET_CONTEXT( cop420 ) { }
 
 /**************************************************************************
  * Validity check
diff --git a/src/emu/cpu/cop400/cop440.c b/src/emu/cpu/cop400/cop440.c
index 8a9e572e03f..55274b61470 100644
--- a/src/emu/cpu/cop400/cop440.c
+++ b/src/emu/cpu/cop400/cop440.c
@@ -454,16 +454,12 @@ static CPU_EXECUTE( cop444 )
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( cop444 )
-{
-}
+static CPU_GET_CONTEXT( cop444 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( cop444 )
-{
-}
+static CPU_SET_CONTEXT( cop444 ) { }
 
 /**************************************************************************
  * Validity check
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 7685ab69c0e..32c2fa34f8b 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -276,7 +276,7 @@ INLINE void invalid_instruction(UINT32 op)
 ***************************************************************************/
 static void check_irqs(void)
 {
-	logerror("Dsp56k check irqs\n");
+	//logerror("Dsp56k check irqs\n");
 }
 
 static void set_irq_line(int irqline, int state)
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index 227ba430edd..cad9abd1f41 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -1714,13 +1714,9 @@ static CPU_EXIT( hyperstone )
 	// nothing to do
 }
 
-static CPU_GET_CONTEXT( hyperstone )
-{
-}
+static CPU_GET_CONTEXT( hyperstone ) { }
 
-static CPU_SET_CONTEXT( hyperstone )
-{
-}
+static CPU_SET_CONTEXT( hyperstone ) { }
 
 static CPU_DISASSEMBLE( hyperstone )
 {
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index 6d3d6566f05..cfee8240a03 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -241,14 +241,10 @@ static CPU_EXECUTE( g65816 )
 
 
 /* Get the current CPU context */
-static CPU_GET_CONTEXT( g65816 )
-{
-}
+static CPU_GET_CONTEXT( g65816 ) { }
 
 /* Set the current CPU context */
-static CPU_SET_CONTEXT( g65816 )
-{
-}
+static CPU_SET_CONTEXT( g65816 ) { }
 
 /* Get the current Program Counter */
 static unsigned g65816_get_pc(g65816i_cpu_struct *cpustate)
diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c
index 1cf02227094..7449f1df4c1 100644
--- a/src/emu/cpu/h83002/h8_16.c
+++ b/src/emu/cpu/h83002/h8_16.c
@@ -358,13 +358,9 @@ static void h8_check_irqs(h83xx_state *h8)
 
 // MAME interface stuff
 
-static CPU_GET_CONTEXT( h8 )
-{
-}
+static CPU_GET_CONTEXT( h8 ) { }
 
-static CPU_SET_CONTEXT( h8 )
-{
-}
+static CPU_SET_CONTEXT( h8 ) { }
 
 static CPU_SET_INFO( h8 )
 {
diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c
index f4bc54d1566..7955acec76f 100644
--- a/src/emu/cpu/h83002/h8_8.c
+++ b/src/emu/cpu/h83002/h8_8.c
@@ -349,13 +349,9 @@ static void h8_check_irqs(h83xx_state *h8)
 
 // MAME interface stuff
 
-static CPU_GET_CONTEXT( h8 )
-{
-}
+static CPU_GET_CONTEXT( h8 ) { }
 
-static CPU_SET_CONTEXT( h8 )
-{
-}
+static CPU_SET_CONTEXT( h8 ) { }
 
 static CPU_SET_INFO( h8 )
 {
diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c
index 133b2750757..91eb82120c4 100644
--- a/src/emu/cpu/hd6309/hd6309.c
+++ b/src/emu/cpu/hd6309/hd6309.c
@@ -497,16 +497,12 @@ static void check_irq_lines( m68_state_t *m68_state )
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( hd6309 )
-{
-}
+static CPU_GET_CONTEXT( hd6309 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( hd6309 )
-{
-}
+static CPU_SET_CONTEXT( hd6309 ) { }
 
 static STATE_POSTLOAD( hd6309_postload )
 {
diff --git a/src/emu/cpu/i8x41/i8x41.c b/src/emu/cpu/i8x41/i8x41.c
index 79fabec9a31..0d742516f54 100644
--- a/src/emu/cpu/i8x41/i8x41.c
+++ b/src/emu/cpu/i8x41/i8x41.c
@@ -1012,18 +1012,14 @@ static CPU_EXECUTE( i8x41 )
  *  Get all registers in given buffer
  ****************************************************************************/
 
-static CPU_GET_CONTEXT( i8x41 )
-{
-}
+static CPU_GET_CONTEXT( i8x41 ) { }
 
 
 /****************************************************************************
  *  Set all registers to given values
  ****************************************************************************/
 
-static CPU_SET_CONTEXT( i8x41 )
-{
-}
+static CPU_SET_CONTEXT( i8x41 ) { }
 
 /****************************************************************************
  *  Set IRQ line state
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index 75f2514c79d..97f078c1b1f 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -1958,13 +1958,9 @@ static CPU_EXECUTE( i960 )
 	return cycles - i960->icount;
 }
 
-static CPU_GET_CONTEXT( i960 )
-{
-}
+static CPU_GET_CONTEXT( i960 ) { }
 
-static CPU_SET_CONTEXT( i960 )
-{
-}
+static CPU_SET_CONTEXT( i960 ) { }
 
 static void set_irq_line(i960_state_t *i960, int irqline, int state)
 {
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index a6c89ffcf9e..8171c3193eb 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -344,14 +344,9 @@ static void set_irq_line(jaguar_state *jaguar, int irqline, int state)
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( jaguar )
-{
-}
+static CPU_GET_CONTEXT( jaguar ) { }
 
-
-static CPU_SET_CONTEXT( jaguar )
-{
-}
+static CPU_SET_CONTEXT( jaguar ) { }
 
 
 /***************************************************************************
diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c
index 4979fc71ae1..029928d82c5 100644
--- a/src/emu/cpu/m37710/m37710.c
+++ b/src/emu/cpu/m37710/m37710.c
@@ -860,14 +860,10 @@ static CPU_EXECUTE( m37710 )
 
 
 /* Get the current CPU context */
-static CPU_GET_CONTEXT( m37710 )
-{
-}
+static CPU_GET_CONTEXT( m37710 ) { }
 
 /* Set the current CPU context */
-static CPU_SET_CONTEXT( m37710 )
-{
-}
+static CPU_SET_CONTEXT( m37710 ) { }
 
 /* Set the Program Counter */
 static void m37710_set_pc(m37710i_cpu_struct *cpustate, unsigned val)
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index efc13276905..aeac8353812 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -129,13 +129,9 @@ static CPU_EXIT( m65ce02 )
 	/* nothing to do yet */
 }
 
-static CPU_GET_CONTEXT( m65ce02 )
-{
-}
+static CPU_GET_CONTEXT( m65ce02 ) { }
 
-static CPU_SET_CONTEXT( m65ce02 )
-{
-}
+static CPU_SET_CONTEXT( m65ce02 ) { }
 
 INLINE void m65ce02_take_irq(m65ce02_Regs *cpustate)
 {
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index dc3fb6f1fdf..5771c82c616 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -572,13 +572,9 @@ static CPU_RESET( m68k )
 	m68k->run_mode = RUN_MODE_NORMAL;
 }
 
-static CPU_GET_CONTEXT( m68k )
-{
-}
+static CPU_GET_CONTEXT( m68k ) { }
 
-static CPU_SET_CONTEXT( m68k )
-{
-}
+static CPU_SET_CONTEXT( m68k ) { }
 
 static CPU_DISASSEMBLE( m68k )
 {
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 13f2752a13d..da2931a248e 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -358,16 +358,12 @@ static void check_irq_lines(m68_state_t *m68_state)
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( m6809 )
-{
-}
+static CPU_GET_CONTEXT( m6809 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( m6809 )
-{
-}
+static CPU_SET_CONTEXT( m6809 ) { }
 
 
 /****************************************************************************/
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index 969ba6500eb..d69e1f6f70a 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -989,9 +989,7 @@ ADDRESS_MAP_END
     destination
 -------------------------------------------------*/
 
-static CPU_GET_CONTEXT( mcs48 )
-{
-}
+static CPU_GET_CONTEXT( mcs48 ) { }
 
 
 /*-------------------------------------------------
@@ -999,9 +997,7 @@ static CPU_GET_CONTEXT( mcs48 )
     from the source
 -------------------------------------------------*/
 
-static CPU_SET_CONTEXT( mcs48 )
-{
-}
+static CPU_SET_CONTEXT( mcs48 ) { }
 
 
 /*-------------------------------------------------
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c
index 69075d91f20..22180ba8361 100644
--- a/src/emu/cpu/mcs51/mcs51.c
+++ b/src/emu/cpu/mcs51/mcs51.c
@@ -2414,13 +2414,9 @@ ADDRESS_MAP_END
     GENERAL CONTEXT ACCESS
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( mcs51 )
-{
-}
+static CPU_GET_CONTEXT( mcs51 ) { }
 
-static CPU_SET_CONTEXT( mcs51 )
-{
-}
+static CPU_SET_CONTEXT( mcs51 ) { }
 
 /**************************************************************************
  * Generic set_info
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 42e76962380..97b8a02a12d 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -211,14 +211,9 @@ static CPU_BURN( minx )
 }
 
 
-static CPU_SET_CONTEXT( minx )
-{
-}
+static CPU_GET_CONTEXT( minx ) { }
 
-
-static CPU_GET_CONTEXT( minx )
-{
-}
+static CPU_SET_CONTEXT( minx ) { }
 
 
 static unsigned minx_get_reg( int regnum )
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index 3633cb3cd35..1ae5202f43e 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -2835,13 +2835,9 @@ static CPU_EXECUTE( psxcpu )
 	return cycles - psxcpu->icount;
 }
 
-static CPU_GET_CONTEXT( psxcpu )
-{
-}
+static CPU_GET_CONTEXT( psxcpu ) { }
 
-static CPU_SET_CONTEXT( psxcpu )
-{
-}
+static CPU_SET_CONTEXT( psxcpu ) { }
 
 static void set_irq_line( psxcpu_state *psxcpu, int irqline, int state )
 {
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 7b5ea0fab50..b987c5bb28c 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -284,14 +284,10 @@ static void set_irq_line(r3000_state *r3000, int irqline, int state)
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( r3000 )
-{
-}
+static CPU_GET_CONTEXT( r3000 ) { }
 
 
-static CPU_SET_CONTEXT( r3000 )
-{
-}
+static CPU_SET_CONTEXT( r3000 ) { }
 
 
 
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index fe0918214e5..dd6085c110a 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -1047,13 +1047,9 @@ static void i_invalid(nec_state_t *nec_state)
 
 /*****************************************************************************/
 
-static CPU_GET_CONTEXT( nec )
-{
-}
+static CPU_GET_CONTEXT( nec ) { }
 
-static CPU_SET_CONTEXT( nec )
-{
-}
+static CPU_SET_CONTEXT( nec ) { }
 
 static void set_irq_line(nec_state_t *nec_state, int irqline, int state)
 {
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index 1d8c25b04d8..9b557d79a83 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -806,13 +806,9 @@ static CPU_EXIT( s2650 )
 	/* nothing to do */
 }
 
-static CPU_GET_CONTEXT( s2650 )
-{
-}
+static CPU_GET_CONTEXT( s2650 ) { }
 
-static CPU_SET_CONTEXT( s2650 )
-{
-}
+static CPU_SET_CONTEXT( s2650 ) { }
 
 static void set_irq_line(s2650_regs *s2650c, int irqline, int state)
 {
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 5452dfb8964..ee8dd863c52 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -1793,13 +1793,9 @@ static CPU_EXIT( SE3208 )
 }
 
 
-static CPU_GET_CONTEXT( SE3208 )
-{
-}
+static CPU_GET_CONTEXT( SE3208 ) { }
 
-static CPU_SET_CONTEXT( SE3208 )
-{
-}
+static CPU_SET_CONTEXT( SE3208 ) { }
 
 static void set_irq_line(se3208_state_t *se3208_state, int line,int state)
 {
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index a74cc9a363d..375f2deb0fa 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -253,13 +253,9 @@ static CPU_BURN( sm8500 )
 	}
 }
 
-static CPU_SET_CONTEXT( sm8500 )
-{
-}
+static CPU_SET_CONTEXT( sm8500 ) { }
 
-static CPU_GET_CONTEXT( sm8500 )
-{
-}
+static CPU_GET_CONTEXT( sm8500 ) { }
 
 unsigned sm8500_get_reg( int regnum )
 {
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index a7e49b1cd4c..ec5c739ba46 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -1228,14 +1228,10 @@ CPU_EXIT( spc700 )
 
 
 /* Get the current CPU context */
-CPU_GET_CONTEXT( spc700 )
-{
-}
+CPU_GET_CONTEXT( spc700 ) { }
 
 /* Set the current CPU context */
-CPU_SET_CONTEXT( spc700 )
-{
-}
+CPU_SET_CONTEXT( spc700 ) { }
 
 /* Get the current Program Counter */
 unsigned spc700_get_pc(spc700i_cpu *cpustate)
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index 2abf5a30db6..c9376d84dfb 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -756,13 +756,9 @@ static CPU_EXECUTE( ssp1601 )
  * MAME interface
  **************************************************************************/
 
-static CPU_GET_CONTEXT( ssp1601 )
-{
-}
+static CPU_GET_CONTEXT( ssp1601 ) { }
 
-static CPU_SET_CONTEXT( ssp1601 )
-{
-}
+static CPU_SET_CONTEXT( ssp1601 ) { }
 
 static CPU_DISASSEMBLE( ssp1601 )
 {
diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c
index 57a965ad838..f42ee0ea587 100644
--- a/src/emu/cpu/t11/t11.c
+++ b/src/emu/cpu/t11/t11.c
@@ -242,9 +242,7 @@ static void t11_check_irqs(t11_state *cpustate)
  *
  *************************************/
 
-static CPU_GET_CONTEXT( t11 )
-{
-}
+static CPU_GET_CONTEXT( t11 ) { }
 
 
 
@@ -254,9 +252,7 @@ static CPU_GET_CONTEXT( t11 )
  *
  *************************************/
 
-static CPU_SET_CONTEXT( t11 )
-{
-}
+static CPU_SET_CONTEXT( t11 ) { }
 
 
 
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index ca9bb9b3b30..8ec95bd542c 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -357,14 +357,10 @@ static void set_irq_line(tms32031_state *tms, int irqline, int state)
     CONTEXT SWITCHING
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( tms32031 )
-{
-}
+static CPU_GET_CONTEXT( tms32031 ) { }
 
 
-static CPU_SET_CONTEXT( tms32031 )
-{
-}
+static CPU_SET_CONTEXT( tms32031 ) { }
 
 
 
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index cd79f4260b0..c80cd41e966 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -704,14 +704,10 @@ static CPU_EXIT( tms34010 )
     Get all registers in given buffer
 ***************************************************************************/
 
-static CPU_GET_CONTEXT( tms34010 )
-{
-}
+static CPU_GET_CONTEXT( tms34010 ) { }
 
 
-static CPU_GET_CONTEXT( tms34020 )
-{
-}
+static CPU_GET_CONTEXT( tms34020 ) { }
 
 
 
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index 750650ae413..704c0e78201 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -3487,16 +3487,12 @@ static CPU_BURN( z80 )
 /****************************************************************************
  * Get all registers in given buffer
  ****************************************************************************/
-static CPU_GET_CONTEXT( z80 )
-{
-}
+static CPU_GET_CONTEXT( z80 ) { }
 
 /****************************************************************************
  * Set all registers to given values
  ****************************************************************************/
-static CPU_SET_CONTEXT( z80 )
-{
-}
+static CPU_SET_CONTEXT( z80 ) { }
 
 /****************************************************************************
  * Set IRQ line state