Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-12-22 15:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Finished the proof-of-concept machine presets

Browse Source
This commit is contained in:
dingusdev 2020-08-31 22:20:47 -07:00
parent 4f59407cd0
commit 4ccfb5d527
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
machines/machineconfig.cpp
View File

@ -72,7 +72,7 @@ void init_search_array() {
bool is_power_of_two(uint32_t number_to_check) {
if (number_to_check == 0)
return false;
return true; //This would be false normally, but 0 is used by DPPC to signify an empty bank of RAM
return (ceil(log2(number_to_check)) == floor(log2(number_to_check)));
}
@ -99,6 +99,12 @@ bool check_ram_size(std::string machine_str, uint32_t number_to_check) {
bool loop_ram_check(std::string machine_str, uint32_t* ram_sizes) {
for (int checking_stage_one = 0; checking_stage_one < sizeof(ram_sizes); checking_stage_one++) {
if (checking_stage_one == 0) {
if (ram_sizes[checking_stage_one] == 0) {
LOG_F(ERROR, "EMPTY RAM BANK 0!!");
return false;
}
}
if (check_ram_size(machine_str, ram_sizes[checking_stage_one]) == false) {
LOG_F(ERROR, "RAM BANK ERROR with RAM BANK %d", checking_stage_one);
return false;
@ -142,7 +148,8 @@ void search_properties(std::string machine_str) {
std::cout << "GMEM SIZE: " << std::dec << gfx_size << std::endl;
}
bool establish_machine_presets(const char* rom_filepath, std::string machine_str, uint32_t* ram_sizes) {
int establish_machine_presets(
const char* rom_filepath, std::string machine_str, uint32_t* ram_sizes, uint32_t gfx_mem) {
ifstream rom_file;
uint32_t file_size;
@ -157,22 +164,30 @@ bool establish_machine_presets(const char* rom_filepath, std::string machine_str
if (rom_file.fail()) {
LOG_F(ERROR, "Cound not open the specified ROM file.");
rom_file.close();
return false;
return -1;
}
rom_file.seekg(0, rom_file.end);
file_size = rom_file.tellg();
rom_file.seekg(0, rom_file.beg);
if (file_size != 0x400000UL) {
LOG_F(ERROR, "Unxpected ROM File size. Expected size is 4 megabytes.");
rom_file.close();
return false;
return -1;
}
if (loop_ram_check(machine_str, ram_sizes) == true) {
if (machine_str.compare("PowerMacG3") == 0) {
create_gossamer(ram_sizes, gfx_mem);
}
}
else {
return -1;
}
load_rom(rom_file, file_size);
rom_file.close();
if (loop_ram_check (machine_str, ram_sizes)) {
return true;
}
else {
return false;
}
return 0;
}

3
machines/machineproperties.h
View File

@ -41,6 +41,7 @@ void init_gpu_map(); //JANKY FUNCTION TO FIX VS 2019 BUG!
uint32_t get_gfx_card(std::string gfx_str);
uint32_t get_cpu_type(std::string cpu_str);
void search_properties(uint32_t chosen_gestalt);
bool establish_machine_presets(const char* rom_filepath, std::string machine_str, uint32_t* ram_sizes);
int establish_machine_presets(
const char* rom_filepath, std::string machine_str, uint32_t* ram_sizes, uint32_t gfx_mem);
#endif /* MACHINE_PROPERTIES_H */

10
main.cpp
View File

@ -181,13 +181,9 @@ int main(int argc, char** argv) {
if (machine_specified) {
if (machine_name.compare("PowerMacG3") == 0) {
if (establish_machine_presets(rom_file.c_str(), machine_name, sys_ram_size)) {
if (create_gossamer(sys_ram_size, gfx_mem)) {
goto bail;
}
} else {
LOG_F(ERROR, "Invalid Settings Specified");
return -1;
LOG_F(INFO, "Time to build up a machine");
if (establish_machine_presets(rom_file.c_str(), machine_name, sys_ram_size, gfx_mem)) {
goto bail;
}
}
else if (machine_name.compare("PowerMac6100") == 0) {