From a47d3f01fa7ddf29ea3fbc6da18de0c50687a185 Mon Sep 17 00:00:00 2001
From: Fabio Priuli <etabeta78@users.noreply.github.com>
Date: Sat, 11 Apr 2009 14:06:24 +0000
Subject: [PATCH] Fixed CPU_GET_INFO issues spotted by -validate in MESS debug
 build

---
 src/emu/cpu/i86/i286.c    | 2 +-
 src/emu/cpu/m6502/m4510.c | 2 +-
 src/emu/cpu/m6502/m6509.c | 2 +-
 src/emu/cpu/v30mz/v30mz.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index 553d54dc28a..07403ea0c6f 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -377,7 +377,7 @@ static CPU_SET_INFO( i80286 )
 
 CPU_GET_INFO( i80286 )
 {
-	i80286_state *cpustate = (device != NULL) ? get_safe_token(device) : NULL;
+	i80286_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
 
 	switch (state)
 	{
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index c2cf3d7ae70..72aeb79a3a0 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -443,7 +443,7 @@ static CPU_SET_INFO( m4510 )
 
 CPU_GET_INFO( m4510 )
 {
-	m4510_Regs *cpustate = (device != NULL && device != NULL) ? get_safe_token(device) : NULL;
+	m4510_Regs *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
 
 	switch (state)
 	{
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index de80b6b1e87..67d957b9306 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -324,7 +324,7 @@ static CPU_SET_INFO( m6509 )
 
 CPU_GET_INFO( m6509 )
 {
-	m6509_Regs *cpustate = (device != NULL && device != NULL) ? get_safe_token(device) : NULL;
+	m6509_Regs *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
 
 	switch (state)
 	{
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index 019f17ec40f..2652ff328fd 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -1042,7 +1042,7 @@ static CPU_SET_INFO( nec )
 
 CPU_GET_INFO( v30mz )
 {
-	v30mz_state *cpustate = (device != NULL && device != NULL) ? get_safe_token(device) : NULL;
+	v30mz_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
 	int flags;
 
 	switch (state)