From 9df6cfe0870923fe2054ebe8e8f6ef081736831d Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Tue, 6 Nov 2018 17:20:10 +0700 Subject: [PATCH] r3000: call it like it is (nw) --- scripts/src/cpu.lua | 22 +++++++++---------- scripts/target/mame/arcade.lua | 4 ++-- scripts/target/mame/mess.lua | 4 ++-- src/devices/cpu/mips/{r3000.cpp => mips1.cpp} | 4 ++-- src/devices/cpu/mips/{r3000.h => mips1.h} | 6 ++--- .../cpu/mips/{r3kdasm.cpp => mips1dsm.cpp} | 2 +- .../cpu/mips/{r3kdasm.h => mips1dsm.h} | 6 ++--- src/devices/machine/iopintc.h | 2 +- src/devices/sound/iopspu.h | 2 +- src/mame/drivers/4dpi.cpp | 2 +- src/mame/drivers/decstation.cpp | 2 +- src/mame/drivers/indigo.cpp | 2 +- src/mame/drivers/jaguar.cpp | 2 +- src/mame/drivers/namcops2.cpp | 2 +- src/mame/drivers/ps2sony.cpp | 2 +- src/mame/drivers/pyson.cpp | 2 +- src/mame/drivers/speglsht.cpp | 2 +- src/mame/drivers/srmp5.cpp | 2 +- src/mame/drivers/tekxp33x.cpp | 2 +- src/mame/includes/mips.h | 2 +- src/mame/includes/policetr.h | 2 +- src/mame/includes/turrett.h | 2 +- src/mame/video/jaguar.cpp | 2 +- src/mame/video/policetr.cpp | 2 +- src/tools/unidasm.cpp | 2 +- 25 files changed, 42 insertions(+), 42 deletions(-) rename src/devices/cpu/mips/{r3000.cpp => mips1.cpp} (99%) rename src/devices/cpu/mips/{r3000.h => mips1.h} (99%) rename src/devices/cpu/mips/{r3kdasm.cpp => mips1dsm.cpp} (99%) rename src/devices/cpu/mips/{r3kdasm.h => mips1dsm.h} (90%) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 0a7282eb9b7..b3eaac479bf 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -13,7 +13,7 @@ -- Dynamic recompiler objects -------------------------------------------------- -DRC_CPUS = { "E1", "SH", "MIPS", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16" } +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 @@ -1254,27 +1254,27 @@ end -------------------------------------------------- -- MIPS R3000 (MIPS I/II) series ---@src/devices/cpu/mips/r3000.h,CPUS["R3000"] = true +--@src/devices/cpu/mips/mips1.h,CPUS["MIPS1"] = true -------------------------------------------------- -if (CPUS["R3000"]~=null) then +if (CPUS["MIPS1"]~=null) then files { - MAME_DIR .. "src/devices/cpu/mips/r3000.cpp", - MAME_DIR .. "src/devices/cpu/mips/r3000.h", + MAME_DIR .. "src/devices/cpu/mips/mips1.cpp", + MAME_DIR .. "src/devices/cpu/mips/mips1.h", } end -if (CPUS["R3000"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.h") +if (CPUS["MIPS1"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips1dsm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips1dsm.h") end -------------------------------------------------- -- MIPS R4000 (MIPS III/IV) series ---@src/devices/cpu/mips/mips3.h,CPUS["MIPS"] = true +--@src/devices/cpu/mips/mips3.h,CPUS["MIPS3"] = true -------------------------------------------------- -if (CPUS["MIPS"]~=null) then +if (CPUS["MIPS3"]~=null) then files { MAME_DIR .. "src/devices/cpu/mips/mips3com.cpp", MAME_DIR .. "src/devices/cpu/mips/mips3com.h", @@ -1290,7 +1290,7 @@ if (CPUS["MIPS"]~=null) then } end -if (CPUS["MIPS"]~=null or _OPTIONS["with-tools"]) then +if (CPUS["MIPS3"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.h") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/vudasm.cpp") diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index d44a432194e..1d873296b17 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -57,8 +57,8 @@ CPUS["ARM7"] = true CPUS["JAGUAR"] = true CPUS["CUBEQCPU"] = true CPUS["ESRIP"] = true -CPUS["MIPS"] = true -CPUS["R3000"] = true +CPUS["MIPS1"] = true +CPUS["MIPS3"] = true CPUS["PSX"] = true CPUS["SH"] = true CPUS["DSP16"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 2685e740a94..4b366b81e24 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -57,8 +57,8 @@ CPUS["ARM7"] = true CPUS["JAGUAR"] = true CPUS["CUBEQCPU"] = true CPUS["ESRIP"] = true -CPUS["MIPS"] = true -CPUS["R3000"] = true +CPUS["MIPS1"] = true +CPUS["MIPS3"] = true CPUS["PSX"] = true CPUS["SH"] = true CPUS["DSP16"] = true diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/mips1.cpp similarity index 99% rename from src/devices/cpu/mips/r3000.cpp rename to src/devices/cpu/mips/mips1.cpp index c43492c7871..4fd5b8a50e8 100644 --- a/src/devices/cpu/mips/r3000.cpp +++ b/src/devices/cpu/mips/mips1.cpp @@ -15,8 +15,8 @@ * */ #include "emu.h" -#include "r3000.h" -#include "r3kdasm.h" +#include "mips1.h" +#include "mips1dsm.h" #include "debugger.h" #define LOG_GENERAL (1U << 0) diff --git a/src/devices/cpu/mips/r3000.h b/src/devices/cpu/mips/mips1.h similarity index 99% rename from src/devices/cpu/mips/r3000.h rename to src/devices/cpu/mips/mips1.h index 047c049c112..608cbb8463b 100644 --- a/src/devices/cpu/mips/r3000.h +++ b/src/devices/cpu/mips/mips1.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_CPU_MIPS_R3000_H -#define MAME_CPU_MIPS_R3000_H +#ifndef MAME_CPU_MIPS_MIPS1_H +#define MAME_CPU_MIPS_MIPS1_H #pragma once @@ -323,4 +323,4 @@ DECLARE_DEVICE_TYPE(R3071, r3071_device) DECLARE_DEVICE_TYPE(R3081, r3081_device) DECLARE_DEVICE_TYPE(SONYPS2_IOP, iop_device) -#endif // MAME_CPU_MIPS_R3000_H +#endif // MAME_CPU_MIPS_MIPS1_H diff --git a/src/devices/cpu/mips/r3kdasm.cpp b/src/devices/cpu/mips/mips1dsm.cpp similarity index 99% rename from src/devices/cpu/mips/r3kdasm.cpp rename to src/devices/cpu/mips/mips1dsm.cpp index f31705d18f7..cbaee8b969b 100644 --- a/src/devices/cpu/mips/r3kdasm.cpp +++ b/src/devices/cpu/mips/mips1dsm.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "r3kdasm.h" +#include "mips1dsm.h" const char *const mips1_disassembler::reg[32] = { diff --git a/src/devices/cpu/mips/r3kdasm.h b/src/devices/cpu/mips/mips1dsm.h similarity index 90% rename from src/devices/cpu/mips/r3kdasm.h rename to src/devices/cpu/mips/mips1dsm.h index 9341bb459f5..2d06e98253f 100644 --- a/src/devices/cpu/mips/r3kdasm.h +++ b/src/devices/cpu/mips/mips1dsm.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_MIPS_R3KDASM_H -#define MAME_CPU_MIPS_R3KDASM_H +#ifndef MAME_CPU_MIPS_MIPS1DSM_H +#define MAME_CPU_MIPS_MIPS1DSM_H #pragma once @@ -33,4 +33,4 @@ private: }; -#endif +#endif // MAME_CPU_MIPS_MIPS1DSM_H diff --git a/src/devices/machine/iopintc.h b/src/devices/machine/iopintc.h index ed326e3c7bf..d2e9a544f0b 100644 --- a/src/devices/machine/iopintc.h +++ b/src/devices/machine/iopintc.h @@ -14,7 +14,7 @@ #pragma once -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" class iop_intc_device : public device_t { diff --git a/src/devices/sound/iopspu.h b/src/devices/sound/iopspu.h index 44e26a68066..d199b4876bd 100644 --- a/src/devices/sound/iopspu.h +++ b/src/devices/sound/iopspu.h @@ -14,7 +14,7 @@ #pragma once -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "machine/iopintc.h" class iop_spu_device : public device_t, public device_sound_interface diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 2439d6d1d34..3454744feb8 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -16,7 +16,7 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "screen.h" diff --git a/src/mame/drivers/decstation.cpp b/src/mame/drivers/decstation.cpp index 3190f11efcf..41dcae97e52 100644 --- a/src/mame/drivers/decstation.cpp +++ b/src/mame/drivers/decstation.cpp @@ -57,7 +57,7 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/mips/mips3.h" #include "machine/decioga.h" #include "machine/mc146818.h" diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index a1afaef6e3a..35039eb40a6 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -22,7 +22,7 @@ #include "bus/scsi/scsi.h" #include "bus/scsi/scsicd.h" #include "cpu/mips/mips3.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "machine/8530scc.h" #include "machine/eepromser.h" #include "machine/sgi.h" diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index 5c203610a0d..52fd4fe71bf 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -338,7 +338,7 @@ Notes: #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "cpu/m68000/m68000.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/jaguar/jaguar.h" #include "imagedev/chd_cd.h" #include "imagedev/snapquik.h" diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp index 8e1c96cb470..3090da63b44 100644 --- a/src/mame/drivers/namcops2.cpp +++ b/src/mame/drivers/namcops2.cpp @@ -872,7 +872,7 @@ Notes: #include "emu.h" #include "cpu/mips/mips3.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/drivers/ps2sony.cpp b/src/mame/drivers/ps2sony.cpp index 1708f52cc57..fdc9df57534 100644 --- a/src/mame/drivers/ps2sony.cpp +++ b/src/mame/drivers/ps2sony.cpp @@ -159,7 +159,7 @@ iLinkSGUID=0x-------- #include "emu.h" #include "cpu/mips/mips3.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/mips/ps2vu.h" #include "cpu/mips/ps2vif1.h" diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp index 4d1e9461aa7..1d7747fb2a9 100644 --- a/src/mame/drivers/pyson.cpp +++ b/src/mame/drivers/pyson.cpp @@ -152,7 +152,7 @@ Notes: #include "emu.h" #include "cpu/mips/mips3.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index 779ebe93c79..1f380450be4 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -108,7 +108,7 @@ Notes: #include "emu.h" #include "emupal.h" #include "machine/st0016.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include class speglsht_state : public driver_device diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index cbbb4e2e519..8f9eb11ebdc 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -38,7 +38,7 @@ This is not a bug (real machine behaves the same). #include "emu.h" #include "machine/st0016.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "emupal.h" #define DEBUG_CHAR diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp index 58d91b17474..de2e0d3aad0 100644 --- a/src/mame/drivers/tekxp33x.cpp +++ b/src/mame/drivers/tekxp33x.cpp @@ -36,7 +36,7 @@ #include "emu.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/tms34010/tms34010.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/includes/mips.h b/src/mame/includes/mips.h index df042000405..9794ef2d815 100644 --- a/src/mame/includes/mips.h +++ b/src/mame/includes/mips.h @@ -7,7 +7,7 @@ #pragma once // processors and memory -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/nec/v5x.h" #include "machine/ram.h" diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 81c8496d547..f95b0af9f16 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -6,7 +6,7 @@ **************************************************************************/ -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "machine/eepromser.h" #include "sound/bsmt2000.h" #include "emupal.h" diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index a91728d215f..2273e644837 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -10,7 +10,7 @@ #pragma once -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "machine/ataintf.h" #include "machine/idehd.h" #include "emupal.h" diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp index 262b432a3b2..a1152652168 100644 --- a/src/mame/video/jaguar.cpp +++ b/src/mame/video/jaguar.cpp @@ -138,7 +138,7 @@ #include "emu.h" #include "machine/atarigen.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "cpu/m68000/m68000.h" #include "includes/jaguar.h" #include "jagblit.h" diff --git a/src/mame/video/policetr.cpp b/src/mame/video/policetr.cpp index 9fc4333f7c1..bb59755ccd2 100644 --- a/src/mame/video/policetr.cpp +++ b/src/mame/video/policetr.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/mips/r3000.h" +#include "cpu/mips/mips1.h" #include "includes/policetr.h" diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index 1548763530e..23da7bb1669 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -92,7 +92,7 @@ using util::BIT; #include "cpu/melps4/melps4d.h" #include "cpu/minx/minxd.h" #include "cpu/mips/mips3dsm.h" -#include "cpu/mips/r3kdasm.h" +#include "cpu/mips/mips1dsm.h" #include "cpu/mn10200/mn102dis.h" #include "cpu/nanoprocessor/nanoprocessor_dasm.h" #include "cpu/nec/necdasm.h"