r3000: call it like it is (nw)

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")

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

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

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)

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

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] =
 {

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

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
 {

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

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"
 
 

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"

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"

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"

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"
 

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"
 

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"
 

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 <algorithm>
 
 class speglsht_state : public driver_device

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

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"

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"
 

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"

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"

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"

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"
 
 

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"