2
1

600-debian_10.selected-frame.patch 22 KB

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