From 68b8da21829fbcab2f66f1ff74618372d73b4792 Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Sat, 19 Dec 2020 09:53:17 +0100 Subject: [PATCH] Add PDM machine factory and the minimal HW. --- machines/machinefactory.cpp | 15 ++++++-- machines/machinefactory.h | 3 +- machines/machinegossamer.cpp | 3 +- machines/machinepdm.cpp | 74 ++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 machines/machinepdm.cpp diff --git a/machines/machinefactory.cpp b/machines/machinefactory.cpp index 2bb6a45..3e71b8e 100644 --- a/machines/machinefactory.cpp +++ b/machines/machinefactory.cpp @@ -36,6 +36,7 @@ along with this program. If not, see . #include #include #include +#include #include #include @@ -77,6 +78,13 @@ static const PropMap GossamerSettings = { new IntProperty( 2, vector({2, 4, 6}))}, }; +static const PropMap PDMSettings = { + {"rambank1_size", + new IntProperty(0, vector({0, 8, 16, 32, 64, 128}))}, + {"rambank2_size", + new IntProperty(0, vector({0, 8, 16, 32, 64, 128}))}, +}; + static const map PropHelp = { {"rambank1_size", "specifies RAM bank 1 size in MB"}, {"rambank2_size", "specifies RAM bank 2 size in MB"}, @@ -84,8 +92,9 @@ static const map PropHelp = { {"gfxmem_size", "specifies video memory size in MB"}, }; -static const map, string>> machines = { - {"pmg3", {GossamerSettings, create_gossamer, "Power Macintosh G3 (Beige)"}}, +static const map, string>> machines = { + {"pm6100", {PDMSettings, create_pdm, "PowerMacintosh 6100"}}, + {"pmg3", {GossamerSettings, create_gossamer, "Power Macintosh G3 (Beige)"}}, }; string machine_name_from_rom(string& rom_filepath) { @@ -268,7 +277,7 @@ int create_machine_for_id(string& id, string& rom_filepath) { auto machine = machines.at(id); /* build machine and load boot ROM */ - if (get<1>(machine)() < 0 || load_boot_rom(rom_filepath) < 0) { + if (get<1>(machine)(id) < 0 || load_boot_rom(rom_filepath) < 0) { return -1; } } catch(out_of_range ex) { diff --git a/machines/machinefactory.h b/machines/machinefactory.h index 7cff1bf..12f44fe 100644 --- a/machines/machinefactory.h +++ b/machines/machinefactory.h @@ -42,6 +42,7 @@ void list_machines(void); void list_properties(void); /* Machine-specific factory functions. */ -int create_gossamer(void); +int create_gossamer(string& id); +int create_pdm(string& id); #endif /* MACHINE_FACTORY_H */ diff --git a/machines/machinegossamer.cpp b/machines/machinegossamer.cpp index 4a3062a..b63d002 100644 --- a/machines/machinegossamer.cpp +++ b/machines/machinegossamer.cpp @@ -35,6 +35,7 @@ along with this program. If not, see . #include "machinebase.h" #include "machineproperties.h" #include +#include static void setup_ram_slot(std::string name, int i2c_addr, int capacity_megs) { @@ -51,7 +52,7 @@ static void setup_ram_slot(std::string name, int i2c_addr, int capacity_megs) { } -int create_gossamer() { +int create_gossamer(std::string& id) { if (gMachineObj) { LOG_F(ERROR, "Global machine object not empty!"); return -1; diff --git a/machines/machinepdm.cpp b/machines/machinepdm.cpp new file mode 100644 index 0000000..48a1316 --- /dev/null +++ b/machines/machinepdm.cpp @@ -0,0 +1,74 @@ +/* +DingusPPC - The Experimental PowerPC Macintosh emulator +Copyright (C) 2018-20 divingkatae and maximum + (theweirdo) spatium + +(Contact divingkatae#1017 or powermax#2286 on Discord for more info) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +/** @file Construct a PDM-style PowerMacintosh machine. + + Author: Max Poliakovski + */ + +#include "cpu/ppc/ppcemu.h" +#include "devices/hmc.h" +#include "machinebase.h" +#include "machineproperties.h" +#include + +int create_pdm(std::string& id) { + if (gMachineObj) { + LOG_F(ERROR, "PDM Factory: global machine object not empty!"); + return -1; + } + + LOG_F(INFO, "Initializing the %s hardware...", id.c_str()); + + /* initialize the global machine object */ + gMachineObj.reset(new MachineBase("PDM")); + + /* register HMC memory controller */ + gMachineObj->add_component("HMC", new HMC); + + /* get raw pointer to HMC object */ + HMC* hmc_obj = dynamic_cast(gMachineObj->get_comp_by_name("HMC")); + + /* allocate ROM region */ + if (!hmc_obj->add_rom_region(0x40000000, 0x400000)) { + LOG_F(ERROR, "Could not allocate ROM region!\n"); + return -1; + } + + /* mirror ROM to 0xFFC00000 for a PowerPC CPU to start */ + if (!hmc_obj->add_mem_mirror(0xFFC00000, 0x40000000)) { + LOG_F(ERROR, "Could not create ROM mirror!\n"); + return -1; + } + + /* add 8MB of soldered on-board RAM */ + if (!hmc_obj->add_ram_region(0x00000000, 0x800000)) { + LOG_F(ERROR, "Could not allocate built-in RAM region!\n"); + return -1; + } + + /* Init virtual CPU and request MPC601 */ + ppc_cpu_init(hmc_obj, PPC_VER::MPC601); + + LOG_F(INFO, "Initialization completed.\n"); + + return 0; +}