From cba9b032fb167b33ff021a6220843f9817ab8aaf Mon Sep 17 00:00:00 2001 From: Ricky Zhang Date: Fri, 6 Oct 2017 20:01:55 -0400 Subject: [PATCH] Fix several minor issues. Signed-off-by: Ricky Zhang --- BasiliskII/src/Unix/main_unix.cpp | 2 +- cxmon/src/mon.cpp | 16 ++++++++-------- cxmon/src/mon.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BasiliskII/src/Unix/main_unix.cpp b/BasiliskII/src/Unix/main_unix.cpp index 56f5dac2..9aadbbf8 100644 --- a/BasiliskII/src/Unix/main_unix.cpp +++ b/BasiliskII/src/Unix/main_unix.cpp @@ -417,7 +417,7 @@ int main(int argc, char **argv) if (i < argc) { std::stringstream ss; ss << std::hex << argv[i]; - ss >> ROMBreakpoint; + ss >> ROMBreakpoint; argv[i] = NULL; } #ifdef ENABLE_MON diff --git a/cxmon/src/mon.cpp b/cxmon/src/mon.cpp index 29b4922d..52478b0c 100644 --- a/cxmon/src/mon.cpp +++ b/cxmon/src/mon.cpp @@ -154,7 +154,7 @@ void mon_add_command(const char *name, void (*func)(), const char *help_text) void mon_error(const char *s) { - fprintf(monerr == NULL? stdout: monerr, "*** %s\n", s); + fprintf(monerr == NULL? stdout : monerr, "*** %s\n", s); } @@ -1034,15 +1034,15 @@ void mon_change_dir() * Add break point */ -void mon_add_break_point(uintptr adr) +void mon_add_break_point(uintptr addr) { - BREAK_POINT_SET::iterator it; + BREAK_POINT_SET::iterator it = disabled_break_points.find(addr); // Save break point - if ((it = disabled_break_points.find(adr)) == disabled_break_points.end()) - active_break_points.insert(adr); - else { + if (it == disabled_break_points.end()) { + active_break_points.insert(addr); + } else { disabled_break_points.erase(it); - active_break_points.insert(adr); + active_break_points.insert(addr); } } @@ -1050,7 +1050,7 @@ void mon_add_break_point(uintptr adr) /* * Load break point from file */ -void mon_load_break_point(char* file_path) +void mon_load_break_point(const char* file_path) { FILE *file; if (!(file = fopen(file_path, "r"))) { diff --git a/cxmon/src/mon.h b/cxmon/src/mon.h index 732c4948..a4e59041 100644 --- a/cxmon/src/mon.h +++ b/cxmon/src/mon.h @@ -108,7 +108,7 @@ extern void mon_write_word(uintptr adr, uint32 l); // Check if break point is set #define IS_BREAK_POINT(address) (active_break_points.find(address) != active_break_points.end()) // Add break point -extern void mon_add_break_point(uintptr adr); -extern void mon_load_break_point(char* file_path); +extern void mon_add_break_point(uintptr addr); +extern void mon_load_break_point(const char* file_path); #endif