From 48aabf412269e49dca22546bb408d6e34a9c79b7 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 2 Oct 2017 17:31:38 +0100 Subject: [PATCH 1/2] move sh2 / sh4 to a folder called superh --- scripts/src/cpu.lua | 76 ++++++++----------- scripts/target/mame/arcade.lua | 3 +- scripts/target/mame/mess.lua | 3 +- src/devices/cpu/{sh2 => superh}/sh2.cpp | 0 src/devices/cpu/{sh2 => superh}/sh2.h | 0 src/devices/cpu/{sh2 => superh}/sh2comn.cpp | 0 src/devices/cpu/{sh2 => superh}/sh2comn.h | 0 src/devices/cpu/{sh2 => superh}/sh2dasm.cpp | 0 src/devices/cpu/{sh2 => superh}/sh2drc.cpp | 0 src/devices/cpu/{sh2 => superh}/sh2fe.cpp | 0 src/devices/cpu/{sh4 => superh}/sh3comn.cpp | 0 src/devices/cpu/{sh4 => superh}/sh3comn.h | 0 src/devices/cpu/{sh4 => superh}/sh4.cpp | 0 src/devices/cpu/{sh4 => superh}/sh4.h | 0 src/devices/cpu/{sh4 => superh}/sh4comn.cpp | 0 src/devices/cpu/{sh4 => superh}/sh4comn.h | 0 src/devices/cpu/{sh4 => superh}/sh4dasm.cpp | 0 src/devices/cpu/{sh4 => superh}/sh4dmac.cpp | 0 src/devices/cpu/{sh4 => superh}/sh4dmac.h | 0 src/devices/cpu/{sh4 => superh}/sh4regs.h | 0 src/devices/cpu/{sh4 => superh}/sh4tmu.cpp | 0 src/devices/cpu/{sh4 => superh}/sh4tmu.h | 0 .../cpu/{sh2 => superh}/sh7604_bus.cpp | 0 src/devices/cpu/{sh2 => superh}/sh7604_bus.h | 0 .../cpu/{sh2 => superh}/sh7604_sci.cpp | 0 src/devices/cpu/{sh2 => superh}/sh7604_sci.h | 0 .../cpu/{sh2 => superh}/sh7604_wdt.cpp | 0 src/devices/cpu/{sh2 => superh}/sh7604_wdt.h | 0 src/mame/drivers/alien.cpp | 2 +- src/mame/drivers/aristmk6.cpp | 2 +- src/mame/drivers/atvtrack.cpp | 2 +- src/mame/drivers/casloopy.cpp | 2 +- src/mame/drivers/coolridr.cpp | 2 +- src/mame/drivers/cps3.cpp | 2 +- src/mame/drivers/cv1k.cpp | 4 +- src/mame/drivers/dccons.cpp | 2 +- src/mame/drivers/deco_mlc.cpp | 2 +- src/mame/drivers/feversoc.cpp | 2 +- src/mame/drivers/hideseek.cpp | 2 +- src/mame/drivers/hikaru.cpp | 2 +- src/mame/drivers/namcos23.cpp | 2 +- src/mame/drivers/psikyosh.cpp | 2 +- src/mame/drivers/saturn.cpp | 2 +- src/mame/drivers/segasp.cpp | 2 +- src/mame/drivers/sh4robot.cpp | 2 +- src/mame/drivers/stv.cpp | 2 +- src/mame/drivers/suprnova.cpp | 2 +- src/mame/includes/cps3.h | 2 +- src/mame/includes/naomi.h | 2 +- src/mame/includes/psikyo4.h | 2 +- src/mame/includes/psikyosh.h | 2 +- src/mame/includes/saturn.h | 2 +- src/mame/includes/suprnova.h | 2 +- src/mame/machine/dc.cpp | 2 +- src/mame/machine/dccons.cpp | 2 +- src/mame/machine/maple-dc.h | 2 +- src/mame/machine/mega32x.h | 4 +- src/mame/machine/naomig1.h | 2 +- src/mame/machine/saturn.cpp | 2 +- src/mame/machine/saturn_cdb.h | 2 +- src/mame/video/powervr2.cpp | 2 +- 61 files changed, 69 insertions(+), 83 deletions(-) rename src/devices/cpu/{sh2 => superh}/sh2.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh2.h (100%) rename src/devices/cpu/{sh2 => superh}/sh2comn.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh2comn.h (100%) rename src/devices/cpu/{sh2 => superh}/sh2dasm.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh2drc.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh2fe.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh3comn.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh3comn.h (100%) rename src/devices/cpu/{sh4 => superh}/sh4.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh4.h (100%) rename src/devices/cpu/{sh4 => superh}/sh4comn.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh4comn.h (100%) rename src/devices/cpu/{sh4 => superh}/sh4dasm.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh4dmac.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh4dmac.h (100%) rename src/devices/cpu/{sh4 => superh}/sh4regs.h (100%) rename src/devices/cpu/{sh4 => superh}/sh4tmu.cpp (100%) rename src/devices/cpu/{sh4 => superh}/sh4tmu.h (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_bus.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_bus.h (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_sci.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_sci.h (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_wdt.cpp (100%) rename src/devices/cpu/{sh2 => superh}/sh7604_wdt.h (100%) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 7aa5963f9fd..bb5496f39f4 100644 --- a/scripts/src/cpu.lua +++ b/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 diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 41d7c9025e9..41966d3d130 100644 --- a/scripts/target/mame/arcade.lua +++ b/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 diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index a28ea4195de..71efe6c8cfb 100644 --- a/scripts/target/mame/mess.lua +++ b/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 diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/superh/sh2.cpp similarity index 100% rename from src/devices/cpu/sh2/sh2.cpp rename to src/devices/cpu/superh/sh2.cpp diff --git a/src/devices/cpu/sh2/sh2.h b/src/devices/cpu/superh/sh2.h similarity index 100% rename from src/devices/cpu/sh2/sh2.h rename to src/devices/cpu/superh/sh2.h diff --git a/src/devices/cpu/sh2/sh2comn.cpp b/src/devices/cpu/superh/sh2comn.cpp similarity index 100% rename from src/devices/cpu/sh2/sh2comn.cpp rename to src/devices/cpu/superh/sh2comn.cpp diff --git a/src/devices/cpu/sh2/sh2comn.h b/src/devices/cpu/superh/sh2comn.h similarity index 100% rename from src/devices/cpu/sh2/sh2comn.h rename to src/devices/cpu/superh/sh2comn.h diff --git a/src/devices/cpu/sh2/sh2dasm.cpp b/src/devices/cpu/superh/sh2dasm.cpp similarity index 100% rename from src/devices/cpu/sh2/sh2dasm.cpp rename to src/devices/cpu/superh/sh2dasm.cpp diff --git a/src/devices/cpu/sh2/sh2drc.cpp b/src/devices/cpu/superh/sh2drc.cpp similarity index 100% rename from src/devices/cpu/sh2/sh2drc.cpp rename to src/devices/cpu/superh/sh2drc.cpp diff --git a/src/devices/cpu/sh2/sh2fe.cpp b/src/devices/cpu/superh/sh2fe.cpp similarity index 100% rename from src/devices/cpu/sh2/sh2fe.cpp rename to src/devices/cpu/superh/sh2fe.cpp diff --git a/src/devices/cpu/sh4/sh3comn.cpp b/src/devices/cpu/superh/sh3comn.cpp similarity index 100% rename from src/devices/cpu/sh4/sh3comn.cpp rename to src/devices/cpu/superh/sh3comn.cpp diff --git a/src/devices/cpu/sh4/sh3comn.h b/src/devices/cpu/superh/sh3comn.h similarity index 100% rename from src/devices/cpu/sh4/sh3comn.h rename to src/devices/cpu/superh/sh3comn.h diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/superh/sh4.cpp similarity index 100% rename from src/devices/cpu/sh4/sh4.cpp rename to src/devices/cpu/superh/sh4.cpp diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/superh/sh4.h similarity index 100% rename from src/devices/cpu/sh4/sh4.h rename to src/devices/cpu/superh/sh4.h diff --git a/src/devices/cpu/sh4/sh4comn.cpp b/src/devices/cpu/superh/sh4comn.cpp similarity index 100% rename from src/devices/cpu/sh4/sh4comn.cpp rename to src/devices/cpu/superh/sh4comn.cpp diff --git a/src/devices/cpu/sh4/sh4comn.h b/src/devices/cpu/superh/sh4comn.h similarity index 100% rename from src/devices/cpu/sh4/sh4comn.h rename to src/devices/cpu/superh/sh4comn.h diff --git a/src/devices/cpu/sh4/sh4dasm.cpp b/src/devices/cpu/superh/sh4dasm.cpp similarity index 100% rename from src/devices/cpu/sh4/sh4dasm.cpp rename to src/devices/cpu/superh/sh4dasm.cpp diff --git a/src/devices/cpu/sh4/sh4dmac.cpp b/src/devices/cpu/superh/sh4dmac.cpp similarity index 100% rename from src/devices/cpu/sh4/sh4dmac.cpp rename to src/devices/cpu/superh/sh4dmac.cpp diff --git a/src/devices/cpu/sh4/sh4dmac.h b/src/devices/cpu/superh/sh4dmac.h similarity index 100% rename from src/devices/cpu/sh4/sh4dmac.h rename to src/devices/cpu/superh/sh4dmac.h diff --git a/src/devices/cpu/sh4/sh4regs.h b/src/devices/cpu/superh/sh4regs.h similarity index 100% rename from src/devices/cpu/sh4/sh4regs.h rename to src/devices/cpu/superh/sh4regs.h diff --git a/src/devices/cpu/sh4/sh4tmu.cpp b/src/devices/cpu/superh/sh4tmu.cpp similarity index 100% rename from src/devices/cpu/sh4/sh4tmu.cpp rename to src/devices/cpu/superh/sh4tmu.cpp diff --git a/src/devices/cpu/sh4/sh4tmu.h b/src/devices/cpu/superh/sh4tmu.h similarity index 100% rename from src/devices/cpu/sh4/sh4tmu.h rename to src/devices/cpu/superh/sh4tmu.h diff --git a/src/devices/cpu/sh2/sh7604_bus.cpp b/src/devices/cpu/superh/sh7604_bus.cpp similarity index 100% rename from src/devices/cpu/sh2/sh7604_bus.cpp rename to src/devices/cpu/superh/sh7604_bus.cpp diff --git a/src/devices/cpu/sh2/sh7604_bus.h b/src/devices/cpu/superh/sh7604_bus.h similarity index 100% rename from src/devices/cpu/sh2/sh7604_bus.h rename to src/devices/cpu/superh/sh7604_bus.h diff --git a/src/devices/cpu/sh2/sh7604_sci.cpp b/src/devices/cpu/superh/sh7604_sci.cpp similarity index 100% rename from src/devices/cpu/sh2/sh7604_sci.cpp rename to src/devices/cpu/superh/sh7604_sci.cpp diff --git a/src/devices/cpu/sh2/sh7604_sci.h b/src/devices/cpu/superh/sh7604_sci.h similarity index 100% rename from src/devices/cpu/sh2/sh7604_sci.h rename to src/devices/cpu/superh/sh7604_sci.h diff --git a/src/devices/cpu/sh2/sh7604_wdt.cpp b/src/devices/cpu/superh/sh7604_wdt.cpp similarity index 100% rename from src/devices/cpu/sh2/sh7604_wdt.cpp rename to src/devices/cpu/superh/sh7604_wdt.cpp diff --git a/src/devices/cpu/sh2/sh7604_wdt.h b/src/devices/cpu/superh/sh7604_wdt.h similarity index 100% rename from src/devices/cpu/sh2/sh7604_wdt.h rename to src/devices/cpu/superh/sh7604_wdt.h diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index 0ac18f4af80..280630ef6ab 100644 --- a/src/mame/drivers/alien.cpp +++ b/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" diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index e0f755d96f4..504367bdbee 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/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" diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 9b391a4d413..7dd3e3d97f2 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/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" diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 2c12c6257ec..16bd45937cc 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/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" diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index a8e4a628114..526b4f99a37 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/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" diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index e6e03478df9..72bd9d340ec 100644 --- a/src/mame/drivers/cps3.cpp +++ b/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" diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 50119e3ea2f..8e10b2cbc72 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/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" diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 383fdcf314d..9085567c08f 100644 --- a/src/mame/drivers/dccons.cpp +++ b/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" diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index 9fee581cfcc..615e5963dde 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/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" diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index b7a98d826c8..7baa7fc5b71 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/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" diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index cc98210c28c..461f574774b 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/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" diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 4cc23dd5807..3a567338f25 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/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" diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index df180fa507f..b1bf576e736 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/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" diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index ae60f086231..ad1ebcbf3db 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/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" diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index ec7929980ac..c4ba07dd2bb 100644 --- a/src/mame/drivers/saturn.cpp +++ b/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" diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index dc8d7d120db..75cb574ada1 100644 --- a/src/mame/drivers/segasp.cpp +++ b/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" diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp index 8f524ef10c7..7fb1df99e84 100644 --- a/src/mame/drivers/sh4robot.cpp +++ b/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 { diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index e274e3409d6..b2faac037cc 100644 --- a/src/mame/drivers/stv.cpp +++ b/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" diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 5d134e1143d..767e99d1804 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/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" diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 7c2ead7ca3d..a6beecdb470 100644 --- a/src/mame/includes/cps3.h +++ b/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" diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 5fa4de38c37..ac6a5623544 100644 --- a/src/mame/includes/naomi.h +++ b/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" diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 3801d81225f..3c59f163291 100644 --- a/src/mame/includes/psikyo4.h +++ b/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" diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 1daaa618d96..a112d52238f 100644 --- a/src/mame/includes/psikyosh.h +++ b/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" diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index e8ff0b7e85d..bcb83508d7f 100644 --- a/src/mame/includes/saturn.h +++ b/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" diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 8878f44cc06..66beb53e92f 100644 --- a/src/mame/includes/suprnova.h +++ b/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 diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index 59fff288941..9e7028b5027 100644 --- a/src/mame/machine/dc.cpp +++ b/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" diff --git a/src/mame/machine/dccons.cpp b/src/mame/machine/dccons.cpp index 0a281cc9f60..7e1dc48868c 100644 --- a/src/mame/machine/dccons.cpp +++ b/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" diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h index 8752c34cbce..be061bdda85 100644 --- a/src/mame/machine/maple-dc.h +++ b/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) \ diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h index 57a657b6b62..e1f8c0880c2 100644 --- a/src/mame/machine/mega32x.h +++ b/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 diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 0a4b6d066cc..14c5a1512db 100644 --- a/src/mame/machine/naomig1.h +++ b/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) \ diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index 561a6b350f7..484a536c64c 100644 --- a/src/mame/machine/saturn.cpp +++ b/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 */ diff --git a/src/mame/machine/saturn_cdb.h b/src/mame/machine/saturn_cdb.h index 6847ea184e6..3fe76ad9311 100644 --- a/src/mame/machine/saturn_cdb.h +++ b/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) diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index 97d40073350..98176f84575 100644 --- a/src/mame/video/powervr2.cpp +++ b/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" From c0ee79f3db1d019c74cd199a99398bb5a04065c5 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Mon, 2 Oct 2017 19:47:35 +0100 Subject: [PATCH 2/2] use 'sh' instead of 'superh' --- scripts/src/cpu.lua | 62 +++++++++---------- scripts/target/mame/arcade.lua | 2 +- scripts/target/mame/mess.lua | 2 +- src/devices/cpu/{superh => sh}/sh2.cpp | 0 src/devices/cpu/{superh => sh}/sh2.h | 0 src/devices/cpu/{superh => sh}/sh2comn.cpp | 0 src/devices/cpu/{superh => sh}/sh2comn.h | 0 src/devices/cpu/{superh => sh}/sh2dasm.cpp | 0 src/devices/cpu/{superh => sh}/sh2drc.cpp | 0 src/devices/cpu/{superh => sh}/sh2fe.cpp | 0 src/devices/cpu/{superh => sh}/sh3comn.cpp | 0 src/devices/cpu/{superh => sh}/sh3comn.h | 0 src/devices/cpu/{superh => sh}/sh4.cpp | 0 src/devices/cpu/{superh => sh}/sh4.h | 0 src/devices/cpu/{superh => sh}/sh4comn.cpp | 0 src/devices/cpu/{superh => sh}/sh4comn.h | 0 src/devices/cpu/{superh => sh}/sh4dasm.cpp | 0 src/devices/cpu/{superh => sh}/sh4dmac.cpp | 0 src/devices/cpu/{superh => sh}/sh4dmac.h | 0 src/devices/cpu/{superh => sh}/sh4regs.h | 0 src/devices/cpu/{superh => sh}/sh4tmu.cpp | 0 src/devices/cpu/{superh => sh}/sh4tmu.h | 0 src/devices/cpu/{superh => sh}/sh7604_bus.cpp | 0 src/devices/cpu/{superh => sh}/sh7604_bus.h | 0 src/devices/cpu/{superh => sh}/sh7604_sci.cpp | 0 src/devices/cpu/{superh => sh}/sh7604_sci.h | 0 src/devices/cpu/{superh => sh}/sh7604_wdt.cpp | 0 src/devices/cpu/{superh => sh}/sh7604_wdt.h | 0 src/mame/drivers/alien.cpp | 2 +- src/mame/drivers/aristmk6.cpp | 2 +- src/mame/drivers/atvtrack.cpp | 2 +- src/mame/drivers/casloopy.cpp | 2 +- src/mame/drivers/coolridr.cpp | 2 +- src/mame/drivers/cps3.cpp | 2 +- src/mame/drivers/cv1k.cpp | 4 +- src/mame/drivers/dccons.cpp | 2 +- src/mame/drivers/deco_mlc.cpp | 2 +- src/mame/drivers/feversoc.cpp | 2 +- src/mame/drivers/hideseek.cpp | 2 +- src/mame/drivers/hikaru.cpp | 2 +- src/mame/drivers/namcos23.cpp | 2 +- src/mame/drivers/psikyosh.cpp | 2 +- src/mame/drivers/saturn.cpp | 2 +- src/mame/drivers/segasp.cpp | 2 +- src/mame/drivers/sh4robot.cpp | 2 +- src/mame/drivers/stv.cpp | 2 +- src/mame/drivers/suprnova.cpp | 2 +- src/mame/includes/cps3.h | 2 +- src/mame/includes/naomi.h | 2 +- src/mame/includes/psikyo4.h | 2 +- src/mame/includes/psikyosh.h | 2 +- src/mame/includes/saturn.h | 2 +- src/mame/includes/suprnova.h | 2 +- src/mame/machine/dc.cpp | 2 +- src/mame/machine/dccons.cpp | 2 +- src/mame/machine/maple-dc.h | 2 +- src/mame/machine/mega32x.h | 4 +- src/mame/machine/naomig1.h | 2 +- src/mame/machine/saturn.cpp | 2 +- src/mame/machine/saturn_cdb.h | 2 +- src/mame/video/powervr2.cpp | 2 +- 61 files changed, 68 insertions(+), 68 deletions(-) rename src/devices/cpu/{superh => sh}/sh2.cpp (100%) rename src/devices/cpu/{superh => sh}/sh2.h (100%) rename src/devices/cpu/{superh => sh}/sh2comn.cpp (100%) rename src/devices/cpu/{superh => sh}/sh2comn.h (100%) rename src/devices/cpu/{superh => sh}/sh2dasm.cpp (100%) rename src/devices/cpu/{superh => sh}/sh2drc.cpp (100%) rename src/devices/cpu/{superh => sh}/sh2fe.cpp (100%) rename src/devices/cpu/{superh => sh}/sh3comn.cpp (100%) rename src/devices/cpu/{superh => sh}/sh3comn.h (100%) rename src/devices/cpu/{superh => sh}/sh4.cpp (100%) rename src/devices/cpu/{superh => sh}/sh4.h (100%) rename src/devices/cpu/{superh => sh}/sh4comn.cpp (100%) rename src/devices/cpu/{superh => sh}/sh4comn.h (100%) rename src/devices/cpu/{superh => sh}/sh4dasm.cpp (100%) rename src/devices/cpu/{superh => sh}/sh4dmac.cpp (100%) rename src/devices/cpu/{superh => sh}/sh4dmac.h (100%) rename src/devices/cpu/{superh => sh}/sh4regs.h (100%) rename src/devices/cpu/{superh => sh}/sh4tmu.cpp (100%) rename src/devices/cpu/{superh => sh}/sh4tmu.h (100%) rename src/devices/cpu/{superh => sh}/sh7604_bus.cpp (100%) rename src/devices/cpu/{superh => sh}/sh7604_bus.h (100%) rename src/devices/cpu/{superh => sh}/sh7604_sci.cpp (100%) rename src/devices/cpu/{superh => sh}/sh7604_sci.h (100%) rename src/devices/cpu/{superh => sh}/sh7604_wdt.cpp (100%) rename src/devices/cpu/{superh => sh}/sh7604_wdt.h (100%) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index bb5496f39f4..365aa3bd6bb 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -13,7 +13,7 @@ -- Dynamic recompiler objects -------------------------------------------------- -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 +if (CPUS["SH"]~=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", @@ -637,41 +637,41 @@ end -------------------------------------------------- -- 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 +--@src/devices/cpu/sh/sh2.h,CPUS["SH"] = true +--@src/devices/cpu/sh/sh4.h,CPUS["SH"] = true -------------------------------------------------- -if (CPUS["SUPERH"]~=null) then +if (CPUS["SH"]~=null) then files { - 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", + MAME_DIR .. "src/devices/cpu/sh/sh2.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh2.h", + MAME_DIR .. "src/devices/cpu/sh/sh2comn.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh2comn.h", + MAME_DIR .. "src/devices/cpu/sh/sh2fe.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh7604_bus.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh7604_bus.h", + MAME_DIR .. "src/devices/cpu/sh/sh7604_sci.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh7604_sci.h", + MAME_DIR .. "src/devices/cpu/sh/sh7604_wdt.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh7604_wdt.h", + --MAME_DIR .. "src/devices/cpu/sh/sh2drc.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh4.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh4.h", + MAME_DIR .. "src/devices/cpu/sh/sh4comn.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh4comn.h", + MAME_DIR .. "src/devices/cpu/sh/sh3comn.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh3comn.h", + MAME_DIR .. "src/devices/cpu/sh/sh4tmu.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh4tmu.h", + MAME_DIR .. "src/devices/cpu/sh/sh4dmac.cpp", + MAME_DIR .. "src/devices/cpu/sh/sh4dmac.h", + MAME_DIR .. "src/devices/cpu/sh/sh4regs.h", } end -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") +if (CPUS["SH"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh/sh2dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh/sh4dasm.cpp") end -------------------------------------------------- @@ -936,7 +936,7 @@ if (CPUS["I86"]~=null) then } end -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 +if (CPUS["SH"]~=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 diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 41966d3d130..e88f1d84b4b 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -60,7 +60,7 @@ CPUS["ESRIP"] = true CPUS["MIPS"] = true CPUS["R3000"] = true CPUS["PSX"] = true -CPUS["SUPERH"] = true +CPUS["SH"] = true CPUS["DSP16A"] = true CPUS["DSP32C"] = true CPUS["PIC16C5X"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 71efe6c8cfb..80f974121ba 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -60,7 +60,7 @@ CPUS["ESRIP"] = true CPUS["MIPS"] = true CPUS["R3000"] = true CPUS["PSX"] = true -CPUS["SUPERH"] = true +CPUS["SH"] = true CPUS["DSP16A"] = true CPUS["DSP32C"] = true CPUS["PIC16C5X"] = true diff --git a/src/devices/cpu/superh/sh2.cpp b/src/devices/cpu/sh/sh2.cpp similarity index 100% rename from src/devices/cpu/superh/sh2.cpp rename to src/devices/cpu/sh/sh2.cpp diff --git a/src/devices/cpu/superh/sh2.h b/src/devices/cpu/sh/sh2.h similarity index 100% rename from src/devices/cpu/superh/sh2.h rename to src/devices/cpu/sh/sh2.h diff --git a/src/devices/cpu/superh/sh2comn.cpp b/src/devices/cpu/sh/sh2comn.cpp similarity index 100% rename from src/devices/cpu/superh/sh2comn.cpp rename to src/devices/cpu/sh/sh2comn.cpp diff --git a/src/devices/cpu/superh/sh2comn.h b/src/devices/cpu/sh/sh2comn.h similarity index 100% rename from src/devices/cpu/superh/sh2comn.h rename to src/devices/cpu/sh/sh2comn.h diff --git a/src/devices/cpu/superh/sh2dasm.cpp b/src/devices/cpu/sh/sh2dasm.cpp similarity index 100% rename from src/devices/cpu/superh/sh2dasm.cpp rename to src/devices/cpu/sh/sh2dasm.cpp diff --git a/src/devices/cpu/superh/sh2drc.cpp b/src/devices/cpu/sh/sh2drc.cpp similarity index 100% rename from src/devices/cpu/superh/sh2drc.cpp rename to src/devices/cpu/sh/sh2drc.cpp diff --git a/src/devices/cpu/superh/sh2fe.cpp b/src/devices/cpu/sh/sh2fe.cpp similarity index 100% rename from src/devices/cpu/superh/sh2fe.cpp rename to src/devices/cpu/sh/sh2fe.cpp diff --git a/src/devices/cpu/superh/sh3comn.cpp b/src/devices/cpu/sh/sh3comn.cpp similarity index 100% rename from src/devices/cpu/superh/sh3comn.cpp rename to src/devices/cpu/sh/sh3comn.cpp diff --git a/src/devices/cpu/superh/sh3comn.h b/src/devices/cpu/sh/sh3comn.h similarity index 100% rename from src/devices/cpu/superh/sh3comn.h rename to src/devices/cpu/sh/sh3comn.h diff --git a/src/devices/cpu/superh/sh4.cpp b/src/devices/cpu/sh/sh4.cpp similarity index 100% rename from src/devices/cpu/superh/sh4.cpp rename to src/devices/cpu/sh/sh4.cpp diff --git a/src/devices/cpu/superh/sh4.h b/src/devices/cpu/sh/sh4.h similarity index 100% rename from src/devices/cpu/superh/sh4.h rename to src/devices/cpu/sh/sh4.h diff --git a/src/devices/cpu/superh/sh4comn.cpp b/src/devices/cpu/sh/sh4comn.cpp similarity index 100% rename from src/devices/cpu/superh/sh4comn.cpp rename to src/devices/cpu/sh/sh4comn.cpp diff --git a/src/devices/cpu/superh/sh4comn.h b/src/devices/cpu/sh/sh4comn.h similarity index 100% rename from src/devices/cpu/superh/sh4comn.h rename to src/devices/cpu/sh/sh4comn.h diff --git a/src/devices/cpu/superh/sh4dasm.cpp b/src/devices/cpu/sh/sh4dasm.cpp similarity index 100% rename from src/devices/cpu/superh/sh4dasm.cpp rename to src/devices/cpu/sh/sh4dasm.cpp diff --git a/src/devices/cpu/superh/sh4dmac.cpp b/src/devices/cpu/sh/sh4dmac.cpp similarity index 100% rename from src/devices/cpu/superh/sh4dmac.cpp rename to src/devices/cpu/sh/sh4dmac.cpp diff --git a/src/devices/cpu/superh/sh4dmac.h b/src/devices/cpu/sh/sh4dmac.h similarity index 100% rename from src/devices/cpu/superh/sh4dmac.h rename to src/devices/cpu/sh/sh4dmac.h diff --git a/src/devices/cpu/superh/sh4regs.h b/src/devices/cpu/sh/sh4regs.h similarity index 100% rename from src/devices/cpu/superh/sh4regs.h rename to src/devices/cpu/sh/sh4regs.h diff --git a/src/devices/cpu/superh/sh4tmu.cpp b/src/devices/cpu/sh/sh4tmu.cpp similarity index 100% rename from src/devices/cpu/superh/sh4tmu.cpp rename to src/devices/cpu/sh/sh4tmu.cpp diff --git a/src/devices/cpu/superh/sh4tmu.h b/src/devices/cpu/sh/sh4tmu.h similarity index 100% rename from src/devices/cpu/superh/sh4tmu.h rename to src/devices/cpu/sh/sh4tmu.h diff --git a/src/devices/cpu/superh/sh7604_bus.cpp b/src/devices/cpu/sh/sh7604_bus.cpp similarity index 100% rename from src/devices/cpu/superh/sh7604_bus.cpp rename to src/devices/cpu/sh/sh7604_bus.cpp diff --git a/src/devices/cpu/superh/sh7604_bus.h b/src/devices/cpu/sh/sh7604_bus.h similarity index 100% rename from src/devices/cpu/superh/sh7604_bus.h rename to src/devices/cpu/sh/sh7604_bus.h diff --git a/src/devices/cpu/superh/sh7604_sci.cpp b/src/devices/cpu/sh/sh7604_sci.cpp similarity index 100% rename from src/devices/cpu/superh/sh7604_sci.cpp rename to src/devices/cpu/sh/sh7604_sci.cpp diff --git a/src/devices/cpu/superh/sh7604_sci.h b/src/devices/cpu/sh/sh7604_sci.h similarity index 100% rename from src/devices/cpu/superh/sh7604_sci.h rename to src/devices/cpu/sh/sh7604_sci.h diff --git a/src/devices/cpu/superh/sh7604_wdt.cpp b/src/devices/cpu/sh/sh7604_wdt.cpp similarity index 100% rename from src/devices/cpu/superh/sh7604_wdt.cpp rename to src/devices/cpu/sh/sh7604_wdt.cpp diff --git a/src/devices/cpu/superh/sh7604_wdt.h b/src/devices/cpu/sh/sh7604_wdt.h similarity index 100% rename from src/devices/cpu/superh/sh7604_wdt.h rename to src/devices/cpu/sh/sh7604_wdt.h diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index 280630ef6ab..69cb5f7ed12 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -24,7 +24,7 @@ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index 504367bdbee..896c20e774e 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -26,7 +26,7 @@ notes: */ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "machine/ins8250.h" #include "machine/eepromser.h" #include "screen.h" diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 7dd3e3d97f2..3e11412f391 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -101,7 +101,7 @@ TODO: */ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "debugger.h" #include "screen.h" diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 16bd45937cc..efd5ec2be4f 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -150,7 +150,7 @@ PCB 'Z545-1 A240570-1' ******************************************************************************/ #include "emu.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "screen.h" diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index 526b4f99a37..da086c8a82d 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/nvram.h" #include "machine/timer.h" #include "sound/scsp.h" diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 72bd9d340ec..e062ed9d7c6 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -460,7 +460,7 @@ hardware modification to the security cart..... #include "emu.h" #include "cdrom.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/intelfsh.h" #include "machine/nvram.h" #include "includes/cps3.h" diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 8e10b2cbc72..7483d5a52ea 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -173,8 +173,8 @@ Blitter Timing #include "emu.h" -#include "cpu/superh/sh3comn.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh3comn.h" +#include "cpu/sh/sh4.h" #include "machine/rtc9701.h" #include "machine/serflash.h" #include "sound/ymz770.h" diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 9085567c08f..d5cbb09e2b4 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -265,7 +265,7 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "imagedev/chd_cd.h" #include "machine/aicartc.h" #include "machine/dc-ctrl.h" diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index 615e5963dde..f828fa999ef 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "speaker.h" diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index 7baa7fc5b71..990d72702e4 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -66,7 +66,7 @@ U0564 LH28F800SU OBJ4-1 *******************************************************************************************/ #include "emu.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/seibuspi.h" #include "sound/okim6295.h" #include "machine/eepromser.h" diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index 461f574774b..0ab3d531085 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 3a567338f25..b11db10b948 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -382,7 +382,7 @@ Notes: */ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "screen.h" diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index b1bf576e736..3d46605e987 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/namco_settings.h" #include "machine/nvram.h" #include "machine/rtc4543.h" diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index ad1ebcbf3db..9dab45a6c38 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -276,7 +276,7 @@ Notes: #include "emu.h" #include "includes/psikyosh.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/ymf278b.h" diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index c4ba07dd2bb..73d1ff54fdb 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -427,7 +427,7 @@ test1f diagnostic hacks: #include "cpu/m68000/m68000.h" #include "cpu/scudsp/scudsp.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "imagedev/chd_cd.h" #include "machine/eepromser.h" #include "machine/nvram.h" diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index 75cb574ada1..b99e285bbee 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -74,7 +74,7 @@ G 171-8278G 315-6416 2x 512Mbit RMI */ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "debugger.h" #include "includes/segasp.h" #include "machine/naomim4.h" diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp index 7fb1df99e84..344edd2e13b 100644 --- a/src/mame/drivers/sh4robot.cpp +++ b/src/mame/drivers/sh4robot.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" class sh4robot_state : public driver_device { diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index b2faac037cc..d8de70f6fe8 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -40,7 +40,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/scudsp/scudsp.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "imagedev/chd_cd.h" #include "machine/eepromser.h" #include "machine/smpc.h" diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 767e99d1804..c5ce025db7e 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -149,7 +149,7 @@ NEP-16 #include "emu.h" #include "includes/suprnova.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "machine/msm6242.h" #include "machine/nvram.h" #include "sound/ymz280b.h" diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index a6beecdb470..c29d36441e5 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -7,7 +7,7 @@ ****************************************************************************/ #include "machine/intelfsh.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "audio/cps3.h" diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index ac6a5623544..d6a7484f259 100644 --- a/src/mame/includes/naomi.h +++ b/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/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "cpu/arm7/arm7core.h" #include "sound/aica.h" #include "machine/aicartc.h" diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 3c59f163291..74e3900a36a 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -6,7 +6,7 @@ *************************************************************************/ -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "sound/ymf278b.h" #include "machine/eepromser.h" #include "screen.h" diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index a112d52238f..8ae929348d0 100644 --- a/src/mame/includes/psikyosh.h +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "screen.h" diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index bcb83508d7f..86f5ce56109 100644 --- a/src/mame/includes/saturn.h +++ b/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/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "bus/sat_ctrl/ctrl.h" diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 66beb53e92f..f7563f5db00 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -4,7 +4,7 @@ #include "machine/timer.h" #include "video/sknsspr.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" struct hit_t diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index 9e7028b5027..380be28fe55 100644 --- a/src/mame/machine/dc.cpp +++ b/src/mame/machine/dc.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "debugger.h" #include "includes/dc.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "cpu/arm7/arm7core.h" #include "machine/mie.h" #include "machine/naomig1.h" diff --git a/src/mame/machine/dccons.cpp b/src/mame/machine/dccons.cpp index 7e1dc48868c..7b252c32ea4 100644 --- a/src/mame/machine/dccons.cpp +++ b/src/mame/machine/dccons.cpp @@ -22,7 +22,7 @@ #include "cdrom.h" #include "debugger.h" #include "includes/dc.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "sound/aica.h" #include "includes/dccons.h" diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h index be061bdda85..095bf289b7d 100644 --- a/src/mame/machine/maple-dc.h +++ b/src/mame/machine/maple-dc.h @@ -5,7 +5,7 @@ #pragma once -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #define MCFG_MAPLE_DC_ADD(_tag, _maincpu_tag, _irq_cb) \ MCFG_DEVICE_ADD(_tag, MAPLE_DC, 0) \ diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h index e1f8c0880c2..2e675ce435f 100644 --- a/src/mame/machine/mega32x.h +++ b/src/mame/machine/mega32x.h @@ -6,8 +6,8 @@ #pragma once -#include "cpu/superh/sh2.h" -#include "cpu/superh/sh2comn.h" +#include "cpu/sh/sh2.h" +#include "cpu/sh/sh2comn.h" #include "sound/dac.h" class sega_32x_device : public device_t diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 14c5a1512db..aca93be6155 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -5,7 +5,7 @@ #pragma once -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #define MCFG_NAOMI_G1_ADD(_tag, type, _irq_cb) \ MCFG_DEVICE_ADD(_tag, type, 0) \ diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index 484a536c64c..3f67edf8f04 100644 --- a/src/mame/machine/saturn.cpp +++ b/src/mame/machine/saturn.cpp @@ -45,7 +45,7 @@ #include "emu.h" #include "includes/saturn.h" -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" #include "cpu/scudsp/scudsp.h" /* TODO: do this in a verboselog style */ diff --git a/src/mame/machine/saturn_cdb.h b/src/mame/machine/saturn_cdb.h index 3fe76ad9311..f08a2a9efc2 100644 --- a/src/mame/machine/saturn_cdb.h +++ b/src/mame/machine/saturn_cdb.h @@ -6,7 +6,7 @@ #pragma once -#include "cpu/superh/sh2.h" +#include "cpu/sh/sh2.h" DECLARE_DEVICE_TYPE(SATURN_CDB, saturn_cdb_device) diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index 98176f84575..812f6c9ef02 100644 --- a/src/mame/video/powervr2.cpp +++ b/src/mame/video/powervr2.cpp @@ -8,7 +8,7 @@ #include "powervr2.h" #include "includes/dc.h" -#include "cpu/superh/sh4.h" +#include "cpu/sh/sh4.h" #include "video/rgbutil.h" #include "rendutil.h"