move sh2 / sh4 to a folder called superh

scripts/src/cpu.lua

@@ -13,7 +13,7 @@
 -- Dynamic recompiler objects
 --------------------------------------------------
 
-if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null) then
+if (CPUS["SUPERH"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/drcbec.cpp",
 		MAME_DIR .. "src/devices/cpu/drcbec.h",
@@ -636,54 +636,42 @@ if (CPUS["HMCS40"]~=null or _OPTIONS["with-tools"]) then
 end
 
 --------------------------------------------------
--- Hitachi SH1/SH2
---@src/devices/cpu/sh2/sh2.h,CPUS["SH2"] = true
+-- Hitachi SuperH series (SH1/SH2/SH3/SH4)
+--@src/devices/cpu/superh/sh2.h,CPUS["SUPERH"] = true
+--@src/devices/cpu/superh/sh4.h,CPUS["SUPERH"] = true
 --------------------------------------------------
 
-if (CPUS["SH2"]~=null) then
+if (CPUS["SUPERH"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sh2/sh2.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh2.h",
-		MAME_DIR .. "src/devices/cpu/sh2/sh2comn.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh2comn.h",
-		MAME_DIR .. "src/devices/cpu/sh2/sh2fe.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.h",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_sci.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_sci.h",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.cpp",
-		MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.h",
-		--MAME_DIR .. "src/devices/cpu/sh2/sh2drc.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh2.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh2.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh2comn.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh2comn.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh2fe.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_bus.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_bus.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_sci.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_sci.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_wdt.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh7604_wdt.h",
+		--MAME_DIR .. "src/devices/cpu/superh/sh2drc.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh4.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh4.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh4comn.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh4comn.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh3comn.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh3comn.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh4tmu.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh4tmu.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh4dmac.cpp",
+		MAME_DIR .. "src/devices/cpu/superh/sh4dmac.h",
+		MAME_DIR .. "src/devices/cpu/superh/sh4regs.h",		
 	}
 end
 
-if (CPUS["SH2"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh2/sh2dasm.cpp")
-end
-
---------------------------------------------------
--- Hitachi SH4
---@src/devices/cpu/sh4/sh4.h,CPUS["SH4"] = true
---------------------------------------------------
-
-if (CPUS["SH4"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/cpu/sh4/sh4.cpp",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4comn.cpp",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4comn.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh3comn.cpp",
-		MAME_DIR .. "src/devices/cpu/sh4/sh3comn.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.cpp",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.cpp",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4regs.h",
-	}
-end
-
-if (CPUS["SH4"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh4/sh4dasm.cpp")
+if (CPUS["SUPERH"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/superh/sh2dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/superh/sh4dasm.cpp")
 end
 
 --------------------------------------------------
@@ -948,7 +936,7 @@ if (CPUS["I86"]~=null) then
 	}
 end
 
-if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then
+if (CPUS["SUPERH"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.h")
 end

scripts/target/mame/arcade.lua

@@ -60,8 +60,7 @@ CPUS["ESRIP"] = true
 CPUS["MIPS"] = true
 CPUS["R3000"] = true
 CPUS["PSX"] = true
-CPUS["SH2"] = true
-CPUS["SH4"] = true
+CPUS["SUPERH"] = true
 CPUS["DSP16A"] = true
 CPUS["DSP32C"] = true
 CPUS["PIC16C5X"] = true

scripts/target/mame/mess.lua

@@ -60,8 +60,7 @@ CPUS["ESRIP"] = true
 CPUS["MIPS"] = true
 CPUS["R3000"] = true
 CPUS["PSX"] = true
-CPUS["SH2"] = true
-CPUS["SH4"] = true
+CPUS["SUPERH"] = true
 CPUS["DSP16A"] = true
 CPUS["DSP32C"] = true
 CPUS["PIC16C5X"] = true

src/mame/drivers/alien.cpp

@@ -24,7 +24,7 @@
 
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "screen.h"
 #include "speaker.h"
 

src/mame/drivers/aristmk6.cpp

@@ -26,7 +26,7 @@ notes:
 */
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "machine/ins8250.h"
 #include "machine/eepromser.h"
 #include "screen.h"

src/mame/drivers/atvtrack.cpp

@@ -101,7 +101,7 @@ TODO:
 */
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "debugger.h"
 #include "screen.h"
 

src/mame/drivers/casloopy.cpp

@@ -150,7 +150,7 @@ PCB 'Z545-1 A240570-1'
 ******************************************************************************/
 
 #include "emu.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
 #include "screen.h"

src/mame/drivers/coolridr.cpp

@@ -283,7 +283,7 @@ to the same bank as defined through A20.
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/nvram.h"
 #include "machine/timer.h"
 #include "sound/scsp.h"

src/mame/drivers/cps3.cpp

@@ -460,7 +460,7 @@ hardware modification to the security cart.....
 
 #include "emu.h"
 #include "cdrom.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/intelfsh.h"
 #include "machine/nvram.h"
 #include "includes/cps3.h"

src/mame/drivers/cv1k.cpp

@@ -173,8 +173,8 @@ Blitter Timing
 
 #include "emu.h"
 
-#include "cpu/sh4/sh3comn.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh3comn.h"
+#include "cpu/superh/sh4.h"
 #include "machine/rtc9701.h"
 #include "machine/serflash.h"
 #include "sound/ymz770.h"

src/mame/drivers/dccons.cpp

@@ -265,7 +265,7 @@
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "imagedev/chd_cd.h"
 #include "machine/aicartc.h"
 #include "machine/dc-ctrl.h"

src/mame/drivers/deco_mlc.cpp

@@ -105,7 +105,7 @@
 #include "machine/deco156.h"
 #include "machine/eepromser.h"
 #include "cpu/arm/arm.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "speaker.h"
 
 

src/mame/drivers/feversoc.cpp

@@ -66,7 +66,7 @@ U0564 LH28F800SU OBJ4-1
 *******************************************************************************************/
 
 #include "emu.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/seibuspi.h"
 #include "sound/okim6295.h"
 #include "machine/eepromser.h"

src/mame/drivers/hideseek.cpp

@@ -27,7 +27,7 @@ Other stuff: NEC D4992 (RTC?) and xtal possibly 32.768kHz, 3V coin battery, 93L4
 
 
 #include "emu.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "screen.h"
 #include "speaker.h"
 

src/mame/drivers/hikaru.cpp

@@ -382,7 +382,7 @@ Notes:
 */
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "screen.h"
 
 

src/mame/drivers/namcos23.cpp

@@ -1258,7 +1258,7 @@ Notes:
 #include "cpu/h8/h83002.h"
 #include "cpu/h8/h83337.h"
 #include "cpu/mips/mips3.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/namco_settings.h"
 #include "machine/nvram.h"
 #include "machine/rtc4543.h"

src/mame/drivers/psikyosh.cpp

@@ -276,7 +276,7 @@ Notes:
 #include "emu.h"
 #include "includes/psikyosh.h"
 
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/eepromser.h"
 #include "machine/watchdog.h"
 #include "sound/ymf278b.h"

src/mame/drivers/saturn.cpp

@@ -427,7 +427,7 @@ test1f diagnostic hacks:
 
 #include "cpu/m68000/m68000.h"
 #include "cpu/scudsp/scudsp.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "imagedev/chd_cd.h"
 #include "machine/eepromser.h"
 #include "machine/nvram.h"

src/mame/drivers/segasp.cpp

@@ -74,7 +74,7 @@ G  171-8278G  315-6416  2x 512Mbit  RMI
 */
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "debugger.h"
 #include "includes/segasp.h"
 #include "machine/naomim4.h"

src/mame/drivers/sh4robot.cpp

@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 
 class sh4robot_state : public driver_device
 {

src/mame/drivers/stv.cpp

@@ -40,7 +40,7 @@
 
 #include "cpu/m68000/m68000.h"
 #include "cpu/scudsp/scudsp.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "imagedev/chd_cd.h"
 #include "machine/eepromser.h"
 #include "machine/smpc.h"

src/mame/drivers/suprnova.cpp

@@ -149,7 +149,7 @@ NEP-16
 #include "emu.h"
 #include "includes/suprnova.h"
 
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "machine/msm6242.h"
 #include "machine/nvram.h"
 #include "sound/ymz280b.h"

src/mame/includes/cps3.h

@@ -7,7 +7,7 @@
 ****************************************************************************/
 
 #include "machine/intelfsh.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "audio/cps3.h"
 
 

src/mame/includes/naomi.h

@@ -19,7 +19,7 @@ naomi.h -> NAOMI includes
 #include "machine/naomim2.h"
 #include "machine/naomim4.h"
 #include "machine/awboard.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "cpu/arm7/arm7core.h"
 #include "sound/aica.h"
 #include "machine/aicartc.h"

src/mame/includes/psikyo4.h

@@ -6,7 +6,7 @@
 
 *************************************************************************/
 
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "sound/ymf278b.h"
 #include "machine/eepromser.h"
 #include "screen.h"

src/mame/includes/psikyosh.h

@@ -2,7 +2,7 @@
 // copyright-holders:David Haywood, Paul Priest
 #include "video/bufsprite.h"
 #include "machine/eepromser.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "screen.h"
 
 

src/mame/includes/saturn.h

@@ -7,7 +7,7 @@
 #include "cpu/m68000/m68000.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/scudsp/scudsp.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 
 #include "bus/sat_ctrl/ctrl.h"
 

src/mame/includes/suprnova.h

@@ -4,7 +4,7 @@
 #include "machine/timer.h"
 #include "video/sknsspr.h"
 
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 
 
 struct hit_t

src/mame/machine/dc.cpp

@@ -9,7 +9,7 @@
 #include "emu.h"
 #include "debugger.h"
 #include "includes/dc.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "cpu/arm7/arm7core.h"
 #include "machine/mie.h"
 #include "machine/naomig1.h"

src/mame/machine/dccons.cpp

@@ -22,7 +22,7 @@
 #include "cdrom.h"
 #include "debugger.h"
 #include "includes/dc.h"
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "sound/aica.h"
 #include "includes/dccons.h"
 

src/mame/machine/maple-dc.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 
 #define MCFG_MAPLE_DC_ADD(_tag, _maincpu_tag, _irq_cb)  \
 	MCFG_DEVICE_ADD(_tag, MAPLE_DC, 0) \

src/mame/machine/mega32x.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "cpu/sh2/sh2.h"
-#include "cpu/sh2/sh2comn.h"
+#include "cpu/superh/sh2.h"
+#include "cpu/superh/sh2comn.h"
 #include "sound/dac.h"
 
 class sega_32x_device : public device_t

src/mame/machine/naomig1.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 
 #define MCFG_NAOMI_G1_ADD(_tag, type, _irq_cb)                          \
 	MCFG_DEVICE_ADD(_tag, type, 0)                                      \

src/mame/machine/saturn.cpp

@@ -45,7 +45,7 @@
 
 #include "emu.h"
 #include "includes/saturn.h"
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 #include "cpu/scudsp/scudsp.h"
 
 /* TODO: do this in a verboselog style */

src/mame/machine/saturn_cdb.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "cpu/sh2/sh2.h"
+#include "cpu/superh/sh2.h"
 
 DECLARE_DEVICE_TYPE(SATURN_CDB, saturn_cdb_device)
 

src/mame/video/powervr2.cpp

@@ -8,7 +8,7 @@
 #include "powervr2.h"
 #include "includes/dc.h"
 
-#include "cpu/sh4/sh4.h"
+#include "cpu/superh/sh4.h"
 #include "video/rgbutil.h"
 #include "rendutil.h"