Large IA64 fix...
* display_args.c: store arg_num in arg_type_info
* display_args.c: support 'double' parameters
* display_args.c: fix implementation of float,double params for ia64
* output.c, process_event.c: store arg_num in arg_type_info
* read_config_file.c: support 'double' parameters
* read_config_file.c: store arg_num in arg_type_info, and as a result,
stop using singleton objects for any of the arg_type_info's.
* read_config_file.c: improve support for struct field alignments
* read_config_file.c: count floating-point parameters to support ia64
float parameter passing
* sysdeps/README, sysdeps/linux-gnu/*/trace.c: pass in the full
arg_type_info to gimme_arg rather than just the arg_num (necessary
for float params on some architectures)
* sysdeps/linux-gnu/ia64/trace.c: accommodate register renaming when
fetching the parameters of a function after it has returned
* sysdeps/linux-gnu/ia64/trace.c: support floating point parameters
diff --git a/display_args.c b/display_args.c
index e8b20e1..08c735a 100644
--- a/display_args.c
+++ b/display_args.c
@@ -27,13 +27,18 @@
void *st, arg_type_info* st_info)
{
long len;
+ arg_type_info info;
+
if (len_spec > 0)
return len_spec;
if (type == LT_TOF_STRUCT) {
umovelong(proc, st + st_info->u.struct_info.offset[-len_spec-1], &len);
return len;
}
- return gimme_arg(type, proc, -len_spec - 1);
+
+ info.arg_num = -len_spec - 1;
+ info.type = ARGTYPE_INT;
+ return gimme_arg(type, proc, &info);
}
static int display_ptrto(enum tof type, struct process *proc, long item,
@@ -199,10 +204,15 @@
case ARGTYPE_USHORT:
return fprintf(output, "%hu", (unsigned short) value);
case ARGTYPE_FLOAT: {
- union { long l; float f; } cvt;
+ union { long l; float f; double d; } cvt;
cvt.l = value;
return fprintf(output, "%f", cvt.f);
}
+ case ARGTYPE_DOUBLE: {
+ union { long l; float f; double d; } cvt;
+ cvt.l = value;
+ return fprintf(output, "%lf", cvt.d);
+ }
case ARGTYPE_ADDR:
if (!value)
return fprintf(output, "NULL");
@@ -233,17 +243,16 @@
}
}
-int display_arg(enum tof type, struct process *proc, int arg_num,
- arg_type_info * info)
+int display_arg(enum tof type, struct process *proc, arg_type_info * info)
{
long arg;
if (info->type == ARGTYPE_VOID) {
return 0;
} else if (info->type == ARGTYPE_FORMAT) {
- return display_format(type, proc, arg_num);
+ return display_format(type, proc, info->arg_num);
} else {
- arg = gimme_arg(type, proc, arg_num);
+ arg = gimme_arg(type, proc, info);
return display_value(type, proc, arg, info, NULL, NULL);
}
}
@@ -326,8 +335,11 @@
unsigned char *str1;
int i;
int len = 0;
+ arg_type_info info;
- addr = (void *)gimme_arg(type, proc, arg_num);
+ info.arg_num = arg_num;
+ info.type = ARGTYPE_POINTER;
+ addr = (void *)gimme_arg(type, proc, &info);
if (!addr) {
return fprintf(output, "NULL");
}
@@ -370,60 +382,68 @@
break;
}
} else if (c == 'd' || c == 'i') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
if (!is_long || proc->mask_32bit)
len +=
fprintf(output, ", %d",
(int)gimme_arg(type,
proc,
- ++arg_num));
+ &info));
else
len +=
fprintf(output, ", %ld",
gimme_arg(type,
proc,
- ++arg_num));
+ &info));
break;
} else if (c == 'u') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
if (!is_long || proc->mask_32bit)
len +=
fprintf(output, ", %u",
(int)gimme_arg(type,
proc,
- ++arg_num));
+ &info));
else
len +=
fprintf(output, ", %lu",
gimme_arg(type,
proc,
- ++arg_num));
+ &info));
break;
} else if (c == 'o') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
if (!is_long || proc->mask_32bit)
len +=
fprintf(output, ", 0%o",
(int)gimme_arg(type,
proc,
- ++arg_num));
+ &info));
else
len +=
fprintf(output, ", 0%lo",
gimme_arg(type,
proc,
- ++arg_num));
+ &info));
break;
} else if (c == 'x' || c == 'X') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
if (!is_long || proc->mask_32bit)
len +=
fprintf(output, ", %#x",
(int)gimme_arg(type,
proc,
- ++arg_num));
+ &info));
else
len +=
fprintf(output, ", %#lx",
gimme_arg(type,
proc,
- ++arg_num));
+ &info));
break;
} else if (strchr("eEfFgGaACS", c)
|| (is_long
@@ -432,34 +452,42 @@
str1[i + 1] = '\0';
break;
} else if (c == 'c') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
len += fprintf(output, ", '");
len +=
display_char((int)
gimme_arg(type, proc,
- ++arg_num));
+ &info));
len += fprintf(output, "'");
break;
} else if (c == 's') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_POINTER;
len += fprintf(output, ", ");
len +=
display_string(type, proc,
(void *)gimme_arg(type,
proc,
- ++arg_num),
+ &info),
string_maxlength);
break;
} else if (c == 'p' || c == 'n') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_POINTER;
len +=
fprintf(output, ", %p",
(void *)gimme_arg(type,
proc,
- ++arg_num));
+ &info));
break;
} else if (c == '*') {
+ info.arg_num = ++arg_num;
+ info.type = ARGTYPE_LONG;
len +=
fprintf(output, ", %d",
(int)gimme_arg(type, proc,
- ++arg_num));
+ &info));
}
}
}