]> granicus.if.org Git - strace/commitdiff
pread, pwrite: fix number of syscall arguments
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 7 May 2013 09:35:18 +0000 (09:35 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 7 May 2013 09:43:55 +0000 (09:43 +0000)
The number of pread and pwrite arguments depends on architecture and
personality.  For 64bit and ilp32 it equals to 4, for unaligned
32bit it equals to 5, and for aligned 32bit it equals to 6.

* linux/aarch64/syscallent1.h: Change the number of pread and pwrite
arguments to 4.
* linux/alpha/syscallent.h: Likewise.
* linux/mips/syscallent-n32.h: Likewise.
* linux/mips/syscallent-n64.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/tile/syscallent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/syscallent.h: Likewise.
* linux/or1k/syscallent.h: Change the number of pread and pwrite
arguments to 5.

linux/aarch64/syscallent1.h
linux/alpha/syscallent.h
linux/mips/syscallent-n32.h
linux/mips/syscallent-n64.h
linux/or1k/syscallent.h
linux/s390x/syscallent.h
linux/sh64/syscallent.h
linux/tile/syscallent.h
linux/x32/syscallent.h
linux/x86_64/syscallent.h

index 58edc5edddce133bc292f333f1d0023ac4fd5498..e772a5ef9ff84cbd0c0699aa7f0399634e8c6433 100644 (file)
@@ -65,8 +65,8 @@
        { 3,    TD,     sys_write,                      "write"                         }, /*   64 */
        { 3,    TD,     sys_readv,                      "readv"                         }, /*   65 */
        { 3,    TD,     sys_writev,                     "writev"                        }, /*   66 */
-       { 5,    TD,     sys_pread,                      "pread64"                       }, /*   67 */
-       { 5,    TD,     sys_pwrite,                     "pwrite64"                      }, /*   68 */
+       { 4,    TD,     sys_pread,                      "pread64"                       }, /*   67 */
+       { 4,    TD,     sys_pwrite,                     "pwrite64"                      }, /*   68 */
        { 4,    TD,     sys_preadv,                     "preadv"                        }, /*   69 */
        { 4,    TD,     sys_pwritev,                    "pwritev"                       }, /*   70 */
        { 4,    TD|TN,  sys_sendfile64,                 "sendfile"                      }, /*   71 */
index 05e23fd4f9a3b08d1cbe5938ba7e9e13a46afaf9..30a5094b1855d9e7c4a38bee4615f56abc1ec9f2 100644 (file)
        { 5,    0,      printargs,              "pciconfig_write"       }, /* 346 */
        { 5,    0,      sys_query_module,       "query_module"          }, /* 347 */
        { 5,    0,      sys_prctl,              "prctl"                 }, /* 348 */
-       { 5,    TD,     sys_pread,              "pread"                 }, /* 349 */
-       { 5,    TD,     sys_pwrite,             "pwrite"                }, /* 350 */
+       { 4,    TD,     sys_pread,              "pread"                 }, /* 349 */
+       { 4,    TD,     sys_pwrite,             "pwrite"                }, /* 350 */
        { 0,    TS,     sys_rt_sigreturn,       "rt_sigreturn"          }, /* 351 */
        { 4,    TS,     sys_rt_sigaction,       "rt_sigaction"          }, /* 352 */
        { 4,    TS,     sys_rt_sigprocmask,     "rt_sigprocmask"        }, /* 353 */
index 8dce9267d2365debbdde79ab083c1577f4c9a6d0..130d03bf9a5c46e4cb4b48691efc0e1a6eb8e26b 100644 (file)
@@ -16,8 +16,8 @@
        { 4,    TS,     sys_rt_sigaction,       "rt_sigaction"  }, /* 6013 */
        { 4,    TS,     sys_rt_sigprocmask,     "rt_sigprocmask"}, /* 6014 */
        { 3,    TD,     sys_ioctl,              "ioctl"         }, /* 6015 */
-       { 6,    TD,     sys_pread,              "pread"         }, /* 6016 */
-       { 6,    TD,     sys_pwrite,             "pwrite"        }, /* 6017 */
+       { 4,    TD,     sys_pread,              "pread"         }, /* 6016 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        }, /* 6017 */
        { 3,    TD,     sys_readv,              "readv"         }, /* 6018 */
        { 3,    TD,     sys_writev,             "writev"        }, /* 6019 */
        { 2,    TF,     sys_access,             "access"        }, /* 6020 */
index 9b9bea2830e90ba49dc4ad5f9dc93c07ec26092e..a0a92ec1e83c0b205358cda0a2f48f48276da843 100644 (file)
@@ -16,8 +16,8 @@
        { 4,    TS,     sys_rt_sigaction,       "rt_sigaction"  }, /* 5013 */
        { 4,    TS,     sys_rt_sigprocmask,     "rt_sigprocmask"}, /* 5014 */
        { 3,    TD,     sys_ioctl,              "ioctl"         }, /* 5015 */
-       { 6,    TD,     sys_pread,              "pread"         }, /* 5016 */
-       { 6,    TD,     sys_pwrite,             "pwrite"        }, /* 5017 */
+       { 4,    TD,     sys_pread,              "pread"         }, /* 5016 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        }, /* 5017 */
        { 3,    TD,     sys_readv,              "readv"         }, /* 5018 */
        { 3,    TD,     sys_writev,             "writev"        }, /* 5019 */
        { 2,    TF,     sys_access,             "access"        }, /* 5020 */
index a5987430d4d3a2731afebde924c2822dcb0bb6b5..975427dcb9a25af6790c3ab5315bb5f8fbd8da9c 100644 (file)
@@ -65,8 +65,8 @@
        { 3,    TD,     sys_write,                      "write"                 }, /* 64 */
        { 3,    TD,     sys_readv,                      "readv"                 }, /* 65 */
        { 3,    TD,     sys_writev,                     "writev"                }, /* 66 */
-       { 6,    TD,     sys_pread,                      "pread64"               }, /* 67 */
-       { 6,    TD,     sys_pwrite,                     "pwrite64"              }, /* 68 */
+       { 5,    TD,     sys_pread,                      "pread64"               }, /* 67 */
+       { 5,    TD,     sys_pwrite,                     "pwrite64"              }, /* 68 */
        { 5,    TD,     sys_preadv,                     "preadv"                }, /* 69 */
        { 5,    TD,     sys_pwritev,                    "pwritev"               }, /* 70 */
        { 4,    TD|TN,  sys_sendfile64,                 "sendfile"              }, /* 71 */
index 4c4f18b027eebf5894a7137f0ffa4d11c6cb384e..05b296cf0959ce65cdd4a2b3381d60fde9a78d4d 100644 (file)
        { 4,    TS,     sys_rt_sigtimedwait,    "rt_sigtimedwait"}, /* 177 */
        { 3,    TS,     sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
        { 2,    TS,     sys_rt_sigsuspend,      "rt_sigsuspend" }, /* 179 */
-       { 5,    TD,     sys_pread,              "pread"         }, /* 180 */
-       { 5,    TD,     sys_pwrite,             "pwrite"        }, /* 181 */
+       { 4,    TD,     sys_pread,              "pread"         }, /* 180 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        }, /* 181 */
        { MA,   0,      NULL,                   NULL            }, /* 182 */
        { 2,    TF,     sys_getcwd,             "getcwd"        }, /* 183 */
        { 2,    0,      sys_capget,             "capget"        }, /* 184 */
index e4a4b22dc9c1aa5562a253e6bc0b7b5ece57f00d..246417dc954f559a32f4de535d46f8ce75b08079 100644 (file)
        { 4,    TS,     sys_rt_sigtimedwait,    "rt_sigtimedwait"}, /* 177 */
        { 3,    TS,     sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
        { 2,    TS,     sys_rt_sigsuspend,      "rt_sigsuspend" }, /* 179 */
-       { 5,    TD,     sys_pread,              "pread"         }, /* 180 */
-       { 5,    TD,     sys_pwrite,             "pwrite"        }, /* 181 */
+       { 4,    TD,     sys_pread,              "pread"         }, /* 180 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        }, /* 181 */
        { 3,    TF,     sys_chown,              "chown"         }, /* 182 */
        { 2,    TF,     sys_getcwd,             "getcwd"        }, /* 183 */
        { 2,    0,      sys_capget,             "capget"        }, /* 184 */
index 8ea68fd66722acca1d76f7fd203ea9098e877edf..5ac87f14ad21efed20a9f912545f981cd48b70cb 100644 (file)
@@ -65,8 +65,8 @@
        { 3,    TD,     sys_write,                      "write"                         }, /*   64 */
        { 3,    TD,     sys_readv,                      "readv"                         }, /*   65 */
        { 3,    TD,     sys_writev,                     "writev"                        }, /*   66 */
-       { 6,    TD,     sys_pread,                      "pread64"                       }, /*   67 */
-       { 6,    TD,     sys_pwrite,                     "pwrite64"                      }, /*   68 */
+       { 4,    TD,     sys_pread,                      "pread64"                       }, /*   67 */
+       { 4,    TD,     sys_pwrite,                     "pwrite64"                      }, /*   68 */
        { 4,    TD,     sys_preadv,                     "preadv"                        }, /*   69 */
        { 4,    TD,     sys_pwritev,                    "pwritev"                       }, /*   70 */
        { 4,    TD|TN,  sys_sendfile64,                 "sendfile"                      }, /*   71 */
index 6a95b15a6854249c0ec4d3b984258cc0810ee709..c43f7ac0f95c0edb4a9e9dd17ea8121e3e6a7708 100644 (file)
@@ -15,8 +15,8 @@
        { 4,    TS,     sys_rt_sigprocmask,     "rt_sigprocmask"},  /* 14 */
        { 0,    TS,     printargs,              "64:rt_sigreturn"       },  /* 15 */
        { 3,    TD,     printargs,              "64:ioctl"      },  /* 16 */
-       { 5,    TD,     sys_pread,              "pread"         },  /* 17 */
-       { 5,    TD,     sys_pwrite,             "pwrite"        },  /* 18 */
+       { 4,    TD,     sys_pread,              "pread"         },  /* 17 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        },  /* 18 */
        { 3,    TD,     printargs,              "64:readv"      },  /* 19 */
        { 3,    TD,     printargs,              "64:writev"     },  /* 20 */
        { 2,    TF,     sys_access,             "access"        },  /* 21 */
index 005752cf4f990b7081fd7616cd5f09cc75a56dd4..b53b736e3bb45c37fbeab87122563467c0d2713d 100644 (file)
@@ -15,8 +15,8 @@
        { 4,    TS,     sys_rt_sigprocmask,     "rt_sigprocmask"},  /* 14 */
        { 0,    TS,     sys_rt_sigreturn,       "rt_sigreturn"  },  /* 15 */
        { 3,    TD,     sys_ioctl,              "ioctl"         },  /* 16 */
-       { 5,    TD,     sys_pread,              "pread"         },  /* 17 */
-       { 5,    TD,     sys_pwrite,             "pwrite"        },  /* 18 */
+       { 4,    TD,     sys_pread,              "pread"         },  /* 17 */
+       { 4,    TD,     sys_pwrite,             "pwrite"        },  /* 18 */
        { 3,    TD,     sys_readv,              "readv"         },  /* 19 */
        { 3,    TD,     sys_writev,             "writev"        },  /* 20 */
        { 2,    TF,     sys_access,             "access"        },  /* 21 */