Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix several minor issues. 

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
This commit is contained in:
Ricky Zhang 2017-10-06 20:01:55 -04:00
parent 175fbfde43
commit cba9b032fb
No known key found for this signature in database
GPG Key ID: 681AFAEF6CDEDB4C
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/Unix/main_unix.cpp
View File

@ -417,7 +417,7 @@ int main(int argc, char **argv)
if (i < argc) { if (i < argc) {
std::stringstream ss; std::stringstream ss;
ss << std::hex << argv[i]; ss << std::hex << argv[i];
ss >> ROMBreakpoint; ss >> ROMBreakpoint;
argv[i] = NULL; argv[i] = NULL;
} }
#ifdef ENABLE_MON #ifdef ENABLE_MON

16
cxmon/src/mon.cpp
View File

@ -154,7 +154,7 @@ void mon_add_command(const char *name, void (*func)(), const char *help_text)
void mon_error(const char *s) 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 * 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 // Save break point
if ((it = disabled_break_points.find(adr)) == disabled_break_points.end()) if (it == disabled_break_points.end()) {
active_break_points.insert(adr); active_break_points.insert(addr);
else { } else {
disabled_break_points.erase(it); 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 * Load break point from file
*/ */
void mon_load_break_point(char* file_path) void mon_load_break_point(const char* file_path)
{ {
FILE *file; FILE *file;
if (!(file = fopen(file_path, "r"))) { if (!(file = fopen(file_path, "r"))) {

4
cxmon/src/mon.h
View File

@ -108,7 +108,7 @@ extern void mon_write_word(uintptr adr, uint32 l);
// Check if break point is set // Check if break point is set
#define IS_BREAK_POINT(address) (active_break_points.find(address) != active_break_points.end()) #define IS_BREAK_POINT(address) (active_break_points.find(address) != active_break_points.end())
// Add break point // Add break point
extern void mon_add_break_point(uintptr adr); extern void mon_add_break_point(uintptr addr);
extern void mon_load_break_point(char* file_path); extern void mon_load_break_point(const char* file_path);
#endif #endif