From 4ddf26e06dc989dca3b5d6f0c056707f9aa1c61e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 12 May 2019 22:45:45 +0000 Subject: [PATCH] Implement and use new parsers of timer_gettime and timer_settime syscalls * time.c (SYS_FUNC(timer_gettime), SYS_FUNC(timer_settime)): Remove. [HAVE_ARCH_TIME32_SYSCALLS] (SYS_FUNC(timer_gettime32), SYS_FUNC(timer_settime32)): New functions. * linux/64/syscallent.h: Replace SEN(timer_gettime) and SEN(timer_settime) with SEN(timer_gettime64) and SEN(timer_settime64), respectively. * linux/alpha/syscallent.h: Likewise. * linux/ia64/syscallent.h: Likewise. * linux/mips/syscallent-n64.h: Likewise. * linux/powerpc64/syscallent.h: Likewise. * linux/s390x/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/sparc64/syscallent.h: Likewise. * linux/x32/syscallent.h: Likewise. * linux/x86_64/syscallent.h: Likewise. * linux/32/syscallent.h: Replace SEN(timer_gettime) and SEN(timer_settime) with SEN(timer_gettime32) and SEN(timer_settime32), respectively. * linux/arm/syscallent.h: Likewise. * linux/avr32/syscallent.h: Likewise. * linux/bfin/syscallent.h: Likewise. * linux/hppa/syscallent.h: Likewise. * linux/i386/syscallent.h: Likewise. * linux/m68k/syscallent.h: Likewise. * linux/microblaze/syscallent.h: Likewise. * linux/mips/syscallent-n32.h: Likewise. * linux/mips/syscallent-o32.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/s390/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/xtensa/syscallent.h: Likewise. --- linux/32/syscallent.h | 4 ++-- linux/64/syscallent.h | 4 ++-- linux/alpha/syscallent.h | 4 ++-- linux/arm/syscallent.h | 4 ++-- linux/avr32/syscallent.h | 4 ++-- linux/bfin/syscallent.h | 4 ++-- linux/hppa/syscallent.h | 4 ++-- linux/i386/syscallent.h | 4 ++-- linux/ia64/syscallent.h | 4 ++-- linux/m68k/syscallent.h | 4 ++-- linux/microblaze/syscallent.h | 4 ++-- linux/mips/syscallent-n32.h | 4 ++-- linux/mips/syscallent-n64.h | 4 ++-- linux/mips/syscallent-o32.h | 4 ++-- linux/powerpc/syscallent.h | 4 ++-- linux/powerpc64/syscallent.h | 4 ++-- linux/s390/syscallent.h | 4 ++-- linux/s390x/syscallent.h | 4 ++-- linux/sh/syscallent.h | 4 ++-- linux/sh64/syscallent.h | 4 ++-- linux/sparc/syscallent.h | 4 ++-- linux/sparc64/syscallent.h | 4 ++-- linux/x32/syscallent.h | 4 ++-- linux/x86_64/syscallent.h | 4 ++-- linux/xtensa/syscallent.h | 4 ++-- time.c | 12 ++++++++---- 26 files changed, 58 insertions(+), 54 deletions(-) diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h index 4d2a17fc..3034e7f6 100644 --- a/linux/32/syscallent.h +++ b/linux/32/syscallent.h @@ -120,9 +120,9 @@ [105] = { 3, 0, SEN(init_module), "init_module" }, [106] = { 2, 0, SEN(delete_module), "delete_module" }, [107] = { 3, 0, SEN(timer_create), "timer_create" }, -[108] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[108] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [109] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, -[110] = { 4, 0, SEN(timer_settime), "timer_settime" }, +[110] = { 4, 0, SEN(timer_settime32), "timer_settime" }, [111] = { 1, 0, SEN(timer_delete), "timer_delete" }, [112] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [113] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, diff --git a/linux/64/syscallent.h b/linux/64/syscallent.h index 057d9b3a..e9a72cfb 100644 --- a/linux/64/syscallent.h +++ b/linux/64/syscallent.h @@ -113,9 +113,9 @@ [105] = { 3, 0, SEN(init_module), "init_module" }, [106] = { 2, 0, SEN(delete_module), "delete_module" }, [107] = { 3, 0, SEN(timer_create), "timer_create" }, -[108] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[108] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [109] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, -[110] = { 4, 0, SEN(timer_settime), "timer_settime" }, +[110] = { 4, 0, SEN(timer_settime64), "timer_settime" }, [111] = { 1, 0, SEN(timer_delete), "timer_delete" }, [112] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [113] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index 42e6e3a4..9d18ab8d 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -358,8 +358,8 @@ [412] = { 0, 0, SEN(restart_syscall), "restart_syscall" }, [413] = { 4, TD, SEN(fadvise64), "fadvise64" }, [414] = { 3, 0, SEN(timer_create), "timer_create" }, -[415] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[416] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[415] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[416] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [417] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [418] = { 1, 0, SEN(timer_delete), "timer_delete" }, [419] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 7949c4e9..5e6c79f9 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -265,8 +265,8 @@ /* [255] - get_thread_area */ [256] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [257] = { 3, 0, SEN(timer_create), "timer_create" }, -[258] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[259] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[258] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[259] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [260] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [261] = { 1, 0, SEN(timer_delete), "timer_delete" }, [262] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h index e7aa0cac..a5f1efa3 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -217,8 +217,8 @@ [208] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [209] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [210] = { 3, 0, SEN(timer_create), "timer_create" }, -[211] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[212] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[211] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[212] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [213] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [214] = { 1, 0, SEN(timer_delete), "timer_delete" }, [215] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 4d6cf64c..0bbfeaa5 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -267,8 +267,8 @@ [258] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [259] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [260] = { 3, 0, SEN(timer_create), "timer_create" }, -[261] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[262] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[261] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[262] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [263] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [264] = { 1, 0, SEN(timer_delete), "timer_delete" }, [265] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index d073284a..656c36ea 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -254,8 +254,8 @@ [248] = { 2, TF, SEN(removexattr), "lremovexattr" }, [249] = { 2, TD, SEN(fremovexattr), "fremovexattr" }, [250] = { 3, 0, SEN(timer_create), "timer_create" }, -[251] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[252] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[251] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[252] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [253] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [254] = { 1, 0, SEN(timer_delete), "timer_delete" }, [255] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 3f2d2d9c..58eaf028 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -266,8 +266,8 @@ [257] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [258] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [259] = { 3, 0, SEN(timer_create), "timer_create" }, -[260] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[261] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[260] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[261] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [262] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [263] = { 1, 0, SEN(timer_delete), "timer_delete" }, [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index 893e0b5c..d862577d 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -232,8 +232,8 @@ [1024 + 222] = { 0, 0, SEN(restart_syscall), "restart_syscall" }, [1024 + 223] = { 4, TI, SEN(semtimedop_time64), "semtimedop" }, [1024 + 224] = { 3, 0, SEN(timer_create), "timer_create" }, -[1024 + 225] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[1024 + 226] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[1024 + 225] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[1024 + 226] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [1024 + 227] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [1024 + 228] = { 1, 0, SEN(timer_delete), "timer_delete" }, [1024 + 229] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index e866f104..dee14139 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -261,8 +261,8 @@ [252] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [253] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [254] = { 3, 0, SEN(timer_create), "timer_create" }, -[255] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[256] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[255] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[256] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [257] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [258] = { 1, 0, SEN(timer_delete), "timer_delete" }, [259] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index f43e4d18..5d1b176f 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -266,8 +266,8 @@ [257] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [258] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [259] = { 3, 0, SEN(timer_create), "timer_create" }, -[260] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[261] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[260] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[261] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [262] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [263] = { 1, 0, SEN(timer_delete), "timer_delete" }, [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h index 627eeed0..4f0fd8fc 100644 --- a/linux/mips/syscallent-n32.h +++ b/linux/mips/syscallent-n32.h @@ -228,8 +228,8 @@ [6218] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [6219] = { 4, TD|TN, SEN(sendfile64), "sendfile64" }, [6220] = { 3, 0, SEN(timer_create), "timer_create" }, -[6221] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[6222] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[6221] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[6222] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [6223] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [6224] = { 1, 0, SEN(timer_delete), "timer_delete" }, [6225] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h index 93ae373c..fb183be5 100644 --- a/linux/mips/syscallent-n64.h +++ b/linux/mips/syscallent-n64.h @@ -224,8 +224,8 @@ [5214] = { 4, TI, SEN(semtimedop_time64), "semtimedop" }, [5215] = { 4, TD, SEN(fadvise64), "fadvise64" }, [5216] = { 3, 0, SEN(timer_create), "timer_create" }, -[5217] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[5218] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[5217] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[5218] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [5219] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [5220] = { 1, 0, SEN(timer_delete), "timer_delete" }, [5221] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h index 55c0d954..cd68a2c6 100644 --- a/linux/mips/syscallent-o32.h +++ b/linux/mips/syscallent-o32.h @@ -266,8 +266,8 @@ [4255] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [4256] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [4257] = { 3, 0, SEN(timer_create), "timer_create" }, -[4258] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[4259] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[4258] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[4259] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [4260] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [4261] = { 1, 0, SEN(timer_delete), "timer_delete" }, [4262] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 10a07c5c..72850cc5 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -248,8 +248,8 @@ [238] = { 4, TD, SEN(epoll_wait), "epoll_wait" }, [239] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [240] = { 3, 0, SEN(timer_create), "timer_create" }, -[241] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[242] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[241] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[242] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [243] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [244] = { 1, 0, SEN(timer_delete), "timer_delete" }, [245] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h index 0ddb5b9f..694a2bdf 100644 --- a/linux/powerpc64/syscallent.h +++ b/linux/powerpc64/syscallent.h @@ -243,8 +243,8 @@ [238] = { 4, TD, SEN(epoll_wait), "epoll_wait" }, [239] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [240] = { 3, 0, SEN(timer_create), "timer_create" }, -[241] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[242] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[241] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[242] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [243] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [244] = { 1, 0, SEN(timer_delete), "timer_delete" }, [245] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index bff4a6d3..785f773e 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -264,8 +264,8 @@ [252] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [253] = { 5, TD, SEN(fadvise64), "fadvise64" }, [254] = { 3, 0, SEN(timer_create), "timer_create" }, -[255] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[256] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[255] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[256] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [257] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [258] = { 1, 0, SEN(timer_delete), "timer_delete" }, [259] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 0d3ab2bc..a7d89b35 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -248,8 +248,8 @@ [252] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [253] = { 4, TD, SEN(fadvise64), "fadvise64" }, [254] = { 3, 0, SEN(timer_create), "timer_create" }, -[255] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[256] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[255] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[256] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [257] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [258] = { 1, 0, SEN(timer_delete), "timer_delete" }, [259] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index ac718a0b..ec806943 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -266,8 +266,8 @@ [257] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [258] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [259] = { 3, 0, SEN(timer_create), "timer_create" }, -[260] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[261] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[260] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[261] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [262] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [263] = { 1, 0, SEN(timer_delete), "timer_delete" }, [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 517f1ce0..bf010433 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -292,8 +292,8 @@ [285] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, [286] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [287] = { 3, 0, SEN(timer_create), "timer_create" }, -[288] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[289] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[288] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[289] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [290] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [291] = { 1, 0, SEN(timer_delete), "timer_delete" }, [292] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 3d9ac03d..887ed1a0 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -267,8 +267,8 @@ [259] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [260] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, [261] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, -[262] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[263] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[262] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[263] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [264] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [265] = { 1, 0, SEN(timer_delete), "timer_delete" }, [266] = { 3, 0, SEN(timer_create), "timer_create" }, diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h index e7c6686a..0f82ee1f 100644 --- a/linux/sparc64/syscallent.h +++ b/linux/sparc64/syscallent.h @@ -265,8 +265,8 @@ [259] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [260] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, [261] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, -[262] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[263] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[262] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[263] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [264] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [265] = { 1, 0, SEN(timer_delete), "timer_delete" }, [266] = { 3, 0, SEN(timer_create), "timer_create" }, diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h index 07b3274a..e53665dc 100644 --- a/linux/x32/syscallent.h +++ b/linux/x32/syscallent.h @@ -228,8 +228,8 @@ [220] = { 4, TI, SEN(semtimedop_time64), "semtimedop" }, [221] = { 4, TD, SEN(fadvise64), "fadvise64" }, [222] = { 3, 0, SEN(printargs), "timer_create#64" }, -[223] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[224] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[223] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[224] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [225] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [226] = { 1, 0, SEN(timer_delete), "timer_delete" }, [227] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index 1be7d3ac..941cdcd6 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -228,8 +228,8 @@ [220] = { 4, TI, SEN(semtimedop_time64), "semtimedop" }, [221] = { 4, TD, SEN(fadvise64), "fadvise64" }, [222] = { 3, 0, SEN(timer_create), "timer_create" }, -[223] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[224] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[223] = { 4, 0, SEN(timer_settime64), "timer_settime" }, +[224] = { 2, 0, SEN(timer_gettime64), "timer_gettime" }, [225] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [226] = { 1, 0, SEN(timer_delete), "timer_delete" }, [227] = { 2, 0, SEN(clock_settime64), "clock_settime" }, diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h index b82ff048..e61ba960 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -247,8 +247,8 @@ [247] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [248] = { 3, 0, SEN(timer_create), "timer_create" }, [249] = { 1, 0, SEN(timer_delete), "timer_delete" }, -[250] = { 4, 0, SEN(timer_settime), "timer_settime" }, -[251] = { 2, 0, SEN(timer_gettime), "timer_gettime" }, +[250] = { 4, 0, SEN(timer_settime32), "timer_settime" }, +[251] = { 2, 0, SEN(timer_gettime32), "timer_gettime" }, [252] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" }, [253] = { }, [254] = { 4, 0, SEN(lookup_dcookie), "lookup_dcookie" }, diff --git a/time.c b/time.c index 634bcaf0..c278aa98 100644 --- a/time.c +++ b/time.c @@ -382,10 +382,12 @@ do_timer_settime(struct tcb *const tcp, const print_obj_by_addr_fn print_its) return 0; } -SYS_FUNC(timer_settime) +#if HAVE_ARCH_TIME32_SYSCALLS +SYS_FUNC(timer_settime32) { - return do_timer_settime(tcp, print_itimerspec); + return do_timer_settime(tcp, print_itimerspec32); } +#endif SYS_FUNC(timer_settime64) { @@ -403,10 +405,12 @@ do_timer_gettime(struct tcb *const tcp, const print_obj_by_addr_fn print_its) return 0; } -SYS_FUNC(timer_gettime) +#if HAVE_ARCH_TIME32_SYSCALLS +SYS_FUNC(timer_gettime32) { - return do_timer_gettime(tcp, print_itimerspec); + return do_timer_gettime(tcp, print_itimerspec32); } +#endif SYS_FUNC(timer_gettime64) { -- 2.40.0