]> granicus.if.org Git - strace/commitdiff
Unify representations of struct user fields for subarchitectures
authorDenys Vlasenko <vda.linux@googlemail.com>
Tue, 12 Feb 2013 16:15:19 +0000 (17:15 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 12 Feb 2013 16:15:19 +0000 (17:15 +0100)
* process.c: Unify MIPS and LINUX_MIPSN32, and SH and SH64 parts of
struct_user_offsets[].

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
process.c

index 2982022f403688199b7c12546b9b04ea0c3dc3d7..4cec11246fb6da7992bacdc356485c29bbc69b61 100644 (file)
--- a/process.c
+++ b/process.c
@@ -2179,19 +2179,7 @@ const struct xlat struct_user_offsets[] = {
        { uoff(magic),          "offsetof(struct user, magic)"          },
        { uoff(u_comm),         "offsetof(struct user, u_comm)"         },
        { sizeof(struct user),  "sizeof(struct user)"                   },
-#elif defined(LINUX_MIPSN32)
-       { uoff(u_tsize),        "offsetof(struct user, u_tsize)"        },
-       { uoff(u_dsize),        "offsetof(struct user, u_dsize)"        },
-       { uoff(u_ssize),        "offsetof(struct user, u_ssize)"        },
-       { uoff(start_code),     "offsetof(struct user, start_code)"     },
-       { uoff(start_data),     "offsetof(struct user, start_data)"     },
-       { uoff(start_stack),    "offsetof(struct user, start_stack)"    },
-       { uoff(signal),         "offsetof(struct user, signal)"         },
-       { uoff(u_ar0),          "offsetof(struct user, u_ar0)"          },
-       { uoff(magic),          "offsetof(struct user, magic)"          },
-       { uoff(u_comm),         "offsetof(struct user, u_comm)"         },
-       { sizeof(struct user),  "sizeof(struct user)"                   },
-#elif defined(MIPS)
+#elif defined(MIPS) || defined(LINUX_MIPSN32)
        { uoff(u_tsize),        "offsetof(struct user, u_tsize)"        },
        { uoff(u_dsize),        "offsetof(struct user, u_dsize)"        },
        { uoff(u_ssize),        "offsetof(struct user, u_ssize)"        },
@@ -2217,21 +2205,7 @@ const struct xlat struct_user_offsets[] = {
        { sizeof(struct user),  "sizeof(struct user)"                   },
 #elif defined(HPPA)
        /* nothing */
-#elif defined(SH)
-       { uoff(u_fpvalid),      "offsetof(struct user, u_fpvalid)"      },
-       { uoff(u_tsize),        "offsetof(struct user, u_tsize)"        },
-       { uoff(u_dsize),        "offsetof(struct user, u_dsize)"        },
-       { uoff(u_ssize),        "offsetof(struct user, u_ssize)"        },
-       { uoff(start_code),     "offsetof(struct user, start_code)"     },
-       { uoff(start_data),     "offsetof(struct user, start_data)"     },
-       { uoff(start_stack),    "offsetof(struct user, start_stack)"    },
-       { uoff(signal),         "offsetof(struct user, signal)"         },
-       { uoff(u_ar0),          "offsetof(struct user, u_ar0)"          },
-       { uoff(u_fpstate),      "offsetof(struct user, u_fpstate)"      },
-       { uoff(magic),          "offsetof(struct user, magic)"          },
-       { uoff(u_comm),         "offsetof(struct user, u_comm)"         },
-       { sizeof(struct user),  "sizeof(struct user)"                   },
-#elif defined(SH64)
+#elif defined(SH) || defined(SH64)
        { uoff(u_fpvalid),      "offsetof(struct user, u_fpvalid)"      },
        { uoff(u_tsize),        "offsetof(struct user, u_tsize)"        },
        { uoff(u_dsize),        "offsetof(struct user, u_dsize)"        },