From 844b0763d46e1fbd2f21aea9528316a7b0cab7da Mon Sep 17 00:00:00 2001 From: Octocontrabass Date: Wed, 18 Sep 2024 20:44:07 -0700 Subject: Add Linksys PAP2 and other MIPS-X improvements (#12726) New machines marked as NOT WORKING ---------------------------------- Linksys PAP2 [unknown] * cpu/mipsx/mipsxdasm.cpp: fix various bugs [Octocontrabass] * tomy/kissite.cpp: memory map borrowed from Linksys PAP2 [Octocontrabass] --- src/devices/cpu/mipsx/mipsx.cpp | 2 +- src/devices/cpu/mipsx/mipsxdasm.cpp | 159 +++++++++++++++++++++++------------- src/mame/mame.lst | 3 + src/mame/skeleton/pap2.cpp | 99 ++++++++++++++++++++++ src/mame/tomy/kisssite.cpp | 10 ++- 5 files changed, 212 insertions(+), 61 deletions(-) create mode 100644 src/mame/skeleton/pap2.cpp diff --git a/src/devices/cpu/mipsx/mipsx.cpp b/src/devices/cpu/mipsx/mipsx.cpp index 72e45f84d1a..438c4b4e3b6 100644 --- a/src/devices/cpu/mipsx/mipsx.cpp +++ b/src/devices/cpu/mipsx/mipsx.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(MIPSX, mipsx_cpu_device, "mipsx", "MIPS-X") mipsx_cpu_device::mipsx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, MIPSX, tag, owner, clock) - , m_program_config("program", ENDIANNESS_BIG, 32, 24, 0) + , m_program_config("program", ENDIANNESS_BIG, 32, 32, 0) , m_pc(0) , m_program(nullptr) , m_icount(0) diff --git a/src/devices/cpu/mipsx/mipsxdasm.cpp b/src/devices/cpu/mipsx/mipsxdasm.cpp index 7705a666ccd..06f6e075aff 100644 --- a/src/devices/cpu/mipsx/mipsxdasm.cpp +++ b/src/devices/cpu/mipsx/mipsxdasm.cpp @@ -10,7 +10,7 @@ constexpr bool SHOW_R0_AS_0 = false; char const *const REGNAMES[32] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", - "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31" }; @@ -55,16 +55,36 @@ constexpr int get_sq(u32 opcode) return BIT(opcode, 16, 1); } -constexpr int get_asr_amount(int shift) +constexpr int get_shift_amount(int shift) { - // TODO - return shift; -} - -constexpr int get_sh_amount(int shift) -{ - // TODO - return shift; + switch (shift & 0xf) + { + case 0x1: + { + shift = ((shift & 0x70) >> 2) + 0; + break; + } + case 0x2: + { + shift = ((shift & 0x70) >> 2) + 1; + break; + } + case 0x4: + { + shift = ((shift & 0x70) >> 2) + 2; + break; + } + case 0x8: + { + shift = ((shift & 0x70) >> 2) + 3; + break; + } + default: + { + return 0; + } + } + return 32 - shift; } @@ -144,7 +164,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da default: { - util::stream_format(stream, "Unhandled TY0 (%08x)", opcode); + util::stream_format(stream, "unknown TY0 (%08x)", opcode); break; } } @@ -153,7 +173,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da case 1: { - u8 op = get_op(opcode); + const u8 op = get_op(opcode); switch (op) { @@ -170,7 +190,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal mstart form"); + util::stream_format(stream, "invalid mstart TY1 OP0 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); } } else if (comp == 0x099) @@ -183,7 +203,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "unknown TY1 subcase 0 (%02x, %02x, %02x %04x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); + util::stream_format(stream, "unknown TY1 OP0 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); } break; } @@ -200,28 +220,53 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da { util::stream_format(stream, "rotlb %s,%s,%s", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode))); } - else if ((comp & 0xf80) == 0x200) - { - int shift = get_sh_amount(get_compute_compfunc(opcode) & 0x7f); - util::stream_format(stream, "sh %s,%s,%s,#%d", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode)), shift); - } else if ((comp & 0xf80) == 0x100) { const u8 src2 = get_src2_dest(opcode); if (src2 == 0x0) { - int shift = get_asr_amount((get_compute_compfunc(opcode) & 0x7f)); - util::stream_format(stream, "asr %s,%s,#%d", get_regname(get_src1(opcode)), get_regname(get_compute_dest(opcode)), shift); + const int shift = get_shift_amount((get_compute_compfunc(opcode) & 0x7f)); + if(shift != 0) + { + util::stream_format(stream, "asr %s,%s,#%d", get_regname(get_src1(opcode)), get_regname(get_compute_dest(opcode)), shift); + } + else + { + util::stream_format(stream, "asr %s,%s,#invalid (%02x)", get_regname(get_src1(opcode)), get_regname(get_compute_dest(opcode)), get_compute_compfunc(opcode) & 0x7f); + } } else { - util::stream_format(stream, "illegal asr form"); + util::stream_format(stream, "invalid asr TY1 OP1 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); + } + } + else if ((comp & 0xf80) == 0x200) + { + const int shift = get_shift_amount(get_compute_compfunc(opcode) & 0x7f); + if(shift != 0) + { + if (get_src1(opcode) == 0) + { + util::stream_format(stream, "lsl %s,%s,#%d", get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode)), 32 - shift); + } + else if (get_src2_dest(opcode) == 0) + { + util::stream_format(stream, "lsr %s,%s,#%d", get_regname(get_src1(opcode)), get_regname(get_compute_dest(opcode)), shift); + } + else + { + util::stream_format(stream, "sh %s,%s,%s,#%d", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode)), shift); + } + } + else + { + util::stream_format(stream, "sh %s,%s,%s,#invalid (%02x)", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode)), get_compute_compfunc(opcode) & 0x7f); } } else { - util::stream_format(stream, "unknown TY1 subcase 1 (%02x, %02x, %02x %04x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); + util::stream_format(stream, "unknown TY1 OP1 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); } break; } @@ -232,7 +277,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da if (comp == 0x00b) { - util::stream_format(stream, "blc %s,%s,%s", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode))); + util::stream_format(stream, "bic %s,%s,%s", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), get_regname(get_compute_dest(opcode))); } else if (comp == 0x00f) { @@ -242,24 +287,24 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal not form"); + util::stream_format(stream, "invalid not TY1 OP4 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); } } else if (comp == 0x019) { - u8 src2 = get_src2_dest(opcode); - if (src2 == 0) + const u8 src1 = get_src1(opcode); + const u8 src2 = get_src2_dest(opcode); + if ((src1 == 0) || (src2 == 0)) { - const u8 src1 = get_src1(opcode); const u8 dest = get_compute_dest(opcode); - - if ((src1 == 0) && (dest == 0)) + if (dest == 0) { util::stream_format(stream, "nop"); } else { - util::stream_format(stream, "mov %s,%s", get_regname(get_src1(opcode)), get_regname(get_compute_dest(opcode))); + // manuals say src2==0 for mov, but actual ROMs use src1==0 + util::stream_format(stream, "mov %s,%s", get_regname(get_src1(opcode) | get_src2_dest(opcode)), get_regname(get_compute_dest(opcode))); } } else @@ -289,14 +334,14 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "unknown compute (%02x, %02x, %02x %04x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); + util::stream_format(stream, "unknown TY1 OP4 (%02x, %02x, %02x %03x)", get_src1(opcode), get_src2_dest(opcode), get_compute_dest(opcode), get_compute_compfunc(opcode)); } break; } default: { - util::stream_format(stream, "Unhandled TY1 (%08x)", opcode); + util::stream_format(stream, "unknown TY1 (%08x)", opcode); break; } } @@ -336,6 +381,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da { // stt - Store Through // stt Offset[rSrc1], rDest + // maybe "store byte" on ES3210 and ES3890 util::stream_format(stream, "stt 0x%08x[%s],%s", imm17, get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode))); break; } @@ -343,11 +389,12 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da { // ldf - Load Floating Point // ldf Offset[rSrc1], rDest + // maybe "load byte" on ES3210 and ES3890 util::stream_format(stream, "ldf 0x%08x[%s],%s", imm17, get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode))); break; } - case 5: // movfrc or aluc + case 5: // movfrc or aluc, maybe "load byte" on ES3210 and ES3890 { // this is just a suggested form const u8 c2 = BIT(opcode, 0, 4); @@ -359,11 +406,11 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da if (src == 0) { - util::stream_format(stream, "movfrc %s,(%02x,%02x,%02x,%02x)", get_regname(dest), op, func, c1, c2); + util::stream_format(stream, "movfrc (%02x,%02x,%02x,%02x),%s", op, func, c1, c2, get_regname(dest)); } else { - util::stream_format(stream, "illegal movfrc form"); + util::stream_format(stream, "movfrc 0x%08x[%s],%s", imm17, get_regname(src), get_regname(dest)); } break; @@ -375,7 +422,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da util::stream_format(stream, "stf 0x%08x[%s],%s", imm17, get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode))); break; } - case 7: // movtoc + case 7: // movtoc, maybe "store byte" on ES3210 { // this is just a suggested form const u8 c2 = BIT(opcode, 0, 4); @@ -392,15 +439,15 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da else { //util::stream_format(stream, "illegal movtoc form"); - // this form appears to be used - util::stream_format(stream, "movtoc %s,(%02x,%02x,%02x,%02x) (src1 == %s)", get_regname(dest), op, func, c1, c2, get_regname(src)); + //util::stream_format(stream, "movtoc %s,(%02x,%02x,%02x,%02x) (src1 == %s)", get_regname(dest), op, func, c1, c2, get_regname(src)); + util::stream_format(stream, "movtoc 0x%08x[%s],%s", imm17, get_regname(src), get_regname(dest)); } break; } default: { - util::stream_format(stream, "Unhandled TY2 (%08x)", opcode); + util::stream_format(stream, "unknown TY2 (%08x)", opcode); break; } } @@ -417,7 +464,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da { // jspci - Jump Indexed and Store PC // jspci rSrc1,#Immed,Rdest - const int imm17 = util::sext(opcode, 17) * 2; + const int imm17 = util::sext(opcode, 17) * 4; util::stream_format(stream, "jspci %s,#%02x,%s", get_regname(get_src1(opcode)), imm17, get_regname(get_src2_dest(opcode))); break; } @@ -431,7 +478,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal hsc form"); + util::stream_format(stream, "invalid hsc TY3 OP1 (%08x)", opcode); } break; } @@ -457,12 +504,12 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal movtos form"); + util::stream_format(stream, "invalid movtos TY3 OP2 (%08x)", opcode); } } else { - util::stream_format(stream, "illegal movtos form"); + util::stream_format(stream, "invalid movtos TY3 OP2 (%08x)", opcode); } break; @@ -488,12 +535,12 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal movfrs form"); + util::stream_format(stream, "invalid movfrs TY3 OP3 (%08x)", opcode); } } else { - util::stream_format(stream, "illegal movfrs form"); + util::stream_format(stream, "invalid movfrs TY3 OP3 (%08x)", opcode); } break; @@ -502,7 +549,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da case 4: { const int imm17 = util::sext(opcode, 17); - util::stream_format(stream, "addi %s,%s,0x%08x", get_regname(get_src1(opcode)), get_regname(get_src2_dest(opcode)), imm17); + util::stream_format(stream, "addi %s,#0x%08x,%s", get_regname(get_src1(opcode)), imm17, get_regname(get_src2_dest(opcode))); break; } @@ -520,12 +567,12 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal jpc form"); + util::stream_format(stream, "invalid jpc TY3 OP5 (%08x)", opcode); } } else { - util::stream_format(stream, "illegal jpc form"); + util::stream_format(stream, "invalid jpc TY3 OP5 (%08x)", opcode); } break; } @@ -534,12 +581,12 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da { if ((opcode & 0x07fff807) == 0x00000003) { - const int vector = (opcode & 0x000007f8) >> 3; - util::stream_format(stream, "trap %02x", vector); + const u8 vector = ~((opcode & 0x000007f8) >> 3); + util::stream_format(stream, "trap 0x%02x", vector); } else { - util::stream_format(stream, "illegal trap form"); + util::stream_format(stream, "invalid trap TY3 OP6 (%08x)", opcode); } break; } @@ -558,19 +605,19 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da } else { - util::stream_format(stream, "illegal jpcrs form"); + util::stream_format(stream, "invalid jpcrs TY3 OP7 (%08x)", opcode); } } else { - util::stream_format(stream, "illegal jpcrs form"); + util::stream_format(stream, "invalid jpcrs TY3 OP7 (%08x)", opcode); } break; } default: { - util::stream_format(stream, "Unhandled TY3 (%08x)", opcode); + util::stream_format(stream, "unknown TY3 (%08x)", opcode); break; } } @@ -579,7 +626,7 @@ offs_t mipsx_disassembler::disassemble(std::ostream& stream, offs_t pc, const da default: { - util::stream_format(stream, "Unhandled (%08x)", opcode); + util::stream_format(stream, "unknown (%08x)", opcode); break; } } diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 9f0d0ff5d6b..634acf3be15 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -42371,6 +42371,9 @@ p8000_16 // @source:skeleton/palestra.cpp palestra +@source:skeleton/pap2.cpp +pap2 + @source:skeleton/pcksurfer.cpp pcksurfer // (c) 2006 Datawind diff --git a/src/mame/skeleton/pap2.cpp b/src/mame/skeleton/pap2.cpp new file mode 100644 index 00000000000..f00c4f0248f --- /dev/null +++ b/src/mame/skeleton/pap2.cpp @@ -0,0 +1,99 @@ +/* + +Linksys PAP2 two-port analog telephone adapter + +ESS Visba 3 ES3890F @ 27MHz (CPU/MCU) +Realtek RTL8019AS (NIC) +ICSI IC41LV16100S-50KG (2MB RAM) +SST39VF080-70-4C-EI (1MB flash ROM) +2x Silicon Labs Si3210-KT (line interfaces) + +Four of the five LEDs are controlled by ES3890F GPIOs +Power LEDs are connected to AUX1[4] and AUX1[5] (pin 112 and 113) +Phone 1 LED is connected to AUX1[6] (pin 114) +Phone 2 LED is connected to AUX1[7] (pin 115) +Ethernet LED is connected to RTL8019AS somehow + +RTL8019AS pin 65 is tied to VDD to disable PnP +RTL8019AS pin 96 is tied to ground to share the flash ROM's 8-bit data bus +RTL8019AS registers are selected when ES3890F pin 19 (/CS1) is low +It looks like the RTL8019AS EEPROM pins are connected to ES3890F AUX2[0-3]? + + +There are several ATAs based on essentially the same hardware: + +Sipura SPA-2000 +Sipura SPA-1000 +Sipura SPA-3000 (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, unknown line interfaces) +Sipura SPA-1001 (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, 1x Si3210) +Sipura SPA-2100 (Sipura SIP316F @ 27MHz, 2x RTL8019AS, 8MB RAM, 2MB flash, unknown line interfaces) +Sipura SPA-2002 +Linksys PAP2T (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, 2x Si3215) +Linksys SPA2102? + +There are also ATAs with similar names but probably very different hardware: + +Linksys PAP2 V2 +Cisco SPA112 +Cisco SPA122 + +*/ + +#include "emu.h" + +#include "cpu/mipsx/mipsx.h" + + +namespace { + +class pap2_state : public driver_device + +{ +public: + pap2_state(machine_config const &mconfig, device_type type, char const *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") + { + } + + void pap2(machine_config &config) ATTR_COLD; + +protected: + virtual void machine_reset() override; + +private: + required_device m_maincpu; + + void mem(address_map &map); +}; + + +void pap2_state::machine_reset() +{ + m_maincpu->set_state_int(STATE_GENPC, 0x1cffff80); // might actually be 0x7fffff80 with a ROM mirror +} + +void pap2_state::mem(address_map &map) +{ + map(0x00000000, 0x001fffff).ram(); + map(0x1c000000, 0x1c0fffff).mirror(0x00f00000).rom().region("maincpu", 0); + // ES3890F registers at 0x20000000-0x2000ffff, ES6008 datasheet could be helpful +} + +void pap2_state::pap2(machine_config &config) +{ + MIPSX(config, m_maincpu, 27'000'000); + m_maincpu->set_addrmap(AS_PROGRAM, &pap2_state::mem); +} + +INPUT_PORTS_START(pap2) +INPUT_PORTS_END + +ROM_START(pap2) + ROM_REGION32_BE(0x100000, "maincpu", 0 ) + ROM_LOAD("linksys-pap2-2.0.12-ls_rom dump of pap2 flash chip.rom", 0x000000, 0x100000, BAD_DUMP CRC(4d0f1e5d) SHA1(73b163b00a3709a14f7419283c8515dd91009598) ) +ROM_END + +} + +SYST( 200?, pap2, 0, 0, pap2, pap2, pap2_state, empty_init, "Linksys (Cisco)", "PAP2", MACHINE_IS_SKELETON ) diff --git a/src/mame/tomy/kisssite.cpp b/src/mame/tomy/kisssite.cpp index 446315af94d..949f929cdd1 100644 --- a/src/mame/tomy/kisssite.cpp +++ b/src/mame/tomy/kisssite.cpp @@ -20,7 +20,7 @@ S1L9223A01-Q0 SAMSUNG C031 S5L9284D01-Q0 -ASD AE43BH40I16I-35 +ASD AE43BH4016I-35 50G00290919D F 037B @@ -77,17 +77,19 @@ private: void kisssite_state::machine_reset() { - m_maincpu->set_state_int(STATE_GENPC, 0xe2cc); // temp, there is code here, but this is unlikely to be the entry point + m_maincpu->set_state_int(STATE_GENPC, 0x1cffff80); // might actually be 0x7fffff80 with a ROM mirror } void kisssite_state::mem(address_map &map) { - map(0x0000000, 0x003ffff).rom(); + map(0x00000000, 0x0007ffff).ram(); + map(0x1c000000, 0x1c03ffff).mirror(0x00fc0000).rom().region("maincpu", 0); + // registers at 0x20000000-0x2000ffff, ES6008 datasheet could be helpful } void kisssite_state::kisssite(machine_config &config) { - MIPSX(config, m_maincpu, 60'000'000); // there is MIPS-X code at at around 0xe2e0 in the ROM, 0x60000019 is "r0 + r0 -> r0" which acts as a NOP + MIPSX(config, m_maincpu, 60'000'000); m_maincpu->set_addrmap(AS_PROGRAM, &kisssite_state::mem); CDROM(config, "cdrom").set_interface("cdrom"); -- cgit v1.2.3