2000-12-22 Fernando Nasser <fnasser@redhat.com>

[deliverable/binutils-gdb.git] / gdb / infcmd.c

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 97a9b28fefd4a25ae88b9135e671d8d93b8b4b13..fb788f86e0a06f7166cd09a7da21c43bb4c0bd07 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -178,11 +178,7 @@ CORE_ADDR step_frame_address;
 
 CORE_ADDR step_sp;
 
-/* 1 means step over all subroutine calls.
-   0 means don't step over calls (used by stepi).
-   -1 means step over calls to undebuggable functions.  */
-
-int step_over_calls;
+enum step_over_calls_kind step_over_calls;
 
 /* If stepping, nonzero means step count is > 1
    so don't print frame next time inferior stops
@@ -304,7 +300,7 @@ Start it from the beginning? "))
       if (args)
        {
          cmd = concat ("set args ", args, NULL);
-         make_cleanup (free, cmd);
+         make_cleanup (xfree, cmd);
          execute_command (cmd, from_tty);
        }
     }
@@ -381,7 +377,7 @@ continue_command (char *proc_count_exp, int from_tty)
       while (num != 0)
        {
          set_ignore_count (num,
-                           parse_and_eval_address (proc_count_exp) - 1,
+                           parse_and_eval_long (proc_count_exp) - 1,
                            from_tty);
          /* set_ignore_count prints a message ending with a period.
             So print two spaces before "Continuing.".  */
@@ -465,7 +461,7 @@ step_1 (int skip_subroutines, int single_inst, char *count_string)
       async_disable_stdin ();
     }
 
-  count = count_string ? parse_and_eval_address (count_string) : 1;
+  count = count_string ? parse_and_eval_long (count_string) : 1;
 
   if (!single_inst || skip_subroutines)                /* leave si command alone */
     {
@@ -513,11 +509,11 @@ which has no line number information.\n", name);
                /* It is stepi.
                   Don't step over function calls, not even to functions lacking
                   line numbers.  */
-               step_over_calls = 0;
+               step_over_calls = STEP_OVER_NONE;
            }
 
          if (skip_subroutines)
-           step_over_calls = 1;
+           step_over_calls = STEP_OVER_ALL;
 
          step_multi = (count > 1);
          proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1);
@@ -607,7 +603,13 @@ step_once (int skip_subroutines, int single_inst, int count)
       if (!single_inst)
        {
          find_pc_line_pc_range (stop_pc, &step_range_start, &step_range_end);
-         if (step_range_end == 0)
+
+         /* If we have no line info, switch to stepi mode.  */
+         if (step_range_end == 0 && step_stop_if_no_debug)
+           {
+             step_range_start = step_range_end = 1;
+           }
+         else if (step_range_end == 0)
            {
              char *name;
              if (find_pc_partial_function (stop_pc, &name, &step_range_start,
@@ -628,11 +630,11 @@ which has no line number information.\n", name);
            /* It is stepi.
               Don't step over function calls, not even to functions lacking
               line numbers.  */
-           step_over_calls = 0;
+           step_over_calls = STEP_OVER_NONE;
        }
 
       if (skip_subroutines)
-       step_over_calls = 1;
+       step_over_calls = STEP_OVER_ALL;
 
       step_multi = (count > 1);
       arg1 =
@@ -694,7 +696,7 @@ jump_command (char *arg, int from_tty)
     }
 
   sal = sals.sals[0];
-  free ((PTR) sals.sals);
+  xfree (sals.sals);
 
   if (sal.symtab == 0 && sal.pc == 0)
     error ("No source file has been specified.");
@@ -777,7 +779,7 @@ signal_command (char *signum_exp, int from_tty)
   if (oursig == TARGET_SIGNAL_UNKNOWN)
     {
       /* No, try numeric.  */
-      int num = parse_and_eval_address (signum_exp);
+      int num = parse_and_eval_long (signum_exp);
 
       if (num == 0)
        oursig = TARGET_SIGNAL_0;
@@ -958,7 +960,7 @@ until_next_command (int from_tty)
       step_range_end = sal.end;
     }
 
-  step_over_calls = 1;
+  step_over_calls = STEP_OVER_ALL;
   step_frame_address = FRAME_FP (frame);
   step_sp = read_sp ();
 
@@ -1373,7 +1375,7 @@ set_environment_command (char *arg, int from_tty)
     }
   else
     set_in_environ (inferior_environ, var, val);
-  free (var);
+  xfree (var);
 }
 
 static void
@@ -1421,7 +1423,7 @@ path_command (char *dirname, int from_tty)
   exec_path = strsave (env);
   mod_path (dirname, &exec_path);
   set_in_environ (inferior_environ, path_var_name, exec_path);
-  free (exec_path);
+  xfree (exec_path);
   if (from_tty)
     path_info ((char *) NULL, from_tty);
 }