Browse Source

Automatically replace kernel_(scno|ureg)_t with kernel_ulong_t

Remove temporary types created for transition from long
to kernel_ulong_t.

Automatically replace kernel_scno_t and kernel_ureg_t with
kernel_ulong_t using
$ git grep -El 'kernel_(scno|ureg)_t' |
  xargs sed -ri 's/kernel_(scno|ureg)_t/kernel_ulong_t/g'

* kernel_types.h (kernel_scno_t, kernel_ureg_t): Remove.
All users updated.
Dmitry V. Levin 3 years ago
parent
commit
7fa3d78319
100 changed files with 330 additions and 333 deletions
  1. 1
    1
      affinity.c
  2. 5
    5
      aio.c
  3. 1
    1
      block.c
  4. 6
    6
      bpf.c
  5. 3
    3
      btrfs.c
  6. 3
    3
      capability.c
  7. 2
    2
      clone.c
  8. 45
    45
      defs.h
  9. 6
    6
      desc.c
  10. 1
    1
      dirent.c
  11. 9
    9
      dm.c
  12. 13
    13
      evdev.c
  13. 2
    2
      execve.c
  14. 6
    6
      fcntl.c
  15. 1
    1
      fetch_seccomp_fprog.c
  16. 2
    2
      fetch_struct_flock.c
  17. 1
    1
      fetch_struct_mmsghdr.c
  18. 1
    1
      fetch_struct_msghdr.c
  19. 1
    1
      fetch_struct_stat.c
  20. 1
    1
      fetch_struct_stat64.c
  21. 3
    3
      fetch_struct_statfs.c
  22. 2
    2
      file_handle.c
  23. 1
    1
      file_ioctl.c
  24. 1
    1
      fs_x_ioctl.c
  25. 3
    3
      futex.c
  26. 1
    1
      hdio.c
  27. 9
    9
      io.c
  28. 1
    1
      ioctl.c
  29. 7
    7
      ipc_msg.c
  30. 2
    2
      ipc_msgctl.c
  31. 1
    1
      ipc_sem.c
  32. 2
    2
      ipc_shmctl.c
  33. 0
    3
      kernel_types.h
  34. 7
    7
      kexec.c
  35. 1
    1
      ldt.c
  36. 1
    1
      linux/aarch64/get_scno.c
  37. 1
    1
      linux/aarch64/set_scno.c
  38. 1
    1
      linux/alpha/get_scno.c
  39. 1
    1
      linux/alpha/set_scno.c
  40. 1
    1
      linux/arc/set_scno.c
  41. 1
    1
      linux/arm/get_scno.c
  42. 1
    1
      linux/arm/set_scno.c
  43. 1
    1
      linux/avr32/set_scno.c
  44. 1
    1
      linux/bfin/set_scno.c
  45. 1
    1
      linux/crisv10/set_scno.c
  46. 1
    1
      linux/hppa/set_scno.c
  47. 1
    1
      linux/i386/set_scno.c
  48. 1
    1
      linux/ia64/set_scno.c
  49. 1
    1
      linux/m68k/set_scno.c
  50. 1
    1
      linux/metag/set_scno.c
  51. 1
    1
      linux/microblaze/set_scno.c
  52. 2
    2
      linux/mips/arch_sigreturn.c
  53. 1
    1
      linux/mips/set_scno.c
  54. 1
    1
      linux/nios2/set_scno.c
  55. 1
    1
      linux/or1k/set_scno.c
  56. 1
    1
      linux/powerpc/set_scno.c
  57. 1
    1
      linux/riscv/set_scno.c
  58. 1
    1
      linux/s390/set_scno.c
  59. 2
    2
      linux/sh/get_scno.c
  60. 1
    1
      linux/sh/set_scno.c
  61. 1
    1
      linux/sh64/set_scno.c
  62. 1
    1
      linux/sparc/set_scno.c
  63. 1
    1
      linux/tile/set_scno.c
  64. 2
    2
      linux/x86_64/arch_sigreturn.c
  65. 1
    1
      linux/x86_64/get_scno.c
  66. 1
    1
      linux/x86_64/set_scno.c
  67. 1
    1
      linux/xtensa/set_scno.c
  68. 3
    3
      loop.c
  69. 16
    16
      mem.c
  70. 1
    1
      membarrier.c
  71. 6
    6
      mmsghdr.c
  72. 1
    1
      mount.c
  73. 12
    12
      msghdr.c
  74. 1
    1
      msghdr.h
  75. 12
    12
      mtd.c
  76. 15
    15
      net.c
  77. 6
    6
      netlink.c
  78. 10
    10
      numa.c
  79. 1
    1
      oldstat.c
  80. 4
    4
      pathtrace.c
  81. 2
    2
      perf.c
  82. 5
    5
      poll.c
  83. 4
    4
      prctl.c
  84. 1
    1
      print_mq_attr.c
  85. 1
    1
      print_msgbuf.c
  86. 1
    1
      print_sigevent.c
  87. 3
    3
      print_statfs.c
  88. 4
    4
      print_timespec.c
  89. 8
    8
      print_timeval.c
  90. 1
    1
      print_timex.c
  91. 2
    2
      printrusage.c
  92. 2
    2
      printsiginfo.c
  93. 5
    5
      process.c
  94. 6
    6
      process_vm.c
  95. 1
    1
      ptp.c
  96. 1
    1
      quota.c
  97. 3
    3
      resource.c
  98. 4
    4
      rtc.c
  99. 2
    2
      sched.c
  100. 0
    0
      scsi.c

+ 1
- 1
affinity.c View File

@@ -61,7 +61,7 @@ get_cpuset_size(void)
61 61
 }
62 62
 
63 63
 static void
64
-print_affinitylist(struct tcb *const tcp, const kernel_ureg_t addr,
64
+print_affinitylist(struct tcb *const tcp, const kernel_ulong_t addr,
65 65
 		   const unsigned int len)
66 66
 {
67 67
 	const unsigned int max_size = get_cpuset_size();

+ 5
- 5
aio.c View File

@@ -161,13 +161,13 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
161 161
 static bool
162 162
 print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
163 163
 {
164
-	kernel_ureg_t addr;
164
+	kernel_ulong_t addr;
165 165
 	struct iocb cb;
166 166
 
167
-	if (elem_size < sizeof(kernel_ureg_t)) {
167
+	if (elem_size < sizeof(kernel_ulong_t)) {
168 168
 		addr = * (unsigned int *) elem_buf;
169 169
 	} else {
170
-		addr = * (kernel_ureg_t *) elem_buf;
170
+		addr = * (kernel_ulong_t *) elem_buf;
171 171
 	}
172 172
 
173 173
 	tprints("{");
@@ -181,8 +181,8 @@ print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
181 181
 SYS_FUNC(io_submit)
182 182
 {
183 183
 	const long nr = widen_to_long(tcp->u_arg[1]);
184
-	const kernel_ureg_t addr = tcp->u_arg[2];
185
-	kernel_ureg_t iocbp;
184
+	const kernel_ulong_t addr = tcp->u_arg[2];
185
+	kernel_ulong_t iocbp;
186 186
 
187 187
 	printaddr(tcp->u_arg[0]);
188 188
 	tprintf(", %ld, ", nr);

+ 1
- 1
block.c View File

@@ -144,7 +144,7 @@ print_blkpg_req(struct tcb *tcp, const struct_blkpg_ioctl_arg *blkpg)
144 144
 }
145 145
 
146 146
 MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
147
-		   const unsigned int code, const kernel_ureg_t arg)
147
+		   const unsigned int code, const kernel_ulong_t arg)
148 148
 {
149 149
 	switch (code) {
150 150
 	/* take arg as a value, not as a pointer */

+ 6
- 6
bpf.c View File

@@ -37,7 +37,7 @@
37 37
 #include "xlat/bpf_map_update_elem_flags.h"
38 38
 
39 39
 static int
40
-bpf_map_create(struct tcb *const tcp, const kernel_ureg_t addr,
40
+bpf_map_create(struct tcb *const tcp, const kernel_ulong_t addr,
41 41
 	       unsigned int size)
42 42
 {
43 43
 	struct {
@@ -62,7 +62,7 @@ bpf_map_create(struct tcb *const tcp, const kernel_ureg_t addr,
62 62
 }
63 63
 
64 64
 static void
65
-bpf_map_update_elem(struct tcb *const tcp, const kernel_ureg_t addr,
65
+bpf_map_update_elem(struct tcb *const tcp, const kernel_ulong_t addr,
66 66
 		    unsigned int size)
67 67
 {
68 68
 	struct {
@@ -90,7 +90,7 @@ bpf_map_update_elem(struct tcb *const tcp, const kernel_ureg_t addr,
90 90
 }
91 91
 
92 92
 static void
93
-bpf_map_delete_elem(struct tcb *const tcp, const kernel_ureg_t addr,
93
+bpf_map_delete_elem(struct tcb *const tcp, const kernel_ulong_t addr,
94 94
 		    unsigned int size)
95 95
 {
96 96
 	struct {
@@ -113,7 +113,7 @@ bpf_map_delete_elem(struct tcb *const tcp, const kernel_ureg_t addr,
113 113
 }
114 114
 
115 115
 static int
116
-bpf_map_io(struct tcb *const tcp, const kernel_ureg_t addr, unsigned int size,
116
+bpf_map_io(struct tcb *const tcp, const kernel_ulong_t addr, unsigned int size,
117 117
 	   const char *const text)
118 118
 {
119 119
 	struct bpf_io_elem_struct {
@@ -146,7 +146,7 @@ bpf_map_io(struct tcb *const tcp, const kernel_ureg_t addr, unsigned int size,
146 146
 }
147 147
 
148 148
 static int
149
-bpf_prog_load(struct tcb *const tcp, const kernel_ureg_t addr,
149
+bpf_prog_load(struct tcb *const tcp, const kernel_ulong_t addr,
150 150
 	      unsigned int size)
151 151
 {
152 152
 	struct {
@@ -180,7 +180,7 @@ bpf_prog_load(struct tcb *const tcp, const kernel_ureg_t addr,
180 180
 SYS_FUNC(bpf)
181 181
 {
182 182
 	const unsigned int cmd = tcp->u_arg[0];
183
-	const kernel_ureg_t addr = tcp->u_arg[1];
183
+	const kernel_ulong_t addr = tcp->u_arg[1];
184 184
 	const unsigned int size = tcp->u_arg[2];
185 185
 	int rc = RVAL_DECODED;
186 186
 

+ 3
- 3
btrfs.c View File

@@ -204,7 +204,7 @@ btrfs_print_balance_args(const char *name, const struct btrfs_balance_args *bba)
204 204
 }
205 205
 
206 206
 static void
207
-btrfs_print_balance(struct tcb *const tcp, const kernel_ureg_t arg, bool out)
207
+btrfs_print_balance(struct tcb *const tcp, const kernel_ulong_t arg, bool out)
208 208
 {
209 209
 	struct btrfs_ioctl_balance_args balance_args;
210 210
 
@@ -376,7 +376,7 @@ print_uint64(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
376 376
 }
377 377
 
378 378
 static void
379
-btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ureg_t qgi_addr)
379
+btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
380 380
 {
381 381
 	struct btrfs_qgroup_inherit inherit;
382 382
 
@@ -513,7 +513,7 @@ print_btrfs_ioctl_space_info(struct tcb *tcp, void *elem_buf,
513 513
 
514 514
 MPERS_PRINTER_DECL(int, btrfs_ioctl,
515 515
 		   struct tcb *const tcp, const unsigned int code,
516
-		   const kernel_ureg_t arg)
516
+		   const kernel_ulong_t arg)
517 517
 {
518 518
 	switch (code) {
519 519
 	/* Take no arguments; command only. */

+ 3
- 3
capability.c View File

@@ -64,7 +64,7 @@ typedef struct user_cap_data_struct {
64 64
 } *cap_user_data_t;
65 65
 
66 66
 static cap_user_header_t
67
-get_cap_header(struct tcb *const tcp, const kernel_ureg_t addr)
67
+get_cap_header(struct tcb *const tcp, const kernel_ulong_t addr)
68 68
 {
69 69
 	static struct user_cap_header_struct header;
70 70
 
@@ -78,7 +78,7 @@ get_cap_header(struct tcb *const tcp, const kernel_ureg_t addr)
78 78
 }
79 79
 
80 80
 static void
81
-print_cap_header(struct tcb *const tcp, const kernel_ureg_t addr,
81
+print_cap_header(struct tcb *const tcp, const kernel_ulong_t addr,
82 82
 		 const cap_user_header_t const h)
83 83
 {
84 84
 	if (!addr || !h) {
@@ -106,7 +106,7 @@ print_cap_bits(const uint32_t lo, const uint32_t hi)
106 106
 }
107 107
 
108 108
 static void
109
-print_cap_data(struct tcb *const tcp, const kernel_ureg_t addr,
109
+print_cap_data(struct tcb *const tcp, const kernel_ulong_t addr,
110 110
 	       const cap_user_header_t const h)
111 111
 {
112 112
 	struct user_cap_data_struct data[2];

+ 2
- 2
clone.c View File

@@ -76,7 +76,7 @@
76 76
 #endif
77 77
 
78 78
 static void
79
-print_tls_arg(struct tcb *const tcp, const kernel_ureg_t addr)
79
+print_tls_arg(struct tcb *const tcp, const kernel_ulong_t addr)
80 80
 {
81 81
 #ifdef HAVE_STRUCT_USER_DESC
82 82
 # if SUPPORTED_PERSONALITIES > 1
@@ -98,7 +98,7 @@ SYS_FUNC(clone)
98 98
 {
99 99
 	if (exiting(tcp)) {
100 100
 		const char *sep = "|";
101
-		kernel_ureg_t flags = tcp->u_arg[ARG_FLAGS];
101
+		kernel_ulong_t flags = tcp->u_arg[ARG_FLAGS];
102 102
 		tprints("child_stack=");
103 103
 		printaddr(tcp->u_arg[ARG_STACK]);
104 104
 		tprints(", ");

+ 45
- 45
defs.h View File

@@ -232,8 +232,8 @@ struct tcb {
232 232
 	int pid;		/* If 0, this tcb is free */
233 233
 	int qual_flg;		/* qual_flags[scno] or DEFAULT_QUAL_FLAGS + RAW */
234 234
 	unsigned long u_error;	/* Error code */
235
-	kernel_scno_t scno;	/* System call number */
236
-	kernel_ureg_t u_arg[MAX_ARGS];	/* System call arguments */
235
+	kernel_ulong_t scno;	/* System call number */
236
+	kernel_ulong_t u_arg[MAX_ARGS];	/* System call arguments */
237 237
 #if HAVE_STRUCT_TCB_EXT_ARG
238 238
 	unsigned long long ext_arg[MAX_ARGS];
239 239
 	long long u_lrval;	/* long long return value */
@@ -471,7 +471,7 @@ extern int get_scno(struct tcb *tcp);
471 471
  * @return     String literal corresponding to the syscall number in case latter
472 472
  *             is valid; NULL otherwise.
473 473
  */
474
-extern const char *syscall_name(kernel_scno_t scno);
474
+extern const char *syscall_name(kernel_ulong_t scno);
475 475
 extern const char *err_name(unsigned long err);
476 476
 
477 477
 extern bool is_erestart(struct tcb *);
@@ -494,34 +494,34 @@ static inline int set_tcb_priv_ulong(struct tcb *tcp, unsigned long val)
494 494
 }
495 495
 
496 496
 extern int
497
-umoven(struct tcb *tcp, kernel_ureg_t addr, unsigned int len, void *laddr);
497
+umoven(struct tcb *tcp, kernel_ulong_t addr, unsigned int len, void *laddr);
498 498
 #define umove(pid, addr, objp)	\
499 499
 	umoven((pid), (addr), sizeof(*(objp)), (void *) (objp))
500 500
 
501 501
 extern int
502
-umoven_or_printaddr(struct tcb *tcp, kernel_ureg_t addr,
502
+umoven_or_printaddr(struct tcb *tcp, kernel_ulong_t addr,
503 503
 		    unsigned int len, void *laddr);
504 504
 #define umove_or_printaddr(pid, addr, objp)	\
505 505
 	umoven_or_printaddr((pid), (addr), sizeof(*(objp)), (void *) (objp))
506 506
 
507 507
 extern int
508
-umoven_or_printaddr_ignore_syserror(struct tcb *tcp, kernel_ureg_t addr,
508
+umoven_or_printaddr_ignore_syserror(struct tcb *tcp, kernel_ulong_t addr,
509 509
 				    unsigned int len, void *laddr);
510 510
 
511 511
 extern int
512
-umovestr(struct tcb *tcp, kernel_ureg_t addr, unsigned int len, char *laddr);
512
+umovestr(struct tcb *tcp, kernel_ulong_t addr, unsigned int len, char *laddr);
513 513
 
514
-extern int upeek(int pid, unsigned long, kernel_ureg_t *);
515
-extern int upoke(int pid, unsigned long, kernel_ureg_t);
514
+extern int upeek(int pid, unsigned long, kernel_ulong_t *);
515
+extern int upoke(int pid, unsigned long, kernel_ulong_t);
516 516
 
517 517
 extern bool
518 518
 print_array(struct tcb *tcp,
519
-	    kernel_ureg_t start_addr,
519
+	    kernel_ulong_t start_addr,
520 520
 	    size_t nmemb,
521 521
 	    void *elem_buf,
522 522
 	    size_t elem_size,
523 523
 	    int (*umoven_func)(struct tcb *,
524
-				     kernel_ureg_t,
524
+				     kernel_ulong_t,
525 525
 				     unsigned int,
526 526
 				     void *),
527 527
 	    bool (*print_func)(struct tcb *,
@@ -601,24 +601,24 @@ extern void print_numeric_umode_t(unsigned short);
601 601
 extern void print_numeric_long_umask(unsigned long);
602 602
 
603 603
 extern void
604
-dumpiov_in_msghdr(struct tcb *, kernel_ureg_t addr, kernel_ureg_t data_size);
604
+dumpiov_in_msghdr(struct tcb *, kernel_ulong_t addr, kernel_ulong_t data_size);
605 605
 
606 606
 extern void
607
-dumpiov_in_mmsghdr(struct tcb *, kernel_ureg_t addr);
607
+dumpiov_in_mmsghdr(struct tcb *, kernel_ulong_t addr);
608 608
 
609 609
 extern void
610
-dumpiov_upto(struct tcb *, int len, kernel_ureg_t addr, kernel_ureg_t data_size);
610
+dumpiov_upto(struct tcb *, int len, kernel_ulong_t addr, kernel_ulong_t data_size);
611 611
 
612 612
 extern void
613
-dumpstr(struct tcb *, kernel_ureg_t addr, int len);
613
+dumpstr(struct tcb *, kernel_ulong_t addr, int len);
614 614
 
615 615
 extern void
616
-printstr_ex(struct tcb *, kernel_ureg_t addr, kernel_ureg_t len,
616
+printstr_ex(struct tcb *, kernel_ulong_t addr, kernel_ulong_t len,
617 617
 	    unsigned int user_style);
618 618
 
619 619
 #define DECL_PRINTNUM(name)						\
620 620
 extern bool								\
621
-printnum_ ## name(struct tcb *, kernel_ureg_t addr, const char *fmt)	\
621
+printnum_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
622 622
 	ATTRIBUTE_FORMAT((printf, 3, 0))
623 623
 DECL_PRINTNUM(short);
624 624
 DECL_PRINTNUM(int);
@@ -627,7 +627,7 @@ DECL_PRINTNUM(int64);
627 627
 
628 628
 #if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
629 629
 extern bool
630
-printnum_long_int(struct tcb *, kernel_ureg_t addr,
630
+printnum_long_int(struct tcb *, kernel_ulong_t addr,
631 631
 		  const char *fmt_long, const char *fmt_int)
632 632
 	ATTRIBUTE_FORMAT((printf, 3, 0))
633 633
 	ATTRIBUTE_FORMAT((printf, 4, 0));
@@ -655,17 +655,17 @@ printnum_long_int(struct tcb *, kernel_ureg_t addr,
655 655
 
656 656
 #define DECL_PRINTPAIR(name)						\
657 657
 extern bool								\
658
-printpair_ ## name(struct tcb *, kernel_ureg_t addr, const char *fmt)	\
658
+printpair_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
659 659
 	ATTRIBUTE_FORMAT((printf, 3, 0))
660 660
 DECL_PRINTPAIR(int);
661 661
 DECL_PRINTPAIR(int64);
662 662
 #undef DECL_PRINTPAIR
663 663
 
664 664
 extern void
665
-printpathn(struct tcb *, kernel_ureg_t addr, unsigned int n);
665
+printpathn(struct tcb *, kernel_ulong_t addr, unsigned int n);
666 666
 
667 667
 extern void
668
-printpath(struct tcb *, kernel_ureg_t addr);
668
+printpath(struct tcb *, kernel_ulong_t addr);
669 669
 
670 670
 #define TIMESPEC_TEXT_BUFSIZE \
671 671
 		(sizeof(intmax_t)*3 * 2 + sizeof("{tv_sec=%jd, tv_nsec=%jd}"))
@@ -676,12 +676,12 @@ extern bool print_sockaddr_by_inode_cached(const unsigned long);
676 676
 extern void print_dirfd(struct tcb *, int);
677 677
 
678 678
 extern int
679
-decode_sockaddr(struct tcb *, kernel_ureg_t addr, int addrlen);
679
+decode_sockaddr(struct tcb *, kernel_ulong_t addr, int addrlen);
680 680
 
681 681
 extern void printuid(const char *, const unsigned int);
682 682
 
683 683
 extern void
684
-print_sigset_addr_len(struct tcb *, kernel_ureg_t addr, kernel_ureg_t len);
684
+print_sigset_addr_len(struct tcb *, kernel_ulong_t addr, kernel_ulong_t len);
685 685
 
686 686
 extern const char *sprintsigmask_n(const char *, const void *, unsigned int);
687 687
 #define tprintsigmask_addr(prefix, mask) \
@@ -689,20 +689,20 @@ extern const char *sprintsigmask_n(const char *, const void *, unsigned int);
689 689
 extern void printsignal(int);
690 690
 
691 691
 extern void
692
-tprint_iov_upto(struct tcb *, kernel_ureg_t len, kernel_ureg_t addr,
693
-		enum iov_decode, kernel_ureg_t data_size);
692
+tprint_iov_upto(struct tcb *, kernel_ulong_t len, kernel_ulong_t addr,
693
+		enum iov_decode, kernel_ulong_t data_size);
694 694
 
695 695
 extern void
696
-decode_netlink(struct tcb *, kernel_ureg_t addr, kernel_ureg_t len);
696
+decode_netlink(struct tcb *, kernel_ulong_t addr, kernel_ulong_t len);
697 697
 
698 698
 extern void tprint_open_modes(unsigned int);
699 699
 extern const char *sprint_open_modes(unsigned int);
700 700
 
701 701
 extern void
702
-print_seccomp_filter(struct tcb *, kernel_ureg_t addr);
702
+print_seccomp_filter(struct tcb *, kernel_ulong_t addr);
703 703
 
704 704
 extern void
705
-print_seccomp_fprog(struct tcb *, kernel_ureg_t addr, unsigned short len);
705
+print_seccomp_fprog(struct tcb *, kernel_ulong_t addr, unsigned short len);
706 706
 
707 707
 struct strace_stat;
708 708
 extern void print_struct_stat(struct tcb *tcp, const struct strace_stat *const st);
@@ -710,10 +710,10 @@ extern void print_struct_stat(struct tcb *tcp, const struct strace_stat *const s
710 710
 struct strace_statfs;
711 711
 
712 712
 extern void
713
-print_struct_statfs(struct tcb *, kernel_ureg_t addr);
713
+print_struct_statfs(struct tcb *, kernel_ulong_t addr);
714 714
 
715 715
 extern void
716
-print_struct_statfs64(struct tcb *, kernel_ureg_t addr, kernel_ureg_t size);
716
+print_struct_statfs64(struct tcb *, kernel_ulong_t addr, kernel_ulong_t size);
717 717
 
718 718
 extern void print_ifindex(unsigned int);
719 719
 
@@ -728,7 +728,7 @@ extern unsigned int qual_flags(const unsigned int);
728 728
 
729 729
 #define DECL_IOCTL(name)						\
730 730
 extern int								\
731
-name ## _ioctl(struct tcb *, unsigned int request, kernel_ureg_t arg)
731
+name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg)
732 732
 DECL_IOCTL(dm);
733 733
 DECL_IOCTL(file);
734 734
 DECL_IOCTL(fs_x);
@@ -759,19 +759,19 @@ extern void unwind_capture_stacktrace(struct tcb* tcp);
759 759
 #endif
760 760
 
761 761
 static inline void
762
-printaddr(kernel_ureg_t addr)
762
+printaddr(kernel_ulong_t addr)
763 763
 {
764 764
 	printaddr_klu(addr);
765 765
 }
766 766
 
767 767
 static inline void
768
-printstrn(struct tcb *tcp, kernel_ureg_t addr, kernel_ureg_t len)
768
+printstrn(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
769 769
 {
770 770
 	printstr_ex(tcp, addr, len, 0);
771 771
 }
772 772
 
773 773
 static inline void
774
-printstr(struct tcb *tcp, kernel_ureg_t addr)
774
+printstr(struct tcb *tcp, kernel_ulong_t addr)
775 775
 {
776 776
 	printstr_ex(tcp, addr, -1, QUOTE_0_TERMINATED);
777 777
 }
@@ -795,7 +795,7 @@ printxval(const struct xlat *x, const unsigned int val, const char *dflt)
795 795
 }
796 796
 
797 797
 static inline void
798
-tprint_iov(struct tcb *tcp, kernel_ureg_t len, kernel_ureg_t addr,
798
+tprint_iov(struct tcb *tcp, kernel_ulong_t len, kernel_ulong_t addr,
799 799
 	   enum iov_decode decode_iov)
800 800
 {
801 801
 	tprint_iov_upto(tcp, len, addr, decode_iov, -1);
@@ -807,15 +807,15 @@ typedef struct {
807 807
 } timeval32_t;
808 808
 
809 809
 extern void print_timeval32_t(const timeval32_t *);
810
-extern void printrusage32(struct tcb *, kernel_ureg_t);
811
-extern const char *sprint_timeval32(struct tcb *tcp, kernel_ureg_t);
812
-extern void print_timeval32(struct tcb *tcp, kernel_ureg_t);
813
-extern void print_timeval32_pair(struct tcb *tcp, kernel_ureg_t);
814
-extern void print_itimerval32(struct tcb *tcp, kernel_ureg_t);
810
+extern void printrusage32(struct tcb *, kernel_ulong_t);
811
+extern const char *sprint_timeval32(struct tcb *tcp, kernel_ulong_t);
812
+extern void print_timeval32(struct tcb *tcp, kernel_ulong_t);
813
+extern void print_timeval32_pair(struct tcb *tcp, kernel_ulong_t);
814
+extern void print_itimerval32(struct tcb *tcp, kernel_ulong_t);
815 815
 #endif
816 816
 
817 817
 #ifdef HAVE_STRUCT_USER_DESC
818
-extern void print_user_desc(struct tcb *, kernel_ureg_t addr);
818
+extern void print_user_desc(struct tcb *, kernel_ulong_t addr);
819 819
 #endif
820 820
 
821 821
 /* Strace log generation machinery.
@@ -885,9 +885,9 @@ extern unsigned current_klongsize;
885 885
 #endif
886 886
 
887 887
 /*
888
- * Cast a pointer or a pointer-sized integer to kernel_ureg_t.
888
+ * Cast a pointer or a pointer-sized integer to kernel_ulong_t.
889 889
  */
890
-#define ptr_to_kulong(v) ((kernel_ureg_t) (unsigned long) (v))
890
+#define ptr_to_kulong(v) ((kernel_ulong_t) (unsigned long) (v))
891 891
 
892 892
 /*
893 893
  * Zero-extend a signed integer type to unsigned long long.
@@ -949,7 +949,7 @@ extern struct fault_opts *fault_vec[SUPPORTED_PERSONALITIES];
949 949
 
950 950
 /* Checks that sysent[scno] is not out of range. */
951 951
 static inline bool
952
-scno_in_range(kernel_scno_t scno)
952
+scno_in_range(kernel_ulong_t scno)
953 953
 {
954 954
 	return scno < nsyscalls;
955 955
 }
@@ -960,7 +960,7 @@ scno_in_range(kernel_scno_t scno)
960 960
  * and its sysent[scno].sys_flags has no TRACE_INDIRECT_SUBCALL flag set.
961 961
  */
962 962
 static inline bool
963
-scno_is_valid(kernel_scno_t scno)
963
+scno_is_valid(kernel_ulong_t scno)
964 964
 {
965 965
 	return scno_in_range(scno)
966 966
 	       && sysent[scno].sys_func

+ 6
- 6
desc.c View File

@@ -69,15 +69,15 @@ SYS_FUNC(dup3)
69 69
 }
70 70
 
71 71
 static int
72
-decode_select(struct tcb *const tcp, const kernel_ureg_t *const args,
73
-	      void (*const print_tv_ts) (struct tcb *, kernel_ureg_t),
74
-	      const char * (*const sprint_tv_ts) (struct tcb *, kernel_ureg_t))
72
+decode_select(struct tcb *const tcp, const kernel_ulong_t *const args,
73
+	      void (*const print_tv_ts) (struct tcb *, kernel_ulong_t),
74
+	      const char * (*const sprint_tv_ts) (struct tcb *, kernel_ulong_t))
75 75
 {
76 76
 	int i, j;
77 77
 	int nfds, fdsize;
78 78
 	fd_set *fds = NULL;
79 79
 	const char *sep;
80
-	kernel_ureg_t addr;
80
+	kernel_ulong_t addr;
81 81
 
82 82
 	/* Kernel truncates args[0] to int, we do the same. */
83 83
 	nfds = (int) args[0];
@@ -192,7 +192,7 @@ decode_select(struct tcb *const tcp, const kernel_ureg_t *const args,
192 192
 
193 193
 SYS_FUNC(oldselect)
194 194
 {
195
-	kernel_ureg_t select_args[5];
195
+	kernel_ulong_t select_args[5];
196 196
 	unsigned int oldselect_args[5];
197 197
 
198 198
 	if (sizeof(*select_args) == sizeof(*oldselect_args)) {
@@ -227,7 +227,7 @@ SYS_FUNC(select)
227 227
 }
228 228
 
229 229
 static int
230
-umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ureg_t addr,
230
+umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr,
231 231
 				kernel_ulong_t *const ptr, const size_t n)
232 232
 {
233 233
 #ifndef current_klongsize

+ 1
- 1
dirent.c View File

@@ -38,7 +38,7 @@
38 38
 #define D_NAME_LEN_MAX 256
39 39
 
40 40
 static void
41
-print_old_dirent(struct tcb *const tcp, const kernel_ureg_t addr)
41
+print_old_dirent(struct tcb *const tcp, const kernel_ulong_t addr)
42 42
 {
43 43
 	kernel_dirent d;
44 44
 

+ 9
- 9
dm.c View File

@@ -102,7 +102,7 @@ dm_decode_flags(const struct dm_ioctl *ioc)
102 102
 }
103 103
 
104 104
 static void
105
-dm_decode_dm_target_spec(struct tcb *const tcp, const kernel_ureg_t addr,
105
+dm_decode_dm_target_spec(struct tcb *const tcp, const kernel_ulong_t addr,
106 106
 			 const struct dm_ioctl *const ioc)
107 107
 {
108 108
 	static const uint32_t target_spec_size =
@@ -177,7 +177,7 @@ dm_print_dev(struct tcb *tcp, void *dev_ptr, size_t dev_size, void *dummy)
177 177
 }
178 178
 
179 179
 static void
180
-dm_decode_dm_target_deps(struct tcb *const tcp, const kernel_ureg_t addr,
180
+dm_decode_dm_target_deps(struct tcb *const tcp, const kernel_ulong_t addr,
181 181
 			 const struct dm_ioctl *const ioc)
182 182
 {
183 183
 	static const uint32_t target_deps_dev_offs =
@@ -220,7 +220,7 @@ misplaced:
220 220
 }
221 221
 
222 222
 static void
223
-dm_decode_dm_name_list(struct tcb *const tcp, const kernel_ureg_t addr,
223
+dm_decode_dm_name_list(struct tcb *const tcp, const kernel_ulong_t addr,
224 224
 		       const struct dm_ioctl *const ioc)
225 225
 {
226 226
 	static const uint32_t name_list_name_offs =
@@ -276,7 +276,7 @@ misplaced:
276 276
 }
277 277
 
278 278
 static void
279
-dm_decode_dm_target_versions(struct tcb *const tcp, const kernel_ureg_t addr,
279
+dm_decode_dm_target_versions(struct tcb *const tcp, const kernel_ulong_t addr,
280 280
 			     const struct dm_ioctl *const ioc)
281 281
 {
282 282
 	static const uint32_t target_vers_name_offs =
@@ -328,7 +328,7 @@ misplaced:
328 328
 }
329 329
 
330 330
 static void
331
-dm_decode_dm_target_msg(struct tcb *const tcp, const kernel_ureg_t addr,
331
+dm_decode_dm_target_msg(struct tcb *const tcp, const kernel_ulong_t addr,
332 332
 		        const struct dm_ioctl *const ioc)
333 333
 {
334 334
 	static const uint32_t target_msg_message_offs =
@@ -359,7 +359,7 @@ dm_decode_dm_target_msg(struct tcb *const tcp, const kernel_ureg_t addr,
359 359
 }
360 360
 
361 361
 static void
362
-dm_decode_string(struct tcb *const tcp, const kernel_ureg_t addr,
362
+dm_decode_string(struct tcb *const tcp, const kernel_ulong_t addr,
363 363
 		 const struct dm_ioctl *const ioc)
364 364
 {
365 365
 	uint32_t offset = ioc->data_start;
@@ -397,7 +397,7 @@ dm_ioctl_has_params(const unsigned int code)
397 397
 
398 398
 static int
399 399
 dm_known_ioctl(struct tcb *const tcp, const unsigned int code,
400
-	       const kernel_ureg_t arg)
400
+	       const kernel_ulong_t arg)
401 401
 {
402 402
 	struct dm_ioctl *ioc = NULL;
403 403
 	struct dm_ioctl *entering_ioc = NULL;
@@ -517,7 +517,7 @@ dm_known_ioctl(struct tcb *const tcp, const unsigned int code,
517 517
 }
518 518
 
519 519
 int
520
-dm_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ureg_t arg)
520
+dm_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ulong_t arg)
521 521
 {
522 522
 	switch (code) {
523 523
 	case DM_VERSION:
@@ -545,7 +545,7 @@ dm_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ureg_t arg
545 545
 # else /* !(DM_VERSION_MAJOR == 4) */
546 546
 
547 547
 int
548
-dm_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ureg_t arg)
548
+dm_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ulong_t arg)
549 549
 {
550 550
 	return 0;
551 551
 }

+ 13
- 13
evdev.c View File

@@ -76,7 +76,7 @@ decode_envelope(void *const data)
76 76
 }
77 77
 
78 78
 static int
79
-ff_effect_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
79
+ff_effect_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
80 80
 {
81 81
 	tprints(", ");
82 82
 
@@ -154,7 +154,7 @@ ff_effect_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
154 154
 }
155 155
 
156 156
 static int
157
-abs_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
157
+abs_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
158 158
 {
159 159
 	tprints(", ");
160 160
 
@@ -188,7 +188,7 @@ abs_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
188 188
 }
189 189
 
190 190
 static int
191
-keycode_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
191
+keycode_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
192 192
 {
193 193
 	tprints(", ");
194 194
 
@@ -205,7 +205,7 @@ keycode_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
205 205
 
206 206
 # ifdef EVIOCGKEYCODE_V2
207 207
 static int
208
-keycode_V2_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
208
+keycode_V2_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
209 209
 {
210 210
 	tprints(", ");
211 211
 
@@ -242,7 +242,7 @@ keycode_V2_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
242 242
 # endif /* EVIOCGKEYCODE_V2 */
243 243
 
244 244
 static int
245
-getid_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
245
+getid_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
246 246
 {
247 247
 	tprints(", ");
248 248
 
@@ -262,14 +262,14 @@ getid_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
262 262
 }
263 263
 
264 264
 static int
265
-decode_bitset(struct tcb *const tcp, const kernel_ureg_t arg,
265
+decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg,
266 266
 	      const struct xlat decode_nr[], const unsigned int max_nr,
267 267
 	      const char *const dflt)
268 268
 {
269 269
 	tprints(", ");
270 270
 
271 271
 	unsigned int size;
272
-	if ((kernel_ureg_t) tcp->u_rval > max_nr)
272
+	if ((kernel_ulong_t) tcp->u_rval > max_nr)
273 273
 		size = max_nr;
274 274
 	else
275 275
 		size = tcp->u_rval;
@@ -306,7 +306,7 @@ decode_bitset(struct tcb *const tcp, const kernel_ureg_t arg,
306 306
 # ifdef EVIOCGMTSLOTS
307 307
 static int
308 308
 mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
309
-	      const kernel_ureg_t arg)
309
+	      const kernel_ulong_t arg)
310 310
 {
311 311
 	tprints(", ");
312 312
 
@@ -338,7 +338,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
338 338
 
339 339
 # if defined EVIOCGREP || defined EVIOCSREP
340 340
 static int
341
-repeat_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
341
+repeat_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
342 342
 {
343 343
 	tprints(", ");
344 344
 	printpair_int(tcp, arg, "%u");
@@ -348,7 +348,7 @@ repeat_ioctl(struct tcb *const tcp, const kernel_ureg_t arg)
348 348
 
349 349
 static int
350 350
 bit_ioctl(struct tcb *const tcp, const unsigned int ev_nr,
351
-	  const kernel_ureg_t arg)
351
+	  const kernel_ulong_t arg)
352 352
 {
353 353
 	switch (ev_nr) {
354 354
 		case EV_SYN:
@@ -399,7 +399,7 @@ bit_ioctl(struct tcb *const tcp, const unsigned int ev_nr,
399 399
 
400 400
 static int
401 401
 evdev_read_ioctl(struct tcb *const tcp, const unsigned int code,
402
-		 const kernel_ureg_t arg)
402
+		 const kernel_ulong_t arg)
403 403
 {
404 404
 	/* fixed-number fixed-length commands */
405 405
 	switch (code) {
@@ -474,7 +474,7 @@ evdev_read_ioctl(struct tcb *const tcp, const unsigned int code,
474 474
 
475 475
 static int
476 476
 evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
477
-		  const kernel_ureg_t arg)
477
+		  const kernel_ulong_t arg)
478 478
 {
479 479
 	/* fixed-number fixed-length commands */
480 480
 	switch (code) {
@@ -515,7 +515,7 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
515 515
 }
516 516
 
517 517
 MPERS_PRINTER_DECL(int, evdev_ioctl, struct tcb *const tcp,
518
-		   const unsigned int code, const kernel_ureg_t arg)
518
+		   const unsigned int code, const kernel_ulong_t arg)
519 519
 {
520 520
 	switch(_IOC_DIR(code)) {
521 521
 		case _IOC_READ:

+ 2
- 2
execve.c View File

@@ -34,7 +34,7 @@
34 34
 #include "defs.h"
35 35
 
36 36
 static void
37
-printargv(struct tcb *const tcp, kernel_ureg_t addr)
37
+printargv(struct tcb *const tcp, kernel_ulong_t addr)
38 38
 {
39 39
 	if (!addr || !verbose(tcp)) {
40 40
 		printaddr(addr);
@@ -76,7 +76,7 @@ printargv(struct tcb *const tcp, kernel_ureg_t addr)
76 76
 }
77 77
 
78 78
 static void
79
-printargc(struct tcb *const tcp, kernel_ureg_t addr)
79
+printargc(struct tcb *const tcp, kernel_ulong_t addr)
80 80
 {
81 81
 	if (!addr || !verbose(tcp)) {
82 82
 		printaddr(addr);

+ 6
- 6
fcntl.c View File

@@ -54,7 +54,7 @@ print_struct_flock64(const struct_kernel_flock64 *fl, const int getlk)
54 54
 }
55 55
 
56 56
 static void
57
-printflock64(struct tcb *const tcp, const kernel_ureg_t addr, const int getlk)
57
+printflock64(struct tcb *const tcp, const kernel_ulong_t addr, const int getlk)
58 58
 {
59 59
 	struct_kernel_flock64 fl;
60 60
 
@@ -63,7 +63,7 @@ printflock64(struct tcb *const tcp, const kernel_ureg_t addr, const int getlk)
63 63
 }
64 64
 
65 65
 static void
66
-printflock(struct tcb *const tcp, const kernel_ureg_t addr, const int getlk)
66
+printflock(struct tcb *const tcp, const kernel_ulong_t addr, const int getlk)
67 67
 {
68 68
 	struct_kernel_flock64 fl;
69 69
 
@@ -72,7 +72,7 @@ printflock(struct tcb *const tcp, const kernel_ureg_t addr, const int getlk)
72 72
 }
73 73
 
74 74
 static void
75
-print_f_owner_ex(struct tcb *const tcp, const kernel_ureg_t addr)
75
+print_f_owner_ex(struct tcb *const tcp, const kernel_ulong_t addr)
76 76
 {
77 77
 	struct { int type, pid; } owner;
78 78
 
@@ -143,7 +143,7 @@ print_fcntl(struct tcb *tcp)
143 143
 		if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
144 144
 			return 0;
145 145
 		tcp->auxstr = sprintflags("flags ", fdflags,
146
-					  (kernel_ureg_t) tcp->u_rval);
146
+					  (kernel_ulong_t) tcp->u_rval);
147 147
 		return RVAL_HEX | RVAL_STR;
148 148
 	case F_GETFL:
149 149
 		if (entering(tcp) || syserror(tcp))
@@ -171,13 +171,13 @@ print_fcntl(struct tcb *tcp)
171 171
 	case F_GETLEASE:
172 172
 		if (entering(tcp) || syserror(tcp))
173 173
 			return 0;
174
-		tcp->auxstr = xlookup(lockfcmds, (kernel_ureg_t) tcp->u_rval);
174
+		tcp->auxstr = xlookup(lockfcmds, (kernel_ulong_t) tcp->u_rval);
175 175
 		return RVAL_HEX | RVAL_STR;
176 176
 	case F_GET_SEALS:
177 177
 		if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
178 178
 			return 0;
179 179
 		tcp->auxstr = sprintflags("seals ", f_seals,
180
-					  (kernel_ureg_t) tcp->u_rval);
180
+					  (kernel_ulong_t) tcp->u_rval);
181 181
 		return RVAL_HEX | RVAL_STR;
182 182
 	case F_GETSIG:
183 183
 		if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)

+ 1
- 1
fetch_seccomp_fprog.c View File

@@ -35,7 +35,7 @@ typedef struct seccomp_fprog seccomp_fprog_t;
35 35
 #include MPERS_DEFS
36 36
 
37 37
 MPERS_PRINTER_DECL(bool, fetch_seccomp_fprog, struct tcb *const tcp,
38
-		   const kernel_ureg_t addr, void *const p)
38
+		   const kernel_ulong_t addr, void *const p)
39 39
 {
40 40
 	struct seccomp_fprog *pfp = p;
41 41
 	seccomp_fprog_t mfp;

+ 2
- 2
fetch_struct_flock.c View File

@@ -52,7 +52,7 @@ typedef struct_kernel_flock64 struct_flock64;
52 52
 	 && FLOCK_MEMBERS_EQ(type, l_pid))
53 53
 
54 54
 MPERS_PRINTER_DECL(bool, fetch_struct_flock, struct tcb *const tcp,
55
-		   const kernel_ureg_t addr, void *const p)
55
+		   const kernel_ulong_t addr, void *const p)
56 56
 {
57 57
 	struct_kernel_flock64 *pfl = p;
58 58
 	struct_flock mfl;
@@ -72,7 +72,7 @@ MPERS_PRINTER_DECL(bool, fetch_struct_flock, struct tcb *const tcp,
72 72
 }
73 73
 
74 74
 MPERS_PRINTER_DECL(bool, fetch_struct_flock64, struct tcb *const tcp,
75
-		   const kernel_ureg_t addr, void *const p)
75
+		   const kernel_ulong_t addr, void *const p)
76 76
 {
77 77
 	struct_kernel_flock64 *pfl = p;
78 78
 	struct_flock64 mfl;

+ 1
- 1
fetch_struct_mmsghdr.c View File

@@ -43,7 +43,7 @@ typedef struct mmsghdr struct_mmsghdr;
43 43
  */
44 44
 
45 45
 MPERS_PRINTER_DECL(int, fetch_struct_mmsghdr,
46
-		   struct tcb *const tcp, const kernel_ureg_t addr,
46
+		   struct tcb *const tcp, const kernel_ulong_t addr,
47 47
 		   void *const p)
48 48
 {
49 49
 	struct mmsghdr *p_native = p;

+ 1
- 1
fetch_struct_msghdr.c View File

@@ -43,7 +43,7 @@ typedef struct msghdr struct_msghdr;
43 43
  */
44 44
 
45 45
 MPERS_PRINTER_DECL(int, fetch_struct_msghdr,
46
-		   struct tcb *const tcp, const kernel_ureg_t addr,
46
+		   struct tcb *const tcp, const kernel_ulong_t addr,
47 47
 		   void *const p)
48 48
 {
49 49
 	struct msghdr *const p_native = p;

+ 1
- 1
fetch_struct_stat.c View File

@@ -70,7 +70,7 @@ typedef struct stat struct_stat;
70 70
 #endif
71 71
 
72 72
 MPERS_PRINTER_DECL(bool, fetch_struct_stat,
73
-		   struct tcb *const tcp, const kernel_ureg_t addr,
73
+		   struct tcb *const tcp, const kernel_ulong_t addr,
74 74
 		   struct strace_stat *const dst)
75 75
 {
76 76
 #ifdef HAVE_STRUCT_STAT

+ 1
- 1
fetch_struct_stat64.c View File

@@ -68,7 +68,7 @@ typedef struct stat64 struct_stat64;
68 68
 #endif
69 69
 
70 70
 MPERS_PRINTER_DECL(bool, fetch_struct_stat64,
71
-		   struct tcb *const tcp, const kernel_ureg_t addr,
71
+		   struct tcb *const tcp, const kernel_ulong_t addr,
72 72
 		   struct strace_stat *const dst)
73 73
 {
74 74
 #ifdef HAVE_STRUCT_STAT64

+ 3
- 3
fetch_struct_statfs.c View File

@@ -40,7 +40,7 @@ typedef struct statfs64 struct_statfs64;
40 40
 #include "statfs.h"
41 41
 
42 42
 MPERS_PRINTER_DECL(bool, fetch_struct_statfs,
43
-		   struct tcb *const tcp, const kernel_ureg_t addr,
43
+		   struct tcb *const tcp, const kernel_ulong_t addr,
44 44
 		   struct strace_statfs *const p)
45 45
 {
46 46
 	struct_statfs b;
@@ -79,8 +79,8 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs,
79 79
 #endif
80 80
 
81 81
 MPERS_PRINTER_DECL(bool, fetch_struct_statfs64,
82
-		   struct tcb *const tcp, const kernel_ureg_t addr,
83
-		   const kernel_ureg_t size, struct strace_statfs *const p)
82
+		   struct tcb *const tcp, const kernel_ulong_t addr,
83
+		   const kernel_ulong_t size, struct strace_statfs *const p)
84 84
 {
85 85
 	struct_statfs64 b;
86 86
 

+ 2
- 2
file_handle.c View File

@@ -41,7 +41,7 @@ typedef struct {
41 41
 SYS_FUNC(name_to_handle_at)
42 42
 {
43 43
 	file_handle_header h;
44
-	const kernel_ureg_t addr = tcp->u_arg[2];
44
+	const kernel_ulong_t addr = tcp->u_arg[2];
45 45
 
46 46
 	if (entering(tcp)) {
47 47
 		/* dirfd */
@@ -106,7 +106,7 @@ SYS_FUNC(name_to_handle_at)
106 106
 SYS_FUNC(open_by_handle_at)
107 107
 {
108 108
 	file_handle_header h;
109
-	const kernel_ureg_t addr = tcp->u_arg[1];
109
+	const kernel_ulong_t addr = tcp->u_arg[1];
110 110
 
111 111
 	/* mount_fd */
112 112
 	printfd(tcp, tcp->u_arg[0]);

+ 1
- 1
file_ioctl.c View File

@@ -124,7 +124,7 @@ print_fiemap_extent(struct tcb *tcp, void *elem_buf, size_t elem_size, void *dat
124 124
 
125 125
 int
126 126
 file_ioctl(struct tcb *const tcp, const unsigned int code,
127
-	   const kernel_ureg_t arg)
127
+	   const kernel_ulong_t arg)
128 128
 {
129 129
 	switch (code) {
130 130
 	case FICLONE:	/* W */

+ 1
- 1
fs_x_ioctl.c View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 int
33 33
 fs_x_ioctl(struct tcb *const tcp, const unsigned int code,
34
-	   const kernel_ureg_t arg)
34
+	   const kernel_ulong_t arg)
35 35
 {
36 36
 	switch (code) {
37 37
 #ifdef FITRIM

+ 3
- 3
futex.c View File

@@ -43,11 +43,11 @@
43 43
 
44 44
 SYS_FUNC(futex)
45 45
 {
46
-	const kernel_ureg_t uaddr = tcp->u_arg[0];
46
+	const kernel_ulong_t uaddr = tcp->u_arg[0];
47 47
 	const int op = tcp->u_arg[1];
48 48
 	const int cmd = op & 127;
49
-	const kernel_ureg_t timeout = tcp->u_arg[3];
50
-	const kernel_ureg_t uaddr2 = tcp->u_arg[4];
49
+	const kernel_ulong_t timeout = tcp->u_arg[3];
50
+	const kernel_ulong_t uaddr2 = tcp->u_arg[4];
51 51
 	const unsigned int val = tcp->u_arg[2];
52 52
 	const unsigned int val2 = tcp->u_arg[3];
53 53
 	const unsigned int val3 = tcp->u_arg[5];

+ 1
- 1
hdio.c View File

@@ -37,7 +37,7 @@ typedef struct hd_geometry struct_hd_geometry;
37 37
 #include MPERS_DEFS
38 38
 
39 39
 MPERS_PRINTER_DECL(int, hdio_ioctl, struct tcb *const tcp,
40
-		   const unsigned int code, const kernel_ureg_t arg)
40
+		   const unsigned int code, const kernel_ulong_t arg)
41 41
 {
42 42
 	switch (code) {
43 43
 	case HDIO_GETGEO:

+ 9
- 9
io.c View File

@@ -59,14 +59,14 @@ SYS_FUNC(write)
59 59
 
60 60
 struct print_iovec_config {
61 61
 	enum iov_decode decode_iov;
62
-	kernel_ureg_t data_size;
62
+	kernel_ulong_t data_size;
63 63
 };
64 64
 
65 65
 static bool
66 66
 print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
67 67
 {
68
-	const kernel_ureg_t *iov;
69
-	kernel_ureg_t iov_buf[2], len;
68
+	const kernel_ulong_t *iov;
69
+	kernel_ulong_t iov_buf[2], len;
70 70
 	struct print_iovec_config *c = data;
71 71
 
72 72
         if (elem_size < sizeof(iov_buf)) {
@@ -85,14 +85,14 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
85 85
 		case IOV_DECODE_STR:
86 86
 			if (len > c->data_size)
87 87
 				len = c->data_size;
88
-			if (c->data_size != (kernel_ureg_t) -1)
88
+			if (c->data_size != (kernel_ulong_t) -1)
89 89
 				c->data_size -= len;
90 90
 			printstrn(tcp, iov[0], len);
91 91
 			break;
92 92
 		case IOV_DECODE_NETLINK:
93 93
 			if (len > c->data_size)
94 94
 				len = c->data_size;
95
-			if (c->data_size != (kernel_ureg_t) -1)
95
+			if (c->data_size != (kernel_ulong_t) -1)
96 96
 				c->data_size -= len;
97 97
 			decode_netlink(tcp, iov[0], iov[1]);
98 98
 			break;
@@ -111,11 +111,11 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
111 111
  * Example: recvmsg returing a short read.
112 112
  */
113 113
 void
114
-tprint_iov_upto(struct tcb *const tcp, const kernel_ureg_t len,
115
-		const kernel_ureg_t addr, const enum iov_decode decode_iov,
116
-		const kernel_ureg_t data_size)
114
+tprint_iov_upto(struct tcb *const tcp, const kernel_ulong_t len,
115
+		const kernel_ulong_t addr, const enum iov_decode decode_iov,
116
+		const kernel_ulong_t data_size)
117 117
 {
118
-	kernel_ureg_t iov[2];
118
+	kernel_ulong_t iov[2];
119 119
 	struct print_iovec_config config =
120 120
 		{ .decode_iov = decode_iov, .data_size = data_size };
121 121
 

+ 1
- 1
ioctl.c View File

@@ -227,7 +227,7 @@ static int
227 227
 ioctl_decode(struct tcb *tcp)
228 228
 {
229 229
 	const unsigned int code = tcp->u_arg[1];
230
-	const kernel_ureg_t arg = tcp->u_arg[2];
230
+	const kernel_ulong_t arg = tcp->u_arg[2];
231 231
 
232 232
 	switch (_IOC_TYPE(code)) {
233 233
 #if defined(ALPHA) || defined(POWERPC)

+ 7
- 7
ipc_msg.c View File

@@ -57,8 +57,8 @@ SYS_FUNC(msgget)
57 57
 }
58 58
 
59 59
 static void
60
-tprint_msgsnd(struct tcb *const tcp, const kernel_ureg_t addr,
61
-	      const kernel_ureg_t count, const unsigned int flags)
60
+tprint_msgsnd(struct tcb *const tcp, const kernel_ulong_t addr,
61
+	      const kernel_ulong_t count, const unsigned int flags)
62 62
 {
63 63
 	tprint_msgbuf(tcp, addr, count);
64 64
 	printflags(ipc_msg_flags, flags, "MSG_???");
@@ -78,16 +78,16 @@ SYS_FUNC(msgsnd)
78 78
 }
79 79
 
80 80
 static void
81
-tprint_msgrcv(struct tcb *const tcp, const kernel_ureg_t addr,
82
-	      const kernel_ureg_t count, const kernel_ureg_t msgtyp)
81
+tprint_msgrcv(struct tcb *const tcp, const kernel_ulong_t addr,
82
+	      const kernel_ulong_t count, const kernel_ulong_t msgtyp)
83 83
 {
84 84
 	tprint_msgbuf(tcp, addr, count);
85 85
 	tprintf("%" PRI_krd ", ", msgtyp);
86 86
 }
87 87
 
88 88
 static int
89
-fetch_msgrcv_args(struct tcb *const tcp, const kernel_ureg_t addr,
90
-		  kernel_ureg_t *const pair)
89
+fetch_msgrcv_args(struct tcb *const tcp, const kernel_ulong_t addr,
90
+		  kernel_ulong_t *const pair)
91 91
 {
92 92
 	if (current_wordsize == sizeof(*pair)) {
93 93
 		if (umoven_or_printaddr(tcp, addr, 2 * sizeof(*pair), pair))
@@ -118,7 +118,7 @@ SYS_FUNC(msgrcv)
118 118
 				tprint_msgrcv(tcp, tcp->u_arg[3],
119 119
 					      tcp->u_arg[1], tcp->u_arg[4]);
120 120
 			} else {
121
-				kernel_ureg_t pair[2];
121
+				kernel_ulong_t pair[2];
122 122
 
123 123
 				if (fetch_msgrcv_args(tcp, tcp->u_arg[3], pair))
124 124
 					tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);

+ 2
- 2
ipc_msgctl.c View File

@@ -51,7 +51,7 @@ typedef struct msqid64_ds msqid_ds_t;
51 51
 #include "xlat/msgctl_flags.h"
52 52
 
53 53
 static void
54
-print_msqid_ds(struct tcb *const tcp, const kernel_ureg_t addr, int cmd)
54
+print_msqid_ds(struct tcb *const tcp, const kernel_ulong_t addr, int cmd)
55 55
 {
56 56
 	/* TODO: We don't properly decode old compat ipc calls. */
57 57
 	if (cmd & IPC_64)
@@ -101,7 +101,7 @@ SYS_FUNC(msgctl)
101 101
 		PRINTCTL(msgctl_flags, tcp->u_arg[1], "MSG_???");
102 102
 		tprints(", ");
103 103
 	} else {
104
-		const kernel_ureg_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
104
+		const kernel_ulong_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
105 105
 		print_msqid_ds(tcp, addr, tcp->u_arg[1]);
106 106
 	}
107 107
 	return 0;

+ 1
- 1
ipc_sem.c View File

@@ -57,7 +57,7 @@ print_sembuf(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
57 57
 #endif
58 58
 
59 59
 static void
60
-tprint_sembuf_array(struct tcb *const tcp, const kernel_ureg_t addr,
60
+tprint_sembuf_array(struct tcb *const tcp, const kernel_ulong_t addr,
61 61
 		    const unsigned int count)
62 62
 {
63 63
 #if defined HAVE_SYS_SEM_H || defined HAVE_LINUX_SEM_H

+ 2
- 2
ipc_shmctl.c View File

@@ -51,7 +51,7 @@ typedef struct shmid64_ds shmid_ds_t;
51 51
 #include "xlat/shmctl_flags.h"
52 52
 
53 53
 static void
54
-print_shmid_ds(struct tcb *const tcp, const kernel_ureg_t addr, int cmd)
54
+print_shmid_ds(struct tcb *const tcp, const kernel_ulong_t addr, int cmd)
55 55
 {
56 56
 	/* TODO: We don't properly decode old compat ipc calls. */
57 57
 	if (cmd & IPC_64)
@@ -101,7 +101,7 @@ SYS_FUNC(shmctl)
101 101
 		PRINTCTL(shmctl_flags, tcp->u_arg[1], "SHM_???");
102 102
 		tprints(", ");
103 103
 	} else {
104
-		const kernel_ureg_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
104
+		const kernel_ulong_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
105 105
 		print_shmid_ds(tcp, addr, tcp->u_arg[1]);
106 106
 	}
107 107
 	return 0;

+ 0
- 3
kernel_types.h View File

@@ -47,9 +47,6 @@ typedef unsigned long kernel_ulong_t;
47 47
 
48 48
 # endif
49 49
 
50
-typedef kernel_ulong_t kernel_scno_t;
51
-typedef kernel_ulong_t kernel_ureg_t;
52
-
53 50
 typedef struct {
54 51
 	kernel_ulong_t	d_ino;
55 52
 	kernel_ulong_t	d_off;

+ 7
- 7
kexec.c View File

@@ -40,8 +40,8 @@
40 40
 static bool
41 41
 print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
42 42
 {
43
-	const kernel_ureg_t *seg;
44
-	kernel_ureg_t seg_buf[4];
43
+	const kernel_ulong_t *seg;
44
+	kernel_ulong_t seg_buf[4];
45 45
 
46 46
         if (elem_size < sizeof(seg_buf)) {
47 47
 		unsigned int i;
@@ -63,15 +63,15 @@ print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
63 63
 }
64 64
 
65 65
 static void
66
-print_kexec_segments(struct tcb *const tcp, const kernel_ureg_t addr,
67
-		     const kernel_ureg_t len)
66
+print_kexec_segments(struct tcb *const tcp, const kernel_ulong_t addr,
67
+		     const kernel_ulong_t len)
68 68
 {
69 69
 	if (len > KEXEC_SEGMENT_MAX) {
70 70
 		printaddr(addr);
71 71
 		return;
72 72
 	}
73 73
 
74
-	kernel_ureg_t seg[4];
74
+	kernel_ulong_t seg[4];
75 75
 	const size_t sizeof_seg = ARRAY_SIZE(seg) * current_wordsize;
76 76
 
77 77
 	print_array(tcp, addr, len, seg, sizeof_seg,
@@ -89,9 +89,9 @@ SYS_FUNC(kexec_load)
89 89
 	tprints(", ");
90 90
 
91 91
 	/* flags */
92
-	kernel_ureg_t n = tcp->u_arg[3];
92
+	kernel_ulong_t n = tcp->u_arg[3];
93 93
 	printxval64(kexec_arch_values, n & KEXEC_ARCH_MASK, "KEXEC_ARCH_???");
94
-	n &= ~(kernel_ureg_t) KEXEC_ARCH_MASK;
94
+	n &= ~(kernel_ulong_t) KEXEC_ARCH_MASK;
95 95
 	if (n) {
96 96
 		tprints("|");
97 97
 		printflags64(kexec_load_flags, n, "KEXEC_???");

+ 1
- 1
ldt.c View File

@@ -38,7 +38,7 @@
38 38
 # include <asm/ldt.h>
39 39
 
40 40
 void
41
-print_user_desc(struct tcb *const tcp, const kernel_ureg_t addr)
41
+print_user_desc(struct tcb *const tcp, const kernel_ulong_t addr)
42 42
 {
43 43
 	struct user_desc desc;
44 44
 

+ 1
- 1
linux/aarch64/get_scno.c View File

@@ -2,7 +2,7 @@
2 2
 static int
3 3
 arch_get_scno(struct tcb *tcp)
4 4
 {
5
-	kernel_scno_t scno = 0;
5
+	kernel_ulong_t scno = 0;
6 6
 
7 7
 	switch (aarch64_io.iov_len) {
8 8
 		case sizeof(aarch64_regs):

+ 1
- 1
linux/aarch64/set_scno.c View File

@@ -7,7 +7,7 @@
7 7
  */
8 8
 
9 9
 static int
10
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
10
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
11 11
 {
12 12
 	unsigned int n = (uint16_t) scno;
13 13
 	const struct iovec io = {

+ 1
- 1
linux/alpha/get_scno.c View File

@@ -2,7 +2,7 @@
2 2
 static int
3 3
 arch_get_scno(struct tcb *tcp)
4 4
 {
5
-	kernel_scno_t scno = 0;
5
+	kernel_ulong_t scno = 0;
6 6
 
7 7
 	if (upeek(tcp->pid, REG_A3, &alpha_a3) < 0)
8 8
 		return -1;

+ 1
- 1
linux/alpha/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, REG_R0, scno);
5 5
 }

+ 1
- 1
linux/arc/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	arc_regs.scratch.r8 = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/arm/get_scno.c View File

@@ -31,7 +31,7 @@
31 31
 static int
32 32
 arch_get_scno(struct tcb *tcp)
33 33
 {
34
-	kernel_scno_t scno = 0;
34
+	kernel_ulong_t scno = 0;
35 35
 
36 36
 	/* Note: we support only 32-bit CPUs, not 26-bit */
37 37
 

+ 1
- 1
linux/arm/set_scno.c View File

@@ -7,7 +7,7 @@
7 7
  */
8 8
 
9 9
 static int
10
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
10
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
11 11
 {
12 12
 	unsigned int n = (uint16_t) scno;
13 13
 	int rc = ptrace(PTRACE_SET_SYSCALL, tcp->pid, NULL, (unsigned long) n);

+ 1
- 1
linux/avr32/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	avr32_regs.r8 = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/bfin/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, PT_ORIG_P0, scno);
5 5
 }

+ 1
- 1
linux/crisv10/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, 4 * PT_R9, scno);
5 5
 }

+ 1
- 1
linux/hppa/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, PT_GR20, scno);
5 5
 }

+ 1
- 1
linux/i386/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 #ifdef HAVE_GETREGS_OLD
5 5
 	return upoke(tcp->pid, 4 * ORIG_EAX, scno);

+ 1
- 1
linux/ia64/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	if (ia64_ia32mode)
5 5
 		ia64_regs.gr[0] = scno;

+ 1
- 1
linux/m68k/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	m68k_regs.orig_d0 = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/metag/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	metag_regs.dx[0][1] = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/microblaze/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, 0, scno);
5 5
 }

+ 2
- 2
linux/mips/arch_sigreturn.c View File

@@ -6,7 +6,7 @@ arch_sigreturn(struct tcb *tcp)
6 6
 	 * offsetof(struct sigframe, sf_mask) ==
7 7
 	 * sizeof(sf_ass) + sizeof(sf_pad) + sizeof(struct sigcontext)
8 8
 	 */
9
-	const kernel_ureg_t addr = mips_REG_SP + 6 * 4 +
9
+	const kernel_ulong_t addr = mips_REG_SP + 6 * 4 +
10 10
 				   sizeof(struct sigcontext);
11 11
 #else
12 12
 	/*
@@ -16,7 +16,7 @@ arch_sigreturn(struct tcb *tcp)
16 16
 	 * offsetof(struct rt_sigframe, rs_uc) ==
17 17
 	 * sizeof(sf_ass) + sizeof(sf_pad) + sizeof(struct siginfo)
18 18
 	 */
19
-	const kernel_ureg_t addr = mips_REG_SP + 6 * 4 + 128 +
19
+	const kernel_ulong_t addr = mips_REG_SP + 6 * 4 + 128 +
20 20
 				   offsetof(struct ucontext, uc_sigmask);
21 21
 #endif
22 22
 

+ 1
- 1
linux/mips/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	mips_REG_V0 = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/nios2/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	nios2_regs.regs[2] = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/or1k/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	or1k_regs.gpr[11] = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/powerpc/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 #ifdef HAVE_GETREGS_OLD
5 5
 	return upoke(tcp->pid, sizeof(long) * PT_R0, scno);

+ 1
- 1
linux/riscv/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	riscv_regs.a7 = scno;
5 5
 	return set_regs(tcp->pid);

+ 1
- 1
linux/s390/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	s390_regset.gprs[2] = scno;
5 5
 	return set_regs(tcp->pid);

+ 2
- 2
linux/sh/get_scno.c View File

@@ -2,7 +2,7 @@
2 2
 static int
3 3
 arch_get_scno(struct tcb *tcp)
4 4
 {
5
-	kernel_scno_t scno = 0;
5
+	kernel_ulong_t scno = 0;
6 6
 
7 7
 	/*
8 8
 	 * In the new syscall ABI, the system call number is in R3.
@@ -14,7 +14,7 @@ arch_get_scno(struct tcb *tcp)
14 14
 		/* Odd as it may seem, a glibc bug has been known to cause
15 15
 		   glibc to issue bogus negative syscall numbers.  So for
16 16
 		   our purposes, make strace print what it *should* have been */
17
-		kernel_scno_t correct_scno = (scno & 0xff);
17
+		kernel_ulong_t correct_scno = (scno & 0xff);
18 18
 		if (debug_flag)
19 19
 			error_msg("Detected glibc bug: bogus system call"
20 20
 				  " number = %ld, correcting to %ld",

+ 1
- 1
linux/sh/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, 4 * (REG_REG0 + 3), scno);
5 5
 }

+ 1
- 1
linux/sh64/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, REG_SYSCALL, scno);
5 5
 }

+ 1
- 1
linux/sparc/set_scno.c View File

@@ -4,7 +4,7 @@
4 4
  */
5 5
 
6 6
 static int
7
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
7
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
8 8
 {
9 9
 	sparc_regs.u_regs[U_REG_G1] = scno;
10 10
 	return set_regs(tcp->pid);

+ 1
- 1
linux/tile/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	tile_regs.regs[10] = scno;
5 5
 	return set_regs(tcp->pid);

+ 2
- 2
linux/x86_64/arch_sigreturn.c View File

@@ -18,14 +18,14 @@ arch_sigreturn(struct tcb *tcp)
18 18
 #define	X86_64_SIGMASK_OFFSET	offsetof(struct ucontext, uc_sigmask)
19 19
 #define	X32_SIGMASK_OFFSET	sizeof(ucontext_x32_header)
20 20
 
21
-	const kernel_ureg_t offset =
21
+	const kernel_ulong_t offset =
22 22
 #ifdef X32
23 23
 		X32_SIGMASK_OFFSET;
24 24
 #else
25 25
 		current_personality == 2 ? X32_SIGMASK_OFFSET :
26 26
 					   X86_64_SIGMASK_OFFSET;
27 27
 #endif
28
-	const kernel_ureg_t addr = (kernel_ureg_t) *x86_64_rsp_ptr + offset;
28
+	const kernel_ulong_t addr = (kernel_ulong_t) *x86_64_rsp_ptr + offset;
29 29
 	tprints("{mask=");
30 30
 	print_sigset_addr_len(tcp, addr, NSIG / 8);
31 31
 	tprints("}");

+ 1
- 1
linux/x86_64/get_scno.c View File

@@ -40,7 +40,7 @@
40 40
 static int
41 41
 arch_get_scno(struct tcb *tcp)
42 42
 {
43
-	kernel_scno_t scno = 0;
43
+	kernel_ulong_t scno = 0;
44 44
 	unsigned int currpers;
45 45
 
46 46
 #ifndef __X32_SYSCALL_BIT

+ 1
- 1
linux/x86_64/set_scno.c View File

@@ -5,7 +5,7 @@
5 5
 #endif /* !HAVE_GETREGS_OLD */
6 6
 
7 7
 static int
8
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
8
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
9 9
 {
10 10
 #ifdef HAVE_GETREGS_OLD
11 11
 	return upoke(tcp->pid, 8 * ORIG_RAX, scno);

+ 1
- 1
linux/xtensa/set_scno.c View File

@@ -1,5 +1,5 @@
1 1
 static int
2
-arch_set_scno(struct tcb *tcp, kernel_scno_t scno)
2
+arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
3 3
 {
4 4
 	return upoke(tcp->pid, SYSCALL_NR, scno);
5 5
 }

+ 3
- 3
loop.c View File

@@ -33,7 +33,7 @@
33 33
 #include "xlat/loop_crypt_type_options.h"
34 34
 
35 35
 static void
36
-decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
36
+decode_loop_info(struct tcb *const tcp, const kernel_ulong_t addr)
37 37
 {
38 38
 	struct loop_info info;
39 39
 
@@ -83,7 +83,7 @@ decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
83 83
 }
84 84
 
85 85
 static void
86
-decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
86
+decode_loop_info64(struct tcb *const tcp, const kernel_ulong_t addr)
87 87
 {
88 88
 	struct loop_info64 info64;
89 89
 
@@ -141,7 +141,7 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
141 141
 
142 142
 int
143 143
 loop_ioctl(struct tcb *const tcp, const unsigned int code,
144
-	   const kernel_ureg_t arg)
144
+	   const kernel_ulong_t arg)
145 145
 {
146 146
 	if (!verbose(tcp))
147 147
 		return RVAL_DECODED;

+ 16
- 16
mem.c View File

@@ -55,12 +55,12 @@ SYS_FUNC(brk)
55 55
 #include "xlat/mmap_flags.h"
56 56
 
57 57
 static void
58
-print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
58
+print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
59 59
 {
60
-	const kernel_ureg_t addr = u_arg[0];
61
-	const kernel_ureg_t len = u_arg[1];
62
-	const kernel_ureg_t prot = u_arg[2];
63
-	const kernel_ureg_t flags = u_arg[3];
60
+	const kernel_ulong_t addr = u_arg[0];
61
+	const kernel_ulong_t len = u_arg[1];
62
+	const kernel_ulong_t prot = u_arg[2];
63
+	const kernel_ulong_t flags = u_arg[3];
64 64
 	const int fd = u_arg[4];
65 65
 
66 66
 	printaddr(addr);
@@ -93,7 +93,7 @@ print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
93 93
 /* Params are pointed to by u_arg[0], offset is in bytes */
94 94
 SYS_FUNC(old_mmap)
95 95
 {
96
-	kernel_ureg_t u_arg[6];
96
+	kernel_ulong_t u_arg[6];
97 97
 # ifndef current_klongsize
98 98
 	/* We are here only in a 32-bit personality. */
99 99
 	unsigned int narrow_arg[6];
@@ -116,7 +116,7 @@ SYS_FUNC(old_mmap)
116 116
 /* Params are pointed to by u_arg[0], offset is in pages */
117 117
 SYS_FUNC(old_mmap_pgoff)
118 118
 {
119
-	kernel_ureg_t u_arg[5];
119
+	kernel_ulong_t u_arg[5];
120 120
 	int i;
121 121
 	unsigned int narrow_arg[6];
122 122
 	unsigned long long offset;
@@ -312,11 +312,11 @@ SYS_FUNC(getpagesize)
312 312
 
313 313
 SYS_FUNC(remap_file_pages)
314 314
 {
315
-	const kernel_ureg_t addr = tcp->u_arg[0];
316
-	const kernel_ureg_t size = tcp->u_arg[1];
317
-	const kernel_ureg_t prot = tcp->u_arg[2];
318
-	const kernel_ureg_t pgoff = tcp->u_arg[3];
319
-	const kernel_ureg_t flags = tcp->u_arg[4];
315
+	const kernel_ulong_t addr = tcp->u_arg[0];
316
+	const kernel_ulong_t size = tcp->u_arg[1];
317
+	const kernel_ulong_t prot = tcp->u_arg[2];
318
+	const kernel_ulong_t pgoff = tcp->u_arg[3];
319
+	const kernel_ulong_t flags = tcp->u_arg[4];
320 320
 
321 321
 	printaddr(addr);
322 322
 	tprintf(", %" PRI_kru ", ", size);
@@ -343,10 +343,10 @@ print_protmap_entry(struct tcb *tcp, void *elem_buf, size_t elem_size, void *dat
343 343
 
344 344
 SYS_FUNC(subpage_prot)
345 345
 {
346
-	kernel_ureg_t addr = tcp->u_arg[0];
347
-	kernel_ureg_t len = tcp->u_arg[1];
348
-	kernel_ureg_t nmemb = len >> 16;
349
-	kernel_ureg_t map = tcp->u_arg[2];
346
+	kernel_ulong_t addr = tcp->u_arg[0];
347
+	kernel_ulong_t len = tcp->u_arg[1];
348
+	kernel_ulong_t nmemb = len >> 16;
349
+	kernel_ulong_t map = tcp->u_arg[2];
350 350
 
351 351
 	printaddr(addr);
352 352
 	tprintf(", %" PRI_kru ", ", len);

+ 1
- 1
membarrier.c View File

@@ -44,6 +44,6 @@ SYS_FUNC(membarrier)
44 44
 		return 0;
45 45
 
46 46
 	tcp->auxstr = sprintflags("", membarrier_cmds,
47
-				  (kernel_ureg_t) tcp->u_rval);
47
+				  (kernel_ulong_t) tcp->u_rval);
48 48
 	return RVAL_HEX | RVAL_STR;
49 49
 }

+ 6
- 6
mmsghdr.c View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 static int
36 36
 fetch_struct_mmsghdr_or_printaddr(struct tcb *const tcp,
37
-				  const kernel_ureg_t addr,
37
+				  const kernel_ulong_t addr,
38 38
 				  const unsigned int len, void *const mh)
39 39
 {
40 40
 	if ((entering(tcp) || !syserror(tcp))
@@ -68,7 +68,7 @@ print_struct_mmsghdr(struct tcb *tcp, void *elem_buf,
68 68
 
69 69
 	tprints("{msg_hdr=");
70 70
 	print_struct_msghdr(tcp, &mmsg->msg_hdr, c->p_user_msg_namelen,
71
-			    c->use_msg_len ? mmsg->msg_len : (kernel_ureg_t) -1);
71
+			    c->use_msg_len ? mmsg->msg_len : (kernel_ulong_t) -1);
72 72
 	if (c->msg_len_vlen) {
73 73
 		tprintf(", msg_len=%u", mmsg->msg_len);
74 74
 		--c->msg_len_vlen;
@@ -98,7 +98,7 @@ struct mmsgvec_data {
98 98
 };
99 99
 
100 100
 static void
101
-save_mmsgvec_namelen(struct tcb *const tcp, kernel_ureg_t addr,
101
+save_mmsgvec_namelen(struct tcb *const tcp, kernel_ulong_t addr,
102 102
 		     unsigned int len, const char *const timeout)
103 103
 {
104 104
 	if (len > IOV_MAX)
@@ -125,7 +125,7 @@ save_mmsgvec_namelen(struct tcb *const tcp, kernel_ureg_t addr,
125 125
 }
126 126
 
127 127
 static void
128
-decode_mmsgvec(struct tcb *const tcp, const kernel_ureg_t addr,
128
+decode_mmsgvec(struct tcb *const tcp, const kernel_ulong_t addr,
129 129
 	       const unsigned int vlen, const unsigned int msg_len_vlen,
130 130
 	       const bool use_msg_len)
131 131
 {
@@ -149,7 +149,7 @@ decode_mmsgvec(struct tcb *const tcp, const kernel_ureg_t addr,
149 149
 }
150 150
 
151 151
 void
152
-dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ureg_t addr)
152
+dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ulong_t addr)
153 153
 {
154 154
 	unsigned int len = tcp->u_rval;
155 155
 	unsigned int i, fetched;
@@ -160,7 +160,7 @@ dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ureg_t addr)
160 160
 		if (!fetched)
161 161
 			break;
162 162
 		tprintf(" = %" PRI_kru " buffers in vector %u\n",
163
-			(kernel_ureg_t) mmsg.msg_hdr.msg_iovlen, i);
163
+			(kernel_ulong_t) mmsg.msg_hdr.msg_iovlen, i);
164 164
 		dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
165 165
 			     ptr_to_kulong(mmsg.msg_hdr.msg_iov),
166 166
 			     mmsg.msg_len);

+ 1
- 1
mount.c View File

@@ -42,7 +42,7 @@ SYS_FUNC(mount)
42 42
 	bool ignore_type = false;
43 43
 	bool ignore_data = false;
44 44
 	bool old_magic = false;
45
-	kernel_ureg_t flags = tcp->u_arg[3];
45
+	kernel_ulong_t flags = tcp->u_arg[3];
46 46
 
47 47
 	/* Discard magic */
48 48
 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL) {

+ 12
- 12
msghdr.c View File

@@ -252,8 +252,8 @@ get_optmem_max(void)
252 252
 }
253 253
 
254 254
 static void
255
-decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
256
-		   const kernel_ureg_t in_control_len)
255
+decode_msg_control(struct tcb *const tcp, const kernel_ulong_t addr,
256
+		   const kernel_ulong_t in_control_len)
257 257
 {
258 258
 	if (!in_control_len)
259 259
 		return;
@@ -279,7 +279,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
279 279
 
280 280
 	tprints("[");
281 281
 	while (buf_len >= cmsg_size) {
282
-		const kernel_ureg_t cmsg_len =
282
+		const kernel_ulong_t cmsg_len =
283 283
 #if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
284 284
 			(current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_len :
285 285
 #endif
@@ -301,7 +301,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
301 301
 		printxval(socketlayers, cmsg_level, "SOL_???");
302 302
 		tprints(", cmsg_type=");
303 303
 
304
-		kernel_ureg_t len = cmsg_len > buf_len ? buf_len : cmsg_len;
304
+		kernel_ulong_t len = cmsg_len > buf_len ? buf_len : cmsg_len;
305 305
 
306 306
 		print_cmsg_type_data(tcp, cmsg_level, cmsg_type,
307 307
 				     (const void *) (u.ptr + cmsg_size),
@@ -313,7 +313,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
313 313
 			break;
314 314
 		}
315 315
 		len = (cmsg_len + current_wordsize - 1) &
316
-			~((kernel_ureg_t) current_wordsize - 1);
316
+			~((kernel_ulong_t) current_wordsize - 1);
317 317
 		if (len >= buf_len) {
318 318
 			buf_len = 0;
319 319
 			break;
@@ -334,7 +334,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
334 334
 void
335 335
 print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
336 336
 		    const int *const p_user_msg_namelen,
337
-		    const kernel_ureg_t data_size)
337
+		    const kernel_ulong_t data_size)
338 338
 {
339 339
 	const int msg_namelen =
340 340
 		p_user_msg_namelen && (int) msg->msg_namelen > *p_user_msg_namelen
@@ -355,11 +355,11 @@ print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
355 355
 
356 356
 	tprint_iov_upto(tcp, msg->msg_iovlen,
357 357
 			ptr_to_kulong(msg->msg_iov), decode, data_size);
358
-	tprintf(", msg_iovlen=%" PRI_kru, (kernel_ureg_t) msg->msg_iovlen);
358
+	tprintf(", msg_iovlen=%" PRI_kru, (kernel_ulong_t) msg->msg_iovlen);
359 359
 
360 360
 	decode_msg_control(tcp, ptr_to_kulong(msg->msg_control),
361 361
 			   msg->msg_controllen);
362
-	tprintf(", msg_controllen=%" PRI_kru, (kernel_ureg_t) msg->msg_controllen);
362
+	tprintf(", msg_controllen=%" PRI_kru, (kernel_ulong_t) msg->msg_controllen);
363 363
 
364 364
 	tprints(", msg_flags=");
365 365
 	printflags(msg_flags, msg->msg_flags, "MSG_???");
@@ -367,7 +367,7 @@ print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
367 367
 }
368 368
 
369 369
 static bool
370
-fetch_msghdr_namelen(struct tcb *const tcp, const kernel_ureg_t addr,
370
+fetch_msghdr_namelen(struct tcb *const tcp, const kernel_ulong_t addr,
371 371
 		     int *const p_msg_namelen)
372 372
 {
373 373
 	struct msghdr msg;
@@ -382,7 +382,7 @@ fetch_msghdr_namelen(struct tcb *const tcp, const kernel_ureg_t addr,
382 382
 
383 383
 static void
384 384
 decode_msghdr(struct tcb *const tcp, const int *const p_user_msg_namelen,
385
-	      const kernel_ureg_t addr, const kernel_ureg_t data_size)
385
+	      const kernel_ulong_t addr, const kernel_ulong_t data_size)
386 386
 {
387 387
 	struct msghdr msg;
388 388
 
@@ -393,8 +393,8 @@ decode_msghdr(struct tcb *const tcp, const int *const p_user_msg_namelen,
393 393
 }
394 394
 
395 395
 void
396
-dumpiov_in_msghdr(struct tcb *const tcp, const kernel_ureg_t addr,
397
-		  const kernel_ureg_t data_size)
396
+dumpiov_in_msghdr(struct tcb *const tcp, const kernel_ulong_t addr,
397
+		  const kernel_ulong_t data_size)
398 398
 {
399 399
 	struct msghdr msg;
400 400
 

+ 1
- 1
msghdr.h View File

@@ -15,6 +15,6 @@ struct tcb;
15 15
 
16 16
 extern void
17 17
 print_struct_msghdr(struct tcb *, const struct msghdr *,
18
-		    const int *p_user_msg_namelen, kernel_ureg_t data_size);
18
+		    const int *p_user_msg_namelen, kernel_ulong_t data_size);
19 19
 
20 20
 #endif /* !STRACE_MSGHDR_H */

+ 12
- 12
mtd.c View File

@@ -50,7 +50,7 @@ typedef struct mtd_oob_buf struct_mtd_oob_buf;
50 50
 #include "xlat/mtd_nandecc_options.h"
51 51
 
52 52
 static void
53
-decode_erase_info_user(struct tcb *const tcp, const kernel_ureg_t addr)
53
+decode_erase_info_user(struct tcb *const tcp, const kernel_ulong_t addr)
54 54
 {
55 55
 	struct erase_info_user einfo;
56 56
 
@@ -62,7 +62,7 @@ decode_erase_info_user(struct tcb *const tcp, const kernel_ureg_t addr)
62 62
 }
63 63
 
64 64
 static void
65
-decode_erase_info_user64(struct tcb *const tcp, const kernel_ureg_t addr)
65
+decode_erase_info_user64(struct tcb *const tcp, const kernel_ulong_t addr)
66 66
 {
67 67
 	struct erase_info_user64 einfo64;
68 68
 
@@ -75,7 +75,7 @@ decode_erase_info_user64(struct tcb *const tcp, const kernel_ureg_t addr)
75 75
 }
76 76
 
77 77
 static void
78
-decode_mtd_oob_buf(struct tcb *const tcp, const kernel_ureg_t addr)
78
+decode_mtd_oob_buf(struct tcb *const tcp, const kernel_ulong_t addr)
79 79
 {
80 80
 	struct_mtd_oob_buf mbuf;
81 81
 
@@ -89,7 +89,7 @@ decode_mtd_oob_buf(struct tcb *const tcp, const kernel_ureg_t addr)
89 89
 }
90 90
 
91 91
 static void
92
-decode_mtd_oob_buf64(struct tcb *const tcp, const kernel_ureg_t addr)
92
+decode_mtd_oob_buf64(struct tcb *const tcp, const kernel_ulong_t addr)
93 93
 {
94 94
 	struct mtd_oob_buf64 mbuf64;
95 95
 
@@ -103,7 +103,7 @@ decode_mtd_oob_buf64(struct tcb *const tcp, const kernel_ureg_t addr)
103 103
 }
104 104
 
105 105
 static void
106
-decode_otp_info(struct tcb *const tcp, const kernel_ureg_t addr)
106
+decode_otp_info(struct tcb *const tcp, const kernel_ulong_t addr)
107 107
 {
108 108
 	struct otp_info oinfo;
109 109
 
@@ -116,7 +116,7 @@ decode_otp_info(struct tcb *const tcp, const kernel_ureg_t addr)
116 116
 }
117 117
 
118 118
 static void
119
-decode_otp_select(struct tcb *const tcp, const kernel_ureg_t addr)
119
+decode_otp_select(struct tcb *const tcp, const kernel_ulong_t addr)
120 120
 {
121 121
 	unsigned int i;
122 122
 
@@ -130,7 +130,7 @@ decode_otp_select(struct tcb *const tcp, const kernel_ureg_t addr)
130 130
 }
131 131
 
132 132
 static void
133
-decode_mtd_write_req(struct tcb *const tcp, const kernel_ureg_t addr)
133
+decode_mtd_write_req(struct tcb *const tcp, const kernel_ulong_t addr)
134 134
 {
135 135
 	struct mtd_write_req mreq;
136 136
 
@@ -149,7 +149,7 @@ decode_mtd_write_req(struct tcb *const tcp, const kernel_ureg_t addr)
149 149
 }
150 150
 
151 151
 static void
152
-decode_mtd_info_user(struct tcb *const tcp, const kernel_ureg_t addr)
152
+decode_mtd_info_user(struct tcb *const tcp, const kernel_ulong_t addr)
153 153
 {
154 154
 	struct mtd_info_user minfo;
155 155
 
@@ -168,7 +168,7 @@ decode_mtd_info_user(struct tcb *const tcp, const kernel_ureg_t addr)
168 168
 }
169 169
 
170 170
 static void
171
-decode_nand_oobinfo(struct tcb *const tcp, const kernel_ureg_t addr)
171
+decode_nand_oobinfo(struct tcb *const tcp, const kernel_ulong_t addr)
172 172
 {
173 173
 	struct nand_oobinfo ninfo;
174 174
 	unsigned int i, j;
@@ -204,7 +204,7 @@ decode_nand_oobinfo(struct tcb *const tcp, const kernel_ureg_t addr)
204 204
 }
205 205
 
206 206
 static void
207
-decode_nand_ecclayout_user(struct tcb *const tcp, const kernel_ureg_t addr)
207
+decode_nand_ecclayout_user(struct tcb *const tcp, const kernel_ulong_t addr)
208 208
 {
209 209
 	struct nand_ecclayout_user nlay;
210 210
 	unsigned int i;
@@ -230,7 +230,7 @@ decode_nand_ecclayout_user(struct tcb *const tcp, const kernel_ureg_t addr)
230 230
 }
231 231
 
232 232
 static void
233
-decode_mtd_ecc_stats(struct tcb *const tcp, const kernel_ureg_t addr)
233
+decode_mtd_ecc_stats(struct tcb *const tcp, const kernel_ulong_t addr)
234 234
 {
235 235
 	struct mtd_ecc_stats es;
236 236
 
@@ -243,7 +243,7 @@ decode_mtd_ecc_stats(struct tcb *const tcp, const kernel_ureg_t addr)
243 243
 }
244 244
 
245 245
 MPERS_PRINTER_DECL(int, mtd_ioctl, struct tcb *const tcp,
246
-		   const unsigned int code, const kernel_ureg_t arg)
246
+		   const unsigned int code, const kernel_ulong_t arg)
247 247
 {
248 248
 	switch (code) {
249 249
 	case MEMERASE:

+ 15
- 15
net.c View File

@@ -104,8 +104,8 @@ print_ifindex(unsigned int ifindex)
104 104
 }
105 105
 
106 106
 static void
107
-decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ureg_t addr,
108
-	       const kernel_ureg_t addrlen)
107
+decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ulong_t addr,
108
+	       const kernel_ulong_t addrlen)
109 109
 {
110 110
 
111 111
 	switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
@@ -188,7 +188,7 @@ SYS_FUNC(listen)
188 188
 
189 189
 static bool
190 190
 fetch_socklen(struct tcb *const tcp, int *const plen,
191
-	      const kernel_ureg_t sockaddr, const kernel_ureg_t socklen)
191
+	      const kernel_ulong_t sockaddr, const kernel_ulong_t socklen)
192 192
 {
193 193
 	return verbose(tcp) && sockaddr && socklen
194 194
 	       && umove(tcp, socklen, plen) == 0;
@@ -374,7 +374,7 @@ printpair_fd(struct tcb *tcp, const int i0, const int i1)
374 374
 }
375 375
 
376 376
 static void
377
-decode_pair_fd(struct tcb *const tcp, const kernel_ureg_t addr)
377
+decode_pair_fd(struct tcb *const tcp, const kernel_ulong_t addr)
378 378
 {
379 379
 	int pair[2];
380 380
 
@@ -487,7 +487,7 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
487 487
 }
488 488
 
489 489
 static void
490
-print_linger(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
490
+print_linger(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
491 491
 {
492 492
 	struct linger linger;
493 493
 
@@ -504,7 +504,7 @@ print_linger(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
504 504
 
505 505
 #ifdef SO_PEERCRED
506 506
 static void
507
-print_ucred(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
507
+print_ucred(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
508 508
 {
509 509
 	struct ucred uc;
510 510
 
@@ -522,7 +522,7 @@ print_ucred(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
522 522
 
523 523
 #ifdef PACKET_STATISTICS
524 524
 static void
525
-print_tpacket_stats(struct tcb *const tcp, const kernel_ureg_t addr,
525
+print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
526 526
 		    const int len)
527 527
 {
528 528
 	struct tpacket_stats stats;
@@ -541,7 +541,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ureg_t addr,
541 541
 #include "xlat/icmpfilterflags.h"
542 542
 
543 543
 static void
544
-print_icmp_filter(struct tcb *const tcp, const kernel_ureg_t addr, int len)
544
+print_icmp_filter(struct tcb *const tcp, const kernel_ulong_t addr, int len)
545 545
 {
546 546
 	struct icmp_filter filter = {};
547 547
 
@@ -562,7 +562,7 @@ print_icmp_filter(struct tcb *const tcp, const kernel_ureg_t addr, int len)
562 562
 
563 563
 static void
564 564
 print_getsockopt(struct tcb *const tcp, const unsigned int level,
565
-		 const unsigned int name, const kernel_ureg_t addr,
565
+		 const unsigned int name, const kernel_ulong_t addr,
566 566
 		 const int len)
567 567
 {
568 568
 	if (addr && verbose(tcp))
@@ -636,7 +636,7 @@ SYS_FUNC(getsockopt)
636 636
 
637 637
 #ifdef IP_ADD_MEMBERSHIP
638 638
 static void
639
-print_mreq(struct tcb *const tcp, const kernel_ureg_t addr,
639
+print_mreq(struct tcb *const tcp, const kernel_ulong_t addr,
640 640
 	   const unsigned int len)
641 641
 {
642 642
 	struct ip_mreq mreq;
@@ -660,7 +660,7 @@ print_mreq(struct tcb *const tcp, const kernel_ureg_t addr,
660 660
 
661 661
 #ifdef IPV6_ADD_MEMBERSHIP
662 662
 static void
663
-print_mreq6(struct tcb *const tcp, const kernel_ureg_t addr,
663
+print_mreq6(struct tcb *const tcp, const kernel_ulong_t addr,
664 664
 	    const unsigned int len)
665 665
 {
666 666
 	struct ipv6_mreq mreq;
@@ -691,7 +691,7 @@ fail:
691 691
 
692 692
 #ifdef MCAST_JOIN_GROUP
693 693
 static void
694
-print_group_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
694
+print_group_req(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
695 695
 {
696 696
 	struct group_req greq;
697 697
 
@@ -710,7 +710,7 @@ print_group_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
710 710
 
711 711
 #ifdef PACKET_RX_RING
712 712
 static void
713
-print_tpacket_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
713
+print_tpacket_req(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
714 714
 {
715 715
 	struct tpacket_req req;
716 716
 
@@ -732,7 +732,7 @@ print_tpacket_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len
732 732
 # include "xlat/packet_mreq_type.h"
733 733
 
734 734
 static void
735
-print_packet_mreq(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
735
+print_packet_mreq(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
736 736
 {
737 737
 	struct packet_mreq mreq;
738 738
 
@@ -756,7 +756,7 @@ print_packet_mreq(struct tcb *const tcp, const kernel_ureg_t addr, const int len
756 756
 
757 757
 static void
758 758
 print_setsockopt(struct tcb *const tcp, const unsigned int level,
759
-		 const unsigned int name, const kernel_ureg_t addr,
759
+		 const unsigned int name, const kernel_ulong_t addr,
760 760
 		 const int len)
761 761
 {
762 762
 	if (addr && verbose(tcp))

+ 6
- 6
netlink.c View File

@@ -37,7 +37,7 @@
37 37
  */
38 38
 static bool
39 39
 fetch_nlmsghdr(struct tcb *const tcp, struct nlmsghdr *const nlmsghdr,
40
-	       const kernel_ureg_t addr, const kernel_ureg_t len)
40
+	       const kernel_ulong_t addr, const kernel_ulong_t len)
41 41
 {
42 42
 	if (len < sizeof(struct nlmsghdr)) {
43 43
 		printstrn(tcp, addr, len);
@@ -69,8 +69,8 @@ print_nlmsghdr(struct tcb *tcp, const struct nlmsghdr *const nlmsghdr)
69 69
 static void
70 70
 decode_nlmsghdr_with_payload(struct tcb *const tcp,
71 71
 			     const struct nlmsghdr *const nlmsghdr,
72
-			     const kernel_ureg_t addr,
73
-			     const kernel_ureg_t len)
72
+			     const kernel_ulong_t addr,
73
+			     const kernel_ulong_t len)
74 74
 {
75 75
 	tprints("{");
76 76
 
@@ -89,7 +89,7 @@ decode_nlmsghdr_with_payload(struct tcb *const tcp,
89 89
 }
90 90
 
91 91
 void
92
-decode_netlink(struct tcb *const tcp, kernel_ureg_t addr, kernel_ureg_t len)
92
+decode_netlink(struct tcb *const tcp, kernel_ulong_t addr, kernel_ulong_t len)
93 93
 {
94 94
 	struct nlmsghdr nlmsghdr;
95 95
 	bool print_array = false;
@@ -102,8 +102,8 @@ decode_netlink(struct tcb *const tcp, kernel_ureg_t addr, kernel_ureg_t len)
102 102
 		}
103 103
 
104 104
 		unsigned int nlmsg_len = NLMSG_ALIGN(nlmsghdr.nlmsg_len);
105
-		kernel_ureg_t next_addr = 0;
106
-		kernel_ureg_t next_len = 0;
105
+		kernel_ulong_t next_addr = 0;
106
+		kernel_ulong_t next_len = 0;
107 107
 
108 108
 		if (nlmsghdr.nlmsg_len >= sizeof(struct nlmsghdr)) {
109 109
 			next_len = (len >= nlmsg_len) ? len - nlmsg_len : 0;

+ 10
- 10
numa.c View File

@@ -31,23 +31,23 @@
31 31
 static bool
32 32
 print_node(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
33 33
 {
34
-	if (elem_size < sizeof(kernel_ureg_t)) {
34
+	if (elem_size < sizeof(kernel_ulong_t)) {
35 35
 		tprintf("%#0*x", (int) elem_size * 2 + 2,
36 36
 			* (unsigned int *) elem_buf);
37 37
 	} else {
38 38
 		tprintf("%#0*" PRI_krx, (int) elem_size * 2 + 2,
39
-			* (kernel_ureg_t *) elem_buf);
39
+			* (kernel_ulong_t *) elem_buf);
40 40
 	}
41 41
 
42 42
 	return true;
43 43
 }
44 44
 
45 45
 static void
46
-print_nodemask(struct tcb *const tcp, const kernel_ureg_t addr,
47
-	       const kernel_ureg_t maxnodes)
46
+print_nodemask(struct tcb *const tcp, const kernel_ulong_t addr,
47
+	       const kernel_ulong_t maxnodes)
48 48
 {
49 49
 	const unsigned int bits_per_long = 8 * current_wordsize;
50
-	const kernel_ureg_t nmemb =
50
+	const kernel_ulong_t nmemb =
51 51
 		(maxnodes + bits_per_long - 2) / bits_per_long;
52 52
 
53 53
 	if (nmemb < maxnodes / bits_per_long ||
@@ -56,7 +56,7 @@ print_nodemask(struct tcb *const tcp, const kernel_ureg_t addr,
56 56
 		return;
57 57
 	}
58 58
 
59
-	kernel_ureg_t buf;
59
+	kernel_ulong_t buf;
60 60
 	print_array(tcp, addr, nmemb, &buf, current_wordsize,
61 61
 		    umoven_or_printaddr, print_node, 0);
62 62
 }
@@ -123,12 +123,12 @@ SYS_FUNC(get_mempolicy)
123 123
 static bool
124 124
 print_addr(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
125 125
 {
126
-	kernel_ureg_t addr;
126
+	kernel_ulong_t addr;
127 127
 
128 128
 	if (elem_size < sizeof(addr)) {
129 129
 		addr = * (unsigned int *) elem_buf;
130 130
 	} else {
131
-		addr = * (kernel_ureg_t *) elem_buf;
131
+		addr = * (kernel_ulong_t *) elem_buf;
132 132
 	}
133 133
 
134 134
 	printaddr(addr);
@@ -159,8 +159,8 @@ print_int(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
159 159
 
160 160
 SYS_FUNC(move_pages)
161 161
 {
162
-	const kernel_ureg_t npages = tcp->u_arg[1];
163
-	kernel_ureg_t buf;
162
+	const kernel_ulong_t npages = tcp->u_arg[1];
163
+	kernel_ulong_t buf;
164 164
 
165 165
 	if (entering(tcp)) {
166 166
 		tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], npages);

+ 1
- 1
oldstat.c View File

@@ -36,7 +36,7 @@
36 36
 #ifdef HAVE_STRUCT___OLD_KERNEL_STAT
37 37
 
38 38
 static void
39
-print_old_kernel_stat(struct tcb *const tcp, const kernel_ureg_t addr)
39
+print_old_kernel_stat(struct tcb *const tcp, const kernel_ulong_t addr)
40 40
 {
41 41
 	struct __old_kernel_stat buf;
42 42
 	if (umove_or_printaddr(tcp, addr, &buf))

+ 4
- 4
pathtrace.c View File

@@ -54,7 +54,7 @@ pathmatch(const char *path)
54 54
  * Return true if specified path (in user-space) matches.
55 55
  */
56 56
 static int
57
-upathmatch(struct tcb *const tcp, const kernel_ureg_t upath)
57
+upathmatch(struct tcb *const tcp, const kernel_ulong_t upath)
58 58
 {
59 59
 	char path[PATH_MAX + 1];
60 60
 
@@ -248,8 +248,8 @@ pathtrace_match(struct tcb *tcp)
248 248
 	{
249 249
 		int     i, j;
250 250
 		int     nfds;
251
-		kernel_ureg_t *args;
252
-		kernel_ureg_t select_args[5];
251
+		kernel_ulong_t *args;
252
+		kernel_ulong_t select_args[5];
253 253
 		unsigned int oldselect_args[5];
254 254
 		unsigned int fdsize;
255 255
 		fd_set *fds;
@@ -311,7 +311,7 @@ pathtrace_match(struct tcb *tcp)
311 311
 	{
312 312
 		struct pollfd fds;
313 313
 		unsigned nfds;
314
-		kernel_ureg_t start, cur, end;
314
+		kernel_ulong_t start, cur, end;
315 315
 
316 316
 		start = tcp->u_arg[0];
317 317
 		nfds = tcp->u_arg[1];

+ 2
- 2
perf.c View File

@@ -61,7 +61,7 @@ free_pea_desc(void *pea_desc_ptr)
61 61
 }
62 62
 
63 63
 static int
64
-fetch_perf_event_attr(struct tcb *const tcp, const kernel_ureg_t addr)
64
+fetch_perf_event_attr(struct tcb *const tcp, const kernel_ulong_t addr)
65 65
 {
66 66
 	struct pea_desc *desc;
67 67
 	struct perf_event_attr *attr;
@@ -118,7 +118,7 @@ fetch_perf_event_attr(struct tcb *const tcp, const kernel_ureg_t addr)
118 118
 	} while (0)
119 119
 
120 120
 static void
121
-print_perf_event_attr(struct tcb *const tcp, const kernel_ureg_t addr)
121
+print_perf_event_attr(struct tcb *const tcp, const kernel_ulong_t addr)
122 122
 {
123 123
 	static const char *precise_ip_desc[] = {
124 124
 		"arbitrary skid",

+ 5
- 5
poll.c View File

@@ -50,7 +50,7 @@ print_pollfd(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
50 50
 static void
51 51
 decode_poll_entering(struct tcb *tcp)
52 52
 {
53
-	const kernel_ureg_t addr = tcp->u_arg[0];
53
+	const kernel_ulong_t addr = tcp->u_arg[0];
54 54
 	const unsigned int nfds = tcp->u_arg[1];
55 55
 	struct pollfd fds;
56 56
 
@@ -60,14 +60,14 @@ decode_poll_entering(struct tcb *tcp)
60 60
 }
61 61
 
62 62
 static int
63
-decode_poll_exiting(struct tcb *const tcp, const kernel_ureg_t pts)
63
+decode_poll_exiting(struct tcb *const tcp, const kernel_ulong_t pts)
64 64
 {
65 65
 	struct pollfd fds;
66 66
 	const unsigned int nfds = tcp->u_arg[1];
67 67
 	const unsigned long size = sizeof(fds) * nfds;
68
-	const kernel_ureg_t start = tcp->u_arg[0];
69
-	const kernel_ureg_t end = start + size;
70
-	kernel_ureg_t cur;
68
+	const kernel_ulong_t start = tcp->u_arg[0];
69
+	const kernel_ulong_t end = start + size;
70
+	kernel_ulong_t cur;
71 71
 	const unsigned int max_printed =
72 72
 		abbrev(tcp) ? max_strlen : -1U;
73 73
 	unsigned int printed;

+ 4
- 4
prctl.c View File

@@ -113,7 +113,7 @@ SYS_FUNC(prctl)
113 113
 			break;
114 114
 		if (syserror(tcp))
115 115
 			return 0;
116
-		tcp->auxstr = xlookup(pr_dumpable, (kernel_ureg_t) tcp->u_rval);
116
+		tcp->auxstr = xlookup(pr_dumpable, (kernel_ulong_t) tcp->u_rval);
117 117
 		return RVAL_STR;
118 118
 
119 119
 	case PR_GET_NAME:
@@ -144,7 +144,7 @@ SYS_FUNC(prctl)
144 144
 		if (syserror(tcp) || tcp->u_rval == 0)
145 145
 			return 0;
146 146
 		tcp->auxstr = sprintflags("", secbits,
147
-					  (kernel_ureg_t) tcp->u_rval);
147
+					  (kernel_ulong_t) tcp->u_rval);
148 148
 		return RVAL_STR;
149 149
 
150 150
 	case PR_GET_TID_ADDRESS:
@@ -180,7 +180,7 @@ SYS_FUNC(prctl)
180 180
 		if (syserror(tcp) || tcp->u_rval == 0)
181 181
 			return 0;
182 182
 		tcp->auxstr = sprintflags("", pr_fp_mode,
183
-					  (kernel_ureg_t) tcp->u_rval);
183
+					  (kernel_ulong_t) tcp->u_rval);
184 184
 		return RVAL_STR;
185 185
 
186 186
 	/* PR_TASK_PERF_EVENTS_* take no arguments. */
@@ -330,7 +330,7 @@ SYS_FUNC(prctl)
330 330
 		if (syserror(tcp))
331 331
 			return 0;
332 332
 		tcp->auxstr = xlookup(pr_mce_kill_policy,
333
-				      (kernel_ureg_t) tcp->u_rval);
333
+				      (kernel_ulong_t) tcp->u_rval);
334 334
 		return tcp->auxstr ? RVAL_STR : RVAL_UDECIMAL;
335 335
 
336 336
 	case PR_SET_FP_MODE:

+ 1
- 1
print_mq_attr.c View File

@@ -44,7 +44,7 @@ typedef struct mq_attr mq_attr_t;
44 44
 #include MPERS_DEFS
45 45
 
46 46
 MPERS_PRINTER_DECL(void, printmqattr, struct tcb *const tcp,
47
-		   const kernel_ureg_t addr, const bool decode_flags)
47
+		   const kernel_ulong_t addr, const bool decode_flags)
48 48
 {
49 49
 #if defined HAVE_MQUEUE_H || defined HAVE_LINUX_MQUEUE_H
50 50
 	mq_attr_t attr;

+ 1
- 1
print_msgbuf.c View File

@@ -39,7 +39,7 @@ typedef struct msgbuf msgbuf_t;
39 39
 #include MPERS_DEFS
40 40
 
41 41
 MPERS_PRINTER_DECL(void, tprint_msgbuf, struct tcb *const tcp,
42
-		   const kernel_ureg_t addr, const kernel_ureg_t count)
42
+		   const kernel_ulong_t addr, const kernel_ulong_t count)
43 43
 {
44 44
 	msgbuf_t msg;
45 45
 

+ 1
- 1
print_sigevent.c View File

@@ -36,7 +36,7 @@
36 36
 #include "xlat/sigev_value.h"
37 37
 
38 38
 MPERS_PRINTER_DECL(void, print_sigevent,
39
-		   struct tcb *const tcp, const kernel_ureg_t addr)
39
+		   struct tcb *const tcp, const kernel_ulong_t addr)
40 40
 {
41 41
 	struct_sigevent sev;
42 42
 

+ 3
- 3
print_statfs.c View File

@@ -56,7 +56,7 @@ print_statfs_number(const char *const prefix, const unsigned long long number)
56 56
 }
57 57
 
58 58
 void
59
-print_struct_statfs(struct tcb *const tcp, const kernel_ureg_t addr)
59
+print_struct_statfs(struct tcb *const tcp, const kernel_ulong_t addr)
60 60
 {
61 61
 #ifdef HAVE_STRUCT_STATFS
62 62
 	struct strace_statfs b;
@@ -91,8 +91,8 @@ print_struct_statfs(struct tcb *const tcp, const kernel_ureg_t addr)
91 91
 }
92 92
 
93 93
 void
94
-print_struct_statfs64(struct tcb *const tcp, const kernel_ureg_t addr,
95
-		      const kernel_ureg_t size)
94
+print_struct_statfs64(struct tcb *const tcp, const kernel_ulong_t addr,
95
+		      const kernel_ulong_t size)
96 96
 {
97 97
 #ifdef HAVE_STRUCT_STATFS64
98 98
 	struct strace_statfs b;

+ 4
- 4
print_timespec.c View File

@@ -65,7 +65,7 @@ print_timespec_t_utime(const timespec_t *t)
65 65
 }
66 66
 
67 67
 MPERS_PRINTER_DECL(void, print_timespec,
68
-		   struct tcb *const tcp, const kernel_ureg_t addr)
68
+		   struct tcb *const tcp, const kernel_ulong_t addr)
69 69
 {
70 70
 	timespec_t t;
71 71
 
@@ -76,7 +76,7 @@ MPERS_PRINTER_DECL(void, print_timespec,
76 76
 }
77 77
 
78 78
 MPERS_PRINTER_DECL(const char *, sprint_timespec,
79
-		   struct tcb *const tcp, const kernel_ureg_t addr)
79
+		   struct tcb *const tcp, const kernel_ulong_t addr)
80 80
 {
81 81
 	timespec_t t;
82 82
 	static char buf[sizeof(timespec_fmt) + 3 * sizeof(t)];
@@ -95,7 +95,7 @@ MPERS_PRINTER_DECL(const char *, sprint_timespec,
95 95
 }
96 96
 
97 97
 MPERS_PRINTER_DECL(void, print_timespec_utime_pair,
98
-		   struct tcb *const tcp, const kernel_ureg_t addr)
98
+		   struct tcb *const tcp, const kernel_ulong_t addr)
99 99
 {
100 100
 	timespec_t t[2];
101 101
 
@@ -110,7 +110,7 @@ MPERS_PRINTER_DECL(void, print_timespec_utime_pair,
110 110
 }
111 111
 
112 112
 MPERS_PRINTER_DECL(void, print_itimerspec,
113
-		   struct tcb *const tcp, const kernel_ureg_t addr)
113
+		   struct tcb *const tcp, const kernel_ulong_t addr)
114 114
 {