From bc113b4e3e6a47e0a5f351a3b9406fa0b1584dbe Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sun, 23 Feb 2014 14:34:29 +0800 Subject: [PATCH] Rename TARGET_XFER_E_UNAVAILABLE to TARGET_XFER_UNAVAILABLE Nowadays, TARGET_XFER_E_UNAVAILABLE isn't regarded as an error in to_xfer_partial interface, so _E_ looks odd. This patch is to replace TARGET_XFER_E_UNAVAILABLE with TARGET_XFER_UNAVAILABLE, and change its value from -2 to 2. Since there is no comparison on the value of 'enum target_xfer_status', so it should be safe. gdb: 2014-02-24 Yao Qi * target.h (enum target_xfer_status) : Rename it to ... : ... it with setting value 2 explicitly. New. * corefile.c (memory_error_message): User updated. * exec.c (section_table_read_available_memory): Likewise. * record-btrace.c (record_btrace_xfer_partial): Likewise. * target.c (target_xfer_status_to_string): Likewise. (raw_memory_xfer_partial): Likewise. (memory_xfer_partial_1, target_xfer_partial): Likewise. * valops.c (read_value_memory): Likewise. * exec.h: Update comments. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/corefile.c | 4 ++-- gdb/exec.c | 4 ++-- gdb/exec.h | 2 +- gdb/record-btrace.c | 6 +++--- gdb/target.c | 8 ++++---- gdb/target.h | 9 ++++----- gdb/valops.c | 2 +- 8 files changed, 32 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9778f7eeb84..5fdbf4f3140 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2014-02-24 Yao Qi + + * target.h (enum target_xfer_status) + : Rename it to ... + : ... it with setting value 2 + explicitly. New. + * corefile.c (memory_error_message): User updated. + * exec.c (section_table_read_available_memory): Likewise. + * record-btrace.c (record_btrace_xfer_partial): Likewise. + * target.c (target_xfer_status_to_string): Likewise. + (raw_memory_xfer_partial): Likewise. + (memory_xfer_partial_1, target_xfer_partial): Likewise. + * valops.c (read_value_memory): Likewise. + * exec.h: Update comments. + 2014-02-24 Yao Qi * target.c (target_xfer_status_to_string): Rename argument err diff --git a/gdb/corefile.c b/gdb/corefile.c index 815adaf46a0..8a96d75db23 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -204,7 +204,7 @@ memory_error_message (enum target_xfer_status err, bounds. */ return xstrprintf (_("Cannot access memory at address %s"), paddress (gdbarch, memaddr)); - case TARGET_XFER_E_UNAVAILABLE: + case TARGET_XFER_UNAVAILABLE: return xstrprintf (_("Memory at address %s unavailable."), paddress (gdbarch, memaddr)); default: @@ -233,7 +233,7 @@ memory_error (enum target_xfer_status err, CORE_ADDR memaddr) case TARGET_XFER_E_IO: exception = MEMORY_ERROR; break; - case TARGET_XFER_E_UNAVAILABLE: + case TARGET_XFER_UNAVAILABLE: exception = NOT_AVAILABLE_ERROR; break; } diff --git a/gdb/exec.c b/gdb/exec.c index 758e382702f..44dddc1ef56 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -661,7 +661,7 @@ section_table_read_available_memory (gdb_byte *readbuf, ULONGEST offset, else { *xfered_len = r->start - offset; - status = TARGET_XFER_E_UNAVAILABLE; + status = TARGET_XFER_UNAVAILABLE; } do_cleanups (old_chain); return status; @@ -670,7 +670,7 @@ section_table_read_available_memory (gdb_byte *readbuf, ULONGEST offset, do_cleanups (old_chain); *xfered_len = len; - return TARGET_XFER_E_UNAVAILABLE; + return TARGET_XFER_UNAVAILABLE; } enum target_xfer_status diff --git a/gdb/exec.h b/gdb/exec.h index 4d9de90078f..44f1367c773 100644 --- a/gdb/exec.h +++ b/gdb/exec.h @@ -82,7 +82,7 @@ extern enum target_xfer_status /* Read from mappable read-only sections of BFD executable files. Similar to exec_read_partial_read_only, but return - TARGET_XFER_E_UNAVAILABLE if data is unavailable. */ + TARGET_XFER_UNAVAILABLE if data is unavailable. */ extern enum target_xfer_status section_table_read_available_memory (gdb_byte *readbuf, ULONGEST offset, diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index c326c8ddf4b..05e771375bd 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -827,7 +827,7 @@ record_btrace_xfer_partial (struct target_ops *ops, enum target_object object, if (writebuf != NULL) { *xfered_len = len; - return TARGET_XFER_E_UNAVAILABLE; + return TARGET_XFER_UNAVAILABLE; } /* We allow reading readonly memory. */ @@ -846,7 +846,7 @@ record_btrace_xfer_partial (struct target_ops *ops, enum target_object object, } *xfered_len = len; - return TARGET_XFER_E_UNAVAILABLE; + return TARGET_XFER_UNAVAILABLE; } } } @@ -858,7 +858,7 @@ record_btrace_xfer_partial (struct target_ops *ops, enum target_object object, offset, len, xfered_len); *xfered_len = len; - return TARGET_XFER_E_UNAVAILABLE; + return TARGET_XFER_UNAVAILABLE; } /* The to_insert_breakpoint method of target record-btrace. */ diff --git a/gdb/target.c b/gdb/target.c index 25f1cf7ef3b..e4bf2e9051e 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -886,7 +886,7 @@ target_xfer_status_to_string (enum target_xfer_status status) switch (status) { CASE(TARGET_XFER_E_IO); - CASE(TARGET_XFER_E_UNAVAILABLE); + CASE(TARGET_XFER_UNAVAILABLE); default: return ""; } @@ -1099,7 +1099,7 @@ raw_memory_xfer_partial (struct target_ops *ops, gdb_byte *readbuf, break; /* Stop if the target reports that the memory is not available. */ - if (res == TARGET_XFER_E_UNAVAILABLE) + if (res == TARGET_XFER_UNAVAILABLE) break; /* We want to continue past core files to executables, but not @@ -1212,7 +1212,7 @@ memory_xfer_partial_1 (struct target_ops *ops, enum target_object object, /* No use trying further, we know some memory starting at MEMADDR isn't available. */ *xfered_len = len; - return TARGET_XFER_E_UNAVAILABLE; + return TARGET_XFER_UNAVAILABLE; } } @@ -1479,7 +1479,7 @@ target_xfer_partial (struct target_ops *ops, /* Check implementations of to_xfer_partial update *XFERED_LEN properly. Do assertion after printing debug messages, so that we can find more clues on assertion failure from debugging messages. */ - if (retval == TARGET_XFER_OK || retval == TARGET_XFER_E_UNAVAILABLE) + if (retval == TARGET_XFER_OK || retval == TARGET_XFER_UNAVAILABLE) gdb_assert (*xfered_len > 0); return retval; diff --git a/gdb/target.h b/gdb/target.h index 9143ee2b30c..db248a8a034 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -213,15 +213,14 @@ enum target_xfer_status /* No further transfer is possible. */ TARGET_XFER_EOF = 0, + /* The piece of the object requested is unavailable. */ + TARGET_XFER_UNAVAILABLE = 2, + /* Generic I/O error. Note that it's important that this is '-1', as we still have target_xfer-related code returning hardcoded '-1' on error. */ TARGET_XFER_E_IO = -1, - /* Transfer failed because the piece of the object requested is - unavailable. */ - TARGET_XFER_E_UNAVAILABLE = -2, - /* Keep list in sync with target_xfer_status_to_string. */ }; @@ -628,7 +627,7 @@ struct target_ops 'enum target_xfer_status' value). Save the number of bytes actually transferred in *XFERED_LEN if transfer is successful (TARGET_XFER_OK) or the number unavailable bytes if the requested - data is unavailable (TARGET_XFER_E_UNAVAILABLE). *XFERED_LEN + data is unavailable (TARGET_XFER_UNAVAILABLE). *XFERED_LEN smaller than LEN does not indicate the end of the object, only the end of the transfer; higher level code should continue transferring if desired. This is handled in target.c. diff --git a/gdb/valops.c b/gdb/valops.c index 0d726d0deab..82417dac695 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -964,7 +964,7 @@ read_value_memory (struct value *val, int embedded_offset, if (status == TARGET_XFER_OK) /* nothing */; - else if (status == TARGET_XFER_E_UNAVAILABLE) + else if (status == TARGET_XFER_UNAVAILABLE) mark_value_bytes_unavailable (val, embedded_offset + xfered, xfered_len); else if (status == TARGET_XFER_EOF) -- 2.30.2