This is vAmiga 3.0b1

dirkwhoffmann · Sep 15, 2024 · 3cf4a33 · 3cf4a33
1 parent 9ebf8e0
commit 3cf4a33
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/Emulator/Base/MsgQueue.cpp b/Emulator/Base/MsgQueue.cpp
@@ -36,7 +36,7 @@ MsgQueue::put(const Message &msg)
 
         SYNCHRONIZED
 
-        debug(QUEUE_DEBUG, "%s [%llx]\n", MsgTypeEnum::key(msg.type), msg.value);
+        debug(MSG_DEBUG, "%s [%llx]\n", MsgTypeEnum::key(msg.type), msg.value);
 
         if (listener) {
 

diff --git a/Emulator/Components/Emulator.cpp b/Emulator/Components/Emulator.cpp
@@ -403,15 +403,14 @@ Emulator::getDebugVariable(DebugFlag flag)
         case FLAG_TIM_DEBUG:        return TIM_DEBUG;
         case FLAG_WARP_DEBUG:       return WARP_DEBUG;
         case FLAG_CMD_DEBUG:        return CMD_DEBUG;
-        case FLAG_QUEUE_DEBUG:      return QUEUE_DEBUG;
+        case FLAG_MSG_DEBUG:        return MSG_DEBUG;
         case FLAG_SNP_DEBUG:        return SNP_DEBUG;
 
         case FLAG_RUA_DEBUG:        return RUA_DEBUG;
         case FLAG_RUA_CHECKSUM:     return RUA_CHECKSUM;
         case FLAG_RUA_ON_STEROIDS:  return RUA_ON_STEROIDS;
 
         case FLAG_CPU_DEBUG:        return CPU_DEBUG;
-        case FLAG_CST_DEBUG:        return CST_DEBUG;
 
         case FLAG_OCSREG_DEBUG:     return OCSREG_DEBUG;
         case FLAG_ECSREG_DEBUG:     return ECSREG_DEBUG;
@@ -535,7 +534,7 @@ Emulator::setDebugVariable(DebugFlag flag, bool val)
         case FLAG_TIM_DEBUG:        TIM_DEBUG = val; break;
         case FLAG_WARP_DEBUG:       WARP_DEBUG = val; break;
         case FLAG_CMD_DEBUG:        CMD_DEBUG = val; break;
-        case FLAG_QUEUE_DEBUG:      QUEUE_DEBUG = val; break;
+        case FLAG_MSG_DEBUG:        MSG_DEBUG = val; break;
         case FLAG_SNP_DEBUG:        SNP_DEBUG = val; break;
 
             // Run-ahead
@@ -545,7 +544,6 @@ Emulator::setDebugVariable(DebugFlag flag, bool val)
 
             // CPU
         case FLAG_CPU_DEBUG:        CPU_DEBUG = val; break;
-        case FLAG_CST_DEBUG:        CST_DEBUG = val; break;
 
             // Memory access
         case FLAG_OCSREG_DEBUG:     OCSREG_DEBUG = val; break;

diff --git a/Emulator/Components/EmulatorTypes.h b/Emulator/Components/EmulatorTypes.h
@@ -33,7 +33,7 @@ enum_long(DEBUG_FLAG)
     FLAG_TIM_DEBUG,        ///< Thread synchronization
     FLAG_WARP_DEBUG,       ///< Warp mode
     FLAG_CMD_DEBUG,        ///< Debug the command queue
-    FLAG_QUEUE_DEBUG,      ///< Message queue
+    FLAG_MSG_DEBUG,        ///< Message queue
     FLAG_SNP_DEBUG,        ///< Serialization (snapshots)
 
     // Run ahead
@@ -43,7 +43,6 @@ enum_long(DEBUG_FLAG)
 
     // CPU
     FLAG_CPU_DEBUG,        ///< CPU
-    FLAG_CST_DEBUG,        ///< Call stack recording
 
     // Memory access
     FLAG_OCSREG_DEBUG,     ///< General OCS register debugging
@@ -176,7 +175,7 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
             case FLAG_TIM_DEBUG:        return "TIM_DEBUG";
             case FLAG_WARP_DEBUG:       return "WARP_DEBUG";
             case FLAG_CMD_DEBUG:        return "CMD_DEBUG";
-            case FLAG_QUEUE_DEBUG:      return "QUEUE_DEBUG";
+            case FLAG_MSG_DEBUG:        return "MSG_DEBUG";
             case FLAG_SNP_DEBUG:        return "SNP_DEBUG";
 
                 // Run ahead
@@ -186,7 +185,6 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
 
                 // CPU
             case FLAG_CPU_DEBUG:        return "CPU_DEBUG";
-            case FLAG_CST_DEBUG:        return "CST_DEBUG";
 
                 // Memory access
             case FLAG_OCSREG_DEBUG:     return "OCSREG_DEBUG";
@@ -313,7 +311,7 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
             case FLAG_TIM_DEBUG:        return "Thread synchronization";
             case FLAG_WARP_DEBUG:       return "Warp mode";
             case FLAG_CMD_DEBUG:        return "Command queue";
-            case FLAG_QUEUE_DEBUG:      return "Message queue";
+            case FLAG_MSG_DEBUG:        return "Message queue";
             case FLAG_SNP_DEBUG:        return "Serialization (snapshots)";
 
                 // Run ahead
@@ -324,7 +322,6 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
 
                 // CPU
             case FLAG_CPU_DEBUG:        return "CPU";
-            case FLAG_CST_DEBUG:        return "Call stack recording";
 
                 // Memory access
             case FLAG_OCSREG_DEBUG:     return "General OCS register debugging";

diff --git a/Emulator/config.cpp b/Emulator/config.cpp
@@ -21,8 +21,8 @@ debugflag RUN_DEBUG       = 0;
 debugflag TIM_DEBUG       = 0;
 debugflag WARP_DEBUG      = 0;
 debugflag CMD_DEBUG       = 0;
-debugflag QUEUE_DEBUG     = 0;
-debugflag SNP_DEBUG       = 1;
+debugflag MSG_DEBUG       = 0;
+debugflag SNP_DEBUG       = 0;
 
 // Run ahead
 debugflag RUA_DEBUG       = 0;
@@ -31,7 +31,6 @@ debugflag RUA_ON_STEROIDS = 0;
 
 // CPU
 debugflag CPU_DEBUG       = 0;
-debugflag CST_DEBUG       = 0;
 
 // Memory access
 debugflag OCSREG_DEBUG    = 0;

diff --git a/Emulator/config.h b/Emulator/config.h
@@ -111,7 +111,7 @@ extern debugflag RUN_DEBUG;
 extern debugflag TIM_DEBUG;
 extern debugflag WARP_DEBUG;
 extern debugflag CMD_DEBUG;
-extern debugflag QUEUE_DEBUG;
+extern debugflag MSG_DEBUG;
 extern debugflag SNP_DEBUG;
 
 // Run ahead
@@ -121,7 +121,6 @@ extern debugflag RUA_ON_STEROIDS;
 
 // CPU
 extern debugflag CPU_DEBUG;
-extern debugflag CST_DEBUG;
 
 // Memory access
 extern debugflag OCSREG_DEBUG;

diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
@@ -2868,7 +2868,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240914;
+				CURRENT_PROJECT_VERSION = 240915;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2919,7 +2919,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240914;
+				CURRENT_PROJECT_VERSION = 240915;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;

diff --git a/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -191,8 +191,8 @@
             filePath = "Emulator/Components/Emulator.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "508"
-            endingLineNumber = "508"
+            startingLineNumber = "507"
+            endingLineNumber = "507"
             landmarkName = "Emulator::getDebugVariable(flag)"
             landmarkType = "7">
          </BreakpointContent>
@@ -207,8 +207,8 @@
             filePath = "Emulator/Components/Emulator.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "657"
-            endingLineNumber = "657"
+            startingLineNumber = "655"
+            endingLineNumber = "655"
             landmarkName = "Emulator::setDebugVariable(flag, val)"
             landmarkType = "7">
          </BreakpointContent>