diff options
author | 2017-10-02 15:03:08 -0400 | |
---|---|---|
committer | 2017-10-02 15:03:08 -0400 | |
commit | de4b85197f1a9011bdfc94b037eb7ed73f3e7dc3 (patch) | |
tree | e0a67ab2c7113f389bfd97433c9ade6b2554c208 /scripts/src/cpu.lua | |
parent | 1416ca827dec4b1299be13ae9e4664ed5d54a10f (diff) | |
parent | c0ee79f3db1d019c74cd199a99398bb5a04065c5 (diff) |
Merge pull request #2693 from DavidHaywood/021017
move sh2 / sh4 to a folder called superh
Diffstat (limited to 'scripts/src/cpu.lua')
-rw-r--r-- | scripts/src/cpu.lua | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 7aa5963f9fd..365aa3bd6bb 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["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", @@ -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/sh/sh2.h,CPUS["SH"] = true +--@src/devices/cpu/sh/sh4.h,CPUS["SH"] = true -------------------------------------------------- -if (CPUS["SH2"]~=null) then +if (CPUS["SH"]~=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/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["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["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 -------------------------------------------------- @@ -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["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 |