diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index ff6ceb86ce1..0f204a6f09f 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -198,7 +198,8 @@ INLINE psxcpu_state *get_safe_token(const device_config *device)
 	assert(device != NULL);
 	assert(device->token != NULL);
 	assert(device->type == CPU);
-	assert(cpu_get_type(device) == CPU_PSXCPU);
+	assert(cpu_get_type(device) == CPU_PSXCPU ||
+		   cpu_get_type(device) == CPU_CXD8661R);
 	return (psxcpu_state *)device->token;
 }
 
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 3f31d989001..6b425fea362 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -127,7 +127,8 @@ INLINE tms32031_state *get_safe_token(const device_config *device)
 	assert(device != NULL);
 	assert(device->token != NULL);
 	assert(device->type == CPU);
-	assert(cpu_get_type(device) == CPU_TMS32031);
+	assert(cpu_get_type(device) == CPU_TMS32031 ||
+		   cpu_get_type(device) == CPU_TMS32032);
 	return (tms32031_state *)device->token;
 }