diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/cpu.lua | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/cpu.lua')
-rw-r--r-- | scripts/src/cpu.lua | 78 |
1 files changed, 1 insertions, 77 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 8c461e0ce16..08fe95f7f68 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -13,7 +13,7 @@ -- Dynamic recompiler objects -------------------------------------------------- -DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16", "UNSP" } +DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16" } CPU_INCLUDE_DRC = false for i, v in ipairs(DRC_CPUS) do if (CPUS[v]~=null) then @@ -1087,7 +1087,6 @@ if (CPUS["I386"]~=null) then files { MAME_DIR .. "src/devices/cpu/i386/i386.cpp", MAME_DIR .. "src/devices/cpu/i386/i386.h", - MAME_DIR .. "src/devices/cpu/i386/cache.h", MAME_DIR .. "src/devices/cpu/i386/cycles.h", MAME_DIR .. "src/devices/cpu/i386/i386op16.hxx", MAME_DIR .. "src/devices/cpu/i386/i386op32.hxx", @@ -1298,7 +1297,6 @@ end -------------------------------------------------- -- MIPS R4000 (MIPS III/IV) series --@src/devices/cpu/mips/mips3.h,CPUS["MIPS3"] = true ---@src/devices/cpu/mips/r4000.h,CPUS["MIPS3"] = true -------------------------------------------------- if (CPUS["MIPS3"]~=null) then @@ -1315,8 +1313,6 @@ if (CPUS["MIPS3"]~=null) then MAME_DIR .. "src/devices/cpu/mips/ps2vu.h", MAME_DIR .. "src/devices/cpu/mips/ps2vif1.cpp", MAME_DIR .. "src/devices/cpu/mips/ps2vif1.h", - MAME_DIR .. "src/devices/cpu/mips/r4000.cpp", - MAME_DIR .. "src/devices/cpu/mips/r4000.h", } end @@ -2161,10 +2157,6 @@ if (CPUS["UNSP"]~=null) then files { MAME_DIR .. "src/devices/cpu/unsp/unsp.cpp", MAME_DIR .. "src/devices/cpu/unsp/unsp.h", - MAME_DIR .. "src/devices/cpu/unsp/unspdefs.h", - MAME_DIR .. "src/devices/cpu/unsp/unspdrc.cpp", - MAME_DIR .. "src/devices/cpu/unsp/unspfe.cpp", - MAME_DIR .. "src/devices/cpu/unsp/unspfe.h", } end @@ -2784,71 +2776,3 @@ if (_OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.h") end - --------------------------------------------------- --- DEC Alpha (EV4/EV5/EV6/EV7) series ---@src/devices/cpu/alpha/alpha.h,CPUS["ALPHA"] = true --------------------------------------------------- - -if (CPUS["ALPHA"]~=null) then - files { - MAME_DIR .. "src/devices/cpu/alpha/alpha.cpp", - MAME_DIR .. "src/devices/cpu/alpha/alpha.h", - } -end - -if (CPUS["ALPHA"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.h") -end - --------------------------------------------------- --- National Semiconductor HPC ---@src/devices/cpu/hpc/hpc.h,CPUS["HPC"] = true --------------------------------------------------- - -if (CPUS["HPC"]~=null) then - files { - MAME_DIR .. "src/devices/cpu/hpc/hpc.cpp", - MAME_DIR .. "src/devices/cpu/hpc/hpc.h", - } -end - -if (CPUS["HPC"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hpc/hpcdasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hpc/hpcdasm.h") -end - --------------------------------------------------- --- Yamaha Multiple Effects Generator ---@src/devices/sound/meg.h,CPUS["MEG"] = true --------------------------------------------------- - -if (CPUS["MEG"]~=null) then - files { - MAME_DIR .. "src/devices/sound/meg.cpp", - MAME_DIR .. "src/devices/sound/meg.h", - } -end - -if (CPUS["MEG"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/sound/megd.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/sound/megd.h") -end - --------------------------------------------------- --- National Semiconductor NS32000 series ---@src/devices/cpu/ns32000/ns32000.h,CPUS["NS32000"] = true --------------------------------------------------- - -if (CPUS["NS32000"]~=null) then - files { - MAME_DIR .. "src/devices/cpu/ns32000/ns32000.cpp", - MAME_DIR .. "src/devices/cpu/ns32000/ns32000.h", - } -end - -if (CPUS["NS32000"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.h") -end |