From 4e27c1a322a937ab3f5294f785380b1628bedea4 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 6 Oct 2019 16:28:44 -0700
Subject: [PATCH] Rename internal _debugger_go() to avoid name collision with
 main debugger_go()

---
 src/meta/debug.c    | 20 ++++++++++----------
 src/meta/debug.l    | 20 ++++++++++----------
 src/meta/debugger.c |  6 +++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/meta/debug.c b/src/meta/debug.c
index cb62c3b2..1ad1123d 100644
--- a/src/meta/debug.c
+++ b/src/meta/debug.c
@@ -1098,7 +1098,7 @@ extern void set_halt_65c02(void);
 extern void clear_halt_65c02(void);
 extern void clear_halt_opcode(uint8_t opcode);
 extern void show_opcode_breakpts(void);
-extern int debugger_go(stepping_struct_s s);
+extern int _debugger_go(stepping_struct_s s);
 extern void fb_sha1(void);
 
 /*
@@ -1890,7 +1890,7 @@ YY_RULE_SETUP
         s.step_type = NEXTING;
     }
 
-    debugger_go(s);
+    _debugger_go(s);
     return STEP;
 }
 	YY_BREAK
@@ -1914,7 +1914,7 @@ YY_RULE_SETUP
         s.step_type = NEXTING;
     }
 
-    debugger_go(s);
+    _debugger_go(s);
     return STEP;
 }
 	YY_BREAK
@@ -1929,7 +1929,7 @@ YY_RULE_SETUP
         .step_frame = 1
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return FINISH;
 }
 	YY_BREAK
@@ -1976,7 +1976,7 @@ YY_RULE_SETUP
         .step_pc = run_args.cpu65_pc + delta
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return UNTIL;
 }
 	YY_BREAK
@@ -1995,7 +1995,7 @@ YY_RULE_SETUP
         .step_type = GOING
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return GO;
 }
 	YY_BREAK
@@ -2008,7 +2008,7 @@ YY_RULE_SETUP
         .step_type = GOING
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return GO;
 }
 	YY_BREAK
@@ -2307,7 +2307,7 @@ YY_RULE_SETUP
         .step_text = buf
     };
 
-    debugger_go(s);
+    _debugger_go(s);
 
     return TYPE;
 }
@@ -2341,7 +2341,7 @@ YY_RULE_SETUP
             .step_text = buf
         };
 
-        ch = debugger_go(s);
+        ch = _debugger_go(s);
         if (ch != -1) {
             break;
         }
@@ -2352,7 +2352,7 @@ YY_RULE_SETUP
         stepping_struct_s s = {
             .step_type = GOING,
         };
-        debugger_go(s);
+        _debugger_go(s);
     }
 
     return LOAD;
diff --git a/src/meta/debug.l b/src/meta/debug.l
index 666e9de2..2e980948 100644
--- a/src/meta/debug.l
+++ b/src/meta/debug.l
@@ -58,7 +58,7 @@ extern void set_halt_65c02(void);
 extern void clear_halt_65c02(void);
 extern void clear_halt_opcode(uint8_t opcode);
 extern void show_opcode_breakpts(void);
-extern int debugger_go(stepping_struct_s s);
+extern int _debugger_go(stepping_struct_s s);
 extern void fb_sha1(void);
 
 /*
@@ -483,7 +483,7 @@ ADDRS	[0-9a-fA-F]+
         s.step_type = NEXTING;
     }
 
-    debugger_go(s);
+    _debugger_go(s);
     return STEP;
 }
 
@@ -503,7 +503,7 @@ ADDRS	[0-9a-fA-F]+
         s.step_type = NEXTING;
     }
 
-    debugger_go(s);
+    _debugger_go(s);
     return STEP;
 }
 
@@ -514,7 +514,7 @@ ADDRS	[0-9a-fA-F]+
         .step_frame = 1
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return FINISH;
 }
 
@@ -557,7 +557,7 @@ ADDRS	[0-9a-fA-F]+
         .step_pc = run_args.cpu65_pc + delta
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return UNTIL;
 }
 
@@ -572,7 +572,7 @@ ADDRS	[0-9a-fA-F]+
         .step_type = GOING
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return GO;
 }
 
@@ -581,7 +581,7 @@ ADDRS	[0-9a-fA-F]+
         .step_type = GOING
     };
 
-    debugger_go(s);
+    _debugger_go(s);
     return GO;
 }
 
@@ -806,7 +806,7 @@ ADDRS	[0-9a-fA-F]+
         .step_text = buf
     };
 
-    debugger_go(s);
+    _debugger_go(s);
 
     return TYPE;
 }
@@ -836,7 +836,7 @@ ADDRS	[0-9a-fA-F]+
             .step_text = buf
         };
 
-        ch = debugger_go(s);
+        ch = _debugger_go(s);
         if (ch != -1) {
             break;
         }
@@ -847,7 +847,7 @@ ADDRS	[0-9a-fA-F]+
         stepping_struct_s s = {
             .step_type = GOING,
         };
-        debugger_go(s);
+        _debugger_go(s);
     }
 
     return LOAD;
diff --git a/src/meta/debugger.c b/src/meta/debugger.c
index 4b050905..8b57f382 100644
--- a/src/meta/debugger.c
+++ b/src/meta/debugger.c
@@ -1263,9 +1263,9 @@ bool debugger_shouldBreak(void) {
 }
 
 /* -------------------------------------------------------------------------
-    debugger_go () - step into or step over commands
+    _debugger_go () - step into or step over commands
    ------------------------------------------------------------------------- */
-int debugger_go(stepping_struct_s s) {
+int _debugger_go(stepping_struct_s s) {
     memcpy(&stepping_struct, &s, sizeof(s));
 
     int ch = begin_cpu_stepping();
@@ -1521,7 +1521,7 @@ void debugger_go(void) {
     num_buffer_lines = 0;
     is_debugging = true;
 
-    debugger_go(s);
+    _debugger_go(s);
 
     FREE(buf);