aboutsummaryrefslogtreecommitdiff
path: root/gdb/infcmd.c
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2003-07-31 23:41:25 +0000
committerMichael Snyder <msnyder@vmware.com>2003-07-31 23:41:25 +0000
commit4e7d75111e767a216cd9230c1ce8f45f3874d133 (patch)
tree11c4ab0380d0d46b5dd58e030835a11392597522 /gdb/infcmd.c
parent6302298482a57a625399947705ae2b3981b07d20 (diff)
downloadgdb-4e7d75111e767a216cd9230c1ce8f45f3874d133.zip
gdb-4e7d75111e767a216cd9230c1ce8f45f3874d133.tar.gz
gdb-4e7d75111e767a216cd9230c1ce8f45f3874d133.tar.bz2
2003-07-31 Michael Snyder <msnyder@redhat.com>
* value.h, values.c, infcall.c, infcmd.c: Revert 07-30 change, which is already covered by the new frames infrastructure.
Diffstat (limited to 'gdb/infcmd.c')
-rw-r--r--gdb/infcmd.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index c47c9ea..df7d950 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1077,11 +1077,10 @@ print_return_value (int structure_return, struct type *value_type)
if (!structure_return)
{
- value = value_being_returned (value_type, stop_registers, 0, 0);
+ value = value_being_returned (value_type, stop_registers, structure_return);
stb = ui_out_stream_new (uiout);
ui_out_text (uiout, "Value returned is ");
- ui_out_field_fmt (uiout, "gdb-result-var", "$%d",
- record_latest_value (value));
+ ui_out_field_fmt (uiout, "gdb-result-var", "$%d", record_latest_value (value));
ui_out_text (uiout, " = ");
value_print (value, stb->stream, 0, Val_no_prettyprint);
ui_out_field_stream (uiout, "return-value", stb);
@@ -1089,23 +1088,20 @@ print_return_value (int structure_return, struct type *value_type)
}
else
{
+ /* We cannot determine the contents of the structure because
+ it is on the stack, and we don't know where, since we did not
+ initiate the call, as opposed to the call_function_by_hand case */
#ifdef VALUE_RETURNED_FROM_STACK
- /* We cannot determine the contents of the structure because it
- is on the stack, and we don't know where, since we did not
- initiate the call, as opposed to the call_function_by_hand
- case. */
value = 0;
ui_out_text (uiout, "Value returned has type: ");
ui_out_field_string (uiout, "return-type", TYPE_NAME (value_type));
ui_out_text (uiout, ".");
ui_out_text (uiout, " Cannot determine contents\n");
#else
- value = value_being_returned (value_type, stop_registers,
- structure_return, 0);
+ value = value_being_returned (value_type, stop_registers, structure_return);
stb = ui_out_stream_new (uiout);
ui_out_text (uiout, "Value returned is ");
- ui_out_field_fmt (uiout, "gdb-result-var", "$%d",
- record_latest_value (value));
+ ui_out_field_fmt (uiout, "gdb-result-var", "$%d", record_latest_value (value));
ui_out_text (uiout, " = ");
value_print (value, stb->stream, 0, Val_no_prettyprint);
ui_out_field_stream (uiout, "return-value", stb);