Clean up and increase safety with multiple device and ROM versions

Author: meepingsnesroms

qtBuildSystem/Mu/Mu.pro

@@ -38,7 +38,7 @@ windows{
         QMAKE_LFLAGS += -fopenmp
         DEFINES += EMU_MULTITHREADED EMU_MANAGE_HOST_CPU_PIPELINE
     }
-    CONFIG += cpu_x86_32 # this should be auto detected in the future
+    CONFIG += cpu_x86_32 # TODO:this should be auto detected in the future
 }
 
 macx{
@@ -54,25 +54,21 @@ linux-g++{
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
     DEFINES += EMU_MULTITHREADED EMU_MANAGE_HOST_CPU_PIPELINE
-    CONFIG += cpu_x86_64 # this should be auto detected in the future
+    CONFIG += cpu_x86_64 # TODO:this should be auto detected in the future
 }
 
 android{
     QMAKE_CFLAGS += -fopenmp
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
     DEFINES += EMU_MULTITHREADED EMU_MANAGE_HOST_CPU_PIPELINE
-    CONFIG += cpu_armv7 # this should be auto detected in the future
+    CONFIG += cpu_armv7 # TODO:this should be auto detected in the future
 }
 
 
 CONFIG(debug, debug|release){
     # debug build, be accurate, fail hard, and add logging
-    DEFINES += EMU_DEBUG EMU_CUSTOM_DEBUG_LOG_HANDLER EMU_SANDBOX
-    # DEFINES += EMU_SANDBOX_LOG_MEMORY_ACCESSES # checks all reads and writes to memory and logs certain events
-    # DEFINES += EMU_SANDBOX_OPCODE_LEVEL_DEBUG # for breakpoints
-    # DEFINES += EMU_SANDBOX_LOG_JUMPS # log large jumps
-    # DEFINES += EMU_SANDBOX_LOG_APIS # for printing sysTrap* calls, EMU_SANDBOX_OPCODE_LEVEL_DEBUG must be on too
+    DEFINES += EMU_DEBUG EMU_CUSTOM_DEBUG_LOG_HANDLER
     CONFIG += no_dynarec # easier to debug with
     macx|linux-g++{
         # also check for any buffer overflows and memory leaks

qtBuildSystem/Mu/emuwrapper.cpp

@@ -165,28 +165,45 @@ void EmuWrapper::writeOutSaves(){
    }
 }
 
-uint32_t EmuWrapper::init(const QString& assetPath, uint8_t osVersion, bool syncRtc, bool allowInvalidBehavior, bool fastBoot){
+uint32_t EmuWrapper::init(const QString& assetPath, const QString& osVersion, bool syncRtc, bool allowInvalidBehavior, bool fastBoot){
    if(!emuRunning && !emuInited){
       //start emu
       uint32_t error;
-      QString osVersionId = osVersion == 4 ? "41" : osVersion == 5 ? "52" : QString::number((int)osVersion) + "0";
-      QString model = osVersion > 4 ? "en-t3" : "en-m515";
-      QFile romFile(assetPath + "/palmos" + osVersionId + "-" + model + ".rom");
-      QFile bootloaderFile(assetPath + "/bootloader-" + model + ".rom");
-      QFile ramFile(assetPath + "/userdata-" + model + ".ram");
-      QFile sdCardFile(assetPath + "/sd-" + model + ".img");
+      uint8_t deviceModel;
       bool hasBootloader = true;
 
-      //used to mark saves with there OS version and prevent corruption
-      emuOsName = "os" + QString::number((int)osVersion);
+      if(osVersion == "Palm m500/Palm OS 4.0")
+         emuOsName = "palmos40-en-m500";
+      else if(osVersion == "Palm m515/Palm OS 4.1")
+         emuOsName = "palmos41-en-m515";
+      else if(osVersion == "Tungsten T3/Palm OS 5.2.1")
+         emuOsName = "palmos52-en-t3";
+      else if(osVersion == "Tungsten T3/Palm OS 5.2.1")
+         emuOsName = "palmos60-en-t3";
+      else
+         return EMU_ERROR_INVALID_PARAMETER;
+
+      if(osVersion.contains("Palm m500"))
+         deviceModel = EMU_DEVICE_PALM_M500;
+      else if(osVersion.contains("Palm m515"))
+         deviceModel = EMU_DEVICE_PALM_M515;
+      else if(osVersion.contains("Tungsten T3"))
+         deviceModel = EMU_DEVICE_TUNGSTEN_T3;
+      else
+         return EMU_ERROR_INVALID_PARAMETER;
+
+      QFile romFile(assetPath + "/" + emuOsName + ".rom");
+      QFile bootloaderFile(assetPath + "/bootloader-dbvz.rom");
+      QFile ramFile(assetPath + "/userdata-" + emuOsName + ".ram");
+      QFile sdCardFile(assetPath + "/sd-" + emuOsName + ".img");
 
       if(!romFile.open(QFile::ReadOnly | QFile::ExistingOnly))
          return EMU_ERROR_INVALID_PARAMETER;
 
-      if(!bootloaderFile.open(QFile::ReadOnly | QFile::ExistingOnly))
+      if(deviceModel == EMU_DEVICE_TUNGSTEN_T3 || !bootloaderFile.open(QFile::ReadOnly | QFile::ExistingOnly))
          hasBootloader = false;
 
-      error = emulatorInit(osVersion == 4 ? EMU_DEVICE_PALM_M500 : EMU_DEVICE_TUNGSTEN_T3, (uint8_t*)romFile.readAll().data(), romFile.size(), hasBootloader ? (uint8_t*)bootloaderFile.readAll().data() : NULL, hasBootloader ? bootloaderFile.size() : 0, syncRtc, allowInvalidBehavior);
+      error = emulatorInit(deviceModel, (uint8_t*)romFile.readAll().data(), romFile.size(), hasBootloader ? (uint8_t*)bootloaderFile.readAll().data() : NULL, hasBootloader ? bootloaderFile.size() : 0, syncRtc, allowInvalidBehavior);
       if(error == EMU_ERROR_NONE){
          QTime now = QTime::currentTime();
 
@@ -204,9 +221,9 @@ uint32_t EmuWrapper::init(const QString& assetPath, uint8_t osVersion, bool sync
          }
 
          emuInput = palmInput;
-         emuRamFilePath = assetPath + "/userdata-" + model + ".ram";
-         emuSdCardFilePath = assetPath + "/sd-" + model + ".img";
-         emuSaveStatePath = assetPath + "/states-" + model + ".states";
+         emuRamFilePath = assetPath + "/userdata-" + emuOsName + ".ram";
+         emuSdCardFilePath = assetPath + "/sd-" + emuOsName + ".img";
+         emuSaveStatePath = assetPath + "/states-" + emuOsName + ".states";
 
          //make the place to store the saves
          QDir(emuSaveStatePath).mkdir(".");

qtBuildSystem/Mu/emuwrapper.h

@@ -50,7 +50,7 @@ class EmuWrapper{
    EmuWrapper();
    ~EmuWrapper();
 
-   uint32_t init(const QString& assetPath, uint8_t osVersion, bool syncRtc = false, bool allowInvalidBehavior = false, bool fastBoot = false);
+   uint32_t init(const QString& assetPath, const QString& osVersion, bool syncRtc = false, bool allowInvalidBehavior = false, bool fastBoot = false);
    void exit();
    void pause();
    void resume();
@@ -64,6 +64,7 @@ class EmuWrapper{
    bool isInited() const{return emuInited;}
    bool isRunning() const{return emuRunning;}
    bool isPaused() const{return emuPaused;}
+   bool isTungstenT3() const{return palmEmulatingTungstenT3;}
    void setPenValue(float x, float y, bool touched);
    void setKeyValue(uint8_t key, bool pressed);
 

qtBuildSystem/Mu/mainwindow.cpp

@@ -329,15 +329,15 @@ void MainWindow::on_center_released(){
 void MainWindow::on_ctrlBtn_clicked(){
    if(!emu.isInited()){
       QString sysDir = settings->value("resourceDirectory", "").toString();
-      uint32_t error = emu.init(sysDir, settings->value("palmOsVersion", false).toInt(), settings->value("featureSyncedRtc", false).toBool(), settings->value("featureDurable", false).toBool(), settings->value("fastBoot", false).toBool());
+      uint32_t error = emu.init(sysDir, settings->value("palmOsVersionString", "Palm m515/Palm OS 4.1").toString(), settings->value("featureSyncedRtc", false).toBool(), settings->value("featureDurable", false).toBool(), settings->value("fastBoot", false).toBool());
 
       if(error == EMU_ERROR_NONE){
          emu.setCpuSpeed(settings->value("cpuSpeed", 1.00).toDouble());
 
          ui->up->setEnabled(true);
          ui->down->setEnabled(true);
 
-         if(settings->value("palmOsVersion", false).toInt() > 4){
+         if(emu.isTungstenT3()){
             ui->left->setEnabled(true);
             ui->right->setEnabled(true);
             ui->center->setEnabled(true);
@@ -348,7 +348,7 @@ void MainWindow::on_ctrlBtn_clicked(){
          ui->todo->setEnabled(true);
          ui->notes->setEnabled(true);
 
-         if(settings->value("palmOsVersion", false).toInt() > 4)
+         if(emu.isTungstenT3())
             ui->voiceMemo->setEnabled(true);
 
          ui->power->setEnabled(true);

qtBuildSystem/Mu/settingsmanager.cpp

@@ -25,7 +25,7 @@ SettingsManager::SettingsManager(QWidget* parent) :
    ui->showOnscreenKeys->setChecked(!settings->value("hideOnscreenKeys", false).toBool());
 
    ui->fastBoot->setChecked(settings->value("fastBoot", false).toBool());
-   ui->palmOsVersion->setValue(settings->value("palmOsVersion", false).toInt());
+   ui->palmOsVersion->setCurrentIndex(settings->value("palmOsVersionIndex", 0).toInt());
 
    ui->featureSyncedRtc->setChecked(settings->value("featureSyncedRtc", false).toBool());
    ui->featureDurable->setChecked(settings->value("featureDurable", false).toBool());
@@ -161,6 +161,7 @@ void SettingsManager::on_cpuSpeed_valueChanged(double arg1){
       emu.setCpuSpeed(arg1);
 }
 
-void SettingsManager::on_palmOsVersion_valueChanged(int arg1){
-   settings->setValue("palmOsVersion", arg1);
+void SettingsManager::on_palmOsVersion_currentIndexChanged(int index){
+   settings->setValue("palmOsVersionIndex", index);
+   settings->setValue("palmOsVersionString", ui->palmOsVersion->itemText(index));
 }

qtBuildSystem/Mu/settingsmanager.h

@@ -49,7 +49,7 @@ private slots:
 
    void on_fastBoot_toggled(bool checked);
    void on_cpuSpeed_valueChanged(double arg1);
-   void on_palmOsVersion_valueChanged(int arg1);
+   void on_palmOsVersion_currentIndexChanged(int index);
 
 private:
    Ui::SettingsManager* ui;

qtBuildSystem/Mu/settingsmanager.ui

@@ -338,13 +338,30 @@
         </widget>
        </item>
        <item>
-        <widget class="QSpinBox" name="palmOsVersion">
-         <property name="minimum">
-          <number>4</number>
-         </property>
-         <property name="maximum">
-          <number>6</number>
+        <widget class="QComboBox" name="palmOsVersion">
+         <property name="currentIndex">
+          <number>1</number>
          </property>
+         <item>
+          <property name="text">
+           <string>Palm m500/Palm OS 4.0</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Palm m515/Palm OS 4.1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Tungsten T3/Palm OS 5.2.1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Tungsten T3/Palm OS 6.0</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item>

readme.md

@@ -63,14 +63,10 @@ Install prc-tools from the below link(self compiled or prepackaged VM)
 
 ## Running
 #### Files
-palmos41-en-m515.rom(all euro languages, from Palm dev program): 412557a221933a8be12622de7a21320a (MD5)  
-palmos41-en-m515.rom(English only, verified authentic from device): 83cb1d1c76e568b916dc2e7c0bf669f6 (MD5)  
+palmos40-en-m500.rom: f50e4d5e4d98dc831f2c34a9107651eb (MD5)  
+palmos41-en-m515.rom: 83cb1d1c76e568b916dc2e7c0bf669f6 (MD5)  
 palmos52-en-t3.rom: de46ec84d9aabf655eabdf9b00a3845d (MD5)   
-bootloader-en-m515.rom(v1): 9da101cd2317830649a31f8fa46debec (MD5)  
-bootloader-en-m515.rom(v2): e64c755205bc3e79d1bc5b70128f688d (MD5)  
-
-If you can read English or intend to install your own language pack use the verified version:  
-I understand not everyone speaks English so I list both ROMs, I do all my testing on the English only build because I have verified it with an actual device, but will do my best to support the Palm dev version as well(it runs on the same hardware anyway).
+bootloader-dbvz.rom: 9da101cd2317830649a31f8fa46debec (MD5)  
 
 #### For Qt
  1. Run once to create the directory tree