yann@96
|
1 |
2004-10-11
|
yann@96
|
2 |
|
yann@96
|
3 |
This patch is not submitted. Many of these functions should be passing
|
yann@96
|
4 |
a frame around rather than calling get_selected_frame, but at least it
|
yann@96
|
5 |
is an improvement over deprecated_selected_frame.
|
yann@96
|
6 |
|
yann@96
|
7 |
Index: gdb-6.3/gdb/breakpoint.c
|
yann@96
|
8 |
===================================================================
|
yann@96
|
9 |
--- gdb-6.3.orig/gdb/breakpoint.c 2004-10-08 13:30:46.000000000 -0400
|
yann@96
|
10 |
+++ gdb-6.3/gdb/breakpoint.c 2004-11-09 22:55:11.231620957 -0500
|
yann@96
|
11 |
@@ -922,7 +922,7 @@ insert_bp_location (struct bp_location *
|
yann@96
|
12 |
/* FIXME drow/2003-09-09: It would be nice if evaluate_expression
|
yann@96
|
13 |
took a frame parameter, so that we didn't have to change the
|
yann@96
|
14 |
selected frame. */
|
yann@96
|
15 |
- saved_frame_id = get_frame_id (deprecated_selected_frame);
|
yann@96
|
16 |
+ saved_frame_id = get_frame_id (get_selected_frame ());
|
yann@96
|
17 |
|
yann@96
|
18 |
/* Determine if the watchpoint is within scope. */
|
yann@96
|
19 |
if (bpt->owner->exp_valid_block == NULL)
|
yann@96
|
20 |
@@ -5464,14 +5464,9 @@ break_at_finish_at_depth_command_1 (char
|
yann@96
|
21 |
|
yann@96
|
22 |
if (default_breakpoint_valid)
|
yann@96
|
23 |
{
|
yann@96
|
24 |
- if (deprecated_selected_frame)
|
yann@96
|
25 |
- {
|
yann@96
|
26 |
- selected_pc = get_frame_pc (deprecated_selected_frame);
|
yann@96
|
27 |
- if (arg)
|
yann@96
|
28 |
- if_arg = 1;
|
yann@96
|
29 |
- }
|
yann@96
|
30 |
- else
|
yann@96
|
31 |
- error ("No selected frame.");
|
yann@96
|
32 |
+ selected_pc = get_frame_pc (get_selected_frame ());
|
yann@96
|
33 |
+ if (arg)
|
yann@96
|
34 |
+ if_arg = 1;
|
yann@96
|
35 |
}
|
yann@96
|
36 |
else
|
yann@96
|
37 |
error ("No default breakpoint address now.");
|
yann@96
|
38 |
@@ -5542,15 +5537,10 @@ break_at_finish_command_1 (char *arg, in
|
yann@96
|
39 |
{
|
yann@96
|
40 |
if (default_breakpoint_valid)
|
yann@96
|
41 |
{
|
yann@96
|
42 |
- if (deprecated_selected_frame)
|
yann@96
|
43 |
- {
|
yann@96
|
44 |
- addr_string = xstrprintf ("*0x%s",
|
yann@96
|
45 |
- paddr_nz (get_frame_pc (deprecated_selected_frame)));
|
yann@96
|
46 |
- if (arg)
|
yann@96
|
47 |
- if_arg = 1;
|
yann@96
|
48 |
- }
|
yann@96
|
49 |
- else
|
yann@96
|
50 |
- error ("No selected frame.");
|
yann@96
|
51 |
+ addr_string = xstrprintf ("*0x%s",
|
yann@96
|
52 |
+ paddr_nz (get_frame_pc (get_selected_frame ())));
|
yann@96
|
53 |
+ if (arg)
|
yann@96
|
54 |
+ if_arg = 1;
|
yann@96
|
55 |
}
|
yann@96
|
56 |
else
|
yann@96
|
57 |
error ("No default breakpoint address now.");
|
yann@96
|
58 |
@@ -6082,7 +6072,7 @@ until_break_command (char *arg, int from
|
yann@96
|
59 |
{
|
yann@96
|
60 |
struct symtabs_and_lines sals;
|
yann@96
|
61 |
struct symtab_and_line sal;
|
yann@96
|
62 |
- struct frame_info *prev_frame = get_prev_frame (deprecated_selected_frame);
|
yann@96
|
63 |
+ struct frame_info *prev_frame = get_prev_frame (get_selected_frame ());
|
yann@96
|
64 |
struct breakpoint *breakpoint;
|
yann@96
|
65 |
struct cleanup *old_chain;
|
yann@96
|
66 |
struct continuation_arg *arg1;
|
yann@96
|
67 |
@@ -6119,7 +6109,7 @@ until_break_command (char *arg, int from
|
yann@96
|
68 |
/* Otherwise, specify the current frame, because we want to stop only
|
yann@96
|
69 |
at the very same frame. */
|
yann@96
|
70 |
breakpoint = set_momentary_breakpoint (sal,
|
yann@96
|
71 |
- get_frame_id (deprecated_selected_frame),
|
yann@96
|
72 |
+ get_frame_id (get_selected_frame ()),
|
yann@96
|
73 |
bp_until);
|
yann@96
|
74 |
|
yann@96
|
75 |
if (!target_can_async_p ())
|
yann@96
|
76 |
Index: gdb-6.3/gdb/cli/cli-cmds.c
|
yann@96
|
77 |
===================================================================
|
yann@96
|
78 |
--- gdb-6.3.orig/gdb/cli/cli-cmds.c 2004-09-11 06:24:53.000000000 -0400
|
yann@96
|
79 |
+++ gdb-6.3/gdb/cli/cli-cmds.c 2004-11-09 22:51:07.323246218 -0500
|
yann@96
|
80 |
@@ -845,10 +845,7 @@ disassemble_command (char *arg, int from
|
yann@96
|
81 |
name = NULL;
|
yann@96
|
82 |
if (!arg)
|
yann@96
|
83 |
{
|
yann@96
|
84 |
- if (!deprecated_selected_frame)
|
yann@96
|
85 |
- error ("No frame selected.\n");
|
yann@96
|
86 |
-
|
yann@96
|
87 |
- pc = get_frame_pc (deprecated_selected_frame);
|
yann@96
|
88 |
+ pc = get_frame_pc (get_selected_frame ());
|
yann@96
|
89 |
if (find_pc_partial_function (pc, &name, &low, &high) == 0)
|
yann@96
|
90 |
error ("No function contains program counter for selected frame.\n");
|
yann@96
|
91 |
#if defined(TUI)
|
yann@96
|
92 |
Index: gdb-6.3/gdb/f-valprint.c
|
yann@96
|
93 |
===================================================================
|
yann@96
|
94 |
--- gdb-6.3.orig/gdb/f-valprint.c 2003-10-14 02:51:14.000000000 -0400
|
yann@96
|
95 |
+++ gdb-6.3/gdb/f-valprint.c 2004-11-09 22:51:07.326245632 -0500
|
yann@96
|
96 |
@@ -76,7 +76,7 @@ f77_get_dynamic_lowerbound (struct type
|
yann@96
|
97 |
switch (TYPE_ARRAY_LOWER_BOUND_TYPE (type))
|
yann@96
|
98 |
{
|
yann@96
|
99 |
case BOUND_BY_VALUE_ON_STACK:
|
yann@96
|
100 |
- current_frame_addr = get_frame_base (deprecated_selected_frame);
|
yann@96
|
101 |
+ current_frame_addr = get_frame_base (get_selected_frame ());
|
yann@96
|
102 |
if (current_frame_addr > 0)
|
yann@96
|
103 |
{
|
yann@96
|
104 |
*lower_bound =
|
yann@96
|
105 |
@@ -100,7 +100,7 @@ f77_get_dynamic_lowerbound (struct type
|
yann@96
|
106 |
break;
|
yann@96
|
107 |
|
yann@96
|
108 |
case BOUND_BY_REF_ON_STACK:
|
yann@96
|
109 |
- current_frame_addr = get_frame_base (deprecated_selected_frame);
|
yann@96
|
110 |
+ current_frame_addr = get_frame_base (get_selected_frame ());
|
yann@96
|
111 |
if (current_frame_addr > 0)
|
yann@96
|
112 |
{
|
yann@96
|
113 |
ptr_to_lower_bound =
|
yann@96
|
114 |
@@ -134,7 +134,7 @@ f77_get_dynamic_upperbound (struct type
|
yann@96
|
115 |
switch (TYPE_ARRAY_UPPER_BOUND_TYPE (type))
|
yann@96
|
116 |
{
|
yann@96
|
117 |
case BOUND_BY_VALUE_ON_STACK:
|
yann@96
|
118 |
- current_frame_addr = get_frame_base (deprecated_selected_frame);
|
yann@96
|
119 |
+ current_frame_addr = get_frame_base (get_selected_frame ());
|
yann@96
|
120 |
if (current_frame_addr > 0)
|
yann@96
|
121 |
{
|
yann@96
|
122 |
*upper_bound =
|
yann@96
|
123 |
@@ -163,7 +163,7 @@ f77_get_dynamic_upperbound (struct type
|
yann@96
|
124 |
break;
|
yann@96
|
125 |
|
yann@96
|
126 |
case BOUND_BY_REF_ON_STACK:
|
yann@96
|
127 |
- current_frame_addr = get_frame_base (deprecated_selected_frame);
|
yann@96
|
128 |
+ current_frame_addr = get_frame_base (get_selected_frame ());
|
yann@96
|
129 |
if (current_frame_addr > 0)
|
yann@96
|
130 |
{
|
yann@96
|
131 |
ptr_to_upper_bound =
|
yann@96
|
132 |
@@ -630,10 +630,7 @@ info_common_command (char *comname, int
|
yann@96
|
133 |
first make sure that it is visible and if so, let
|
yann@96
|
134 |
us display its contents */
|
yann@96
|
135 |
|
yann@96
|
136 |
- fi = deprecated_selected_frame;
|
yann@96
|
137 |
-
|
yann@96
|
138 |
- if (fi == NULL)
|
yann@96
|
139 |
- error ("No frame selected");
|
yann@96
|
140 |
+ fi = get_selected_frame ();
|
yann@96
|
141 |
|
yann@96
|
142 |
/* The following is generally ripped off from stack.c's routine
|
yann@96
|
143 |
print_frame_info() */
|
yann@96
|
144 |
@@ -722,10 +719,7 @@ there_is_a_visible_common_named (char *c
|
yann@96
|
145 |
if (comname == NULL)
|
yann@96
|
146 |
error ("Cannot deal with NULL common name!");
|
yann@96
|
147 |
|
yann@96
|
148 |
- fi = deprecated_selected_frame;
|
yann@96
|
149 |
-
|
yann@96
|
150 |
- if (fi == NULL)
|
yann@96
|
151 |
- error ("No frame selected");
|
yann@96
|
152 |
+ fi = get_selected_frame ();
|
yann@96
|
153 |
|
yann@96
|
154 |
/* The following is generally ripped off from stack.c's routine
|
yann@96
|
155 |
print_frame_info() */
|
yann@96
|
156 |
Index: gdb-6.3/gdb/infcmd.c
|
yann@96
|
157 |
===================================================================
|
yann@96
|
158 |
--- gdb-6.3.orig/gdb/infcmd.c 2004-09-13 14:26:28.000000000 -0400
|
yann@96
|
159 |
+++ gdb-6.3/gdb/infcmd.c 2004-11-09 22:57:37.274099559 -0500
|
yann@96
|
160 |
@@ -1214,10 +1214,8 @@ finish_command (char *arg, int from_tty)
|
yann@96
|
161 |
error ("The \"finish\" command does not take any arguments.");
|
yann@96
|
162 |
if (!target_has_execution)
|
yann@96
|
163 |
error ("The program is not running.");
|
yann@96
|
164 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
165 |
- error ("No selected frame.");
|
yann@96
|
166 |
|
yann@96
|
167 |
- frame = get_prev_frame (deprecated_selected_frame);
|
yann@96
|
168 |
+ frame = get_prev_frame (get_selected_frame ());
|
yann@96
|
169 |
if (frame == 0)
|
yann@96
|
170 |
error ("\"finish\" not meaningful in the outermost frame.");
|
yann@96
|
171 |
|
yann@96
|
172 |
@@ -1235,7 +1233,7 @@ finish_command (char *arg, int from_tty)
|
yann@96
|
173 |
|
yann@96
|
174 |
/* Find the function we will return from. */
|
yann@96
|
175 |
|
yann@96
|
176 |
- function = find_pc_function (get_frame_pc (deprecated_selected_frame));
|
yann@96
|
177 |
+ function = find_pc_function (get_frame_pc (get_selected_frame ()));
|
yann@96
|
178 |
|
yann@96
|
179 |
/* Print info on the selected frame, including level number but not
|
yann@96
|
180 |
source. */
|
yann@96
|
181 |
@@ -1600,13 +1598,11 @@ registers_info (char *addr_exp, int fpre
|
yann@96
|
182 |
|
yann@96
|
183 |
if (!target_has_registers)
|
yann@96
|
184 |
error ("The program has no registers now.");
|
yann@96
|
185 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
186 |
- error ("No selected frame.");
|
yann@96
|
187 |
|
yann@96
|
188 |
if (!addr_exp)
|
yann@96
|
189 |
{
|
yann@96
|
190 |
gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
|
yann@96
|
191 |
- deprecated_selected_frame, -1, fpregs);
|
yann@96
|
192 |
+ get_selected_frame (), -1, fpregs);
|
yann@96
|
193 |
return;
|
yann@96
|
194 |
}
|
yann@96
|
195 |
|
yann@96
|
196 |
@@ -1644,7 +1640,7 @@ registers_info (char *addr_exp, int fpre
|
yann@96
|
197 |
if (regnum >= 0)
|
yann@96
|
198 |
{
|
yann@96
|
199 |
gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
|
yann@96
|
200 |
- deprecated_selected_frame, regnum, fpregs);
|
yann@96
|
201 |
+ get_selected_frame (), regnum, fpregs);
|
yann@96
|
202 |
continue;
|
yann@96
|
203 |
}
|
yann@96
|
204 |
}
|
yann@96
|
205 |
@@ -1658,7 +1654,7 @@ registers_info (char *addr_exp, int fpre
|
yann@96
|
206 |
&& regnum < NUM_REGS + NUM_PSEUDO_REGS)
|
yann@96
|
207 |
{
|
yann@96
|
208 |
gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
|
yann@96
|
209 |
- deprecated_selected_frame, regnum, fpregs);
|
yann@96
|
210 |
+ get_selected_frame (), regnum, fpregs);
|
yann@96
|
211 |
continue;
|
yann@96
|
212 |
}
|
yann@96
|
213 |
}
|
yann@96
|
214 |
@@ -1684,7 +1680,7 @@ registers_info (char *addr_exp, int fpre
|
yann@96
|
215 |
if (gdbarch_register_reggroup_p (current_gdbarch, regnum,
|
yann@96
|
216 |
group))
|
yann@96
|
217 |
gdbarch_print_registers_info (current_gdbarch,
|
yann@96
|
218 |
- gdb_stdout, deprecated_selected_frame,
|
yann@96
|
219 |
+ gdb_stdout, get_selected_frame (),
|
yann@96
|
220 |
regnum, fpregs);
|
yann@96
|
221 |
}
|
yann@96
|
222 |
continue;
|
yann@96
|
223 |
@@ -1714,8 +1710,6 @@ print_vector_info (struct gdbarch *gdbar
|
yann@96
|
224 |
{
|
yann@96
|
225 |
if (!target_has_registers)
|
yann@96
|
226 |
error ("The program has no registers now.");
|
yann@96
|
227 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
228 |
- error ("No selected frame.");
|
yann@96
|
229 |
|
yann@96
|
230 |
if (gdbarch_print_vector_info_p (gdbarch))
|
yann@96
|
231 |
gdbarch_print_vector_info (gdbarch, file, frame, args);
|
yann@96
|
232 |
@@ -1740,7 +1734,7 @@ print_vector_info (struct gdbarch *gdbar
|
yann@96
|
233 |
static void
|
yann@96
|
234 |
vector_info (char *args, int from_tty)
|
yann@96
|
235 |
{
|
yann@96
|
236 |
- print_vector_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
|
yann@96
|
237 |
+ print_vector_info (current_gdbarch, gdb_stdout, get_selected_frame (), args);
|
yann@96
|
238 |
}
|
yann@96
|
239 |
|
yann@96
|
240 |
|
yann@96
|
241 |
@@ -1910,8 +1904,6 @@ print_float_info (struct gdbarch *gdbarc
|
yann@96
|
242 |
{
|
yann@96
|
243 |
if (!target_has_registers)
|
yann@96
|
244 |
error ("The program has no registers now.");
|
yann@96
|
245 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
246 |
- error ("No selected frame.");
|
yann@96
|
247 |
|
yann@96
|
248 |
if (gdbarch_print_float_info_p (gdbarch))
|
yann@96
|
249 |
gdbarch_print_float_info (gdbarch, file, frame, args);
|
yann@96
|
250 |
@@ -1937,7 +1929,7 @@ No floating-point info available for thi
|
yann@96
|
251 |
static void
|
yann@96
|
252 |
float_info (char *args, int from_tty)
|
yann@96
|
253 |
{
|
yann@96
|
254 |
- print_float_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
|
yann@96
|
255 |
+ print_float_info (current_gdbarch, gdb_stdout, get_selected_frame (), args);
|
yann@96
|
256 |
}
|
yann@96
|
257 |
|
yann@96
|
258 |
static void
|
yann@96
|
259 |
Index: gdb-6.3/gdb/inflow.c
|
yann@96
|
260 |
===================================================================
|
yann@96
|
261 |
--- gdb-6.3.orig/gdb/inflow.c 2004-08-11 05:00:57.000000000 -0400
|
yann@96
|
262 |
+++ gdb-6.3/gdb/inflow.c 2004-11-09 22:58:37.488338883 -0500
|
yann@96
|
263 |
@@ -591,10 +591,7 @@ kill_command (char *arg, int from_tty)
|
yann@96
|
264 |
if (target_has_stack)
|
yann@96
|
265 |
{
|
yann@96
|
266 |
printf_filtered ("In %s,\n", target_longname);
|
yann@96
|
267 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
268 |
- fputs_filtered ("No selected stack frame.\n", gdb_stdout);
|
yann@96
|
269 |
- else
|
yann@96
|
270 |
- print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
yann@96
|
271 |
+ print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
yann@96
|
272 |
}
|
yann@96
|
273 |
bfd_cache_close_all ();
|
yann@96
|
274 |
}
|
yann@96
|
275 |
Index: gdb-6.3/gdb/infrun.c
|
yann@96
|
276 |
===================================================================
|
yann@96
|
277 |
--- gdb-6.3.orig/gdb/infrun.c 2004-09-27 13:58:08.000000000 -0400
|
yann@96
|
278 |
+++ gdb-6.3/gdb/infrun.c 2004-11-09 22:51:07.351240752 -0500
|
yann@96
|
279 |
@@ -3485,7 +3485,7 @@ save_inferior_status (int restore_stack_
|
yann@96
|
280 |
|
yann@96
|
281 |
inf_status->registers = regcache_dup (current_regcache);
|
yann@96
|
282 |
|
yann@96
|
283 |
- inf_status->selected_frame_id = get_frame_id (deprecated_selected_frame);
|
yann@96
|
284 |
+ inf_status->selected_frame_id = get_frame_id (get_selected_frame ());
|
yann@96
|
285 |
return inf_status;
|
yann@96
|
286 |
}
|
yann@96
|
287 |
|
yann@96
|
288 |
Index: gdb-6.3/gdb/mi/mi-main.c
|
yann@96
|
289 |
===================================================================
|
yann@96
|
290 |
--- gdb-6.3.orig/gdb/mi/mi-main.c 2004-09-12 11:00:42.000000000 -0400
|
yann@96
|
291 |
+++ gdb-6.3/gdb/mi/mi-main.c 2004-11-09 22:53:29.998389013 -0500
|
yann@96
|
292 |
@@ -388,7 +388,7 @@ register_changed_p (int regnum)
|
yann@96
|
293 |
{
|
yann@96
|
294 |
char raw_buffer[MAX_REGISTER_SIZE];
|
yann@96
|
295 |
|
yann@96
|
296 |
- if (! frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
|
yann@96
|
297 |
+ if (! frame_register_read (get_selected_frame (), regnum, raw_buffer))
|
yann@96
|
298 |
return -1;
|
yann@96
|
299 |
|
yann@96
|
300 |
if (memcmp (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer,
|
yann@96
|
301 |
@@ -509,7 +509,7 @@ get_register (int regnum, int format)
|
yann@96
|
302 |
if (format == 'N')
|
yann@96
|
303 |
format = 0;
|
yann@96
|
304 |
|
yann@96
|
305 |
- frame_register (deprecated_selected_frame, regnum, &optim, &lval, &addr,
|
yann@96
|
306 |
+ frame_register (get_selected_frame (), regnum, &optim, &lval, &addr,
|
yann@96
|
307 |
&realnum, buffer);
|
yann@96
|
308 |
|
yann@96
|
309 |
if (optim)
|
yann@96
|
310 |
Index: gdb-6.3/gdb/mn10300-tdep.c
|
yann@96
|
311 |
===================================================================
|
yann@96
|
312 |
--- gdb-6.3.orig/gdb/mn10300-tdep.c 2004-08-02 22:02:22.000000000 -0400
|
yann@96
|
313 |
+++ gdb-6.3/gdb/mn10300-tdep.c 2004-11-09 22:51:07.356239776 -0500
|
yann@96
|
314 |
@@ -1154,7 +1154,7 @@ mn10300_print_register (const char *name
|
yann@96
|
315 |
printf_filtered ("%s: ", name);
|
yann@96
|
316 |
|
yann@96
|
317 |
/* Get the data */
|
yann@96
|
318 |
- if (!frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
|
yann@96
|
319 |
+ if (!frame_register_read (get_selected_frame (), regnum, raw_buffer))
|
yann@96
|
320 |
{
|
yann@96
|
321 |
printf_filtered ("[invalid]");
|
yann@96
|
322 |
return;
|
yann@96
|
323 |
Index: gdb-6.3/gdb/stack.c
|
yann@96
|
324 |
===================================================================
|
yann@96
|
325 |
--- gdb-6.3.orig/gdb/stack.c 2004-08-02 20:57:26.000000000 -0400
|
yann@96
|
326 |
+++ gdb-6.3/gdb/stack.c 2004-11-09 22:51:07.361238800 -0500
|
yann@96
|
327 |
@@ -758,9 +758,7 @@ parse_frame_specification (char *frame_e
|
yann@96
|
328 |
switch (numargs)
|
yann@96
|
329 |
{
|
yann@96
|
330 |
case 0:
|
yann@96
|
331 |
- if (deprecated_selected_frame == NULL)
|
yann@96
|
332 |
- error ("No selected frame.");
|
yann@96
|
333 |
- return deprecated_selected_frame;
|
yann@96
|
334 |
+ return get_selected_frame ();
|
yann@96
|
335 |
/* NOTREACHED */
|
yann@96
|
336 |
case 1:
|
yann@96
|
337 |
{
|
yann@96
|
338 |
@@ -902,10 +900,10 @@ frame_info (char *addr_exp, int from_tty
|
yann@96
|
339 |
}
|
yann@96
|
340 |
calling_frame_info = get_prev_frame (fi);
|
yann@96
|
341 |
|
yann@96
|
342 |
- if (!addr_exp && frame_relative_level (deprecated_selected_frame) >= 0)
|
yann@96
|
343 |
+ if (!addr_exp && frame_relative_level (get_selected_frame ()) >= 0)
|
yann@96
|
344 |
{
|
yann@96
|
345 |
printf_filtered ("Stack level %d, frame at ",
|
yann@96
|
346 |
- frame_relative_level (deprecated_selected_frame));
|
yann@96
|
347 |
+ frame_relative_level (get_selected_frame ()));
|
yann@96
|
348 |
print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
|
yann@96
|
349 |
printf_filtered (":\n");
|
yann@96
|
350 |
}
|
yann@96
|
351 |
@@ -1445,9 +1443,7 @@ print_frame_label_vars (struct frame_inf
|
yann@96
|
352 |
void
|
yann@96
|
353 |
locals_info (char *args, int from_tty)
|
yann@96
|
354 |
{
|
yann@96
|
355 |
- if (!deprecated_selected_frame)
|
yann@96
|
356 |
- error ("No frame selected.");
|
yann@96
|
357 |
- print_frame_local_vars (deprecated_selected_frame, 0, gdb_stdout);
|
yann@96
|
358 |
+ print_frame_local_vars (get_selected_frame (), 0, gdb_stdout);
|
yann@96
|
359 |
}
|
yann@96
|
360 |
|
yann@96
|
361 |
static void
|
yann@96
|
362 |
@@ -1470,7 +1466,7 @@ catch_info (char *ignore, int from_tty)
|
yann@96
|
363 |
if (!deprecated_selected_frame)
|
yann@96
|
364 |
error ("No frame selected.");
|
yann@96
|
365 |
|
yann@96
|
366 |
- print_frame_label_vars (deprecated_selected_frame, 0, gdb_stdout);
|
yann@96
|
367 |
+ print_frame_label_vars (get_selected_frame (), 0, gdb_stdout);
|
yann@96
|
368 |
}
|
yann@96
|
369 |
}
|
yann@96
|
370 |
|
yann@96
|
371 |
@@ -1537,9 +1533,7 @@ print_frame_arg_vars (struct frame_info
|
yann@96
|
372 |
void
|
yann@96
|
373 |
args_info (char *ignore, int from_tty)
|
yann@96
|
374 |
{
|
yann@96
|
375 |
- if (!deprecated_selected_frame)
|
yann@96
|
376 |
- error ("No frame selected.");
|
yann@96
|
377 |
- print_frame_arg_vars (deprecated_selected_frame, gdb_stdout);
|
yann@96
|
378 |
+ print_frame_arg_vars (get_selected_frame (), gdb_stdout);
|
yann@96
|
379 |
}
|
yann@96
|
380 |
|
yann@96
|
381 |
|
yann@96
|
382 |
@@ -1724,7 +1718,7 @@ down_silently_base (char *count_exp)
|
yann@96
|
383 |
if (target_has_stack == 0 || deprecated_selected_frame == 0)
|
yann@96
|
384 |
error ("No stack.");
|
yann@96
|
385 |
|
yann@96
|
386 |
- frame = find_relative_frame (deprecated_selected_frame, &count1);
|
yann@96
|
387 |
+ frame = find_relative_frame (get_selected_frame (), &count1);
|
yann@96
|
388 |
if (count1 != 0 && count_exp == 0)
|
yann@96
|
389 |
{
|
yann@96
|
390 |
|
yann@96
|
391 |
@@ -1944,7 +1938,7 @@ func_command (char *arg, int from_tty)
|
yann@96
|
392 |
|
yann@96
|
393 |
if (!found)
|
yann@96
|
394 |
printf_filtered ("'%s' not within current stack frame.\n", arg);
|
yann@96
|
395 |
- else if (fp != deprecated_selected_frame)
|
yann@96
|
396 |
+ else if (fp != get_selected_frame ())
|
yann@96
|
397 |
select_and_print_frame (fp);
|
yann@96
|
398 |
}
|
yann@96
|
399 |
|
yann@96
|
400 |
@@ -1965,7 +1959,7 @@ get_frame_language (void)
|
yann@96
|
401 |
instruction of another function. So we rely on
|
yann@96
|
402 |
get_frame_address_in_block(), it provides us with a PC which is
|
yann@96
|
403 |
guaranteed to be inside the frame's code block. */
|
yann@96
|
404 |
- s = find_pc_symtab (get_frame_address_in_block (deprecated_selected_frame));
|
yann@96
|
405 |
+ s = find_pc_symtab (get_frame_address_in_block (get_selected_frame ()));
|
yann@96
|
406 |
if (s)
|
yann@96
|
407 |
flang = s->language;
|
yann@96
|
408 |
else
|
yann@96
|
409 |
Index: gdb-6.3/gdb/tui/tui-disasm.c
|
yann@96
|
410 |
===================================================================
|
yann@96
|
411 |
--- gdb-6.3.orig/gdb/tui/tui-disasm.c 2004-02-24 20:10:01.000000000 -0500
|
yann@96
|
412 |
+++ gdb-6.3/gdb/tui/tui-disasm.c 2004-11-09 22:51:07.370237044 -0500
|
yann@96
|
413 |
@@ -382,7 +382,7 @@ tui_vertical_disassem_scroll (enum tui_s
|
yann@96
|
414 |
|
yann@96
|
415 |
content = (tui_win_content) TUI_DISASM_WIN->generic.content;
|
yann@96
|
416 |
if (cursal.symtab == (struct symtab *) NULL)
|
yann@96
|
417 |
- s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
|
yann@96
|
418 |
+ s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
|
yann@96
|
419 |
else
|
yann@96
|
420 |
s = cursal.symtab;
|
yann@96
|
421 |
|
yann@96
|
422 |
Index: gdb-6.3/gdb/tui/tui-source.c
|
yann@96
|
423 |
===================================================================
|
yann@96
|
424 |
--- gdb-6.3.orig/gdb/tui/tui-source.c 2004-02-16 16:05:09.000000000 -0500
|
yann@96
|
425 |
+++ gdb-6.3/gdb/tui/tui-source.c 2004-11-09 22:51:07.370237044 -0500
|
yann@96
|
426 |
@@ -326,7 +326,7 @@ tui_vertical_source_scroll (enum tui_scr
|
yann@96
|
427 |
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
|
yann@96
|
428 |
|
yann@96
|
429 |
if (cursal.symtab == (struct symtab *) NULL)
|
yann@96
|
430 |
- s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
|
yann@96
|
431 |
+ s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
|
yann@96
|
432 |
else
|
yann@96
|
433 |
s = cursal.symtab;
|
yann@96
|
434 |
|
yann@96
|
435 |
Index: gdb-6.3/gdb/tui/tui-winsource.c
|
yann@96
|
436 |
===================================================================
|
yann@96
|
437 |
--- gdb-6.3.orig/gdb/tui/tui-winsource.c 2004-02-16 16:05:09.000000000 -0500
|
yann@96
|
438 |
+++ gdb-6.3/gdb/tui/tui-winsource.c 2004-11-09 22:51:07.371236848 -0500
|
yann@96
|
439 |
@@ -311,7 +311,7 @@ tui_horizontal_source_scroll (struct tui
|
yann@96
|
440 |
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
|
yann@96
|
441 |
|
yann@96
|
442 |
if (cursal.symtab == (struct symtab *) NULL)
|
yann@96
|
443 |
- s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
|
yann@96
|
444 |
+ s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
|
yann@96
|
445 |
else
|
yann@96
|
446 |
s = cursal.symtab;
|
yann@96
|
447 |
|
yann@96
|
448 |
Index: gdb-6.3/gdb/valops.c
|
yann@96
|
449 |
===================================================================
|
yann@96
|
450 |
--- gdb-6.3.orig/gdb/valops.c 2004-09-13 23:01:48.000000000 -0400
|
yann@96
|
451 |
+++ gdb-6.3/gdb/valops.c 2004-11-09 22:51:07.374236263 -0500
|
yann@96
|
452 |
@@ -2663,15 +2663,10 @@ value_of_local (const char *name, int co
|
yann@96
|
453 |
struct block *b;
|
yann@96
|
454 |
struct value * ret;
|
yann@96
|
455 |
|
yann@96
|
456 |
- if (deprecated_selected_frame == 0)
|
yann@96
|
457 |
- {
|
yann@96
|
458 |
- if (complain)
|
yann@96
|
459 |
- error ("no frame selected");
|
yann@96
|
460 |
- else
|
yann@96
|
461 |
- return 0;
|
yann@96
|
462 |
- }
|
yann@96
|
463 |
+ if (!complain && deprecated_selected_frame == 0)
|
yann@96
|
464 |
+ return 0;
|
yann@96
|
465 |
|
yann@96
|
466 |
- func = get_frame_function (deprecated_selected_frame);
|
yann@96
|
467 |
+ func = get_frame_function (get_selected_frame ());
|
yann@96
|
468 |
if (!func)
|
yann@96
|
469 |
{
|
yann@96
|
470 |
if (complain)
|
yann@96
|
471 |
@@ -2700,7 +2695,7 @@ value_of_local (const char *name, int co
|
yann@96
|
472 |
return NULL;
|
yann@96
|
473 |
}
|
yann@96
|
474 |
|
yann@96
|
475 |
- ret = read_var_value (sym, deprecated_selected_frame);
|
yann@96
|
476 |
+ ret = read_var_value (sym, get_selected_frame ());
|
yann@96
|
477 |
if (ret == 0 && complain)
|
yann@96
|
478 |
error ("`%s' argument unreadable", name);
|
yann@96
|
479 |
return ret;
|
yann@96
|
480 |
Index: gdb-6.3/gdb/varobj.c
|
yann@96
|
481 |
===================================================================
|
yann@96
|
482 |
--- gdb-6.3.orig/gdb/varobj.c 2004-07-26 10:53:06.000000000 -0400
|
yann@96
|
483 |
+++ gdb-6.3/gdb/varobj.c 2004-11-09 22:51:07.377235677 -0500
|
yann@96
|
484 |
@@ -488,7 +488,7 @@ varobj_create (char *objname,
|
yann@96
|
485 |
if (fi != NULL)
|
yann@96
|
486 |
{
|
yann@96
|
487 |
var->root->frame = get_frame_id (fi);
|
yann@96
|
488 |
- old_fi = deprecated_selected_frame;
|
yann@96
|
489 |
+ old_fi = get_selected_frame ();
|
yann@96
|
490 |
select_frame (fi);
|
yann@96
|
491 |
}
|
yann@96
|
492 |
|
yann@96
|
493 |
Index: gdb-6.3/gdb/testsuite/gdb.base/default.exp
|
yann@96
|
494 |
===================================================================
|
yann@96
|
495 |
--- gdb-6.3.orig/gdb/testsuite/gdb.base/default.exp 2003-03-20 09:45:50.000000000 -0500
|
yann@96
|
496 |
+++ gdb-6.3/gdb/testsuite/gdb.base/default.exp 2004-11-09 22:51:07.379235287 -0500
|
yann@96
|
497 |
@@ -167,7 +167,7 @@ gdb_test "disable breakpoints" "" "disab
|
yann@96
|
498 |
#test disable display
|
yann@96
|
499 |
gdb_test "disable display" "" "disable display"
|
yann@96
|
500 |
#test disassemble
|
yann@96
|
501 |
-gdb_test "disassemble" "No frame selected." "disassemble"
|
yann@96
|
502 |
+gdb_test "disassemble" "No (frame selected|registers)." "disassemble"
|
yann@96
|
503 |
#test display
|
yann@96
|
504 |
gdb_test "display" "" "display"
|
yann@96
|
505 |
#test do
|
yann@96
|
506 |
@@ -229,9 +229,9 @@ gdb_expect {
|
yann@96
|
507 |
}
|
yann@96
|
508 |
|
yann@96
|
509 |
#test frame "f" abbreviation
|
yann@96
|
510 |
-gdb_test "f" "No stack." "frame \"f\" abbreviation"
|
yann@96
|
511 |
+gdb_test "f" "No (stack|registers)." "frame \"f\" abbreviation"
|
yann@96
|
512 |
#test frame
|
yann@96
|
513 |
-gdb_test "frame" "No stack." "frame"
|
yann@96
|
514 |
+gdb_test "frame" "No (stack|registers)." "frame"
|
yann@96
|
515 |
#test fg
|
yann@96
|
516 |
gdb_test "fg" "The program is not being run." "fg"
|
yann@96
|
517 |
# FIXME: fg kills the udi connection
|
yann@96
|
518 |
@@ -294,9 +294,9 @@ gdb_test "ignore" "Argument required .a
|
yann@96
|
519 |
#test info address
|
yann@96
|
520 |
gdb_test "info address" "Argument required." "info address"
|
yann@96
|
521 |
#test info all-registers
|
yann@96
|
522 |
-gdb_test "info all-registers" "The program has no registers now." "info all-registers"
|
yann@96
|
523 |
+gdb_test "info all-registers" "(The program has no registers now|No registers)." "info all-registers"
|
yann@96
|
524 |
#test info args
|
yann@96
|
525 |
-gdb_test "info args" "No frame selected." "info args"
|
yann@96
|
526 |
+gdb_test "info args" "No (frame selected|registers)." "info args"
|
yann@96
|
527 |
#test info bogus-gdb-command
|
yann@96
|
528 |
gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\". Try \"help info\".*" "info bogus-gdb-command"
|
yann@96
|
529 |
#test info breakpoints
|
yann@96
|
530 |
@@ -320,11 +320,11 @@ gdb_test "info frame" "No stack.|No sele
|
yann@96
|
531 |
#test info files
|
yann@96
|
532 |
gdb_test "info files" "" "info files"
|
yann@96
|
533 |
#test info float
|
yann@96
|
534 |
-gdb_test "info float" "The program has no registers now." "info float"
|
yann@96
|
535 |
+gdb_test "info float" "(The program has no registers now|No registers)." "info float"
|
yann@96
|
536 |
#test info functions
|
yann@96
|
537 |
gdb_test "info functions" "All defined functions:" "info functions"
|
yann@96
|
538 |
#test info locals
|
yann@96
|
539 |
-gdb_test "info locals" "No frame selected." "info locals"
|
yann@96
|
540 |
+gdb_test "info locals" "(No frame selected|No registers)." "info locals"
|
yann@96
|
541 |
#test info program
|
yann@96
|
542 |
gdb_test "info program" "The program being debugged is not being run." "info program"
|
yann@96
|
543 |
#test info registers
|
yann@96
|
544 |
@@ -352,7 +352,7 @@ gdb_test "info types" "All defined types
|
yann@96
|
545 |
#test info variables
|
yann@96
|
546 |
gdb_test "info variables" "All defined variables:" "info variables"
|
yann@96
|
547 |
#test info vector
|
yann@96
|
548 |
-gdb_test "info vector" "The program has no registers now." "info vector"
|
yann@96
|
549 |
+gdb_test "info vector" "(The program has no registers now|No registers)." "info vector"
|
yann@96
|
550 |
#test info warranty
|
yann@96
|
551 |
gdb_test "info warranty" "NO WARRANTY(\[^\r\n\]*\[\r\n\])+ *11. *BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY(\[^\r\n\]*\[\r\n\])+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN(\[^\r\n\]*\[\r\n\])+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES(\[^\r\n\]*\[\r\n\])+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED(\[^\r\n\]*\[\r\n\])+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF(\[^\r\n\]*\[\r\n\])+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS(\[^\r\n\]*\[\r\n\])+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE(\[^\r\n\]*\[\r\n\])+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,(\[^\r\n\]*\[\r\n\])+REPAIR OR CORRECTION.(\[^\r\n\]*\[\r\n\])+ *12. *IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING(\[^\r\n\]*\[\r\n\])+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR(\[^\r\n\]*\[\r\n\])+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,(\[^\r\n\]*\[\r\n\])+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING(\[^\r\n\]*\[\r\n\])+OUT OF THE USE OR INABILITY TO USE THE PROGRAM .INCLUDING BUT NOT LIMITED(\[^\r\n\]*\[\r\n\])+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY(\[^\r\n\]*\[\r\n\])+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER(\[^\r\n\]*\[\r\n\])+PROGRAMS., EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE(\[^\r\n\]*\[\r\n\])+POSSIBILITY OF SUCH DAMAGES.*" "info warranty"
|
yann@96
|
552 |
#test info watchpoints
|