Run clang-format.shusers/simark/clang-format

Change-Id: Ia948cc26d534b0dd02702244d52434b1a2093968

1 files changed, 509 insertions, 182 deletions

diff --git a/gdbserver/linux-s390-ipa.cc b/gdbserver/linux-s390-ipa.cc
index b8e1af9..0078822 100644
--- a/gdbserver/linux-s390-ipa.cc
+++ b/gdbserver/linux-s390-ipa.cc
@@ -27,14 +27,14 @@
 #include <sys/auxv.h>
 #endif
 
-#define FT_FPR(x) (0x000 + (x) * 0x10)
-#define FT_VR(x) (0x000 + (x) * 0x10)
-#define FT_VR_L(x) (0x008 + (x) * 0x10)
-#define FT_GPR(x) (0x200 + (x) * 8)
-#define FT_GPR_U(x) (0x200 + (x) * 8)
-#define FT_GPR_L(x) (0x204 + (x) * 8)
-#define FT_GPR(x) (0x200 + (x) * 8)
-#define FT_ACR(x) (0x280 + (x) * 4)
+#define FT_FPR(x) (0x000 + (x) *0x10)
+#define FT_VR(x) (0x000 + (x) *0x10)
+#define FT_VR_L(x) (0x008 + (x) *0x10)
+#define FT_GPR(x) (0x200 + (x) *8)
+#define FT_GPR_U(x) (0x200 + (x) *8)
+#define FT_GPR_L(x) (0x204 + (x) *8)
+#define FT_GPR(x) (0x200 + (x) *8)
+#define FT_ACR(x) (0x280 + (x) *4)
 #define FT_PSWM 0x2c0
 #define FT_PSWM_U 0x2c0
 #define FT_PSWA 0x2c8
@@ -53,122 +53,310 @@
 
 static const int s390_linux32_ft_collect_regmap[] = {
   /* 32-bit PSWA and PSWM.  */
-  FT_PSWM_U, FT_PSWA_L,
+  FT_PSWM_U,
+  FT_PSWA_L,
   /* 32-bit GPRs (mapped to lower halves of 64-bit slots).  */
-  FT_GPR_L (0), FT_GPR_L (1), FT_GPR_L (2), FT_GPR_L (3),
-  FT_GPR_L (4), FT_GPR_L (5), FT_GPR_L (6), FT_GPR_L (7),
-  FT_GPR_L (8), FT_GPR_L (9), FT_GPR_L (10), FT_GPR_L (11),
-  FT_GPR_L (12), FT_GPR_L (13), FT_GPR_L (14), FT_GPR_L (15),
+  FT_GPR_L (0),
+  FT_GPR_L (1),
+  FT_GPR_L (2),
+  FT_GPR_L (3),
+  FT_GPR_L (4),
+  FT_GPR_L (5),
+  FT_GPR_L (6),
+  FT_GPR_L (7),
+  FT_GPR_L (8),
+  FT_GPR_L (9),
+  FT_GPR_L (10),
+  FT_GPR_L (11),
+  FT_GPR_L (12),
+  FT_GPR_L (13),
+  FT_GPR_L (14),
+  FT_GPR_L (15),
   /* ACRs */
-  FT_ACR (0), FT_ACR (1), FT_ACR (2), FT_ACR (3),
-  FT_ACR (4), FT_ACR (5), FT_ACR (6), FT_ACR (7),
-  FT_ACR (8), FT_ACR (9), FT_ACR (10), FT_ACR (11),
-  FT_ACR (12), FT_ACR (13), FT_ACR (14), FT_ACR (15),
+  FT_ACR (0),
+  FT_ACR (1),
+  FT_ACR (2),
+  FT_ACR (3),
+  FT_ACR (4),
+  FT_ACR (5),
+  FT_ACR (6),
+  FT_ACR (7),
+  FT_ACR (8),
+  FT_ACR (9),
+  FT_ACR (10),
+  FT_ACR (11),
+  FT_ACR (12),
+  FT_ACR (13),
+  FT_ACR (14),
+  FT_ACR (15),
   /* FPRs (mapped to upper halves of 128-bit VR slots).  */
-  FT_FPR (0), FT_FPR (1), FT_FPR (2), FT_FPR (3),
-  FT_FPR (4), FT_FPR (5), FT_FPR (6), FT_FPR (7),
-  FT_FPR (8), FT_FPR (9), FT_FPR (10), FT_FPR (11),
-  FT_FPR (12), FT_FPR (13), FT_FPR (14), FT_FPR (15),
+  FT_FPR (0),
+  FT_FPR (1),
+  FT_FPR (2),
+  FT_FPR (3),
+  FT_FPR (4),
+  FT_FPR (5),
+  FT_FPR (6),
+  FT_FPR (7),
+  FT_FPR (8),
+  FT_FPR (9),
+  FT_FPR (10),
+  FT_FPR (11),
+  FT_FPR (12),
+  FT_FPR (13),
+  FT_FPR (14),
+  FT_FPR (15),
   /* orig_r2, last_break, system_call */
-  -1, -1, -1,
+  -1,
+  -1,
+  -1,
 };
 
 /* Used for s390-linux64, s390-linux64v1, s390-linux64v2, s390-vx-linux64.  */
 
 static const int s390_linux64_ft_collect_regmap[] = {
   /* 32-bit PSWA and PSWM.  */
-  FT_PSWM_U, FT_PSWA_L,
+  FT_PSWM_U,
+  FT_PSWA_L,
   /* 32-bit halves of 64-bit GPRs.  */
-  FT_GPR_U (0), FT_GPR_L (0),
-  FT_GPR_U (1), FT_GPR_L (1),
-  FT_GPR_U (2), FT_GPR_L (2),
-  FT_GPR_U (3), FT_GPR_L (3),
-  FT_GPR_U (4), FT_GPR_L (4),
-  FT_GPR_U (5), FT_GPR_L (5),
-  FT_GPR_U (6), FT_GPR_L (6),
-  FT_GPR_U (7), FT_GPR_L (7),
-  FT_GPR_U (8), FT_GPR_L (8),
-  FT_GPR_U (9), FT_GPR_L (9),
-  FT_GPR_U (10), FT_GPR_L (10),
-  FT_GPR_U (11), FT_GPR_L (11),
-  FT_GPR_U (12), FT_GPR_L (12),
-  FT_GPR_U (13), FT_GPR_L (13),
-  FT_GPR_U (14), FT_GPR_L (14),
-  FT_GPR_U (15), FT_GPR_L (15),
+  FT_GPR_U (0),
+  FT_GPR_L (0),
+  FT_GPR_U (1),
+  FT_GPR_L (1),
+  FT_GPR_U (2),
+  FT_GPR_L (2),
+  FT_GPR_U (3),
+  FT_GPR_L (3),
+  FT_GPR_U (4),
+  FT_GPR_L (4),
+  FT_GPR_U (5),
+  FT_GPR_L (5),
+  FT_GPR_U (6),
+  FT_GPR_L (6),
+  FT_GPR_U (7),
+  FT_GPR_L (7),
+  FT_GPR_U (8),
+  FT_GPR_L (8),
+  FT_GPR_U (9),
+  FT_GPR_L (9),
+  FT_GPR_U (10),
+  FT_GPR_L (10),
+  FT_GPR_U (11),
+  FT_GPR_L (11),
+  FT_GPR_U (12),
+  FT_GPR_L (12),
+  FT_GPR_U (13),
+  FT_GPR_L (13),
+  FT_GPR_U (14),
+  FT_GPR_L (14),
+  FT_GPR_U (15),
+  FT_GPR_L (15),
   /* ACRs */
-  FT_ACR (0), FT_ACR (1), FT_ACR (2), FT_ACR (3),
-  FT_ACR (4), FT_ACR (5), FT_ACR (6), FT_ACR (7),
-  FT_ACR (8), FT_ACR (9), FT_ACR (10), FT_ACR (11),
-  FT_ACR (12), FT_ACR (13), FT_ACR (14), FT_ACR (15),
+  FT_ACR (0),
+  FT_ACR (1),
+  FT_ACR (2),
+  FT_ACR (3),
+  FT_ACR (4),
+  FT_ACR (5),
+  FT_ACR (6),
+  FT_ACR (7),
+  FT_ACR (8),
+  FT_ACR (9),
+  FT_ACR (10),
+  FT_ACR (11),
+  FT_ACR (12),
+  FT_ACR (13),
+  FT_ACR (14),
+  FT_ACR (15),
   /* FPRs (mapped to upper halves of 128-bit VR slots).  */
-  FT_FPR (0), FT_FPR (1), FT_FPR (2), FT_FPR (3),
-  FT_FPR (4), FT_FPR (5), FT_FPR (6), FT_FPR (7),
-  FT_FPR (8), FT_FPR (9), FT_FPR (10), FT_FPR (11),
-  FT_FPR (12), FT_FPR (13), FT_FPR (14), FT_FPR (15),
+  FT_FPR (0),
+  FT_FPR (1),
+  FT_FPR (2),
+  FT_FPR (3),
+  FT_FPR (4),
+  FT_FPR (5),
+  FT_FPR (6),
+  FT_FPR (7),
+  FT_FPR (8),
+  FT_FPR (9),
+  FT_FPR (10),
+  FT_FPR (11),
+  FT_FPR (12),
+  FT_FPR (13),
+  FT_FPR (14),
+  FT_FPR (15),
   /* orig_r2, last_break, system_call */
-  -1, -1, -1,
+  -1,
+  -1,
+  -1,
   /* Lower halves of 128-bit VRs. */
-  FT_VR_L (0), FT_VR_L (1), FT_VR_L (2), FT_VR_L (3),
-  FT_VR_L (4), FT_VR_L (5), FT_VR_L (6), FT_VR_L (7),
-  FT_VR_L (8), FT_VR_L (9), FT_VR_L (10), FT_VR_L (11),
-  FT_VR_L (12), FT_VR_L (13), FT_VR_L (14), FT_VR_L (15),
+  FT_VR_L (0),
+  FT_VR_L (1),
+  FT_VR_L (2),
+  FT_VR_L (3),
+  FT_VR_L (4),
+  FT_VR_L (5),
+  FT_VR_L (6),
+  FT_VR_L (7),
+  FT_VR_L (8),
+  FT_VR_L (9),
+  FT_VR_L (10),
+  FT_VR_L (11),
+  FT_VR_L (12),
+  FT_VR_L (13),
+  FT_VR_L (14),
+  FT_VR_L (15),
   /* And the next 16 VRs.  */
-  FT_VR (16), FT_VR (17), FT_VR (18), FT_VR (19),
-  FT_VR (20), FT_VR (21), FT_VR (22), FT_VR (23),
-  FT_VR (24), FT_VR (25), FT_VR (26), FT_VR (27),
-  FT_VR (28), FT_VR (29), FT_VR (30), FT_VR (31),
+  FT_VR (16),
+  FT_VR (17),
+  FT_VR (18),
+  FT_VR (19),
+  FT_VR (20),
+  FT_VR (21),
+  FT_VR (22),
+  FT_VR (23),
+  FT_VR (24),
+  FT_VR (25),
+  FT_VR (26),
+  FT_VR (27),
+  FT_VR (28),
+  FT_VR (29),
+  FT_VR (30),
+  FT_VR (31),
 };
 
 /* Used for s390-te-linux64, s390-tevx-linux64, and s390-gs-linux64.  */
 
 static const int s390_te_linux64_ft_collect_regmap[] = {
   /* 32-bit PSWA and PSWM.  */
-  FT_PSWM_U, FT_PSWA_L,
+  FT_PSWM_U,
+  FT_PSWA_L,
   /* 32-bit halves of 64-bit GPRs.  */
-  FT_GPR_U (0), FT_GPR_L (0),
-  FT_GPR_U (1), FT_GPR_L (1),
-  FT_GPR_U (2), FT_GPR_L (2),
-  FT_GPR_U (3), FT_GPR_L (3),
-  FT_GPR_U (4), FT_GPR_L (4),
-  FT_GPR_U (5), FT_GPR_L (5),
-  FT_GPR_U (6), FT_GPR_L (6),
-  FT_GPR_U (7), FT_GPR_L (7),
-  FT_GPR_U (8), FT_GPR_L (8),
-  FT_GPR_U (9), FT_GPR_L (9),
-  FT_GPR_U (10), FT_GPR_L (10),
-  FT_GPR_U (11), FT_GPR_L (11),
-  FT_GPR_U (12), FT_GPR_L (12),
-  FT_GPR_U (13), FT_GPR_L (13),
-  FT_GPR_U (14), FT_GPR_L (14),
-  FT_GPR_U (15), FT_GPR_L (15),
+  FT_GPR_U (0),
+  FT_GPR_L (0),
+  FT_GPR_U (1),
+  FT_GPR_L (1),
+  FT_GPR_U (2),
+  FT_GPR_L (2),
+  FT_GPR_U (3),
+  FT_GPR_L (3),
+  FT_GPR_U (4),
+  FT_GPR_L (4),
+  FT_GPR_U (5),
+  FT_GPR_L (5),
+  FT_GPR_U (6),
+  FT_GPR_L (6),
+  FT_GPR_U (7),
+  FT_GPR_L (7),
+  FT_GPR_U (8),
+  FT_GPR_L (8),
+  FT_GPR_U (9),
+  FT_GPR_L (9),
+  FT_GPR_U (10),
+  FT_GPR_L (10),
+  FT_GPR_U (11),
+  FT_GPR_L (11),
+  FT_GPR_U (12),
+  FT_GPR_L (12),
+  FT_GPR_U (13),
+  FT_GPR_L (13),
+  FT_GPR_U (14),
+  FT_GPR_L (14),
+  FT_GPR_U (15),
+  FT_GPR_L (15),
   /* ACRs */
-  FT_ACR (0), FT_ACR (1), FT_ACR (2), FT_ACR (3),
-  FT_ACR (4), FT_ACR (5), FT_ACR (6), FT_ACR (7),
-  FT_ACR (8), FT_ACR (9), FT_ACR (10), FT_ACR (11),
-  FT_ACR (12), FT_ACR (13), FT_ACR (14), FT_ACR (15),
+  FT_ACR (0),
+  FT_ACR (1),
+  FT_ACR (2),
+  FT_ACR (3),
+  FT_ACR (4),
+  FT_ACR (5),
+  FT_ACR (6),
+  FT_ACR (7),
+  FT_ACR (8),
+  FT_ACR (9),
+  FT_ACR (10),
+  FT_ACR (11),
+  FT_ACR (12),
+  FT_ACR (13),
+  FT_ACR (14),
+  FT_ACR (15),
   /* FPRs (mapped to upper halves of 128-bit VR slots).  */
-  FT_FPR (0), FT_FPR (1), FT_FPR (2), FT_FPR (3),
-  FT_FPR (4), FT_FPR (5), FT_FPR (6), FT_FPR (7),
-  FT_FPR (8), FT_FPR (9), FT_FPR (10), FT_FPR (11),
-  FT_FPR (12), FT_FPR (13), FT_FPR (14), FT_FPR (15),
+  FT_FPR (0),
+  FT_FPR (1),
+  FT_FPR (2),
+  FT_FPR (3),
+  FT_FPR (4),
+  FT_FPR (5),
+  FT_FPR (6),
+  FT_FPR (7),
+  FT_FPR (8),
+  FT_FPR (9),
+  FT_FPR (10),
+  FT_FPR (11),
+  FT_FPR (12),
+  FT_FPR (13),
+  FT_FPR (14),
+  FT_FPR (15),
   /* orig_r2, last_break, system_call */
-  -1, -1, -1,
+  -1,
+  -1,
+  -1,
   /* TDB */
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
   /* Lower halves of 128-bit VRs. */
-  FT_VR_L (0), FT_VR_L (1), FT_VR_L (2), FT_VR_L (3),
-  FT_VR_L (4), FT_VR_L (5), FT_VR_L (6), FT_VR_L (7),
-  FT_VR_L (8), FT_VR_L (9), FT_VR_L (10), FT_VR_L (11),
-  FT_VR_L (12), FT_VR_L (13), FT_VR_L (14), FT_VR_L (15),
+  FT_VR_L (0),
+  FT_VR_L (1),
+  FT_VR_L (2),
+  FT_VR_L (3),
+  FT_VR_L (4),
+  FT_VR_L (5),
+  FT_VR_L (6),
+  FT_VR_L (7),
+  FT_VR_L (8),
+  FT_VR_L (9),
+  FT_VR_L (10),
+  FT_VR_L (11),
+  FT_VR_L (12),
+  FT_VR_L (13),
+  FT_VR_L (14),
+  FT_VR_L (15),
   /* And the next 16 VRs.  */
-  FT_VR (16), FT_VR (17), FT_VR (18), FT_VR (19),
-  FT_VR (20), FT_VR (21), FT_VR (22), FT_VR (23),
-  FT_VR (24), FT_VR (25), FT_VR (26), FT_VR (27),
-  FT_VR (28), FT_VR (29), FT_VR (30), FT_VR (31),
+  FT_VR (16),
+  FT_VR (17),
+  FT_VR (18),
+  FT_VR (19),
+  FT_VR (20),
+  FT_VR (21),
+  FT_VR (22),
+  FT_VR (23),
+  FT_VR (24),
+  FT_VR (25),
+  FT_VR (26),
+  FT_VR (27),
+  FT_VR (28),
+  FT_VR (29),
+  FT_VR (30),
+  FT_VR (31),
 };
 
 #else /* __s390x__ */
@@ -177,34 +365,97 @@ static const int s390_te_linux64_ft_collect_regmap[] = {
 
 static const int s390x_ft_collect_regmap[] = {
   /* 64-bit PSWA and PSWM.  */
-  FT_PSWM, FT_PSWA,
+  FT_PSWM,
+  FT_PSWA,
   /* 64-bit GPRs.  */
-  FT_GPR (0), FT_GPR (1), FT_GPR (2), FT_GPR (3),
-  FT_GPR (4), FT_GPR (5), FT_GPR (6), FT_GPR (7),
-  FT_GPR (8), FT_GPR (9), FT_GPR (10), FT_GPR (11),
-  FT_GPR (12), FT_GPR (13), FT_GPR (14), FT_GPR (15),
+  FT_GPR (0),
+  FT_GPR (1),
+  FT_GPR (2),
+  FT_GPR (3),
+  FT_GPR (4),
+  FT_GPR (5),
+  FT_GPR (6),
+  FT_GPR (7),
+  FT_GPR (8),
+  FT_GPR (9),
+  FT_GPR (10),
+  FT_GPR (11),
+  FT_GPR (12),
+  FT_GPR (13),
+  FT_GPR (14),
+  FT_GPR (15),
   /* ACRs */
-  FT_ACR (0), FT_ACR (1), FT_ACR (2), FT_ACR (3),
-  FT_ACR (4), FT_ACR (5), FT_ACR (6), FT_ACR (7),
-  FT_ACR (8), FT_ACR (9), FT_ACR (10), FT_ACR (11),
-  FT_ACR (12), FT_ACR (13), FT_ACR (14), FT_ACR (15),
+  FT_ACR (0),
+  FT_ACR (1),
+  FT_ACR (2),
+  FT_ACR (3),
+  FT_ACR (4),
+  FT_ACR (5),
+  FT_ACR (6),
+  FT_ACR (7),
+  FT_ACR (8),
+  FT_ACR (9),
+  FT_ACR (10),
+  FT_ACR (11),
+  FT_ACR (12),
+  FT_ACR (13),
+  FT_ACR (14),
+  FT_ACR (15),
   /* FPRs (mapped to upper halves of 128-bit VR slots).  */
-  FT_FPR (0), FT_FPR (1), FT_FPR (2), FT_FPR (3),
-  FT_FPR (4), FT_FPR (5), FT_FPR (6), FT_FPR (7),
-  FT_FPR (8), FT_FPR (9), FT_FPR (10), FT_FPR (11),
-  FT_FPR (12), FT_FPR (13), FT_FPR (14), FT_FPR (15),
+  FT_FPR (0),
+  FT_FPR (1),
+  FT_FPR (2),
+  FT_FPR (3),
+  FT_FPR (4),
+  FT_FPR (5),
+  FT_FPR (6),
+  FT_FPR (7),
+  FT_FPR (8),
+  FT_FPR (9),
+  FT_FPR (10),
+  FT_FPR (11),
+  FT_FPR (12),
+  FT_FPR (13),
+  FT_FPR (14),
+  FT_FPR (15),
   /* orig_r2, last_break, system_call */
-  -1, -1, -1,
+  -1,
+  -1,
+  -1,
   /* Lower halves of 128-bit VRs. */
-  FT_VR_L (0), FT_VR_L (1), FT_VR_L (2), FT_VR_L (3),
-  FT_VR_L (4), FT_VR_L (5), FT_VR_L (6), FT_VR_L (7),
-  FT_VR_L (8), FT_VR_L (9), FT_VR_L (10), FT_VR_L (11),
-  FT_VR_L (12), FT_VR_L (13), FT_VR_L (14), FT_VR_L (15),
+  FT_VR_L (0),
+  FT_VR_L (1),
+  FT_VR_L (2),
+  FT_VR_L (3),
+  FT_VR_L (4),
+  FT_VR_L (5),
+  FT_VR_L (6),
+  FT_VR_L (7),
+  FT_VR_L (8),
+  FT_VR_L (9),
+  FT_VR_L (10),
+  FT_VR_L (11),
+  FT_VR_L (12),
+  FT_VR_L (13),
+  FT_VR_L (14),
+  FT_VR_L (15),
   /* And the next 16 VRs.  */
-  FT_VR (16), FT_VR (17), FT_VR (18), FT_VR (19),
-  FT_VR (20), FT_VR (21), FT_VR (22), FT_VR (23),
-  FT_VR (24), FT_VR (25), FT_VR (26), FT_VR (27),
-  FT_VR (28), FT_VR (29), FT_VR (30), FT_VR (31),
+  FT_VR (16),
+  FT_VR (17),
+  FT_VR (18),
+  FT_VR (19),
+  FT_VR (20),
+  FT_VR (21),
+  FT_VR (22),
+  FT_VR (23),
+  FT_VR (24),
+  FT_VR (25),
+  FT_VR (26),
+  FT_VR (27),
+  FT_VR (28),
+  FT_VR (29),
+  FT_VR (30),
+  FT_VR (31),
 };
 
 /* Used for s390x-te-linux64, s390x-tevx-linux64, and
@@ -212,40 +463,118 @@ static const int s390x_ft_collect_regmap[] = {
 
 static const int s390x_te_ft_collect_regmap[] = {
   /* 64-bit PSWA and PSWM.  */
-  FT_PSWM, FT_PSWA,
+  FT_PSWM,
+  FT_PSWA,
   /* 64-bit GPRs.  */
-  FT_GPR (0), FT_GPR (1), FT_GPR (2), FT_GPR (3),
-  FT_GPR (4), FT_GPR (5), FT_GPR (6), FT_GPR (7),
-  FT_GPR (8), FT_GPR (9), FT_GPR (10), FT_GPR (11),
-  FT_GPR (12), FT_GPR (13), FT_GPR (14), FT_GPR (15),
+  FT_GPR (0),
+  FT_GPR (1),
+  FT_GPR (2),
+  FT_GPR (3),
+  FT_GPR (4),
+  FT_GPR (5),
+  FT_GPR (6),
+  FT_GPR (7),
+  FT_GPR (8),
+  FT_GPR (9),
+  FT_GPR (10),
+  FT_GPR (11),
+  FT_GPR (12),
+  FT_GPR (13),
+  FT_GPR (14),
+  FT_GPR (15),
   /* ACRs */
-  FT_ACR (0), FT_ACR (1), FT_ACR (2), FT_ACR (3),
-  FT_ACR (4), FT_ACR (5), FT_ACR (6), FT_ACR (7),
-  FT_ACR (8), FT_ACR (9), FT_ACR (10), FT_ACR (11),
-  FT_ACR (12), FT_ACR (13), FT_ACR (14), FT_ACR (15),
+  FT_ACR (0),
+  FT_ACR (1),
+  FT_ACR (2),
+  FT_ACR (3),
+  FT_ACR (4),
+  FT_ACR (5),
+  FT_ACR (6),
+  FT_ACR (7),
+  FT_ACR (8),
+  FT_ACR (9),
+  FT_ACR (10),
+  FT_ACR (11),
+  FT_ACR (12),
+  FT_ACR (13),
+  FT_ACR (14),
+  FT_ACR (15),
   /* FPRs (mapped to upper halves of 128-bit VR slots).  */
-  FT_FPR (0), FT_FPR (1), FT_FPR (2), FT_FPR (3),
-  FT_FPR (4), FT_FPR (5), FT_FPR (6), FT_FPR (7),
-  FT_FPR (8), FT_FPR (9), FT_FPR (10), FT_FPR (11),
-  FT_FPR (12), FT_FPR (13), FT_FPR (14), FT_FPR (15),
+  FT_FPR (0),
+  FT_FPR (1),
+  FT_FPR (2),
+  FT_FPR (3),
+  FT_FPR (4),
+  FT_FPR (5),
+  FT_FPR (6),
+  FT_FPR (7),
+  FT_FPR (8),
+  FT_FPR (9),
+  FT_FPR (10),
+  FT_FPR (11),
+  FT_FPR (12),
+  FT_FPR (13),
+  FT_FPR (14),
+  FT_FPR (15),
   /* orig_r2, last_break, system_call */
-  -1, -1, -1,
+  -1,
+  -1,
+  -1,
   /* TDB */
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
-  -1, -1, -1, -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
+  -1,
   /* Lower halves of 128-bit VRs. */
-  FT_VR_L (0), FT_VR_L (1), FT_VR_L (2), FT_VR_L (3),
-  FT_VR_L (4), FT_VR_L (5), FT_VR_L (6), FT_VR_L (7),
-  FT_VR_L (8), FT_VR_L (9), FT_VR_L (10), FT_VR_L (11),
-  FT_VR_L (12), FT_VR_L (13), FT_VR_L (14), FT_VR_L (15),
+  FT_VR_L (0),
+  FT_VR_L (1),
+  FT_VR_L (2),
+  FT_VR_L (3),
+  FT_VR_L (4),
+  FT_VR_L (5),
+  FT_VR_L (6),
+  FT_VR_L (7),
+  FT_VR_L (8),
+  FT_VR_L (9),
+  FT_VR_L (10),
+  FT_VR_L (11),
+  FT_VR_L (12),
+  FT_VR_L (13),
+  FT_VR_L (14),
+  FT_VR_L (15),
   /* And the next 16 VRs.  */
-  FT_VR (16), FT_VR (17), FT_VR (18), FT_VR (19),
-  FT_VR (20), FT_VR (21), FT_VR (22), FT_VR (23),
-  FT_VR (24), FT_VR (25), FT_VR (26), FT_VR (27),
-  FT_VR (28), FT_VR (29), FT_VR (30), FT_VR (31),
+  FT_VR (16),
+  FT_VR (17),
+  FT_VR (18),
+  FT_VR (19),
+  FT_VR (20),
+  FT_VR (21),
+  FT_VR (22),
+  FT_VR (23),
+  FT_VR (24),
+  FT_VR (25),
+  FT_VR (26),
+  FT_VR (27),
+  FT_VR (28),
+  FT_VR (29),
+  FT_VR (30),
+  FT_VR (31),
 };
 
 #endif
@@ -259,7 +588,7 @@ static int s390_regnum;
 
 void
 supply_fast_tracepoint_registers (struct regcache *regcache,
-				  const unsigned char *buf)
+                                  const unsigned char *buf)
 {
   int i;
   for (i = 0; i < s390_regnum; i++)
@@ -280,23 +609,20 @@ get_raw_reg (const unsigned char *raw_regs, int regnum)
   /* The regnums are variable, better to figure out size by FT offset.  */
 
   /* 64-bit ones.  */
-  if (offset < FT_VR(16)
+  if (offset < FT_VR (16)
 #ifdef __s390x__
-      || (offset >= FT_GPR(0) && offset < FT_ACR(0))
-      || offset == FT_PSWM
+      || (offset >= FT_GPR (0) && offset < FT_ACR (0)) || offset == FT_PSWM
       || offset == FT_PSWA
 #endif
-     )
+  )
     return *(uint64_t *) (raw_regs + offset);
 
-  if (offset >= FT_ACR(0 && offset < FT_PSWM)
-      || offset == FT_FPC
+  if (offset >= FT_ACR (0 && offset < FT_PSWM) || offset == FT_FPC
 #ifndef __s390x__
-      || (offset >= FT_GPR(0) && offset < FT_ACR(0))
-      || offset == FT_PSWM_U
+      || (offset >= FT_GPR (0) && offset < FT_ACR (0)) || offset == FT_PSWM_U
       || offset == FT_PSWA_L
 #endif
-     )
+  )
     return *(uint32_t *) (raw_regs + offset);
 
   /* This leaves 128-bit VX.  No way to return them.  */
@@ -309,66 +635,68 @@ get_raw_reg (const unsigned char *raw_regs, int regnum)
 const struct target_desc *
 get_ipa_tdesc (int idx)
 {
-#define SET_REGMAP(regmap, skip_last) \
-	do { \
-	  s390_regmap = regmap; \
-	  s390_regnum = (sizeof regmap / sizeof regmap[0]) - skip_last; \
-	} while(0)
+#define SET_REGMAP(regmap, skip_last)                               \
+  do                                                                \
+    {                                                               \
+      s390_regmap = regmap;                                         \
+      s390_regnum = (sizeof regmap / sizeof regmap[0]) - skip_last; \
+    }                                                               \
+  while (0)
   switch (idx)
     {
 #ifdef __s390x__
     case S390_TDESC_64:
       /* Subtract number of VX regs.  */
-      SET_REGMAP(s390x_ft_collect_regmap, 32);
+      SET_REGMAP (s390x_ft_collect_regmap, 32);
       return tdesc_s390x_linux64;
     case S390_TDESC_64V1:
-      SET_REGMAP(s390x_ft_collect_regmap, 32);
+      SET_REGMAP (s390x_ft_collect_regmap, 32);
       return tdesc_s390x_linux64v1;
     case S390_TDESC_64V2:
-      SET_REGMAP(s390x_ft_collect_regmap, 32);
+      SET_REGMAP (s390x_ft_collect_regmap, 32);
       return tdesc_s390x_linux64v2;
     case S390_TDESC_TE:
-      SET_REGMAP(s390x_te_ft_collect_regmap, 32);
+      SET_REGMAP (s390x_te_ft_collect_regmap, 32);
       return tdesc_s390x_te_linux64;
     case S390_TDESC_VX:
-      SET_REGMAP(s390x_ft_collect_regmap, 0);
+      SET_REGMAP (s390x_ft_collect_regmap, 0);
       return tdesc_s390x_vx_linux64;
     case S390_TDESC_TEVX:
-      SET_REGMAP(s390x_te_ft_collect_regmap, 0);
+      SET_REGMAP (s390x_te_ft_collect_regmap, 0);
       return tdesc_s390x_tevx_linux64;
     case S390_TDESC_GS:
-      SET_REGMAP(s390x_te_ft_collect_regmap, 0);
+      SET_REGMAP (s390x_te_ft_collect_regmap, 0);
       return tdesc_s390x_gs_linux64;
 #else
     case S390_TDESC_32:
-      SET_REGMAP(s390_linux32_ft_collect_regmap, 0);
+      SET_REGMAP (s390_linux32_ft_collect_regmap, 0);
       return tdesc_s390_linux32;
     case S390_TDESC_32V1:
-      SET_REGMAP(s390_linux32_ft_collect_regmap, 0);
+      SET_REGMAP (s390_linux32_ft_collect_regmap, 0);
       return tdesc_s390_linux32v1;
     case S390_TDESC_32V2:
-      SET_REGMAP(s390_linux32_ft_collect_regmap, 0);
+      SET_REGMAP (s390_linux32_ft_collect_regmap, 0);
       return tdesc_s390_linux32v2;
     case S390_TDESC_64:
-      SET_REGMAP(s390_linux64_ft_collect_regmap, 32);
+      SET_REGMAP (s390_linux64_ft_collect_regmap, 32);
       return tdesc_s390_linux64;
     case S390_TDESC_64V1:
-      SET_REGMAP(s390_linux64_ft_collect_regmap, 32);
+      SET_REGMAP (s390_linux64_ft_collect_regmap, 32);
       return tdesc_s390_linux64v1;
     case S390_TDESC_64V2:
-      SET_REGMAP(s390_linux64_ft_collect_regmap, 32);
+      SET_REGMAP (s390_linux64_ft_collect_regmap, 32);
       return tdesc_s390_linux64v2;
     case S390_TDESC_TE:
-      SET_REGMAP(s390_te_linux64_ft_collect_regmap, 32);
+      SET_REGMAP (s390_te_linux64_ft_collect_regmap, 32);
       return tdesc_s390_te_linux64;
     case S390_TDESC_VX:
-      SET_REGMAP(s390_linux64_ft_collect_regmap, 0);
+      SET_REGMAP (s390_linux64_ft_collect_regmap, 0);
       return tdesc_s390_vx_linux64;
     case S390_TDESC_TEVX:
-      SET_REGMAP(s390_te_linux64_ft_collect_regmap, 0);
+      SET_REGMAP (s390_te_linux64_ft_collect_regmap, 0);
       return tdesc_s390_tevx_linux64;
     case S390_TDESC_GS:
-      SET_REGMAP(s390_te_linux64_ft_collect_regmap, 0);
+      SET_REGMAP (s390_te_linux64_ft_collect_regmap, 0);
       return tdesc_s390_gs_linux64;
 #endif
     default:
@@ -411,23 +739,22 @@ alloc_jump_pad_buffer (size_t size)
   for (; addr; addr -= pagesize)
     {
       /* No MAP_FIXED - we don't want to zap someone's mapping.  */
-      res = mmap ((void *) addr, size,
-		  PROT_READ | PROT_WRITE | PROT_EXEC,
-		  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+      res = mmap ((void *) addr, size, PROT_READ | PROT_WRITE | PROT_EXEC,
+                  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
       /* If we got what we wanted, return.  */
       if ((uintptr_t) res == addr)
-	return res;
+        return res;
 
       /* If we got a mapping, but at a wrong address, undo it.  */
       if (res != MAP_FAILED)
-	munmap (res, size);
+        munmap (res, size);
     }
 
   return NULL;
 #else
   void *res = mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC,
-		    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
   if (res == MAP_FAILED)
     return NULL;