diff options
Diffstat (limited to 'mmt/mmt_main.c')
| -rw-r--r-- | mmt/mmt_main.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/mmt/mmt_main.c b/mmt/mmt_main.c index 4ae9dc5a..39e9c436 100644 --- a/mmt/mmt_main.c +++ b/mmt/mmt_main.c @@ -32,17 +32,15 @@ #include "pub_tool_libcprint.h" #include "pub_tool_mallocfree.h" -#include "mmt_nv_ioctl.h" -#include "mmt_nouveau_ioctl.h" +#include "mmt_fgl_ioctl.h" #include "mmt_instrument.h" #include "mmt_trace.h" #define TF_OPT "--mmt-trace-file=" -#define TN_OPT "--mmt-trace-nvidia-ioctls" +#define TN_OPT "--mmt-trace-fglrx-ioctls" #define TO_OPT "--mmt-trace-all-opens" #define TA_OPT "--mmt-trace-all-files" #define TM_OPT "--mmt-trace-marks" -#define TV_OPT "--mmt-trace-nouveau-ioctls" static Bool mmt_process_cmd_line_option(Char * arg) { @@ -63,7 +61,7 @@ static Bool mmt_process_cmd_line_option(Char * arg) } else if (VG_(strcmp)(arg, TN_OPT) == 0) { - mmt_trace_nvidia_ioctls = True; + mmt_trace_fglrx_ioctls = True; return True; } else if (VG_(strcmp)(arg, TO_OPT) == 0) @@ -81,11 +79,6 @@ static Bool mmt_process_cmd_line_option(Char * arg) mmt_trace_marks = True; return True; } - else if (VG_(strcmp)(arg, TV_OPT) == 0) - { - mmt_trace_nouveau_ioctls = True; - return True; - } return False; } @@ -93,11 +86,10 @@ static Bool mmt_process_cmd_line_option(Char * arg) static void mmt_print_usage(void) { VG_(printf)(" " TF_OPT "path trace loads and stores to memory mapped for\n" - " this file (e.g. /dev/nvidia0) (you can pass \n" + " this file (e.g. /dev/ati/card0) (you can pass \n" " this option multiple times)\n"); VG_(printf)(" " TA_OPT " trace loads and store to memory mapped for all files\n"); - VG_(printf)(" " TN_OPT " trace nvidia ioctls on /dev/nvidiactl and /dev/nvidia0\n"); - VG_(printf)(" " TV_OPT " trace nouveau ioctls on /dev/dri/cardX\n"); + VG_(printf)(" " TN_OPT " trace fglrx ioctls on /dev/ati/card0\n"); VG_(printf)(" " TO_OPT " trace all 'open' syscalls\n"); VG_(printf)(" " TM_OPT " send mmiotrace marks before and after ioctls\n"); } @@ -108,12 +100,12 @@ static void mmt_print_debug_usage(void) static void mmt_fini(Int exitcode) { - mmt_nv_ioctl_fini(); + mmt_fgl_ioctl_fini(); } static void mmt_post_clo_init(void) { - mmt_nv_ioctl_post_clo_init(); + mmt_fgl_ioctl_post_clo_init(); } static void mmt_pre_clo_init(void) @@ -137,8 +129,7 @@ static void mmt_pre_clo_init(void) for (i = 0; i < MMT_MAX_TRACE_FILES; ++i) FD_ZERO(&mmt_trace_files[i].fds); - mmt_nv_ioctl_pre_clo_init(); - mmt_nouveau_ioctl_pre_clo_init(); + mmt_fgl_ioctl_pre_clo_init(); } VG_DETERMINE_INTERFACE_VERSION(mmt_pre_clo_init) |