Merge branch 'arm-fix'

namhyung · namhyung · commit 80862bec2f6c · 2019-02-25T19:00:18.000+09:00
Fix (hardware) floating-point argument handling on ARM. Fixed: #681 Signed-off-by: Namhyung Kim <namhyung@gmail.com>
diff --git a/arch/arm/mcount-support.c b/arch/arm/mcount-support.c
@@ -359,7 +359,7 @@ int mcount_get_register_arg(struct mcount_arg_context *ctx,
 		ctx->val.i = ARG4(regs);
 		break;
 
-#ifdef HAVE_UFT_ARM_HARDFP
+#ifdef HAVE_ARM_HARDFP
 	case UFT_ARM_REG_S0:
 		asm volatile ("vstr %%s0, %0\n" : "=m" (ctx->val.v));
 		break;
diff --git a/cmds/replay.c b/cmds/replay.c
@@ -720,7 +720,10 @@ void get_argspec_string(struct uftrace_task_reader *task,
 				lm = len_mod[idx];
 
 				snprintf(fmtstr, sizeof(fmtstr), "%%#%s%c", lm, fmt);
-				print_args(fmtstr, val.ll);
+				if (spec->size == 8)
+					print_args(fmtstr, val.ll);
+				else
+					print_args(fmtstr, val.i);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,10 @@ void get_argspec_string(struct uftrace_task_reader *task,`
`720`	`720`	`lm = len_mod[idx];`
`721`	`721`
`722`	`722`	`snprintf(fmtstr, sizeof(fmtstr), "%%#%s%c", lm, fmt);`
`723`		`- print_args(fmtstr, val.ll);`
	`723`	`+ if (spec->size == 8)`
	`724`	`+ print_args(fmtstr, val.ll);`
	`725`	`+ else`
	`726`	`+ print_args(fmtstr, val.i);`
`724`	`727`	`}`
`725`	`728`	`}`
`726`	`729`