Re: [PATCH] remove download_write_size variable

Daniel Jacobowitz
2006-08-08T15:49:11Z

On Wed, Aug 02, 2006 at 06:12:40AM +0300, Eli Zaretskii wrote:
> > From: Vladimir Prus <vladimir@codesourcery.com>
> > Date: Tue, 1 Aug 2006 09:33:58 +0400
> > Cc: gdb-patches@sources.redhat.com
> >
> > Please find the new patch attached. Doc dir changelog is:
> >
> > 2006-08-01 Vladimir Prus <vladimir@codesourcery.com>
> >
> > * gdb.texinfo (Target Commands): Remove
> > 'set download-write-size' and 'show download-write-size'.
>
> The patches for gdb.texinfo and for NEWS are approved.

Thanks. While Vladimir is away, I've committed this on his behalf,
along with these testsuite fixups (not many testing configurations
trigger this code).

--
Daniel Jacobowitz
CodeSourcery

2006-08-08 Daniel Jacobowitz <dan@codesourcery.com>

* config/monitor.exp (gdb_load): Remove support for obsolete
download-write-size.
* gdb.base/remote.exp: Likewise. Update all callers of
gdb_timed_load.

Index: testsuite/config/monitor.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/config/monitor.exp,v
retrieving revision 1.5
diff -u -p -r1.5 monitor.exp
--- testsuite/config/monitor.exp 15 Mar 2001 21:46:57 -0000 1.5
+++ testsuite/config/monitor.exp 8 Aug 2006 15:46:06 -0000
@@ -140,17 +140,6 @@ proc gdb_load { arg } {
global timeout
global last_gdb_file;

- if [target_info exists gdb_download_size] {
- send_gdb "set download-write-size [target_info gdb_download_size]\n";
- gdb_expect 30 {
- -re "$gdb_prompt $" { }
- default {
- perror "Setting download-write-size for target failed";
- return -1;
- }
- }
- }
-
if { $arg == "" } {
if [info exists last_gdb_file] {
set arg $last_gdb_file;
Index: testsuite/gdb.base/remote.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/remote.exp,v
retrieving revision 1.6
diff -u -p -r1.6 remote.exp
--- testsuite/gdb.base/remote.exp 4 Jul 2006 09:40:28 -0000 1.6
+++ testsuite/gdb.base/remote.exp 8 Aug 2006 15:46:06 -0000
@@ -46,17 +46,6 @@ if {$result != "" } then {
# Part ONE: Check the down load commands
#

-gdb_test "show download-write-size" \
- "The write size used when downloading a program is 512." \
- "download limit default"
-
-gdb_test "set download-write-size" "Argument required.*"
-
-gdb_test "set download-write-size 0" ""
-gdb_test "show download-write-size" \
- "The write size used when downloading a program is unlimited." \
- "set download limit - unlimited"
-
gdb_test "show remote memory-write-packet-size" \
"The memory-write-packet-size is 0. Packets are limited to \[0-9\]+ bytes." \
"write-packet default"
@@ -79,21 +68,14 @@ gdb_test "show remote memory-write-packe
# Part TWO: Check the download behavour
#

-proc gdb_load_timed {executable downloadsize class writesize} {
+proc gdb_load_timed {executable class writesize} {
global test gdb_prompt
- set test "timed download `[file tail $executable]' - $downloadsize, $class, $writesize"
+ set test "timed download `[file tail $executable]' - $class, $writesize"

if {$writesize != ""} then {
gdb_test "set remote memory-write-packet-size $writesize" \
"" "$test - set packet size"
- }
-
- if {$downloadsize != ""} then {
- gdb_test "set download-write-size $downloadsize" \
- "" "$test - set download size"
- }

- if {$downloadsize != ""} then {
send_gdb "set remote memory-write-packet-size $class\n"
gdb_expect 5 {
-re ".*Change the packet size.*$" {
@@ -127,18 +109,18 @@ proc gdb_load_timed {executable download
pass $test
}

-gdb_load_timed $binfile {} "" {}
+gdb_load_timed $binfile "" {}

# Typically about 400-1 bytes can be downloaded
-gdb_load_timed $binfile 0 "limit" 398
-gdb_load_timed $binfile 0 "limit" 400
+gdb_load_timed $binfile "limit" 398
+gdb_load_timed $binfile "limit" 400

# Absolute max is 16384
-gdb_load_timed $binfile 0 "fixed" 0
-gdb_load_timed $binfile 0 "fixed" 16385
+gdb_load_timed $binfile "fixed" 0
+gdb_load_timed $binfile "fixed" 16385

# fall back to the default
-gdb_load_timed $binfile 0 "limit" 0
+gdb_load_timed $binfile "limit" 0

# Get size of data uploaded