diff --git a/src/devices/cpu/sparc/sparc.cpp b/src/devices/cpu/sparc/sparc.cpp
index 48ad8c98816..8fecf92604a 100644
--- a/src/devices/cpu/sparc/sparc.cpp
+++ b/src/devices/cpu/sparc/sparc.cpp
@@ -2077,14 +2077,6 @@ bool sparcv7_device::execute_extra_group2(uint32_t op)
 {
 	switch (OP3)
 	{
-		case OP3_TADDCCTV:
-			execute_taddcc(op);
-			return true;
-
-		case OP3_TSUBCCTV:
-			execute_tsubcc(op);
-			return true;
-
 		default:
 			return false;
 	}
@@ -2148,6 +2140,12 @@ bool mb86930_device::execute_extra_group2(uint32_t op)
 			execute_scan(op);
 			return true;
 
+		case OP3_UMUL:
+		case OP3_SMUL:
+		case OP3_UMULCC:
+		case OP3_SMULCC:
+			return sparcv8_device::execute_extra_group2(op);
+
 		default:
 			return false;
 	}
@@ -3123,7 +3121,6 @@ void sparc_base_device::execute_ldstub(uint32_t op)
 		}
 	}
 
-	uint32_t data(0);
 	//while (m_pb_block_ldst_byte || m_pb_block_ldst_word)
 	//{
 		// { wait for lock(s) to be lifted }
@@ -3134,7 +3131,7 @@ void sparc_base_device::execute_ldstub(uint32_t op)
 	m_pb_block_ldst_byte = 1;
 
 	static const uint32_t mask8[4] = { 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff };
-	data = read_word(addr_space, address, mask8[address & 3]);
+	uint32_t data = read_word(addr_space, address, mask8[address & 3]);
 
 	if (MAE)
 	{
diff --git a/src/devices/cpu/sparc/sparcdefs.h b/src/devices/cpu/sparc/sparcdefs.h
index 6b31cfe796b..fd90b065ed8 100644
--- a/src/devices/cpu/sparc/sparcdefs.h
+++ b/src/devices/cpu/sparc/sparcdefs.h
@@ -207,7 +207,6 @@
 #define OP3_SDIVCC  31
 #define OP3_TADDCC  32
 #define OP3_TSUBCC  33
-#define OP3_SCAN    34
 #define OP3_TADDCCTV    34
 #define OP3_TSUBCCTV    35
 #define OP3_MULSCC  36
@@ -218,6 +217,7 @@
 #define OP3_RDPSR   41
 #define OP3_RDWIM   42
 #define OP3_RDTBR   43
+#define OP3_SCAN    44
 #define OP3_WRASR   48
 #define OP3_WRPSR   49
 #define OP3_WRWIM   50