Skip to content

Commit 3cf4a33

Browse files
dirkwhoffmanndirkwhoffmann
committed
This is vAmiga 3.0b1
1 parent 9ebf8e0 commit 3cf4a33

File tree

7 files changed

+15
-22
lines changed

7 files changed

+15
-22
lines changed

‎Emulator/Base/MsgQueue.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ MsgQueue::put(const Message &msg)
3636

3737
SYNCHRONIZED
3838

39-
debug(QUEUE_DEBUG, "%s [%llx]\n", MsgTypeEnum::key(msg.type), msg.value);
39+
debug(MSG_DEBUG, "%s [%llx]\n", MsgTypeEnum::key(msg.type), msg.value);
4040

4141
if (listener) {
4242

‎Emulator/Components/Emulator.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,14 @@ Emulator::getDebugVariable(DebugFlag flag)
403403
case FLAG_TIM_DEBUG: return TIM_DEBUG;
404404
case FLAG_WARP_DEBUG: return WARP_DEBUG;
405405
case FLAG_CMD_DEBUG: return CMD_DEBUG;
406-
case FLAG_QUEUE_DEBUG: return QUEUE_DEBUG;
406+
case FLAG_MSG_DEBUG: return MSG_DEBUG;
407407
case FLAG_SNP_DEBUG: return SNP_DEBUG;
408408

409409
case FLAG_RUA_DEBUG: return RUA_DEBUG;
410410
case FLAG_RUA_CHECKSUM: return RUA_CHECKSUM;
411411
case FLAG_RUA_ON_STEROIDS: return RUA_ON_STEROIDS;
412412

413413
case FLAG_CPU_DEBUG: return CPU_DEBUG;
414-
case FLAG_CST_DEBUG: return CST_DEBUG;
415414

416415
case FLAG_OCSREG_DEBUG: return OCSREG_DEBUG;
417416
case FLAG_ECSREG_DEBUG: return ECSREG_DEBUG;
@@ -535,7 +534,7 @@ Emulator::setDebugVariable(DebugFlag flag, bool val)
535534
case FLAG_TIM_DEBUG: TIM_DEBUG = val; break;
536535
case FLAG_WARP_DEBUG: WARP_DEBUG = val; break;
537536
case FLAG_CMD_DEBUG: CMD_DEBUG = val; break;
538-
case FLAG_QUEUE_DEBUG: QUEUE_DEBUG = val; break;
537+
case FLAG_MSG_DEBUG: MSG_DEBUG = val; break;
539538
case FLAG_SNP_DEBUG: SNP_DEBUG = val; break;
540539

541540
// Run-ahead
@@ -545,7 +544,6 @@ Emulator::setDebugVariable(DebugFlag flag, bool val)
545544

546545
// CPU
547546
case FLAG_CPU_DEBUG: CPU_DEBUG = val; break;
548-
case FLAG_CST_DEBUG: CST_DEBUG = val; break;
549547

550548
// Memory access
551549
case FLAG_OCSREG_DEBUG: OCSREG_DEBUG = val; break;

‎Emulator/Components/EmulatorTypes.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum_long(DEBUG_FLAG)
3333
FLAG_TIM_DEBUG, ///< Thread synchronization
3434
FLAG_WARP_DEBUG, ///< Warp mode
3535
FLAG_CMD_DEBUG, ///< Debug the command queue
36-
FLAG_QUEUE_DEBUG, ///< Message queue
36+
FLAG_MSG_DEBUG, ///< Message queue
3737
FLAG_SNP_DEBUG, ///< Serialization (snapshots)
3838

3939
// Run ahead
@@ -43,7 +43,6 @@ enum_long(DEBUG_FLAG)
4343

4444
// CPU
4545
FLAG_CPU_DEBUG, ///< CPU
46-
FLAG_CST_DEBUG, ///< Call stack recording
4746

4847
// Memory access
4948
FLAG_OCSREG_DEBUG, ///< General OCS register debugging
@@ -176,7 +175,7 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
176175
case FLAG_TIM_DEBUG: return "TIM_DEBUG";
177176
case FLAG_WARP_DEBUG: return "WARP_DEBUG";
178177
case FLAG_CMD_DEBUG: return "CMD_DEBUG";
179-
case FLAG_QUEUE_DEBUG: return "QUEUE_DEBUG";
178+
case FLAG_MSG_DEBUG: return "MSG_DEBUG";
180179
case FLAG_SNP_DEBUG: return "SNP_DEBUG";
181180

182181
// Run ahead
@@ -186,7 +185,6 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
186185

187186
// CPU
188187
case FLAG_CPU_DEBUG: return "CPU_DEBUG";
189-
case FLAG_CST_DEBUG: return "CST_DEBUG";
190188

191189
// Memory access
192190
case FLAG_OCSREG_DEBUG: return "OCSREG_DEBUG";
@@ -313,7 +311,7 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
313311
case FLAG_TIM_DEBUG: return "Thread synchronization";
314312
case FLAG_WARP_DEBUG: return "Warp mode";
315313
case FLAG_CMD_DEBUG: return "Command queue";
316-
case FLAG_QUEUE_DEBUG: return "Message queue";
314+
case FLAG_MSG_DEBUG: return "Message queue";
317315
case FLAG_SNP_DEBUG: return "Serialization (snapshots)";
318316

319317
// Run ahead
@@ -324,7 +322,6 @@ struct DebugFlagEnum : vamiga::util::Reflection<DebugFlagEnum, DebugFlag>
324322

325323
// CPU
326324
case FLAG_CPU_DEBUG: return "CPU";
327-
case FLAG_CST_DEBUG: return "Call stack recording";
328325

329326
// Memory access
330327
case FLAG_OCSREG_DEBUG: return "General OCS register debugging";

‎Emulator/config.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ debugflag RUN_DEBUG = 0;
2121
debugflag TIM_DEBUG = 0;
2222
debugflag WARP_DEBUG = 0;
2323
debugflag CMD_DEBUG = 0;
24-
debugflag QUEUE_DEBUG = 0;
25-
debugflag SNP_DEBUG = 1;
24+
debugflag MSG_DEBUG = 0;
25+
debugflag SNP_DEBUG = 0;
2626

2727
// Run ahead
2828
debugflag RUA_DEBUG = 0;
@@ -31,7 +31,6 @@ debugflag RUA_ON_STEROIDS = 0;
3131

3232
// CPU
3333
debugflag CPU_DEBUG = 0;
34-
debugflag CST_DEBUG = 0;
3534

3635
// Memory access
3736
debugflag OCSREG_DEBUG = 0;

‎Emulator/config.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ extern debugflag RUN_DEBUG;
111111
extern debugflag TIM_DEBUG;
112112
extern debugflag WARP_DEBUG;
113113
extern debugflag CMD_DEBUG;
114-
extern debugflag QUEUE_DEBUG;
114+
extern debugflag MSG_DEBUG;
115115
extern debugflag SNP_DEBUG;
116116

117117
// Run ahead
@@ -121,7 +121,6 @@ extern debugflag RUA_ON_STEROIDS;
121121

122122
// CPU
123123
extern debugflag CPU_DEBUG;
124-
extern debugflag CST_DEBUG;
125124

126125
// Memory access
127126
extern debugflag OCSREG_DEBUG;

‎vAmiga.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,7 @@
28682868
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
28692869
CODE_SIGN_STYLE = Manual;
28702870
COMBINE_HIDPI_IMAGES = YES;
2871-
CURRENT_PROJECT_VERSION = 240914;
2871+
CURRENT_PROJECT_VERSION = 240915;
28722872
DEAD_CODE_STRIPPING = YES;
28732873
DEVELOPMENT_TEAM = "";
28742874
ENABLE_APP_SANDBOX = NO;
@@ -2919,7 +2919,7 @@
29192919
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
29202920
CODE_SIGN_STYLE = Manual;
29212921
COMBINE_HIDPI_IMAGES = YES;
2922-
CURRENT_PROJECT_VERSION = 240914;
2922+
CURRENT_PROJECT_VERSION = 240915;
29232923
DEAD_CODE_STRIPPING = YES;
29242924
DEVELOPMENT_TEAM = "";
29252925
ENABLE_APP_SANDBOX = NO;

‎vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@
191191
filePath = "Emulator/Components/Emulator.cpp"
192192
startingColumnNumber = "9223372036854775807"
193193
endingColumnNumber = "9223372036854775807"
194-
startingLineNumber = "508"
195-
endingLineNumber = "508"
194+
startingLineNumber = "507"
195+
endingLineNumber = "507"
196196
landmarkName = "Emulator::getDebugVariable(flag)"
197197
landmarkType = "7">
198198
</BreakpointContent>
@@ -207,8 +207,8 @@
207207
filePath = "Emulator/Components/Emulator.cpp"
208208
startingColumnNumber = "9223372036854775807"
209209
endingColumnNumber = "9223372036854775807"
210-
startingLineNumber = "657"
211-
endingLineNumber = "657"
210+
startingLineNumber = "655"
211+
endingLineNumber = "655"
212212
landmarkName = "Emulator::setDebugVariable(flag, val)"
213213
landmarkType = "7">
214214
</BreakpointContent>

0 commit comments

Comments
 (0)