Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkwhoffmann committed Feb 5, 2024
1 parent d83aa14 commit d1ef29b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 25 deletions.
2 changes: 0 additions & 2 deletions Emulator/Components/C64.cpp
Expand Up @@ -1079,8 +1079,6 @@ C64::execute()
// | 1 | | 2 | | | | | | |
// '-----' '-----' '-----' | '-----' |
// | |
// | |
// | |
// | ,--------, |
// | | | |
// ,-- Drive ----------------------------|--> | VC1541 | ----|--,
Expand Down
1 change: 0 additions & 1 deletion Emulator/Components/C64.h
Expand Up @@ -436,7 +436,6 @@ class C64 : public Thread {
void signalUserSnapshot() { setFlag(RL::USER_SNAPSHOT); }
void signalBreakpoint() { setFlag(RL::BREAKPOINT); }
void signalWatchpoint() { setFlag(RL::WATCHPOINT); }
void signalInspect() { setFlag(RL::INSPECT); }
void signalJammed() { setFlag(RL::CPU_JAM); }
void signalStop() { setFlag(RL::STOP); }
void signalExpPortNmi() { setFlag(RL::EXTERNAL_NMI); }
Expand Down
21 changes: 10 additions & 11 deletions Emulator/Components/C64Types.h
Expand Up @@ -346,17 +346,16 @@ typedef u32 RunLoopFlags;
namespace RL
{
constexpr u32 STOP = (1 << 0);
constexpr u32 INSPECT = (1 << 1);
constexpr u32 WARP_ON = (1 << 2);
constexpr u32 WARP_OFF = (1 << 3);
constexpr u32 BREAKPOINT = (1 << 4);
constexpr u32 WATCHPOINT = (1 << 5);
constexpr u32 AUTO_SNAPSHOT = (1 << 6);
constexpr u32 USER_SNAPSHOT = (1 << 7);
constexpr u32 CPU_JAM = (1 << 8);
constexpr u32 EXTERNAL_NMI = (1 << 9);
constexpr u32 EXTERNAL_BRK = (1 << 10);
constexpr u32 SINGLE_STEP = (1 << 11);
constexpr u32 WARP_ON = (1 << 1);
constexpr u32 WARP_OFF = (1 << 2);
constexpr u32 BREAKPOINT = (1 << 3);
constexpr u32 WATCHPOINT = (1 << 4);
constexpr u32 AUTO_SNAPSHOT = (1 << 5);
constexpr u32 USER_SNAPSHOT = (1 << 6);
constexpr u32 CPU_JAM = (1 << 7);
constexpr u32 EXTERNAL_NMI = (1 << 8);
constexpr u32 EXTERNAL_BRK = (1 << 9);
constexpr u32 SINGLE_STEP = (1 << 10);

};

Expand Down
5 changes: 5 additions & 0 deletions Emulator/Utilities/Chrono.h
Expand Up @@ -26,6 +26,11 @@ class Time {
public:

static Time now();
static Time nanoseconds(i64 value) { return Time(value); }
static Time microseconds(i64 value) { return Time(value * 1000); }
static Time milliseconds(i64 value) { return Time(value * 1000000); }
static Time seconds(i64 value) { return Time(value * 1000000000); }
static Time seconds(float value) { return Time(i64(value * 1000000000.f)); }
static std::tm local(const std::time_t &time);

Time() { };
Expand Down
18 changes: 7 additions & 11 deletions GUI/MyControllerStatusBar.swift
Expand Up @@ -331,21 +331,17 @@ extension MyController {
refreshStatusBar()
myAppDelegate.prefController?.refresh()
}

/*
@IBAction func warpAction(_ sender: Any!) {
switch pref.warpMode {

case .auto: pref.warpMode = .off
case .off: pref.warpMode = .on
case .on: pref.warpMode = .auto
}
/*
@IBAction func timeLapseAction(_ sender: NSSlider!) {
let value = sender.integerValue
let incr = sender.altIncrementValue
print("value = \(value) incr = \(incr)")
config.tim
refreshStatusBar()
}
*/

*/
@IBAction func activityTypeAction(_ sender: NSPopUpButton!) {

/*
Expand Down

0 comments on commit d1ef29b

Please sign in to comment.