diff options
author | Elliott Hughes <enh@google.com> | 2015-12-11 22:51:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-11 22:51:28 +0000 |
commit | dbe82fba03fa40209293f104a2f67979c6bc9e57 (patch) | |
tree | 0f64009226e0210dc549318953025a6dc82767a7 | |
parent | 938e52e1c86d99bebb2990d77a6d2b0c523f04e0 (diff) | |
parent | da827085d0f8eed7601d722c967ec08ceff8acc1 (diff) | |
download | strace-brillo-m8-release.tar.gz |
Merge "Fix strace build."brillo-m8-releasebrillo-m8-dev
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | native_printer_decls.h | 18 | ||||
-rw-r--r-- | native_printer_defs.h | 18 | ||||
-rw-r--r-- | printers.h | 56 |
4 files changed, 92 insertions, 3 deletions
@@ -61,6 +61,3 @@ Makefile.in /mx32_printer_decls.h /mx32_printer_defs.h /mx32_type_defs.h -/native_printer_decls.h -/native_printer_defs.h -/printers.h diff --git a/native_printer_decls.h b/native_printer_decls.h new file mode 100644 index 00000000..a1c60f90 --- /dev/null +++ b/native_printer_decls.h @@ -0,0 +1,18 @@ +/* Generated by Makefile from dirent.c fetch_seccomp_fprog.c fetch_struct_flock.c ipc_msgctl.c ipc_shmctl.c print_mq_attr.c print_msgbuf.c print_sigevent.c print_time.c print_timex.c printrusage.c printsiginfo.c sigaltstack.c sysinfo.c times.c utime.c; do not edit. */ +extern bool fetch_seccomp_fprog(struct tcb *tcp, const long addr, void *p); +extern bool fetch_struct_flock(struct tcb *tcp, const long addr, void *p); +extern bool fetch_struct_flock64(struct tcb *tcp, const long addr, void *p); +extern void printmqattr(struct tcb *tcp, const long addr); +extern void tprint_msgbuf(struct tcb *tcp, const long addr, const unsigned long count); +extern void print_sigevent(struct tcb *tcp, const long addr); +extern void print_timespec(struct tcb *tcp, const long addr); +extern const char * sprint_timespec(struct tcb *tcp, const long addr); +extern void print_timespec_utime_pair(struct tcb *tcp, const long addr); +extern void print_itimerspec(struct tcb *tcp, const long addr); +extern void print_timeval(struct tcb *tcp, const long addr); +extern void print_timeval_pair(struct tcb *tcp, const long addr); +extern const char * sprint_timeval(struct tcb *tcp, const long addr); +extern void print_itimerval(struct tcb *tcp, const long addr); +extern int print_timex(struct tcb *tcp, const long addr); +extern void printrusage(struct tcb *tcp, long addr); +extern void printsiginfo_at(struct tcb *tcp, long addr); diff --git a/native_printer_defs.h b/native_printer_defs.h new file mode 100644 index 00000000..285bb441 --- /dev/null +++ b/native_printer_defs.h @@ -0,0 +1,18 @@ +/* Generated by Makefile from dirent.c fetch_seccomp_fprog.c fetch_struct_flock.c ipc_msgctl.c ipc_shmctl.c print_mq_attr.c print_msgbuf.c print_sigevent.c print_time.c print_timex.c printrusage.c printsiginfo.c sigaltstack.c sysinfo.c times.c utime.c; do not edit. */ +.fetch_seccomp_fprog = fetch_seccomp_fprog, +.fetch_struct_flock = fetch_struct_flock, +.fetch_struct_flock64 = fetch_struct_flock64, +.printmqattr = printmqattr, +.tprint_msgbuf = tprint_msgbuf, +.print_sigevent = print_sigevent, +.print_timespec = print_timespec, +.sprint_timespec = sprint_timespec, +.print_timespec_utime_pair = print_timespec_utime_pair, +.print_itimerspec = print_itimerspec, +.print_timeval = print_timeval, +.print_timeval_pair = print_timeval_pair, +.sprint_timeval = sprint_timeval, +.print_itimerval = print_itimerval, +.print_timex = print_timex, +.printrusage = printrusage, +.printsiginfo_at = printsiginfo_at, diff --git a/printers.h b/printers.h new file mode 100644 index 00000000..f63140a7 --- /dev/null +++ b/printers.h @@ -0,0 +1,56 @@ +/* Generated by Makefile from dirent.c fetch_seccomp_fprog.c fetch_struct_flock.c ipc_msgctl.c ipc_shmctl.c print_mq_attr.c print_msgbuf.c print_sigevent.c print_time.c print_timex.c printrusage.c printsiginfo.c sigaltstack.c sysinfo.c times.c utime.c; do not edit. */ +typedef struct { + bool (*fetch_seccomp_fprog) (struct tcb *tcp, const long addr, void *p); +#define fetch_seccomp_fprog MPERS_PRINTER_NAME(fetch_seccomp_fprog) + + bool (*fetch_struct_flock) (struct tcb *tcp, const long addr, void *p); +#define fetch_struct_flock MPERS_PRINTER_NAME(fetch_struct_flock) + + bool (*fetch_struct_flock64) (struct tcb *tcp, const long addr, void *p); +#define fetch_struct_flock64 MPERS_PRINTER_NAME(fetch_struct_flock64) + + void (*printmqattr) (struct tcb *tcp, const long addr); +#define printmqattr MPERS_PRINTER_NAME(printmqattr) + + void (*tprint_msgbuf) (struct tcb *tcp, const long addr, const unsigned long count); +#define tprint_msgbuf MPERS_PRINTER_NAME(tprint_msgbuf) + + void (*print_sigevent) (struct tcb *tcp, const long addr); +#define print_sigevent MPERS_PRINTER_NAME(print_sigevent) + + void (*print_timespec) (struct tcb *tcp, const long addr); +#define print_timespec MPERS_PRINTER_NAME(print_timespec) + + const char * (*sprint_timespec) (struct tcb *tcp, const long addr); +#define sprint_timespec MPERS_PRINTER_NAME(sprint_timespec) + + void (*print_timespec_utime_pair) (struct tcb *tcp, const long addr); +#define print_timespec_utime_pair MPERS_PRINTER_NAME(print_timespec_utime_pair) + + void (*print_itimerspec) (struct tcb *tcp, const long addr); +#define print_itimerspec MPERS_PRINTER_NAME(print_itimerspec) + + void (*print_timeval) (struct tcb *tcp, const long addr); +#define print_timeval MPERS_PRINTER_NAME(print_timeval) + + void (*print_timeval_pair) (struct tcb *tcp, const long addr); +#define print_timeval_pair MPERS_PRINTER_NAME(print_timeval_pair) + + const char * (*sprint_timeval) (struct tcb *tcp, const long addr); +#define sprint_timeval MPERS_PRINTER_NAME(sprint_timeval) + + void (*print_itimerval) (struct tcb *tcp, const long addr); +#define print_itimerval MPERS_PRINTER_NAME(print_itimerval) + + int (*print_timex) (struct tcb *tcp, const long addr); +#define print_timex MPERS_PRINTER_NAME(print_timex) + + void (*printrusage) (struct tcb *tcp, long addr); +#define printrusage MPERS_PRINTER_NAME(printrusage) + + void (*printsiginfo_at) (struct tcb *tcp, long addr); +#define printsiginfo_at MPERS_PRINTER_NAME(printsiginfo_at) + +} struct_printers; +extern const struct_printers *printers; +#define MPERS_PRINTER_NAME(printer_name) printers->printer_name |