[FIX] argument types conformance
authorNikita Kalyazin <n.kalyazin@samsung.com>
Sun, 10 Nov 2013 09:50:23 +0000 (13:50 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Mon, 11 Nov 2013 08:04:25 +0000 (12:04 +0400)
"x", "p" arguments are wrapped with type casting.
Otherwise they are saved as 32-bit ones and poison next arguments.

Change-Id: I3ed635a0b7f1a7cc5c3fc09154ca138466300fea
Signed-off-by: Nikita Kalyazin <n.kalyazin@samsung.com>
22 files changed:
custom_chart/da_chart.c
include/binproto.h
probe_capi/capi_appfw.c
probe_event/gesture.cpp
probe_event/keytouch.c
probe_file/da_io_posix.c
probe_file/da_io_stdc.c
probe_graphics/da_gles20.cpp
probe_memory/libdamemalloc.c
probe_memory/libdamemmanage.c
probe_memory/libdanew.cpp
probe_socket/libdasocket.c
probe_thread/libdasync.c
probe_thread/libdathread.c
probe_tizenapi/tizen_controls.cpp
probe_tizenapi/tizen_file.cpp
probe_tizenapi/tizen_http.cpp
probe_tizenapi/tizen_lifecycle.cpp
probe_tizenapi/tizen_socket.cpp
probe_tizenapi/tizen_sync.cpp
probe_tizenapi/tizen_thread.cpp
probe_ui/tizen_scenemanager.cpp

index 5d0ed0e..4cbf5f6 100755 (executable)
@@ -449,7 +449,7 @@ void da_mark(chart_color color, char* mark_text)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_mark,
-                         "dp", color, mark_text);
+                         "dp", color, voidp_to_uint64(mark_text));
        PACK_COMMON_END(0, 0, 2);
        PACK_CUSTOM(0, 0, mark_text, color, 0.0f);
        FLUSH_LOCAL_BUF();
@@ -477,7 +477,7 @@ da_handle da_create_chart(char* chart_name)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_create_chart,
-                         "p", chart_name);
+                         "p", voidp_to_uint64(chart_name));
        PACK_COMMON_END(ret, 0, 2);
        PACK_CUSTOM(0, 0, chart_name, 0, 0.0f);
        FLUSH_LOCAL_BUF();
@@ -513,7 +513,8 @@ da_handle da_create_series(da_handle charthandle, char* seriesname,
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_create_series,
-                         "dpdd",  charthandle, seriesname, type, color);
+                         "dpdd",  charthandle, voidp_to_uint64(seriesname),
+                         type, color);
        PACK_COMMON_END(ret, 0, 2);
        PACK_CUSTOM(charthandle, type, seriesname, color, 0.0f);
        FLUSH_LOCAL_BUF();
@@ -587,7 +588,7 @@ void da_log(da_handle series_handle, float uservalue)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_log,
-                         "dw", series_handle, uservalue);
+                         "df", series_handle, uservalue);
        PACK_COMMON_END(0, 0, 2);
        PACK_CUSTOM(series_handle, 0, "", 0, uservalue);
        FLUSH_LOCAL_BUF();
index c5e318e..eac11c1 100644 (file)
 #define CALLER_ADDRESS                                                 \
        ((void*) __builtin_extract_return_addr(__builtin_return_address(0)))
 
-
+static inline uint64_t voidp_to_uint64(const void *p)
+{
+       return (uint64_t)(uintptr_t)p;
+}
 
 // COMMON
 static inline char *pack_int32(char *to, uint32_t val)
index 38fc30f..26de9c7 100644 (file)
@@ -67,7 +67,8 @@ static bool _dalc_app_create(void* user_data)
 
        bret = gAppCallback.create(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, bret, "p", user_data);
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, bret, "p",
+                                voidp_to_uint64(user_data));
 
        return bret;
 }
@@ -81,7 +82,8 @@ static void _dalc_app_terminate(void* user_data)
 
        gAppCallback.terminate(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 0, "p", user_data);
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 0, "p",
+                                voidp_to_uint64(user_data));
 }
 
 static void _dalc_app_pause(void* user_data)
@@ -93,7 +95,8 @@ static void _dalc_app_pause(void* user_data)
 
        gAppCallback.pause(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 0, "p", user_data);
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 0, "p",
+                                voidp_to_uint64(user_data));
 }
 
 static void _dalc_app_resume(void* user_data)
@@ -105,7 +108,8 @@ static void _dalc_app_resume(void* user_data)
 
        gAppCallback.resume(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 0, "p", user_data);
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 0, "p",
+                                voidp_to_uint64(user_data));
 }
 
 static void _dalc_app_service(service_h service, void* user_data)
@@ -117,7 +121,9 @@ static void _dalc_app_service(service_h service, void* user_data)
 
        gAppCallback.service(service, user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 0, "dp", (unsigned int)service, user_data);
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 0, "dp",
+                                (unsigned int)service,
+                                voidp_to_uint64(user_data));
 }
 
 static void _dalc_app_deviceorientationchanged(app_device_orientation_e orientation, void* user_data)
index d7dc281..208c104 100755 (executable)
@@ -44,7 +44,7 @@
                char info1_str[16];                                                                                                             \
                setProbePoint(&probeInfo);                                                                                              \
                PREPARE_LOCAL_BUF();                                                                                                    \
-               PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "p", _ARGDETECTOR);        \
+               PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "p", voidp_to_uint64(_ARGDETECTOR));       \
                PACK_COMMON_END(0, 0, 0);                                                                                               \
                sprintf(info1_str, "%d", _INFO1);                                                                               \
                PACK_UIEVENT(_EVENT_GESTURE, _GESTURETYPE, _X, _Y, info1_str, _INFO2);  \
index 36d89ec..da6c8a4 100755 (executable)
@@ -60,7 +60,8 @@ bool touch_pressed = false;
                setProbePoint(&probeInfo);                                                                                              \
                PREPARE_LOCAL_BUF();                                                                                                    \
                PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "pdp",                                     \
-                                 _ARGDATA, _ARGTYPE, _ARGEVENT);                                                               \
+                                 voidp_to_uint64(_ARGDATA), _ARGTYPE,  \
+                                 voidp_to_uint64(_ARGEVENT));          \
                PACK_COMMON_END(0, 0, 0);                                                                                               \
                PACK_UIEVENT(_EVENTTYPE, _DETAILTYPE, _X, _Y, _KEYCODE, _EXTRA);                \
                FLUSH_LOCAL_BUF();                                                                                                              \
index c263ed3..f933ebd 100755 (executable)
@@ -158,7 +158,7 @@ off_t lseek(int fd, off_t offset, int whence)
 
        AFTER_PACK_ORIGINAL_FD(API_ID_lseek,
                                   offret, (unsigned int)offset, fd, FD_API_OTHER,
-                                  "dxd", fd, offset, whence);
+                                  "dxd", fd, (uint64_t)(offset), whence);
 
        return offret;
 }
@@ -202,7 +202,8 @@ int ftruncate(int fd, off_t length)
        ret = ftruncatep(fd, length);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_ftruncate,
-                                  ret, (unsigned int)length, fd, FD_API_DIRECTORY, "dx", fd, length);
+                              ret, (unsigned int)length, fd,
+                              FD_API_DIRECTORY, "dx", fd, (uint64_t)(length));
 
        return ret;
 }
@@ -229,7 +230,7 @@ int lockf(int fd, int function, off_t size)
        ret = lockfp(fd, function, size);
        AFTER_PACK_ORIGINAL_FD(API_ID_lockf,
                                   ret, (unsigned int)size, fd, FD_API_PERMISSION,
-                                  "ddx", fd, function, size);
+                                  "ddx", fd, function, (uint64_t)(size));
        return ret;
 }
 
@@ -256,12 +257,18 @@ ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
        ssize_t sret;
 
        BEFORE_ORIGINAL_START_END_FD(API_ID_pread, pread, LIBC, fd,
-                               FD_API_READ_START, "dpxx", fd, buf, nbyte, offset);
+                                    FD_API_READ_START, "dpxx", fd,
+                                    voidp_to_uint64(buf),
+                                    (uint64_t)(nbyte),
+                                    (uint64_t)(offset));
 
        sret = preadp(fd, buf, nbyte, offset);
 
        AFTER_ORIGINAL_START_END_FD(API_ID_pread, sret, (unsigned int)sret, fd,
-                               FD_API_READ_END, "dpxx", fd, buf, nbyte, offset);
+                                   FD_API_READ_END, "dpxx", fd,
+                                   voidp_to_uint64(buf),
+                                   (uint64_t)(nbyte),
+                                   (uint64_t)(offset));
 
        return sret;
 }
@@ -271,12 +278,15 @@ ssize_t read(int fd, void *buf, size_t nbyte)
        ssize_t sret;
 
        BEFORE_ORIGINAL_START_END_FD(API_ID_read, read, LIBC, fd, FD_API_READ_START,
-                               "dpx", fd, buf, nbyte);
+                                    "dpx", fd, voidp_to_uint64(buf),
+                                    (uint64_t)(nbyte));
 
        sret = readp(fd, buf, nbyte);
 
        AFTER_ORIGINAL_START_END_FD(API_ID_read, sret, (unsigned int)sret, fd,
-                               FD_API_READ_END, "dpx", fd, buf, nbyte);
+                                   FD_API_READ_END, "dpx", fd,
+                                   voidp_to_uint64(buf),
+                                   (uint64_t)(nbyte));
 
        return sret;
 }
@@ -287,13 +297,18 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
        ssize_t sret;
 
        BEFORE_ORIGINAL_START_END_FD(API_ID_pwrite, pwrite, LIBC, fd, FD_API_WRITE_START,
-                                "dpxx", fd, buf, nbyte, offset);
+                                    "dpxx", fd, voidp_to_uint64(buf),
+                                    (uint64_t)(nbyte),
+                                    (uint64_t)(offset));
 
        sret = pwritep(fd, buf, nbyte, offset);
 
        DEFINE_FILESIZE_FD(fd);
        AFTER_ORIGINAL_START_END_FD(API_ID_pwrite, sret, (unsigned int)sret, fd,
-                                  FD_API_WRITE_END, "dpxx", fd, buf, nbyte, offset);
+                                  FD_API_WRITE_END, "dpxx", fd,
+                                   voidp_to_uint64(buf),
+                                   (uint64_t)(nbyte),
+                                   (uint64_t)(offset));
 
        return sret;
 }
@@ -304,13 +319,16 @@ ssize_t write(int fd, const void *buf, size_t nbyte)
        ssize_t sret;
 
        BEFORE_ORIGINAL_START_END_FD(API_ID_write, write, LIBC, fd, FD_API_WRITE_START,
-                                "dpx", fd, buf, nbyte);
+                                    "dpx", fd, voidp_to_uint64(buf),
+                                    (uint64_t)(nbyte));
 
        sret = writep(fd, buf, nbyte);
 
        DEFINE_FILESIZE_FD(fd);
        AFTER_ORIGINAL_START_END_FD(API_ID_write, sret, (unsigned int)sret, fd,
-                               FD_API_WRITE_END, "dpx", fd, buf, nbyte);
+                                   FD_API_WRITE_END, "dpx", fd,
+                                   voidp_to_uint64(buf),
+                                   (uint64_t)(nbyte));
 
        return sret;
 }
@@ -322,12 +340,13 @@ ssize_t readv(int fd, const struct iovec *iov, int iovcnt)
        ssize_t sret;
 
        BEFORE_ORIGINAL_START_END_FD(API_ID_readv, readv, LIBC, fd, FD_API_READ_START,
-                                "dpd", fd, iov, iovcnt);
+                                    "dpd", fd, voidp_to_uint64(iov), iovcnt);
 
        sret = readvp(fd,iov,iovcnt);
 
        AFTER_ORIGINAL_START_END_FD(API_ID_readv, sret, (unsigned int)sret, fd,
-                               FD_API_READ_END, "dpd", fd, iov, iovcnt);
+                                   FD_API_READ_END, "dpd", fd,
+                                   voidp_to_uint64(iov), iovcnt);
 
        return sret;
 }
@@ -414,7 +433,8 @@ int fstat(int fd, struct stat *buf)
 
        BEFORE_ORIGINAL_FILE(fstat, LIBC);
        ret = fstatp(fd, buf);
-       AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dp", fd, buf);
+       AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dp", fd,
+                              voidp_to_uint64(buf));
        return ret;
 }
 #endif
@@ -426,6 +446,7 @@ int futimens(int fd, const struct timespec times[2])
        BEFORE_ORIGINAL_FILE(futimens, LIBC);
        ret = futimensp(fd, times);
        AFTER_PACK_ORIGINAL_FD(API_ID_futimens,
-                                  ret, 0, fd, FD_API_OTHER, "dp", fd, times);
+                              ret, 0, fd, FD_API_OTHER, "dp", fd,
+                              voidp_to_uint64(times));
        return ret;
 }
index fd0390f..6c9b40b 100644 (file)
@@ -78,7 +78,7 @@ FILE* freopen(const char * filename, const char * mode, FILE * stream)
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_freopen, fret, 0, fret, FD_API_OPEN,
                                  "ssp", absolutize_filepath(buffer, filename),
-                                 mode, stream);
+                                 mode, voidp_to_uint64(stream));
 
        return fret;
 }
@@ -105,7 +105,8 @@ int fflush(FILE* stream)
        BEFORE_ORIGINAL_FILE(fflush, LIBC);
        ret = fflushp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fflush,
-                                 ret, 0, stream, FD_API_OTHER, "p", stream);
+                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
        return ret;
 }
 
@@ -130,7 +131,7 @@ int fclose(FILE* stream)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                          API_ID_fclose,
-                         "p", stream);
+                         "p", voidp_to_uint64(stream));
        PACK_COMMON_END(ret, newerrno, blockresult);
        POST_PACK_PROBEBLOCK_MIDDLE_FD(0, _fd, FD_API_CLOSE);
        POST_PACK_PROBEBLOCK_END();
@@ -158,7 +159,9 @@ int fgetpos(FILE* stream, fpos_t* position)
        BEFORE_ORIGINAL_FILE(fgetpos, LIBC);
        ret = fgetposp(stream, position);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fgetpos,
-                                 ret, 0, stream, FD_API_OTHER, "pp", stream, position);
+                                 ret, 0, stream, FD_API_OTHER, "pp",
+                                 voidp_to_uint64(stream),
+                                 voidp_to_uint64(position));
        return ret;
 }
 
@@ -170,7 +173,8 @@ int fseek(FILE* stream, long int offset, int origin)
        ret = fseekp(stream, offset, origin);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fseek,
                                  ret, (unsigned int)offset, stream, FD_API_OTHER,
-                                 "pxd", stream, offset, origin);
+                                 "pxd", voidp_to_uint64(stream),
+                                 (uint64_t)(offset), origin);
        return ret;
 }
 
@@ -181,7 +185,8 @@ int fsetpos(FILE* stream, const fpos_t* pos)
        BEFORE_ORIGINAL_FILE(fsetpos, LIBC);
        ret = fsetposp(stream, pos);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fsetpos,
-                                 ret, 0, stream, FD_API_OTHER, "pp", stream, pos);
+                                 ret, 0, stream, FD_API_OTHER, "pp",
+                                 voidp_to_uint64(stream), voidp_to_uint64(pos));
        return ret;
 }
 
@@ -195,7 +200,8 @@ long int ftell(FILE* stream)
        lret = ftellp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_ftell,
-                                 lret, 0, stream, FD_API_OTHER, "p", stream);
+                                 lret, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
 
        return lret;
 }
@@ -209,7 +215,8 @@ void rewind(FILE* stream)
        rewindp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_rewind,
-                                 0, 0, stream, FD_API_OTHER, "p", stream);
+                                 0, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
 }
 
 void clearerr(FILE* stream)
@@ -221,7 +228,8 @@ void clearerr(FILE* stream)
        clearerrp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_clearerr,
-                                 0, 0, stream, FD_API_OTHER, "p", stream);
+                                 0, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
 }
 
 int feof(FILE* stream)
@@ -231,7 +239,8 @@ int feof(FILE* stream)
        BEFORE_ORIGINAL_FILE(feof, LIBC);
        ret = feofp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_feof,
-                                 ret, 0, stream, FD_API_OTHER, "p", stream);
+                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
        return ret;
 }
 
@@ -242,7 +251,8 @@ int ferror(FILE* stream)
        BEFORE_ORIGINAL_FILE(ferror, LIBC);
        ret = ferrorp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_ferror,
-                                 ret, 0, stream, FD_API_OTHER, "p", stream);
+                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
        return ret;
 }
 
@@ -253,7 +263,8 @@ int fileno(FILE* stream)
        BEFORE_ORIGINAL_FILE(fileno, LIBC);
        ret = filenop(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fileno,
-                                 ret, 0, stream, FD_API_OTHER, "p", stream);
+                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
        return ret;
 }
 
@@ -268,12 +279,14 @@ int vfprintf(FILE* stream, const char* format, va_list arg)
        static int (*vfprintfp)(FILE* stream, const char* format, va_list arg);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfprintf, vfprintf, LIBC, stream,
-               FD_API_WRITE_START, "ps", stream, format);
+                                       FD_API_WRITE_START, "ps",
+                                       voidp_to_uint64(stream), format);
 
        ret = vfprintfp(stream, format, arg);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_vfprintf, ret, ret, stream,
-                               FD_API_WRITE_END, "ps", stream, format);
+                                      FD_API_WRITE_END, "ps",
+                                      voidp_to_uint64(stream), format);
 
        return ret;
 }
@@ -283,12 +296,14 @@ int vfscanf(FILE* stream, const char* format, va_list arg)
        static int (*vfscanfp)(FILE* stream, const char* format, va_list arg);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfscanf, vfscanf, LIBC, stream,
-                               FD_API_READ_START, "ps", stream, format);
+                                       FD_API_READ_START, "ps",
+                                       voidp_to_uint64(stream), format);
 
        ret = vfscanfp(stream, format, arg);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_vfscanf, ret, ret, stream,
-                               FD_API_READ_END, "ps", stream, format);
+                                      FD_API_READ_END, "ps",
+                                      voidp_to_uint64(stream), format);
 
        return ret;
 }
@@ -298,12 +313,14 @@ int fgetc(FILE* stream)
        static int (*fgetcp)(FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fgetc, fgetc, LIBC, stream,
-                               FD_API_READ_START, "p", stream);
+                                       FD_API_READ_START, "p",
+                                       voidp_to_uint64(stream));
 
        ret = fgetcp(stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fgetc, ret, (ret != EOF), stream,
-                                 FD_API_READ_END, "p", stream);
+                                      FD_API_READ_END, "p",
+                                      voidp_to_uint64(stream));
 
        return ret;
 }
@@ -331,12 +348,14 @@ int fputc(int character, FILE* stream)
        static int (*fputcp)(int character, FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputc, fputc, LIBC, stream,
-                               FD_API_WRITE_START, "dp", character, stream);
+                                       FD_API_WRITE_START, "dp", character,
+                                       voidp_to_uint64(stream));
 
        ret = fputcp(character, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputc, ret, (ret == EOF ? 0 : 1), stream,
-                                 FD_API_WRITE_END, "dp", character, stream);
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputc, ret, (ret == EOF ? 0 : 1),
+                                      stream, FD_API_WRITE_END, "dp",
+                                      character, voidp_to_uint64(stream));
 
        return ret;
 }
@@ -346,12 +365,14 @@ int fputs(const char* str, FILE* stream)
        static int (*fputsp)(const char* str, FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputs, fputs, LIBC, stream,
-                               FD_API_WRITE_START, "sp", str, stream);
+                                       FD_API_WRITE_START, "sp", str,
+                                       voidp_to_uint64(stream));
 
        ret = fputsp(str, stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fputs, ret, ret, stream,
-                               FD_API_WRITE_END, "sp", str, stream);
+                                      FD_API_WRITE_END, "sp", str,
+                                      voidp_to_uint64(stream));
 
        return ret;
 }
@@ -361,12 +382,14 @@ int getc(FILE* stream)
        static int (*getcp)(FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_getc, getc, LIBC, stream,
-                               FD_API_READ_START, "p", stream);
+                                       FD_API_READ_START, "p",
+                                       voidp_to_uint64(stream));
 
        ret = getcp(stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_getc, ret, (ret == EOF ? 0 : 1), stream,
-                               FD_API_READ_END, "p", stream);
+                                      FD_API_READ_END, "p",
+                                      voidp_to_uint64(stream));
 
        return ret;
 }
@@ -376,12 +399,14 @@ int putc(int character, FILE* stream)
        static int (*putcp)(int character, FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, putc, LIBC, stream,
-                               FD_API_WRITE_START, "dp", character, stream);
+                                       FD_API_WRITE_START, "dp", character,
+                                       voidp_to_uint64(stream));
 
        ret = putcp(character, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_putc, ret, (ret == EOF ? 0 : 1), stream,
-                               FD_API_WRITE_END, "dp", character, stream);
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_putc, ret, (ret == EOF ? 0 : 1),
+                                      stream, FD_API_WRITE_END, "dp",
+                                      character, voidp_to_uint64(stream));
 
        return ret;
 }
@@ -391,12 +416,14 @@ int ungetc(int character, FILE* stream)
        static int (*ungetcp)(int character, FILE* stream);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, ungetc, LIBC, stream,
-                               FD_API_WRITE_START, "dp", character, stream);
+                                       FD_API_WRITE_START, "dp", character,
+                                       voidp_to_uint64(stream));
 
        ret = ungetcp(character, stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_ungetc, ret, 0, stream,
-                               FD_API_OTHER, "dp", character, stream);
+                                      FD_API_OTHER, "dp", character,
+                                      voidp_to_uint64(stream));
 
        return ret;
 }
@@ -407,12 +434,20 @@ size_t fread(void* ptr, size_t size, size_t count, FILE* stream)
        size_t tret;
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fread, fread, LIBC, stream,
-                               FD_API_READ_START, "pxxp", ptr, size, count, stream);
+                                       FD_API_READ_START, "pxxp",
+                                       voidp_to_uint64(ptr),
+                                       (uint64_t)(size),
+                                       (uint64_t)(count),
+                                       voidp_to_uint64(stream));
 
        tret = freadp(ptr, size, count, stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fread, tret, tret*size, stream,
-                               FD_API_READ_END, "pxxp", ptr, size, count, stream);
+                                      FD_API_READ_END, "pxxp",
+                                      voidp_to_uint64(ptr),
+                                      (uint64_t)(size),
+                                      (uint64_t)(count),
+                                      voidp_to_uint64(stream));
 
        return tret;
 }
@@ -423,12 +458,20 @@ size_t fwrite(const void* ptr, size_t size, size_t count, FILE* stream)
        size_t tret;
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fwrite, fwrite, LIBC, stream,
-                               FD_API_WRITE_START, "pxxp", ptr, size, count, stream);
+                                       FD_API_WRITE_START, "pxxp",
+                                       voidp_to_uint64(ptr),
+                                       (uint64_t)(size),
+                                       (uint64_t)(count),
+                                       voidp_to_uint64(stream));
 
        tret = fwritep(ptr, size, count, stream);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fwrite, tret, tret*size, stream,
-                               FD_API_WRITE_END, "pxxp", ptr, size, count, stream);
+                                      FD_API_WRITE_END, "pxxp",
+                                      voidp_to_uint64(ptr),
+                                      (uint64_t)(size),
+                                      (uint64_t)(count),
+                                      voidp_to_uint64(stream));
 
        return tret;
 }
@@ -441,7 +484,8 @@ int fprintf(FILE* stream, const char* format, ...)
        static int (*vfprintfp)(FILE* stream, const char* format, ...);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fprintf, vfprintf, LIBC, stream,
-                               FD_API_WRITE_START, "ps", stream, format);
+                                       FD_API_WRITE_START, "ps",
+                                       voidp_to_uint64(stream), format);
 
        va_list arg;
        va_start(arg, format);
@@ -449,7 +493,8 @@ int fprintf(FILE* stream, const char* format, ...)
        ret = vfprintfp(stream, format, arg);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fprintf, ret, ret, stream,
-                               FD_API_WRITE_END, "ps", stream, format);
+                                      FD_API_WRITE_END, "ps",
+                                      voidp_to_uint64(stream), format);
 
        va_end(arg);
 
@@ -461,7 +506,8 @@ int fscanf(FILE* stream, const char* format, ...)
        static int (*vfscanfp)(FILE* stream, const char* format, ...);
 
        BEFORE_ORIGINAL_START_END_FILEP(API_ID_fscanf, vfscanf, LIBC, stream,
-                               FD_API_READ_START, "ps", stream, format);
+                                       FD_API_READ_START, "ps",
+                                       voidp_to_uint64(stream), format);
 
        va_list arg;
        va_start(arg, format);
@@ -469,7 +515,8 @@ int fscanf(FILE* stream, const char* format, ...)
        ret = vfscanfp(stream, format, arg);
 
        AFTER_ORIGINAL_START_END_FILEP(API_ID_fscanf, ret, ret, stream,
-                               FD_API_READ_END, "ps", stream, format);
+                                      FD_API_READ_END, "ps",
+                                      voidp_to_uint64(stream), format);
 
        va_end(arg);
 
@@ -590,7 +637,9 @@ void setbuf(FILE* stream, char* buf)
        setbufp(stream, buf);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setbuf,
-                                 0, 0, stream, FD_API_OTHER, "pp", stream, buf);
+                                 0, 0, stream, FD_API_OTHER, "pp",
+                                 voidp_to_uint64(stream),
+                                 voidp_to_uint64(buf));
 }
 
 void setbuffer(FILE* stream, char* buf, size_t size)
@@ -603,7 +652,8 @@ void setbuffer(FILE* stream, char* buf, size_t size)
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setbuffer,
                                  0, size, stream, FD_API_OTHER,
-                                 "ppx", stream, buf, size);
+                                 "ppx", voidp_to_uint64(stream),
+                                 voidp_to_uint64(buf), (uint64_t)(size));
 }
 
 void setlinebuf(FILE* stream)
@@ -615,7 +665,8 @@ void setlinebuf(FILE* stream)
        setlinebufp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setlinebuf,
-                                 0, 0, stream, FD_API_OTHER, "p", stream);
+                                 0, 0, stream, FD_API_OTHER, "p",
+                                 voidp_to_uint64(stream));
 }
 
 int setvbuf(FILE* stream, char* buf, int mode, size_t size)
@@ -626,6 +677,9 @@ int setvbuf(FILE* stream, char* buf, int mode, size_t size)
        ret = setvbufp(stream,buf,mode,size);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setvbuf,
                                  ret, size, stream, FD_API_OTHER,
-                                 "ppdx", stream, buf, mode, size);
+                                 "ppdx",
+                                 voidp_to_uint64(stream),
+                                 voidp_to_uint64(buf), mode,
+                                 (uint64_t)(size));
        return ret;
 }
index 362374f..531f70d 100644 (file)
@@ -42,7 +42,7 @@ void glActiveTexture(GLenum texture) {
        glActiveTexturep(texture);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
-                       texture);
+             (uint64_t)(texture));
 }
 
 void glAttachShader(GLuint program, GLuint shader) {
@@ -73,7 +73,7 @@ void glBindBuffer(GLenum target, GLuint buffer) {
        glBindBufferp(target, buffer);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       target, buffer);
+             (uint64_t)(target), buffer);
 }
 
 void glBindFramebuffer(GLenum target, GLuint framebuffer) {
@@ -82,7 +82,7 @@ void glBindFramebuffer(GLenum target, GLuint framebuffer) {
        glBindFramebufferp(target, framebuffer);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       target, framebuffer);
+             (uint64_t)(target), framebuffer);
 }
 
 void glBindRenderbuffer(GLenum target, GLuint renderbuffer) {
@@ -91,7 +91,7 @@ void glBindRenderbuffer(GLenum target, GLuint renderbuffer) {
        glBindRenderbufferp(target, renderbuffer);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       target, renderbuffer);
+             (uint64_t)(target), renderbuffer);
 }
 
 void glBindTexture(GLenum target, GLuint texture) {
@@ -100,7 +100,7 @@ void glBindTexture(GLenum target, GLuint texture) {
        glBindTexturep(target, texture);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       target, texture);
+             (uint64_t)(target), texture);
 }
 
 void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
@@ -117,7 +117,8 @@ void glBlendEquation(GLenum mode) {
        BEFORE(glBlendEquation);
        glBlendEquationp(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", mode);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+             (uint64_t)(mode));
 }
 
 void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
@@ -126,7 +127,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
        glBlendEquationSeparatep(modeRGB, modeAlpha);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       modeRGB, modeAlpha);
+             (uint64_t)(modeRGB), (uint64_t)(modeAlpha));
 }
 
 void glBlendFunc(GLenum sfactor, GLenum dfactor) {
@@ -135,7 +136,7 @@ void glBlendFunc(GLenum sfactor, GLenum dfactor) {
        glBlendFuncp(sfactor, dfactor);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       sfactor, dfactor);
+             (uint64_t)(sfactor), (uint64_t)(dfactor));
 }
 
 void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
@@ -145,7 +146,8 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
        glBlendFuncSeparatep(srcRGB, dstRGB, srcAlpha, dstAlpha);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
-                       srcRGB, dstRGB, srcAlpha, dstAlpha);
+             (uint64_t)(srcRGB), (uint64_t)(dstRGB),
+             (uint64_t)(srcAlpha), (uint64_t)(dstAlpha));
 }
 
 void glBufferData(GLenum target, GLsizeiptr size, const GLvoid * data,
@@ -154,8 +156,9 @@ void glBufferData(GLenum target, GLsizeiptr size, const GLvoid * data,
        BEFORE(glBufferData);
        glBufferDatap(target, size, data, usage);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xxpx", target, size, data, usage);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxpx",
+             (uint64_t)(target), (uint64_t)(size),
+             voidp_to_uint64(data), (uint64_t)(usage));
 }
 
 void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
@@ -164,8 +167,9 @@ void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
        BEFORE(glBufferSubData);
        glBufferSubDatap(target, offset, size, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xxxp", target, offset, size, data);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxp",
+             (uint64_t)(target), (uint64_t)(offset),
+             (uint64_t)(size), voidp_to_uint64(data));
 }
 
 // ==================================================================
@@ -177,7 +181,8 @@ GLenum glCheckFramebufferStatus(GLenum target) {
        BEFORE(glCheckFramebufferStatus);
        GLenum ret = glCheckFramebufferStatusp(target);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", target);
+       AFTER(ret, APITYPE_CONTEXT, "", "x",
+             (uint64_t)(target));
 
        return ret;
 }
@@ -187,7 +192,8 @@ void glClear(GLbitfield mask) {
        BEFORE(glClear);
        glClearp(mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", mask);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+             (uint64_t)(mask));
 }
 
 void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
@@ -230,7 +236,7 @@ void glCompileShader(GLuint shader) {
        BEFORE(glCompileShader);
        glCompileShaderp(shader);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", shader);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(shader));
 }
 
 void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
@@ -242,9 +248,10 @@ void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
        glCompressedTexImage2Dp(target, level, internalformat, width, height,
                        border, imageSize, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xdxddddp",
-                       target, level, internalformat, width, height, border, imageSize, data);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddp",
+             (uint64_t)(target), level,
+             (uint64_t)(internalformat), width, height, border, imageSize,
+             voidp_to_uint64(data));
 }
 
 void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
@@ -256,9 +263,9 @@ void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
        glCompressedTexSubImage2Dp(target, level, xoffset, yoffset, width, height,
                        format, imageSize, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xdddddxdp",
-                       target, level, xoffset, yoffset, width, height, format, imageSize, data);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxdp",
+             (uint64_t)(target), level, xoffset, yoffset, width, height,
+             (uint64_t)(format), imageSize, voidp_to_uint64(data));
 }
 
 void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
@@ -269,9 +276,9 @@ void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
        glCopyTexImage2Dp(target, level, internalformat, x, y, width, height,
                        border);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xdxddddd",
-                       target, level, internalformat, x, y, width, height, border);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddd",
+             (uint64_t)(target), level,
+             (uint64_t)(internalformat), x, y, width, height, border);
 }
 
 void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
@@ -281,9 +288,9 @@ void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
        BEFORE(glCopyTexSubImage2D);
        glCopyTexSubImage2Dp(target, level, xoffset, yoffset, x, y, width, height);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xddddddd",
-                       target, level, xoffset, yoffset, x, y, width, height);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xddddddd",
+             (uint64_t)(target), level, xoffset, yoffset, x, y, width,
+             height);
 }
 
 GLuint glCreateProgram(void) {
@@ -301,7 +308,7 @@ GLuint glCreateShader(GLenum shaderType) {
        BEFORE(glCreateShader);
        GLuint ret = glCreateShaderp(shaderType);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", shaderType);
+       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(shaderType));
 
        return ret;
 }
@@ -311,7 +318,7 @@ void glCullFace(GLenum mode) {
        BEFORE(glCullFace);
        glCullFacep(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", mode);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(mode));
 }
 
 // ==================================================================
@@ -324,7 +331,7 @@ void glDeleteBuffers(GLsizei n, const GLuint * buffers) {
        glDeleteBuffersp(n, buffers);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, buffers);
+             n, voidp_to_uint64(buffers));
 }
 
 void glDeleteFramebuffers(GLsizei n, const GLuint * framebuffers) {
@@ -333,7 +340,7 @@ void glDeleteFramebuffers(GLsizei n, const GLuint * framebuffers) {
        glDeleteFramebuffersp(n, framebuffers);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, framebuffers);
+             n, voidp_to_uint64(framebuffers));
 }
 
 void glDeleteProgram(GLuint program) {
@@ -351,7 +358,7 @@ void glDeleteRenderbuffers(GLsizei n, const GLuint * renderbuffers) {
        glDeleteRenderbuffersp(n, renderbuffers);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, renderbuffers);
+             n, voidp_to_uint64(renderbuffers));
 }
 
 void glDeleteShader(GLuint shader) {
@@ -377,10 +384,10 @@ void glDeleteTextures(GLsizei n, const GLuint * textures) {
                        }
                }
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
-                               n, textures);
+                     n, voidp_to_uint64(textures));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                               n, textures);
+                     n, voidp_to_uint64(textures));
        }
 }
 
@@ -389,7 +396,7 @@ void glDepthFunc(GLenum func) {
        BEFORE(glDepthFunc);
        glDepthFuncp(func);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", func);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(func));
 }
 
 void glDepthMask(GLboolean flag) {
@@ -397,7 +404,7 @@ void glDepthMask(GLboolean flag) {
        BEFORE(glDepthMask);
        glDepthMaskp(flag);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", flag);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(flag));
 }
 
 void glDepthRangef(GLclampf nearVal, GLclampf farVal) {
@@ -423,7 +430,7 @@ void glDisable(GLenum cap) {
        BEFORE(glDisable);
        glDisablep(cap);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", cap);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
 void glDisableVertexAttribArray(GLuint index) {
@@ -440,7 +447,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count) {
        glDrawArraysp(mode, first, count);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
-                       mode, first, count);
+             (uint64_t)(mode), first, count);
 }
 
 void glDrawElements(GLenum mode, GLsizei count, GLenum type,
@@ -450,7 +457,7 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type,
        glDrawElementsp(mode, count, type, indices);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxp",
-                       mode, count, type, indices);
+             (uint64_t)(mode), count, (uint64_t)(type), indices);
 }
 
 // ==================================================================
@@ -462,7 +469,7 @@ void glEnable(GLenum cap) {
        BEFORE(glEnable);
        glEnablep(cap);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", cap);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
 void glEnableVertexAttribArray(GLuint index) {
@@ -523,7 +530,8 @@ void glFramebufferRenderbuffer(GLenum target, GLenum attachment,
                        renderbuffer);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxd",
-                       target, attachment, renderbuffertarget, renderbuffer);
+             (uint64_t)(target), (uint64_t)(attachment),
+             (uint64_t)(renderbuffertarget), renderbuffer);
 }
 
 void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
@@ -532,8 +540,9 @@ void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
        BEFORE(glFramebufferTexture2D);
        glFramebufferTexture2Dp(target, attachment, textarget, texture, level);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xxxdd", target, attachment, textarget, texture, level);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxdd",
+             (uint64_t)(target), (uint64_t)(attachment),
+             (uint64_t)(textarget), texture, level);
 }
 
 void glFrontFace(GLenum mode) {
@@ -541,7 +550,8 @@ void glFrontFace(GLenum mode) {
        BEFORE(glFrontFace);
        glFrontFacep(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", mode);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+             (uint64_t)(mode));
 }
 
 // ==================================================================
@@ -563,10 +573,10 @@ void glGenBuffers(GLsizei n, GLuint * buffers) {
                        }
                }
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
-                       n, buffers);
+                     n, voidp_to_uint64(buffers));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, buffers);
+                     n, voidp_to_uint64(buffers));
        }
 }
 
@@ -576,7 +586,7 @@ void glGenFramebuffers(GLsizei n, GLuint * framebuffers) {
        glGenFramebuffersp(n, framebuffers);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, framebuffers);
+             n, voidp_to_uint64(framebuffers));
 }
 
 void glGenRenderbuffers(GLsizei n, GLuint * renderbuffers) {
@@ -585,7 +595,7 @@ void glGenRenderbuffers(GLsizei n, GLuint * renderbuffers) {
        glGenRenderbuffersp(n, renderbuffers);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                       n, renderbuffers);
+             n, voidp_to_uint64(renderbuffers));
 }
 
 void glGenTextures(GLsizei n, GLuint * textures) {
@@ -603,10 +613,10 @@ void glGenTextures(GLsizei n, GLuint * textures) {
                        }
                }
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
-                               n, textures);
+                     n, voidp_to_uint64(textures));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
-                               n, textures);
+                     n, voidp_to_uint64(textures));
        }
 }
 
@@ -615,7 +625,7 @@ void glGenerateMipmap(GLenum target) {
        BEFORE(glGenerateMipmap);
        glGenerateMipmapp(target);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", target);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(target));
 }
 
 //lsh_get
@@ -624,7 +634,7 @@ void glGetBooleanv(GLenum pname, GLboolean * params) {
        BEFORE(glGetBooleanv);
        glGetBooleanvp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", pname);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -633,7 +643,7 @@ void glGetFloatv(GLenum pname, GLfloat * params) {
        BEFORE(glGetFloatv);
        glGetFloatvp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", pname);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -642,7 +652,7 @@ void glGetIntegerv(GLenum pname, GLint * params) {
        BEFORE(glGetIntegerv);
        glGetIntegervp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", pname);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -686,7 +696,7 @@ void glGetAttribLocation(GLenum pname, GLint * params) {
        BEFORE(glGetAttribLocation);
        glGetAttribLocationp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", pname);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -696,7 +706,7 @@ void glGetBufferParameteriv(GLenum target, GLenum value, GLint * data) {
        glGetBufferParameterivp(target, value, data);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       target, value);
+             (uint64_t)(target), (uint64_t)(value));
 }
 
 GLenum glGetError(void) {
@@ -717,7 +727,8 @@ void glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
        glGetFramebufferAttachmentParameterivp(target, attachment, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
-                       target, attachment, pname);
+             (uint64_t)(target), (uint64_t)(attachment),
+             (uint64_t)(pname));
 }
 
 //lsh_get
@@ -738,7 +749,7 @@ void glGetProgramiv(GLuint program, GLenum pname, GLint *params) {
        glGetProgramivp(program, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
-                       program, pname);
+             program, (uint64_t)(pname));
 }
 
 //lsh_get
@@ -748,7 +759,7 @@ void glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) {
        glGetRenderbufferParameterivp(target, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       target, pname);
+             (uint64_t)(target), (uint64_t)(pname));
 }
 
 //lsh_get
@@ -770,7 +781,7 @@ void glGetShaderPrecisionFormat(GLenum shaderType, GLenum precisionType,
        glGetShaderPrecisionFormatp(shaderType, precisionType, range, precision);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       shaderType, precisionType);
+             (uint64_t)(shaderType), (uint64_t)(precisionType));
 }
 
 //lsh_get
@@ -791,7 +802,7 @@ void glGetShaderiv(GLuint shader, GLenum pname, GLint *params) {
        glGetShaderivp(shader, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
-                       shader, pname);
+             shader, (uint64_t)(pname));
 }
 
 const GLubyte* glGetString(GLenum name) {
@@ -799,7 +810,7 @@ const GLubyte* glGetString(GLenum name) {
        BEFORE(glGetString);
        const GLubyte* ret = glGetStringp(name);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", name);
+       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(name));
 
        return ret;
 }
@@ -811,7 +822,7 @@ void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) {
        glGetTexParameterfvp(target, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       target, pname);
+             (uint64_t)(target), (uint64_t)(pname));
 }
 
 //lsh_get
@@ -821,7 +832,7 @@ void glGetTexParameteriv(GLenum target, GLenum pname, GLint * params) {
        glGetTexParameterivp(target, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       target, pname);
+             (uint64_t)(target), (uint64_t)(pname));
 }
 
 //lsh_get
@@ -862,7 +873,7 @@ void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) {
        glGetVertexAttribfvp(index, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
-                       index, pname);
+             index, (uint64_t)(pname));
 }
 
 //lsh_get
@@ -872,7 +883,7 @@ void glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params) {
        glGetVertexAttribivp(index, pname, params);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
-                       index, pname);
+             index, (uint64_t)(pname));
 }
 
 //lsh_get
@@ -882,7 +893,7 @@ void glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer) {
        glGetVertexAttribPointervp(index, pname, pointer);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
-                       index, pname);
+             index, (uint64_t)(pname));
 }
 
 // ==================================================================
@@ -895,7 +906,7 @@ void glHint(GLenum target, GLenum mode) {
        glHintp(target, mode);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
-                       target, mode);
+             (uint64_t)(target), (uint64_t)(mode));
 }
 
 // ==================================================================
@@ -917,7 +928,7 @@ GLboolean glIsEnabled(GLenum cap) {
        BEFORE(glIsEnabled);
        GLboolean ret = glIsEnabledp(cap);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", cap);
+       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 
        return ret;
 }
@@ -1036,7 +1047,7 @@ void glPixelStorei(GLenum pname, GLint param) {
        glPixelStoreip(pname, param);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       pname, param);
+             (uint64_t)(pname), param);
 }
 
 void glPolygonOffset(GLfloat factor, GLfloat units) {
@@ -1061,7 +1072,8 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
        glReadPixelsp(x, y, width, height, format, type, data);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "ddddxx", x, y, width, height, format, type);
+             "ddddxx", x, y, width, height,
+             (uint64_t)(format), (uint64_t)(type));
 }
 
 void glReleaseShaderCompiler(void) {
@@ -1079,7 +1091,8 @@ void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width,
        glRenderbufferStoragep(target, internalformat, width, height);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
-                       target, internalformat, width, height);
+             (uint64_t)(target), (uint64_t)(internalformat),
+             width, height);
 }
 
 // ==================================================================
@@ -1092,7 +1105,7 @@ void glSampleCoverage(GLclampf value, GLboolean invert) {
        glSampleCoveragep(value, invert);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "fx",
-                       value, invert);
+                       value, (uint64_t)(invert));
 }
 
 void glScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
@@ -1113,7 +1126,8 @@ void glShaderBinary(GLsizei n, const GLuint *shaders, GLenum binaryformat,
        glShaderBinaryp(n, shaders, binaryformat, binary, length);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "dpxpd", n, shaders, binaryformat, binary, length);
+             "dpxpd", n, voidp_to_uint64(shaders),
+             (uint64_t)(binaryformat), voidp_to_uint64(binary), length);
 }
 
 //lsh_param
@@ -1129,10 +1143,12 @@ void glShaderSource(GLuint shader, GLsizei count, const char** string,
                char buf[length[0]];
                glGetShaderSource(shader, length[0], NULL, buf);
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf,
-                               "ddpp", shader, count, string, length);
+                     "ddpp", shader, count,
+                     voidp_to_uint64(string), voidp_to_uint64(length));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                               "ddpp", shader, count, string, length);
+                     "ddpp", shader, count,
+                     voidp_to_uint64(string), voidp_to_uint64(length));
        }
 }
 
@@ -1142,7 +1158,7 @@ void glStencilFunc(GLenum func, GLint ref, GLuint mask) {
        glStencilFuncp(func, ref, mask);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
-                       func, ref, mask);
+             (uint64_t)(func), ref, mask);
 }
 
 void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) {
@@ -1151,7 +1167,7 @@ void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) {
        glStencilFuncSeparatep(face, func, ref, mask);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
-                       face, func, ref, mask);
+             (uint64_t)(face), (uint64_t)(func), ref, mask);
 }
 
 void glStencilMask(GLuint mask) {
@@ -1168,7 +1184,7 @@ void glStencilMaskSeparate(GLenum face, GLuint mask) {
        glStencilMaskSeparatep(face, mask);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
-                       face, mask);
+             (uint64_t)(face), mask);
 }
 
 void glStencilOp(GLenum sfail, GLenum dpfail, GLenum dppass) {
@@ -1177,7 +1193,8 @@ void glStencilOp(GLenum sfail, GLenum dpfail, GLenum dppass) {
        glStencilOpp(sfail, dpfail, dppass);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
-                       sfail, dpfail, dppass);
+             (uint64_t)(sfail), (uint64_t)(dpfail),
+             (uint64_t)(dppass));
 }
 
 void glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail,
@@ -1187,7 +1204,8 @@ void glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail,
        glStencilOpSeparatep(face, sfail, dpfail, dppass);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
-                       face, sfail, dpfail, dppass);
+             (uint64_t)(face), (uint64_t)(sfail), (uint64_t)(dpfail),
+             (uint64_t)(dppass));
 }
 
 // ==================================================================
@@ -1203,9 +1221,10 @@ void glTexImage2D(GLenum target, GLint level, GLint internalformat,
        glTexImage2Dp(target, level, internalformat, width, height, border, format,
                        type, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xdddddxxp",
-                       target, level, internalformat, width, height, border, format, type, data);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxxp",
+             (uint64_t)(target), level, internalformat, width, height,
+             border, (uint64_t)(format), (uint64_t)(type),
+             voidp_to_uint64(data));
 }
 
 void glTexParameterf(GLenum target, GLenum pname, GLfloat param) {
@@ -1213,8 +1232,8 @@ void glTexParameterf(GLenum target, GLenum pname, GLfloat param) {
        BEFORE(glTexParameterf);
        glTexParameterfp(target, pname, param);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
-                       target, pname, (GLenum)param);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxf",
+             (uint64_t)(target), (uint64_t)(pname), param);
 }
 
 void glTexParameterfv(GLenum target, GLenum pname, const GLfloat * params) {
@@ -1226,10 +1245,12 @@ void glTexParameterfv(GLenum target, GLenum pname, const GLfloat * params) {
                char param0[8];
                sprintf(param0, "%x", (GLenum)params[0]);
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
-                                       target, pname, params);
+                     (uint64_t)(target), (uint64_t)(pname),
+                     voidp_to_uint64(params));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
-                       target, pname, params);
+                     (uint64_t)(target), (uint64_t)(pname),
+                     voidp_to_uint64(params));
        }
 }
 
@@ -1239,7 +1260,8 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
        glTexParameterip(target, pname, param);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
-                       target, pname, param);
+             (uint64_t)(target), (uint64_t)(pname),
+             (uint64_t)(param));
 }
 
 void glTexParameteriv(GLenum target, GLenum pname, const GLint * params) {
@@ -1251,10 +1273,13 @@ void glTexParameteriv(GLenum target, GLenum pname, const GLint * params) {
                char param0[8];
                sprintf(param0, "%x", (GLenum)params[0]);
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
-                                       target, pname, params);
+                     (uint64_t)(target), (uint64_t)(pname),
+                     voidp_to_uint64(params));
        } else {
                AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
-                               target, pname, params);
+                     (uint64_t)(target),
+                     (uint64_t)(pname),
+                     voidp_to_uint64(params));
        }
 }
 
@@ -1268,8 +1293,9 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        data);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "xdddddxxp",
-                       target, level, xoffset, yoffset, width, height, format, type, data);
+             "xdddddxxp",
+             (uint64_t)(target), level, xoffset, yoffset, width, height,
+             (uint64_t)(format), (uint64_t)(type), voidp_to_uint64(data));
 }
 
 // ==================================================================
@@ -1319,7 +1345,7 @@ void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) {
        glUniform1fvp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) {
@@ -1328,7 +1354,7 @@ void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) {
        glUniform2fvp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) {
@@ -1337,7 +1363,7 @@ void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) {
        glUniform3fvp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) {
@@ -1346,7 +1372,7 @@ void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) {
        glUniform4fvp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform1i(GLint location, GLint v0) {
@@ -1391,7 +1417,7 @@ void glUniform1iv(GLint location, GLsizei count, const GLint *value) {
        glUniform1ivp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform2iv(GLint location, GLsizei count, const GLint *value) {
@@ -1400,7 +1426,7 @@ void glUniform2iv(GLint location, GLsizei count, const GLint *value) {
        glUniform2ivp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniform3iv(GLint location, GLsizei count, const GLint *value) {
@@ -1409,7 +1435,7 @@ void glUniform3iv(GLint location, GLsizei count, const GLint *value) {
        glUniform3ivp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
@@ -1419,7 +1445,7 @@ void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
        glUniformMatrix2fvp(location, count, transpose, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
-                       location, count, transpose, value);
+             location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
 void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
@@ -1429,7 +1455,7 @@ void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
        glUniformMatrix3fvp(location, count, transpose, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
-                       location, count, transpose, value);
+             location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
 void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
@@ -1439,7 +1465,7 @@ void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
        glUniformMatrix4fvp(location, count, transpose, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
-                       location, count, transpose, value);
+             location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
 void glUniform4iv(GLint location, GLsizei count, const GLint *value) {
@@ -1448,7 +1474,7 @@ void glUniform4iv(GLint location, GLsizei count, const GLint *value) {
        glUniform4ivp(location, count, value);
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
-                       location, count, value);
+             location, count, voidp_to_uint64(value));
 }
 
 void glUseProgram(GLuint program) {
@@ -1541,7 +1567,7 @@ void glVertexAttrib1fv(GLuint index, const GLfloat *v) {
 
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
-                       "dp", index, v);
+             "dp", index, voidp_to_uint64(v));
 }
 
 void glVertexAttrib2fv(GLuint index, const GLfloat *v) {
@@ -1555,7 +1581,7 @@ void glVertexAttrib2fv(GLuint index, const GLfloat *v) {
 
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
-                       "dp", index, v);
+             "dp", index, voidp_to_uint64(v));
 }
 
 void glVertexAttrib3fv(GLuint index, const GLfloat *v) {
@@ -1569,7 +1595,7 @@ void glVertexAttrib3fv(GLuint index, const GLfloat *v) {
 
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
-                       "dp", index, v);
+             "dp", index, voidp_to_uint64(v));
 }
 
 void glVertexAttrib4fv(GLuint index, const GLfloat *v) {
@@ -1582,7 +1608,7 @@ void glVertexAttrib4fv(GLuint index, const GLfloat *v) {
 
        error = glGetError();
        AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
-                       "dp", index, v);
+             "dp", index, voidp_to_uint64(v));
 }
 
 void glVertexAttribPointer(GLuint index, GLint size, GLenum type,
@@ -1592,9 +1618,9 @@ void glVertexAttribPointer(GLuint index, GLint size, GLenum type,
        BEFORE(glVertexAttribPointer);
        glVertexAttribPointerp(index, size, type, normalized, stride, pointer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
-                       "ddxxdp",
-                       index, size, type, normalized, stride, pointer);
+       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxxdp",
+             index, size, (uint64_t)(type), (uint64_t)(normalized),
+             stride, voidp_to_uint64(pointer));
 }
 
 void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
index 6e91de5..ee53cdd 100755 (executable)
@@ -153,7 +153,7 @@ void *realloc(void *memblock, size_t size)
 
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, API_ID_realloc,
-                         "px", (uint64_t)(int) memblock, (uint64_t) size);
+                         "px", voidp_to_uint64(memblock), (uint64_t) size);
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
index 3ef791d..409c40b 100644 (file)
@@ -62,7 +62,8 @@ void *memset(void *memblock, int c, size_t n)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_memset,
-                         "pdx", memblock, c, n);
+                         "pdx", voidp_to_uint64(memblock), c,
+                         (uint64_t)(n));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(n, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
@@ -88,7 +89,8 @@ int memcmp(const void * ptr1, const void * ptr2, size_t num)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_memcmp,
-                         "ppx", ptr1, ptr2, num);
+                         "ppx", voidp_to_uint64(ptr1), voidp_to_uint64(ptr2),
+                         (uint64_t)(num));
        PACK_COMMON_END(ret, newerrno, blockresult);
        PACK_MEMORY(num, MEMORY_API_MANAGE, ret);
        FLUSH_LOCAL_BUF();
@@ -115,7 +117,9 @@ void *memcpy(void * destination, const void * source, size_t num )
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_memcpy,
-                         "ppx", destination, source, num);
+                         "ppx", voidp_to_uint64(destination),
+                         voidp_to_uint64(source),
+                         (uint64_t)(num));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(num, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
index 0bad896..0785f9e 100644 (file)
@@ -68,7 +68,7 @@ void *operator new(std::size_t size) throw (std::bad_alloc)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new_std__size_t_size__throw__std__bad_alloc_,
-                         "x", size);
+                         "x", (uint64_t)(size));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
@@ -101,7 +101,7 @@ void *operator new[](std::size_t size) throw (std::bad_alloc)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new___std__size_t_size__throw__std__bad_alloc_,
-                         "x", size);
+                         "x", (uint64_t)(size));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
@@ -142,7 +142,7 @@ void operator delete(void *ptr) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete_void__ptr__throw__,
-                         "p", ptr);
+                         "p", voidp_to_uint64(ptr));
        PACK_COMMON_END(0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
@@ -181,7 +181,7 @@ void operator delete[](void *ptr) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete___void__ptr__throw__,
-                         "p", ptr);
+                         "p", voidp_to_uint64(ptr));
        PACK_COMMON_END(0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
@@ -212,7 +212,7 @@ void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new_std__size_t_size__const_std__nothrow_t__nothrow__throw__,
-                         "xp", size, &nothrow);
+                         "xp", (uint64_t)(size), voidp_to_uint64(&nothrow));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
@@ -245,7 +245,7 @@ void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new___std__size_t_size__const_std__nothrow_t__nothrow__throw__,
-                         "xp", size, &nothrow);
+                         "xp", (uint64_t)(size), voidp_to_uint64(&nothrow));
        PACK_COMMON_END(pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
@@ -286,7 +286,7 @@ void operator delete(void *ptr, const std::nothrow_t& nothrow) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete_void__ptr__const_std__nothrow_t__nothrow__throw__,
-                         "pp", ptr, &nothrow);
+                         "pp", voidp_to_uint64(ptr), voidp_to_uint64(&nothrow));
        PACK_COMMON_END(0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
@@ -325,7 +325,7 @@ void operator delete[](void *ptr, const std::nothrow_t& nothrow) throw()
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete___void__ptr__const_std__nothrow_t__nothrow__throw__,
-                         "pp", ptr, &nothrow);
+                         "pp", voidp_to_uint64(ptr), voidp_to_uint64(&nothrow));
        PACK_COMMON_END(0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
index a3fb2f5..09bcc72 100644 (file)
@@ -96,14 +96,14 @@ int accept(int socket, struct sockaddr *address, socklen_t *address_len) {
        char* callAddress = getAddress(address);
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
                        SOCKET_API_ACCEPT_START, info, "dsp",
-                       socket, callAddress, address_len);
+                       socket, callAddress, voidp_to_uint64(address_len));
 
        ret = acceptp(socket, address, address_len);
        info.sock = (struct sockaddr *)address;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, socket,
                        SOCKET_API_ACCEPT_END, info, "dsp",
-                       socket, callAddress, address_len);
+                       socket, callAddress, voidp_to_uint64(address_len));
 
        return ret;
 }
@@ -117,14 +117,14 @@ int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) {
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, sockfd,
                        SOCKET_API_ACCEPT_START, info, "dspd",
-                       sockfd, callAddress, addrlen, flags);
+                       sockfd, callAddress, voidp_to_uint64(addrlen), flags);
 
        ret = accept4p(sockfd, addr, addrlen, flags);
        info.sock = (struct sockaddr *)addr;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, sockfd,
                        SOCKET_API_ACCEPT_END, info,  "dspd",
-                       sockfd, callAddress, addrlen, flags);
+                       sockfd, callAddress, voidp_to_uint64(addrlen), flags);
 
        return ret;
 }
@@ -194,7 +194,7 @@ ssize_t send(int socket, const void *message, size_t length, int flags) {
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
                        SOCKET_API_SEND_START, info, "dpdd",
-                       socket, messagP, length, flags);
+                       socket, voidp_to_uint64(messagP), length, flags);
 
        sret = sendp(socket, message, length, flags);
        result = sret;
@@ -206,7 +206,7 @@ ssize_t send(int socket, const void *message, size_t length, int flags) {
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
                        SOCKET_API_SEND_END, info, "dpdd",
-                       socket, messagP, length, flags);
+                       socket, voidp_to_uint64(messagP), length, flags);
        return sret;
 }
 
@@ -220,7 +220,7 @@ ssize_t recv(int socket, void *buffer, size_t length, int flags) {
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
                        SOCKET_API_RECV_START, info, "dpdd",
-                       socket, bufferP, length, flags);
+                       socket, voidp_to_uint64(bufferP), length, flags);
 
        sret = recvp(socket, buffer, length, flags);
        result = sret;
@@ -232,7 +232,7 @@ ssize_t recv(int socket, void *buffer, size_t length, int flags) {
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
                        SOCKET_API_RECV_END, info, "dpdd",
-                       socket, bufferP, length, flags);
+                       socket, voidp_to_uint64(bufferP), length, flags);
        return sret;
 }
 
@@ -248,8 +248,13 @@ ssize_t sendto(int socket, const void *message, size_t length, int flags,
        info.sock = (struct sockaddr *) dest_addr;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
-                       SOCKET_API_SEND_START, info, "dpddpd",
-                       socket, bufferP, length, flags, dest_addr, dest_len);
+                                                SOCKET_API_SEND_START, info,
+                                                "dpddpd",
+                                                socket,
+                                                voidp_to_uint64(bufferP),
+                                                length, flags,
+                                                voidp_to_uint64(dest_addr),
+                                                dest_len);
 
        sret = sendtop(socket, message, length, flags, dest_addr, dest_len);
        result = sret;
@@ -260,8 +265,13 @@ ssize_t sendto(int socket, const void *message, size_t length, int flags,
        info.msg_buf = bufferP;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
-                       SOCKET_API_SEND_END, info, "dpddpd",
-                       socket, bufferP, length, flags, dest_addr, dest_len);
+                                              SOCKET_API_SEND_END, info,
+                                              "dpddpd",
+                                              socket,
+                                              voidp_to_uint64(bufferP),
+                                              length, flags,
+                                              voidp_to_uint64(dest_addr),
+                                              dest_len);
        return sret;
 }
 
@@ -276,8 +286,12 @@ ssize_t recvfrom(int socket, void *buffer, size_t length, int flags,
        char *bufferP = (char *)buffer;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
-                       SOCKET_API_RECV_START, info, "dpddpp",
-                       socket, bufferP, length, flags, address, address_len);
+                                                SOCKET_API_RECV_START, info,
+                                                "dpddpp",
+                                                socket,
+                                                voidp_to_uint64(bufferP), length,
+                                                flags, voidp_to_uint64(address),
+                                                voidp_to_uint64(address_len));
 
        sret = recvfromp(socket, buffer, length, flags, address, address_len);
        info.sock = (struct sockaddr *)address;
@@ -290,8 +304,11 @@ ssize_t recvfrom(int socket, void *buffer, size_t length, int flags,
        info.msg_buf = bufferP;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
-                       SOCKET_API_RECV_END, info, "dpddpp",
-                       socket, bufferP, length, flags, address, address_len);
+                                              SOCKET_API_RECV_END, info,
+                                              "dpddpp", socket,
+                                              voidp_to_uint64(bufferP), length,
+                                              flags, voidp_to_uint64(address),
+                                              voidp_to_uint64(address_len));
        return sret;
 }
 
@@ -304,8 +321,9 @@ ssize_t recvmsg(int socket, struct msghdr *message, int flags) {
        int* bufferP = (int*) message->msg_name;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
-                       SOCKET_API_RECV_START, info, "dpd",
-                       socket, message, flags);
+                                                SOCKET_API_RECV_START, info,
+                                                "dpd", socket,
+                                                voidp_to_uint64(message), flags);
 
        sret = recvmsgp(socket, message, flags);
        if (sret <= 0) {
@@ -329,8 +347,9 @@ ssize_t recvmsg(int socket, struct msghdr *message, int flags) {
        }
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
-                       SOCKET_API_RECV_END, info, "dpd",
-                       socket, bufferP, flags);
+                                              SOCKET_API_RECV_END, info, "dpd",
+                                              socket, voidp_to_uint64(bufferP),
+                                              flags);
        free(out);
        return sret;
 }
@@ -345,8 +364,10 @@ ssize_t sendmsg(int socket, const struct msghdr *message, int flags) {
        int* bufferP = (int*) message->msg_name;
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, socket,
-                       SOCKET_API_SEND_START, info, "dpd",
-                       socket, message, flags);
+                                                SOCKET_API_SEND_START, info,
+                                                "dpd",
+                                                socket,
+                                                voidp_to_uint64(message), flags);
 
        sret = sendmsgp(socket, message, flags);
        if (sret <= 0) {
@@ -369,8 +390,9 @@ ssize_t sendmsg(int socket, const struct msghdr *message, int flags) {
        }
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(sret, OBJ_DUMMY, socket,
-                       SOCKET_API_SEND_END, info, "dpd",
-                       socket, bufferP, flags);
+                                              SOCKET_API_SEND_END, info, "dpd",
+                                              socket,
+                                              voidp_to_uint64(bufferP), flags);
        free(out);
        return sret;
 }
@@ -386,7 +408,8 @@ int getsockopt(int socket, int level, int option_name, void *option_value,
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, socket, SOCKET_API_OTHER, info,
                                 "dddpp", socket, level, option_name,
-                                option_value, option_len);
+                                voidp_to_uint64(option_value),
+                                voidp_to_uint64(option_len));
 
        return ret;
 }
@@ -402,7 +425,7 @@ int setsockopt(int socket, int level, int option_name, const void *option_value,
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, socket, SOCKET_API_OTHER, info,
                                 "dddpd", socket, level, option_name,
-                                option_value, option_len);
+                                voidp_to_uint64(option_value), option_len);
 
        return ret;
 }
@@ -416,7 +439,8 @@ int getpeername(int fd, struct sockaddr *addr, socklen_t *len) {
        info.sock = (struct sockaddr *)addr;
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, fd, SOCKET_API_OTHER, info,
-                                "dsp", fd, getAddress(addr), len);
+                                "dsp", fd, getAddress(addr),
+                                voidp_to_uint64(len));
        return ret;
 }
 
@@ -430,7 +454,8 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
        info.sock = (struct sockaddr *)addr;
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, sockfd, SOCKET_API_OTHER, info,
-                                "dsp", sockfd, getAddress(addr), addrlen);
+                                "dsp", sockfd, getAddress(addr),
+                                voidp_to_uint64(addrlen));
 
        return ret;
 }
@@ -482,14 +507,22 @@ int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
        BEFORE_ORIGINAL_SOCK(select, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, 0,
-                       SOCKET_API_EVENT_START, info, "dpppp",
-                       nfds, readfds, writefds, exceptfds, timeout);
+                                                SOCKET_API_EVENT_START, info,
+                                                "dpppp", nfds,
+                                                voidp_to_uint64(readfds),
+                                                voidp_to_uint64(writefds),
+                                                voidp_to_uint64(exceptfds),
+                                                voidp_to_uint64(timeout));
 
        ret = selectp(nfds, readfds, writefds, exceptfds, timeout);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, 0,
-                       SOCKET_API_EVENT_END, info, "dpppp",
-                       nfds, readfds, writefds, exceptfds, timeout);
+                                              SOCKET_API_EVENT_END, info,
+                                              "dpppp", nfds,
+                                              voidp_to_uint64(readfds),
+                                              voidp_to_uint64(writefds),
+                                              voidp_to_uint64(exceptfds),
+                                              voidp_to_uint64(timeout));
 
        return ret;
 }
@@ -503,14 +536,24 @@ int pselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
        BEFORE_ORIGINAL_SOCK(pselect, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, 0,
-                       SOCKET_API_EVENT_START, info, "dppppp",
-                       nfds, readfds, writefds, exceptfds, ntimeout, sigmask);
+                                                SOCKET_API_EVENT_START, info,
+                                                "dppppp", nfds,
+                                                voidp_to_uint64(readfds),
+                                                voidp_to_uint64(writefds),
+                                                voidp_to_uint64(exceptfds),
+                                                voidp_to_uint64(ntimeout),
+                                                voidp_to_uint64(sigmask));
 
        ret = pselectp(nfds, readfds, writefds, exceptfds, ntimeout, sigmask);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, 0,
-                       SOCKET_API_EVENT_END, info, "dppppp",
-                       nfds, readfds, writefds, exceptfds, ntimeout, sigmask);
+                                              SOCKET_API_EVENT_END, info,
+                                              "dppppp", nfds,
+                                              voidp_to_uint64(readfds),
+                                              voidp_to_uint64(writefds),
+                                              voidp_to_uint64(exceptfds),
+                                              voidp_to_uint64(ntimeout),
+                                              voidp_to_uint64(sigmask));
 
        return ret;
 }
@@ -521,13 +564,16 @@ int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
        BEFORE_ORIGINAL_SOCK(poll, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, fds->fd,
-                       SOCKET_API_EVENT_START, info, "pxd",
-                       fds, nfds, timeout);
+                                                SOCKET_API_EVENT_START, info,
+                                                "pxd", voidp_to_uint64(fds),
+                                                (uint64_t)(nfds), timeout);
 
        ret = pollp(fds, nfds, timeout);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, fds->fd,
-                       SOCKET_API_EVENT_END, info, "pxd", fds, nfds, timeout);
+                                              SOCKET_API_EVENT_END, info,
+                                              "pxd", voidp_to_uint64(fds),
+                                              (uint64_t)(nfds), timeout);
 
        return ret;
 }
@@ -540,14 +586,22 @@ int ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts,
        BEFORE_ORIGINAL_SOCK(ppoll, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, fds->fd,
-                       SOCKET_API_EVENT_START, info, "pxpp",
-                       fds, nfds, timeout_ts, sigmask);
+                                                SOCKET_API_EVENT_START, info,
+                                                "pxpp",
+                                                voidp_to_uint64(fds),
+                                                (uint64_t)(nfds),
+                                                voidp_to_uint64(timeout_ts),
+                                                voidp_to_uint64(sigmask));
 
        ret = ppollp(fds, nfds, timeout_ts, sigmask);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, fds->fd,
-                       SOCKET_API_EVENT_END, info, "pxpp",
-                       fds, nfds, timeout_ts, sigmask);
+                                              SOCKET_API_EVENT_END, info,
+                                              "pxpp",
+                                              voidp_to_uint64(fds),
+                                              (uint64_t)(nfds),
+                                              voidp_to_uint64(timeout_ts),
+                                              voidp_to_uint64(sigmask));
 
        return ret;
 }
@@ -581,14 +635,18 @@ int epoll_wait(int __epfd, struct epoll_event *__events, int __maxevents,
        BEFORE_ORIGINAL_SOCK(epoll_wait, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, __epfd,
-                       SOCKET_API_EVENT_START, info, "dpdd",
-                       __epfd, __events, __maxevents, __timeout);
+                                                SOCKET_API_EVENT_START, info,
+                                                "dpdd", __epfd,
+                                                voidp_to_uint64(__events),
+                                                __maxevents, __timeout);
 
        ret = epoll_waitp(__epfd, __events, __maxevents, __timeout);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, __epfd,
-                       SOCKET_API_EVENT_END, info, "dpdd",
-                       __epfd, __events, __maxevents, __timeout);
+                                              SOCKET_API_EVENT_END, info,
+                                              "dpdd", __epfd,
+                                              voidp_to_uint64(__events),
+                                              __maxevents, __timeout);
 
        return ret;
 }
@@ -600,14 +658,21 @@ int epoll_pwait(int __epfd, struct epoll_event *__events, int __maxevents,
        BEFORE_ORIGINAL_SOCK(epoll_pwait, LIBC);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_START(NULL, OBJ_DUMMY, __epfd,
-                       SOCKET_API_EVENT_START, info, "dpdd %p",
-                       __epfd, __events, __maxevents, __timeout, __ss);
+                                                SOCKET_API_EVENT_START, info,
+                                                "dpddp", __epfd,
+                                                voidp_to_uint64(__events),
+                                                __maxevents,
+                                                __timeout,
+                                                voidp_to_uint64(__ss));
 
        ret = epoll_pwaitp(__epfd, __events, __maxevents, __timeout, __ss);
 
        AFTER_ORIGINAL_LIBC_SOCK_WAIT_FUNC_END(ret, OBJ_DUMMY, __epfd,
-                       SOCKET_API_EVENT_END, info, "dpdd %p",
-                       __epfd, __events, __maxevents, __timeout, __ss);
+                                              SOCKET_API_EVENT_END, info,
+                                              "dpddp", __epfd,
+                                              voidp_to_uint64(__events),
+                                              __maxevents, __timeout,
+                                              voidp_to_uint64(__ss));
 
        return ret;
 }
@@ -621,7 +686,8 @@ int epoll_ctl(int __epfd, int __op, int __fd, struct epoll_event *__event) {
        ret = epoll_ctlp(__epfd, __op, __fd, __event);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, __fd, SOCKET_API_OTHER, info,
-                                "dddp", __epfd, __op, __fd, __event);
+                                "dddp", __epfd, __op, __fd,
+                                voidp_to_uint64(__event));
        return ret;
 }
 
@@ -664,7 +730,8 @@ int inet_aton(const char *cp, struct in_addr *inp) {
        ret = inet_atonp(cp, inp);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pp", cp, inp);
+                                info, "pp", voidp_to_uint64(cp),
+                                voidp_to_uint64(inp));
 
        return ret;
 }
@@ -678,7 +745,7 @@ in_addr_t inet_addr(const char *cp) {
        iret = inet_addrp(cp);
 
        AFTER_ORIGINAL_LIBC_SOCK(iret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", cp);
+                                info, "p", voidp_to_uint64(cp));
 
        return iret;
 }
@@ -692,7 +759,7 @@ in_addr_t inet_network(const char *cp) {
        iret = inet_networkp(cp);
 
        AFTER_ORIGINAL_LIBC_SOCK(iret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", cp);
+                                info, "p", voidp_to_uint64(cp));
 
        return iret;
 }
@@ -777,7 +844,8 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size) {
        cret = inet_ntopp(af, src, dst, size);
 
        AFTER_ORIGINAL_LIBC_SOCK(cret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dppd", af, src, dst, size);
+                                info, "dppd", af, voidp_to_uint64(src),
+                                voidp_to_uint64(dst), size);
 
        return cret;
 }
@@ -790,7 +858,8 @@ int inet_pton(int af, const char *src, void *dst) {
        ret = inet_ptonp(af, src, dst);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dpp", af, src, dst);
+                                info, "dpp", af, voidp_to_uint64(src),
+                                voidp_to_uint64(dst));
 
        return ret;
 }
@@ -805,7 +874,11 @@ int getaddrinfo(const char *node, const char *service,
        ret = getaddrinfop(node, service, hints, res);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pppp", node, service, hints, res);
+                                info, "pppp",
+                                voidp_to_uint64(node),
+                                voidp_to_uint64(service),
+                                voidp_to_uint64(hints),
+                                voidp_to_uint64(res));
 
        return ret;
 }
@@ -818,7 +891,7 @@ void freeaddrinfo(struct addrinfo *res) {
        freeaddrinfop(res);
 
        AFTER_ORIGINAL_LIBC_SOCK(NULL, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", res);
+                                info, "p", voidp_to_uint64(res));
 }
 
 const char *gai_strerror(int errcode) {
@@ -845,7 +918,8 @@ int gai_suspend(const struct gaicb* const list[], int nitems,
        ret = gai_suspendp(list, nitems, timeout);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pdp", list, nitems, timeout);
+                                info, "pdp", voidp_to_uint64(list), nitems,
+                                voidp_to_uint64(timeout));
 
        return ret;
 }
@@ -858,7 +932,7 @@ int gai_error(struct gaicb *req) {
        ret = gai_errorp(req);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", req);
+                                info, "p", voidp_to_uint64(req));
 
        return ret;
 }
@@ -871,7 +945,7 @@ int gai_cancel(struct gaicb *req) {
        ret = gai_cancelp(req);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", req);
+                                info, "p", voidp_to_uint64(req));
 
        return ret;
 }
@@ -886,7 +960,9 @@ int getaddrinfo_a(int mode, struct gaicb *list[], int nitems,
        ret = getaddrinfo_ap(mode, list, nitems, sevp);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dpdp", mode, list, nitems, sevp);
+                                info, "dpdp", mode,
+                                voidp_to_uint64(list), nitems,
+                                voidp_to_uint64(sevp));
 
        return ret;
 }
@@ -901,7 +977,7 @@ int getdomainname(char *name, size_t len) {
        //AFTER_ORIGINAL_NOSOCK(FD_API_OTHER, "pd", name, len);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pd", name, len);
+                                info, "pd", voidp_to_uint64(name), len);
 
        return ret;
 }
@@ -914,7 +990,7 @@ int setdomainname(const char *name, size_t len) {
        ret = setdomainnamep(name, len);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pd", name, len);
+                                info, "pd", voidp_to_uint64(name), len);
 
        return ret;
 }
@@ -927,7 +1003,7 @@ int gethostname(char *name, size_t len) {
        ret = gethostnamep(name, len);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pd", name, len);
+                                info, "pd", voidp_to_uint64(name), len);
 
        return ret;
 }
@@ -940,7 +1016,7 @@ int sethostname(const char *name, size_t len) {
        ret = sethostnamep(name, len);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pd", name, len);
+                                info, "pd", voidp_to_uint64(name), len);
 
        return ret;
 }
@@ -956,8 +1032,9 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
        ret = getnameinfop(sa, salen, host, hostlen, serv, servlen, flags);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pdpdpdd",
-                       sa, salen, host, hostlen, serv, servlen, flags);
+                                info, "pdpdpdd",
+                                voidp_to_uint64(sa), salen, voidp_to_uint64(host),
+                                hostlen, voidp_to_uint64(serv), servlen, flags);
 
        return ret;
 }
@@ -971,7 +1048,7 @@ struct hostent *gethostbyname(const char *name) {
        pret = gethostbynamep(name);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", name);
+                                info, "p", voidp_to_uint64(name));
 
        return pret;
 }
@@ -986,7 +1063,7 @@ struct hostent *gethostbyaddr(const void *addr, socklen_t len, int type) {
        pret = gethostbyaddrp(addr, len, type);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pdd", addr, len, type);
+                                info, "pdd", voidp_to_uint64(addr), len, type);
 
        return pret;
 }
@@ -1023,7 +1100,7 @@ void herror(const char *s) {
        herrorp(s);
 
        AFTER_ORIGINAL_LIBC_SOCK(NULL, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", s);
+                                info, "p", voidp_to_uint64(s));
 }
 
 const char *hstrerror(int err) {
@@ -1063,7 +1140,7 @@ struct hostent *gethostbyname2(const char *name, int af) {
        pret = gethostbyname2p(name, af);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pd", name, af);
+                                info, "pd", voidp_to_uint64(name), af);
 
        return pret;
 }
@@ -1078,7 +1155,10 @@ int gethostent_r(struct hostent *rret, char *buf, size_t buflen,
        ret = gethostent_rp(rret, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ppdpp", rret, buf, buflen, result, h_errnop);
+                                info, "ppdpp", voidp_to_uint64(rret),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1096,8 +1176,11 @@ int gethostbyaddr_r(const void *addr, socklen_t len, int type,
                        h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pddppdpp",
-                       addr, len, type, rret, buf, buflen, result, h_errnop);
+                                info, "pddppdpp",
+                                voidp_to_uint64(addr), len, type,
+                                voidp_to_uint64(rret), voidp_to_uint64(buf),
+                                buflen, voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1112,8 +1195,12 @@ int gethostbyname_r(const char *name, struct hostent *rret, char *buf,
        ret = gethostbyname_rp(name, rret, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pppdpp",
-                       name, rret, buf, buflen, result, h_errnop);
+                                info, "pppdpp",
+                                voidp_to_uint64(name),
+                                voidp_to_uint64(rret),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1129,8 +1216,11 @@ int gethostbyname2_r(const char *name, int af, struct hostent *rret, char *buf,
        ret = gethostbyname2_rp(name, af, rret, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pdppdpp",
-                       name, af, rret, buf, buflen, result, h_errnop);
+                                info, "pdppdpp",
+                                voidp_to_uint64(name), af, voidp_to_uint64(rret),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1145,7 +1235,8 @@ struct servent *getservbyname(const char *name, const char *proto) {
        pret = getservbynamep(name, proto);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pp", name, proto);
+                                info, "pp", voidp_to_uint64(name),
+                                voidp_to_uint64(proto));
 
        return pret;
 }
@@ -1195,7 +1286,7 @@ struct servent *getservbyport(int port, const char *proto) {
        pret = getservbyportp(port, proto);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dp", port, proto);
+                                info, "dp", port, voidp_to_uint64(proto));
 
        return pret;
 }
@@ -1210,7 +1301,10 @@ int getservent_r(struct servent *result_buf, char *buf, size_t buflen,
        ret = getservent_rp(result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ppdp", result_buf, buf, buflen, result);
+                                info, "ppdp",
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result));
 
        return ret;
 }
@@ -1227,8 +1321,10 @@ int getservbyname_r(const char *name, const char *proto,
        ret = getservbyname_rp(name, proto, result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ppppdp",
-                       name, proto, result_buf, buf, buflen, result);
+                                info, "ppppdp",
+                                voidp_to_uint64(name), voidp_to_uint64(proto),
+                                voidp_to_uint64(result_buf), voidp_to_uint64(buf),
+                                buflen, voidp_to_uint64(result));
 
        return ret;
 }
@@ -1244,8 +1340,11 @@ int getservbyport_r(int port, const char *proto, struct servent *result_buf,
        ret = getservbyport_rp(port, proto, result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dpppdp",
-                       port, proto, result_buf, buf, buflen, result);
+                                info, "dpppdp",
+                                port, voidp_to_uint64(proto),
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result));
 
        return ret;
 }
@@ -1273,7 +1372,7 @@ struct netent *getnetbyname(const char *name) {
        pret = getnetbynamep(name);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", name);
+                                info, "p", voidp_to_uint64(name));
 
        return pret;
 }
@@ -1324,8 +1423,11 @@ int getnetent_r(struct netent *result_buf, char *buf, size_t buflen,
        ret = getnetent_rp(result_buf, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ppdpp",
-                       result_buf, buf, buflen, result, h_errnop);
+                                info, "ppdpp",
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1340,8 +1442,12 @@ int getnetbyname_r(const char *name, struct netent *result_buf, char *buf,
        ret = getnetbyname_rp(name, result_buf, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pppdpp",
-                       name, result_buf, buf, buflen, result, h_errnop);
+                                info, "pppdpp",
+                                voidp_to_uint64(name),
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1357,8 +1463,11 @@ int getnetbyaddr_r(uint32_t net, int type, struct netent *result_buf, char *buf,
        ret = getnetbyaddr_rp(net, type, result_buf, buf, buflen, result, h_errnop);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ddppdpp",
-                       net, type, result_buf, buf, buflen, result, h_errnop);
+                                info, "ddppdpp",
+                                net, type, voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result),
+                                voidp_to_uint64(h_errnop));
 
        return ret;
 }
@@ -1386,7 +1495,7 @@ struct protoent *getprotobyname(const char *name) {
        pret = getprotobynamep(name);
 
        AFTER_ORIGINAL_LIBC_SOCK(pret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", name);
+                                info, "p", voidp_to_uint64(name));
 
        return pret;
 }
@@ -1437,7 +1546,9 @@ int getprotoent_r(struct protoent *result_buf, char *buf, size_t buflen,
        ret = getprotoent_rp(result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "ppdp", result_buf, buf, buflen, result);
+                                info, "ppdp", voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result));
 
        return ret;
 }
@@ -1453,7 +1564,10 @@ int getprotobyname_r(const char *name, struct protoent *result_buf, char *buf,
        ret = getprotobyname_rp(name, result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "pppdp", name, result_buf, buf, buflen, result);
+                                info, "pppdp", voidp_to_uint64(name),
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result));
 
        return ret;
 }
@@ -1468,7 +1582,10 @@ int getprotobynumber_r(int proto, struct protoent *result_buf, char *buf,
        ret = getprotobynumber_rp(proto, result_buf, buf, buflen, result);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dppdp", proto, result_buf, buf, buflen, result);
+                                info, "dppdp", proto,
+                                voidp_to_uint64(result_buf),
+                                voidp_to_uint64(buf), buflen,
+                                voidp_to_uint64(result));
 
        return ret;
 }
@@ -1482,7 +1599,7 @@ unsigned int if_nametoindex(__const char *__ifname) {
        uret = if_nametoindexp(__ifname);
 
        AFTER_ORIGINAL_LIBC_SOCK(uret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", __ifname);
+                                info, "p", voidp_to_uint64(__ifname));
 
        return uret;
 }
@@ -1496,7 +1613,8 @@ char *if_indextoname(unsigned int __ifindex, char *__ifname) {
        cret = if_indextonamep(__ifindex, __ifname);
 
        AFTER_ORIGINAL_LIBC_SOCK(cret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "dp", __ifindex, __ifname);
+                                info, "dp", __ifindex,
+                                voidp_to_uint64(__ifname));
 
        return cret;
 }
@@ -1523,7 +1641,7 @@ void if_freenameindex(struct if_nameindex *__ptr) {
        if_freenameindexp(__ptr);
 
        AFTER_ORIGINAL_LIBC_SOCK(NULL, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", __ptr);
+                                info, "p", voidp_to_uint64(__ptr));
 }
 
 int getifaddrs(struct ifaddrs **ifap) {
@@ -1534,7 +1652,7 @@ int getifaddrs(struct ifaddrs **ifap) {
        ret = getifaddrsp(ifap);
 
        AFTER_ORIGINAL_LIBC_SOCK(ret, OBJ_DUMMY, 0, SOCKET_API_OTHER,
-                       info, "p", ifap);
+                                info, "p", voidp_to_uint64(ifap));
 
        return ret;
 }
@@ -1547,7 +1665,7 @@ void freeifaddrs(struct ifaddrs *ifa) {
        freeifaddrsp(ifa);
 
        AFTER_ORIGINAL_LIBC_SOCK(NULL, OBJ_DUMMY, 0, SOCKET_API_OTHER, info,
-                                "p", ifa);
+                                "p", voidp_to_uint64(ifa));
 }
 
 //To do
index c9efc78..d2cc1cf 100644 (file)
@@ -53,7 +53,8 @@ int pthread_mutex_init(pthread_mutex_t *mutex,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_init,
                                 ret, mutex, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pp", mutex, attr);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(mutex), voidp_to_uint64(attr));
 
        return ret;
 }
@@ -67,7 +68,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_destroy,
                                 ret, mutex, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "p", mutex);
+                                SYNC_API_OTHER, "p", voidp_to_uint64(mutex));
 
        return ret;
 }
@@ -91,7 +92,7 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) {
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                          API_ID_pthread_mutex_lock,
-                         "p", mutex);
+                         "p", voidp_to_uint64(mutex));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
        FLUSH_LOCAL_BUF();
@@ -108,7 +109,7 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_pthread_mutex_lock,
-                                 "p", mutex);
+                                 "p", voidp_to_uint64(mutex));
                PACK_COMMON_END(ret, errno, blockresult);
                PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -132,7 +133,8 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex,
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                          API_ID_pthread_mutex_timedlock,
-                         "pp", mutex, abs_timeout);
+                         "pp", voidp_to_uint64(mutex),
+                         voidp_to_uint64(abs_timeout));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
        FLUSH_LOCAL_BUF();
@@ -149,7 +151,8 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_pthread_mutex_timedlock,
-                                 "pp", mutex, abs_timeout);
+                                 "pp", voidp_to_uint64(mutex),
+                                 voidp_to_uint64(abs_timeout));
                PACK_COMMON_END(ret, errno, blockresult);
                PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -169,7 +172,8 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_trylock,
                                 ret, mutex, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_TRY_ACQUIRE, "p", mutex);
+                                SYNC_API_TRY_ACQUIRE, "p",
+                                voidp_to_uint64(mutex));
 
        return ret;
 }
@@ -191,7 +195,8 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_unlock,
                                 ret, mutex, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_RELEASE, "p", mutex);
+                                SYNC_API_RELEASE, "p",
+                                voidp_to_uint64(mutex));
 
        return ret;
 }
@@ -205,7 +210,8 @@ int pthread_mutexattr_init(pthread_mutexattr_t *attr) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_init,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "p", attr);
+                                SYNC_API_OTHER, "p",
+                                voidp_to_uint64(attr));
 
        return ret;
 }
@@ -219,7 +225,8 @@ int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_destroy,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "p", attr);
+                                SYNC_API_OTHER, "p",
+                                voidp_to_uint64(attr));
 
        return ret;
 }
@@ -235,7 +242,9 @@ int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getprioceiling,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pp", attr, prioceiling);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(attr),
+                                voidp_to_uint64(prioceiling));
 
        return ret;
 }
@@ -251,7 +260,8 @@ int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setprioceiling,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pd", attr, prioceiling);
+                                SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
+                                prioceiling);
 
        return ret;
 }
@@ -267,7 +277,9 @@ int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getprotocol,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pp", attr, protocol);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(attr),
+                                voidp_to_uint64(protocol));
 
        return ret;
 }
@@ -283,7 +295,8 @@ int pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setprotocol,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pd", attr, protocol);
+                                SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
+                                protocol);
 
        return ret;
 }
@@ -299,7 +312,9 @@ int pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getpshared,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pp", attr, pshared);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(attr),
+                                voidp_to_uint64(pshared));
 
        return ret;
 }
@@ -315,7 +330,8 @@ int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr,
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setpshared,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pd", attr, pshared);
+                                SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
+                                pshared);
 
        return ret;
 }
@@ -330,7 +346,9 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_gettype,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pp", attr, type);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(attr),
+                                voidp_to_uint64(type));
 
        return ret;
 }
@@ -345,7 +363,9 @@ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_settype,
                                 ret, 0, SYNC_PTHREAD_MUTEX,
-                                SYNC_API_OTHER, "pd", attr, type);
+                                SYNC_API_OTHER, "pd",
+                                voidp_to_uint64(attr),
+                                type);
 
        return ret;
 }
@@ -367,7 +387,9 @@ int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_init,
                                 ret, cond, SYNC_PTHREAD_COND_VARIABLE,
-                                SYNC_API_OTHER, "pp", cond, attr);
+                                SYNC_API_OTHER, "pp",
+                                voidp_to_uint64(cond),
+                                voidp_to_uint64(attr));
 
        return ret;
 }
@@ -381,7 +403,8 @@ int pthread_cond_destroy(pthread_cond_t *cond) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_destroy,
                                 ret, cond, SYNC_PTHREAD_COND_VARIABLE,
-                                SYNC_API_OTHER, "p", cond);
+                                SYNC_API_OTHER, "p",
+                                voidp_to_uint64(cond));
 
        return ret;
 }
@@ -399,7 +422,9 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                          API_ID_pthread_cond_wait,
-                         "pp", cond, mutex);
+                         "pp",
+                         voidp_to_uint64(cond),
+                         voidp_to_uint64(mutex));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_START);
        FLUSH_LOCAL_BUF();
@@ -416,7 +441,9 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_pthread_cond_wait,
-                                 "pp", cond, mutex);
+                                 "pp",
+                                 voidp_to_uint64(cond),
+                                 voidp_to_uint64(mutex));
                PACK_COMMON_END(ret, errno, blockresult);
                PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -441,7 +468,10 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                          API_ID_pthread_cond_timedwait,
-                         "ppp", cond, mutex, abstime);
+                         "ppp",
+                         voidp_to_uint64(cond),
+                         voidp_to_uint64(mutex),
+                         voidp_to_uint64(abstime));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_START);
        FLUSH_LOCAL_BUF();
@@ -458,7 +488,10 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_pthread_cond_timedwait,
-                                 "ppp", cond, mutex, abstime);
+                                 "ppp",
+                                 voidp_to_uint64(cond),
+                                 voidp_to_uint64(mutex),
+                                 voidp_to_uint64(abstime));
                PACK_COMMON_END(ret, errno, blockresult);
                PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -478,7 +511,7 @@ int pthread_cond_signal(pthread_cond_t *cond) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_signal,
                                 ret, cond, SYNC_PTHREAD_COND_VARIABLE,
-                       SYNC_API_NOTIFY, "p", cond);
+                                SYNC_API_NOTIFY, "p", voidp_to_uint64(cond));
 
        return ret;
 }
@@ -492,7 +525,7 @@ int pthread_cond_broadcast(pthread_cond_t *cond) {
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_broadcast,
                                 ret, cond, SYNC_PTHREAD_COND_VARIABLE,
-                                SYNC_API_NOTIFY_ALL, "p", cond);
+                                SYNC_API_NOTIFY_ALL, "p", voidp_to_uint64(cond));
 
        return ret;
 }
index 9140ad8..47f5220 100644 (file)
@@ -64,7 +64,7 @@ void _da_cleanup_handler(void *data)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_cleanup_handler,
-                         "p", data);
+                         "p", voidp_to_uint64(data));
        PACK_COMMON_END(0, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_STOP);
        FLUSH_LOCAL_BUF();
@@ -95,7 +95,7 @@ void *_da_ThreadProc(void *params)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_ThreadProc,
-                         "p", params);
+                         "p", voidp_to_uint64(params));
        PACK_COMMON_END(0, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_START);
        FLUSH_LOCAL_BUF();
@@ -120,7 +120,7 @@ void *_da_ThreadProc(void *params)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_ThreadProc,
-                         "p", params);
+                         "p", voidp_to_uint64(params));
        PACK_COMMON_END(ret, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_STOP);
        FLUSH_LOCAL_BUF();
@@ -157,7 +157,11 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_create,
                                   ret, *thread, THREAD_API_START,
-                                  "pppp", thread, attr, start_routine, arg);
+                                  "pppp",
+                                  voidp_to_uint64(thread),
+                                  voidp_to_uint64(attr),
+                                  voidp_to_uint64(start_routine),
+                                  voidp_to_uint64(arg));
 
        return ret;
 }
@@ -174,7 +178,7 @@ int pthread_join(pthread_t thread, void **retval)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID_pthread_join,
-                         "xp", thread, retval);
+                         "xp", (uint64_t)(thread), voidp_to_uint64(retval));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_THREAD(thread, THREAD_PTHREAD, THREAD_API_WAIT_START);
        FLUSH_LOCAL_BUF();
@@ -191,7 +195,9 @@ int pthread_join(pthread_t thread, void **retval)
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_pthread_join,
-                                 "xp", thread, retval);
+                                 "xp",
+                                 (uint64_t)(thread),
+                                 voidp_to_uint64(retval));
                PACK_COMMON_END(ret, errno, blockresult);
                PACK_THREAD(thread, THREAD_PTHREAD, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -217,7 +223,7 @@ void pthread_exit(void *retval)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID_pthread_exit,
-                         "p", retval);
+                         "p", voidp_to_uint64(retval));
        PACK_COMMON_END(0, 0, blockresult);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_EXIT);
        FLUSH_LOCAL_BUF();
@@ -236,7 +242,8 @@ int pthread_cancel(pthread_t thread)
        ret = pthread_cancelp(thread);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_cancel,
-                                  ret, thread, THREAD_API_STOP, "x", thread);
+                                  ret, thread, THREAD_API_STOP, "x",
+                                  (uint64_t)(thread));
 
        return ret;
 }
@@ -250,7 +257,8 @@ int pthread_detach(pthread_t thread)
        ret = pthread_detachp(thread);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_detach,
-                                  ret, thread, THREAD_API_OTHER, "x", thread);
+                                  ret, thread, THREAD_API_OTHER, "x",
+                                  (uint64_t)(thread));
 
        return ret;
 }
@@ -281,7 +289,8 @@ int pthread_equal(pthread_t t1, pthread_t t2)
        ret = pthread_equalp(t1, t2);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_equal,
-                                  ret, t1, THREAD_API_OTHER, "xx", t1, t2);
+                                  ret, t1, THREAD_API_OTHER, "xx",
+                                  (uint64_t)(t1), (uint64_t)(t2));
 
        return ret;
 }
@@ -307,7 +316,7 @@ int pthread_setcancelstate(int state, int *oldstate)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_setcancelstate,
                                   ret, pSelf, THREAD_API_OTHER,
-                                  "dp", state, oldstate);
+                                  "dp", state, voidp_to_uint64(oldstate));
 
        return ret;
 }
@@ -324,7 +333,7 @@ int pthread_setcanceltype(int type, int *oldtype)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_setcanceltype,
                                   ret, pSelf, THREAD_API_OTHER,
-                                  "dp", type, oldtype);
+                                  "dp", type, voidp_to_uint64(oldtype));
 
        return ret;
 }
@@ -339,7 +348,8 @@ int pthread_attr_init(pthread_attr_t *attr)
        ret = pthread_attr_initp(attr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_init,
-                                  ret, thread, THREAD_API_OTHER, "p", attr);
+                                  ret, thread, THREAD_API_OTHER, "p",
+                                  voidp_to_uint64(attr));
 
        return ret;
 }
@@ -354,7 +364,8 @@ int pthread_attr_destroy(pthread_attr_t *attr)
        ret = pthread_attr_destroyp(attr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_destroy,
-                                  ret, thread, THREAD_API_OTHER, "p", attr);
+                                  ret, thread, THREAD_API_OTHER, "p",
+                                  voidp_to_uint64(attr));
 
        return ret;
 }
@@ -371,7 +382,8 @@ int pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getdetachstate,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, detachstate);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(detachstate));
 
        return ret;
 }
@@ -388,7 +400,8 @@ int pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setdetachstate,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pd", attr, detachstate);
+                                  "pd", voidp_to_uint64(attr),
+                                  detachstate);
 
        return ret;
 }
@@ -405,7 +418,8 @@ int pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstacksize,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, stacksize);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(stacksize));
 
        return ret;
 }
@@ -422,7 +436,8 @@ int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstacksize,
                                   ret, thread, THREAD_API_OTHER,
-                                  "px", attr, stacksize);
+                                  "px", voidp_to_uint64(attr),
+                                  (uint64_t)(stacksize));
 
        return ret;
 }
@@ -439,7 +454,8 @@ int pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstackaddr,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, stackaddr);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(stackaddr));
 
        return ret;
 }
@@ -456,7 +472,9 @@ int pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstackaddr,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, stackaddr);
+                                  "pp",
+                                  voidp_to_uint64(attr),
+                                  voidp_to_uint64(stackaddr));
 
        return ret;
 }
@@ -473,7 +491,8 @@ int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inheritsched)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getinheritsched,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, inheritsched);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(inheritsched));
 
        return ret;
 }
@@ -490,7 +509,8 @@ int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setinheritsched,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pd", attr, inheritsched);
+                                  "pd", voidp_to_uint64(attr),
+                                  inheritsched);
 
        return ret;
 }
@@ -508,7 +528,8 @@ int pthread_attr_getschedparam(const pthread_attr_t *attr,
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getschedparam,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, param);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(param));
 
        return ret;
 }
@@ -526,7 +547,9 @@ int pthread_attr_setschedparam(pthread_attr_t *attr,
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setschedparam,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, param);
+                                  "pp",
+                                  voidp_to_uint64(attr),
+                                  voidp_to_uint64(param));
 
        return ret;
 }
@@ -543,7 +566,8 @@ int pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getschedpolicy,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, policy);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(policy));
 
        return ret;
 }
@@ -560,7 +584,8 @@ int pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setschedpolicy,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pd", attr, policy);
+                                  "pd", voidp_to_uint64(attr),
+                                  policy);
 
        return ret;
 }
@@ -577,7 +602,8 @@ int pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getguardsize,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, guardsize);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(guardsize));
 
        return ret;
 }
@@ -594,7 +620,8 @@ int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setguardsize,
                                   ret, thread, THREAD_API_OTHER,
-                                  "px", attr, guardsize);
+                                  "px", voidp_to_uint64(attr),
+                                  (uint64_t)(guardsize));
 
        return ret;
 }
@@ -611,7 +638,8 @@ int pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getscope,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pp", attr, contentionscope);
+                                  "pp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(contentionscope));
 
        return ret;
 }
@@ -628,7 +656,7 @@ int pthread_attr_setscope(pthread_attr_t *attr, int contentionscope)
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setscope,
                                   ret, thread, THREAD_API_OTHER,
-                                  "pd", attr, contentionscope);
+                                  "pd", voidp_to_uint64(attr), contentionscope);
 
        return ret;
 }
@@ -646,7 +674,9 @@ int pthread_attr_getstack(const pthread_attr_t *attr,
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstack,
                                   ret, thread, THREAD_API_OTHER,
-                                  "ppp", attr, stackaddr, stacksize);
+                                  "ppp", voidp_to_uint64(attr),
+                                  voidp_to_uint64(stackaddr),
+                                  voidp_to_uint64(stacksize));
 
        return ret;
 }
@@ -664,7 +694,9 @@ int pthread_attr_setstack(pthread_attr_t *attr,
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstack,
                                   ret, thread, THREAD_API_OTHER,
-                                  "ppx", attr, stackaddr, stacksize);
+                                  "ppx", voidp_to_uint64(attr),
+                                  voidp_to_uint64(stackaddr),
+                                  (uint64_t)(stacksize));
 
        return ret;
 }
index 74721bc..59e955a 100755 (executable)
@@ -75,7 +75,7 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame)
                        PREPARE_LOCAL_BUF();
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_UiApp__AddFrame_const_Tizen__Ui__Controls__Frame__frame_,
-                                         "p", &frame);
+                                         "p", voidp_to_uint64(&frame));
                        PACK_COMMON_END(ret, 0, 0);
                        PACK_UICONTROL(parent);
                        PACK_UICONTROL(&frame);
@@ -110,7 +110,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame)
 
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_UiApp__RemoveFrame_const_Tizen__Ui__Controls__Frame__frame_,
-                                 "p", &frame);
+                                 "p", voidp_to_uint64(&frame));
                PACK_COMMON_END(0, 0, 0);
                PACK_UICONTROL(parent);
                PACK_UICONTROL(&frame);
@@ -173,7 +173,7 @@ void Control::SetName(const Tizen::Base::String &name)
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_void_Control__SetName_const_Tizen__Base__String__name_,
-                                 "p", &name);
+                                 "p", voidp_to_uint64(&name));
                PACK_COMMON_END(0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(parent);
@@ -228,7 +228,7 @@ result Container::AddControl(const Control &control)
                        PREPARE_LOCAL_BUF();
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_Container__AddControl_const_Control__control_,
-                                         "p", &control);
+                                         "p", voidp_to_uint64(&control));
                        PACK_COMMON_END(ret, 0, 0);
                        PACK_UICONTROL(this);
                        PACK_UICONTROL(&control);
@@ -286,7 +286,7 @@ result Container::AddControl(Control* control)
                        PREPARE_LOCAL_BUF();
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_Container__AddControl_Control__control_,
-                                         "p", control);
+                                         "p", voidp_to_uint64(control));
                        PACK_COMMON_END(ret, 0, 0);
                        PACK_UICONTROL(this);
                        PACK_UICONTROL(control);
@@ -320,7 +320,7 @@ result Container::RemoveControl(const Control &control)
 
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_Container__RemoveControl_const_Control__control_,
-                                 "p", &control);
+                                 "p", voidp_to_uint64(&control));
                PACK_COMMON_END(0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(&control);
@@ -365,7 +365,7 @@ result Container::RemoveControl(Control* control)
 
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_Container__RemoveControl_Control__control_,
-                                 "p", control);
+                                 "p", voidp_to_uint64(control));
                PACK_COMMON_END(0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(control);
index 03dd1b7..f622d64 100755 (executable)
@@ -206,7 +206,7 @@ result File::Construct(const Tizen::Base::String& filePath,
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode_,
                                  "sp", absolutize_filepath(buffer, temp),
-                                 pOpenMode);
+                                 voidp_to_uint64(pOpenMode));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp);
                FLUSH_LOCAL_BUF();
@@ -262,7 +262,8 @@ result File::Construct(const Tizen::Base::String& filePath,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode__const_Tizen__Base__ByteBuffer__secretKey_,
-                                 "sp", temp, pOpenMode);
+                                 "sp", temp,
+                                 voidp_to_uint64(pOpenMode));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp);
                FLUSH_LOCAL_BUF();
@@ -412,7 +413,7 @@ result File::Read(Tizen::Base::String& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__String__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
@@ -432,7 +433,7 @@ result File::Read(Tizen::Base::String& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__String__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
@@ -479,7 +480,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
@@ -499,7 +500,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
@@ -546,7 +547,7 @@ int File::Read(void *buffer, int length) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_int_File__Read_void__buffer__int_length_,
-                                 "xd", (unsigned long)buffer, length);
+                                 "xd", (uint64_t)(buffer), length);
                PACK_COMMON_END(0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
@@ -567,7 +568,7 @@ int File::Read(void *buffer, int length) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_int_File__Read_void__buffer__int_length_,
-                                 "xd", (unsigned long)buffer, length);
+                                 "xd", (uint64_t)(buffer), length);
                PACK_COMMON_END(ret, res, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
@@ -632,7 +633,7 @@ result File::Seek(FileSeekPosition position, long offset) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Seek_FileSeekPosition_position__long_offset_,
-                                 "sx", temp_pos, offset);
+                                 "sx", temp_pos, (uint64_t)(offset));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
@@ -783,7 +784,7 @@ result File::Write(const void *buffer, int length) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_void__buffer__int_length_,
-                                 "xd", (unsigned long)buffer, length);
+                                 "xd", (uint64_t)(buffer), length);
                PACK_COMMON_END(0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp);
                FLUSH_LOCAL_BUF();
@@ -803,7 +804,7 @@ result File::Write(const void *buffer, int length) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_void__buffer__int_length_,
-                                 "xd", (unsigned long)buffer, length);
+                                 "xd", (uint64_t)(buffer), length);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp);
                FLUSH_LOCAL_BUF();
@@ -850,7 +851,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp);
                FLUSH_LOCAL_BUF();
@@ -870,7 +871,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_,
-                                 "x", (unsigned long)&buffer);
+                                 "x", (uint64_t)(&buffer));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp);
                FLUSH_LOCAL_BUF();
index 9b96338..7eb5e0c 100755 (executable)
@@ -384,9 +384,11 @@ result HttpSession::Construct(NetHttpSessionMode sessionMode,
        WcharToChar(temp2, hostAddr.GetPointer());
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpSession::Construct", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_SESSION_CONSTRUCT,
-                       info, "dssxd",
-                       sessionMode, temp1, temp2, (unsigned int)&pCommonHeader, flag);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_SESSION_CONSTRUCT,
+                                 info, "dssxd",
+                                 sessionMode, temp1, temp2,
+                                 voidp_to_uint64(&pCommonHeader), flag);
        return retVal;
 }
 
@@ -420,9 +422,12 @@ result HttpSession::Construct(const NetConnection& netConnection,
        WcharToChar(temp2, hostAddr.GetPointer());
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpSession::Construct", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_SESSION_CONSTRUCT,
-                       info, "xdssxd",
-                       (unsigned int)&netConnection, sessionMode, temp1, temp2, (unsigned int)&pCommonHeader, flag);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_SESSION_CONSTRUCT,
+                                 info, "xdssxd",
+                                 voidp_to_uint64(&netConnection), sessionMode,
+                                 temp1, temp2,
+                                 voidp_to_uint64(&pCommonHeader), flag);
        return retVal;
 }
 
@@ -463,8 +468,9 @@ HttpTransaction* HttpSession::OpenTransactionN(const HttpAuthentication& auth)
        if (retVal == NULL)
                newerrno = 1;
        AFTER_ORIGINAL_TIZEN_SOCK("HttpSession::OpenTransactionN", VT_PTR, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_TRANSACTION_OPEN,
-                       info, "x", (unsigned int)&auth);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_TRANSACTION_OPEN,
+                                 info, "x", voidp_to_uint64(&auth));
        return retVal;
 
 }
@@ -483,9 +489,10 @@ result HttpSession::CancelTransaction(HttpTransaction& httpTransaction)
        retVal = (this->*CancelTransactionp)(httpTransaction);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpSession::CancelTransaction", VT_ULONG,
-                       retVal, (unsigned int)this, (unsigned int)this,
-                       HTTP_API_TRANSACTION_CLOSE, info, "x",
-                       (unsigned int)&httpTransaction);
+                                 retVal, (unsigned int)this,
+                                 (unsigned int)this,
+                                 HTTP_API_TRANSACTION_CLOSE, info, "x",
+                                 voidp_to_uint64(&httpTransaction));
 
        return retVal;
 }
@@ -504,8 +511,9 @@ result HttpSession::CloseTransaction(HttpTransaction& httpTransaction)
        retVal = (this->*CloseTransactionp)(httpTransaction);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpSession::CloseTransaction", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_TRANSACTION_CLOSE,
-                       info, "x", (unsigned int)&httpTransaction);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_TRANSACTION_CLOSE,
+                                 info, "x", voidp_to_uint64(&httpTransaction));
 
        return retVal;
 }
@@ -789,8 +797,10 @@ result HttpTransaction::AddHttpTransactionListener(
        retVal = (this->*AddHttpTransactionListenerp)(listener);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpTransaction::AddHttpTransactionListener",
-                       VT_ULONG, retVal, (unsigned int)this, (unsigned int)this,
-                       HTTP_API_OTHER, info, "x", (unsigned int)&listener);
+                                 VT_ULONG, retVal, (unsigned int)this,
+                                 (unsigned int)this,
+                                 HTTP_API_OTHER, info,
+                                 "x", voidp_to_uint64(&listener));
        return retVal;
 }
 
@@ -808,8 +818,10 @@ result HttpTransaction::RemoveHttpTransactionListener(
        retVal = (this->*RemoveHttpTransactionListenerp)(listener);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpTransaction::RemoveHttpTransactionListener",
-                       VT_ULONG, retVal, (unsigned int)this, (unsigned int)this,
-                       HTTP_API_OTHER, info, "x", (unsigned int)&listener);
+                                 VT_ULONG, retVal, (unsigned int)this,
+                                 (unsigned int)this,
+                                 HTTP_API_OTHER, info, "x",
+                                 voidp_to_uint64(&listener));
        return retVal;
 }
 
@@ -827,8 +839,10 @@ result HttpTransaction::SetHttpProgressListener(
        retVal = (this->*SetHttpProgressListenerp)(listener);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpTransaction::SetHttpProgressListener",
-                       VT_ULONG, retVal, (unsigned int)this, (unsigned int)this,
-                       HTTP_API_OTHER, info, "x", (unsigned int)&listener);
+                                 VT_ULONG, retVal, (unsigned int)this,
+                                 (unsigned int)this,
+                                 HTTP_API_OTHER, info, "x",
+                                 voidp_to_uint64(&listener));
        return retVal;
 }
 
@@ -846,9 +860,10 @@ result HttpTransaction::SetUserObject(const Tizen::Base::Object* pUserData)
        retVal = (this->*SetUserObjectp)(pUserData);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpTransaction::SetUserObject", VT_ULONG,
-                                 retVal, (unsigned int)this, (unsigned int)this,
+                                 retVal, (unsigned int)this,
+                                 (unsigned int)this,
                                  HTTP_API_OTHER, info, "x",
-                                 (unsigned int)&pUserData);
+                                 voidp_to_uint64(&pUserData));
        return retVal;
 }
 
@@ -1198,9 +1213,10 @@ result HttpRequest::SetCustomMethod(const Tizen::Base::String& method)
        info.msg_pack_size = nSize;
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpRequest::SetCustomMethod", VT_ULONG,
-                                 retVal, (unsigned int)this, (unsigned int)this,
+                                 retVal, (unsigned int)this,
+                                 (unsigned int)this,
                                  HTTP_API_REQUEST, info, "x",
-                                 (unsigned int)&method);
+                                 voidp_to_uint64(&method));
        return retVal;
 }
 
@@ -1271,7 +1287,7 @@ result HttpRequest::WriteBody(const Tizen::Base::ByteBuffer& body)
        AFTER_ORIGINAL_TIZEN_SOCK("HttpRequest::WriteBody", VT_ULONG, retVal,
                                  (unsigned int)this, (unsigned int)this,
                                  HTTP_API_REQUEST, info, "x",
-                                 (unsigned int)&body);
+                                 voidp_to_uint64(&body));
        delete [] out;
        return retVal;
 }
@@ -1289,8 +1305,9 @@ result HttpRequest::SetEntity(IHttpEntity& entity)
        retVal = (this->*SetEntityp)(entity);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpRequest::SetEntity", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_OTHER, info,
-                       "x", (unsigned int)& entity);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_OTHER, info,
+                                 "x", voidp_to_uint64(&entity));
        return retVal;
 }
 
@@ -1334,7 +1351,7 @@ result HttpRequest::SetCookie(const Tizen::Base::String& cookieString)
        AFTER_ORIGINAL_TIZEN_SOCK("HttpRequest::SetCookie", VT_ULONG, retVal,
                                  (unsigned int)this, (unsigned int)this,
                                  HTTP_API_REQUEST, info, "x",
-                                 (unsigned int)&cookieString);
+                                 voidp_to_uint64(&cookieString));
        return retVal;
 }
 
@@ -1732,8 +1749,9 @@ result HttpResponse::WriteBody(const Tizen::Base::ByteBuffer& body)
        info.msg_total_size = bufferSize;
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpResponse::WriteBody", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_RESPONSE,
-                       info, "x", (unsigned int)&body);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_RESPONSE,
+                                 info, "x", voidp_to_uint64(&body));
        delete out;
        return retVal;
 }
@@ -1751,9 +1769,11 @@ result HttpResponse::Read(int headerLen, int bodyLen, int& rcvHeaderLen,
        retVal = (this->*Readp)(headerLen, bodyLen, rcvHeaderLen, rcvBodyLen);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpResponse::Read", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_OTHER, info,
-                       "ddxx",
-                       headerLen, bodyLen, (unsigned int)&rcvHeaderLen, (unsigned int)&rcvBodyLen);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_OTHER, info,
+                                 "ddxx", headerLen, bodyLen,
+                                 voidp_to_uint64(&rcvHeaderLen),
+                                 voidp_to_uint64(&rcvBodyLen));
        return retVal;
 }
 
@@ -1771,8 +1791,9 @@ result HttpResponse::SetCookie(Tizen::Net::Http::HttpHeader* pHeader)
        retVal = (this->*SetCookiep)(pHeader);
 
        AFTER_ORIGINAL_TIZEN_SOCK("HttpResponse::SetCookie", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, HTTP_API_OTHER, info,
-                       "x", (unsigned int)&pHeader);
+                                 (unsigned int)this, (unsigned int)this,
+                                 HTTP_API_OTHER, info,
+                                 "x", voidp_to_uint64(&pHeader));
        return retVal;
 }
 
index d82e095..6756606 100755 (executable)
@@ -107,7 +107,8 @@ result UiApp::Execute(UiAppInstanceFactory pUiAppFactory,
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                          API_ID_result_UiApp__Execute_UiAppInstanceFactory_pUiAppFactory__const_IList__pArguments_,
-                         "pp", pUiAppFactory, pArguments);
+                         "pp", (uint64_t)(pUiAppFactory),
+                         voidp_to_uint64(pArguments));
        PACK_COMMON_END(ret, 0, 0);
        FLUSH_LOCAL_BUF();
 
@@ -131,7 +132,7 @@ void _AppImpl::OnTerminate(void* user_data)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                          API_ID_void__AppImpl__OnTerminate_void__user_data_,
-                         "p", user_data);
+                         "p", voidp_to_uint64(user_data));
        PACK_COMMON_END(0, 0, 0);
        FLUSH_LOCAL_BUF();
 
@@ -171,7 +172,7 @@ void _AppInfo::SetAppState(AppState appState)
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                                  API_ID_void__AppInfo__SetAppState_AppState_appState_,
-                                 "p", appState);
+                                 "p", (uint64_t)(appState));
                PACK_COMMON_END(0, 0, 0);
                FLUSH_LOCAL_BUF();
        }
index c0f7e9b..bd61987 100644 (file)
@@ -476,7 +476,7 @@ result Socket::Construct(const NetConnection& netConnection,
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::Construct", VT_ULONG, retVal,
                        (unsigned int)this, (unsigned int)this, SOCKET_API_FD_OPEN, 
                        info, "xddd",
-                       (unsigned int)&netConnection, addressFamily, socketType, protocol);
+                       (uint64_t)(&netConnection), addressFamily, socketType, protocol);
 
        return retVal;
 }
@@ -599,7 +599,7 @@ result Socket::Receive(Tizen::Base::ByteBuffer& buffer) const {
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::Receive", VT_NULL, NULL,
                        (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_START,
-                       info, "x", (unsigned int)&buffer);
+                       info, "x", (uint64_t)(&buffer));
 
        pret = (this->*Receivep)(buffer);
 
@@ -612,7 +612,7 @@ result Socket::Receive(Tizen::Base::ByteBuffer& buffer) const {
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::Receive", VT_ULONG, pret,
                        (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_END,
-                       info, "x", (unsigned int)&buffer);
+                       info, "x", (uint64_t)(&buffer));
        return pret;
 }
 
@@ -626,19 +626,29 @@ result Socket::Receive(void* pBuffer, int length, int& rcvdLength) const {
                        _ZNK5Tizen3Net7Sockets6Socket11ReceiveFromEPviRNS0_11NetEndPointERi,
                        Receivep);
 
-       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::Receive", VT_NULL, NULL,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_START, 
-                       info, "xdx",
-                       (unsigned int)&pBuffer, length, rcvdLength);
+       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::Receive", VT_NULL,
+                                                 NULL,
+                                                 (unsigned int)this,
+                                                 (unsigned int)this,
+                                                 SOCKET_API_RECV_START,
+                                                 info, "xdx",
+                                                 (uint64_t)(&pBuffer),
+                                                 length,
+                                                 (uint64_t)(rcvdLength));
 
        pret = (this->*Receivep)(pBuffer, length, rcvdLength);
        info.msg_buf = (char *)pBuffer;
        info.msg_total_size = rcvdLength;
        info.msg_pack_size = rcvdLength > SOCKET_SEND_SIZE ? SOCKET_SEND_SIZE : rcvdLength;
 
-       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::Receive", VT_ULONG, pret,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_END,
-                       info, "xdx", (unsigned int)&pBuffer, length, rcvdLength);
+       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::Receive", VT_ULONG,
+                                               pret,
+                                               (unsigned int)this,
+                                               (unsigned int)this,
+                                               SOCKET_API_RECV_END,
+                                               info, "xdx",
+                                               (uint64_t)(&pBuffer), length,
+                                               (uint64_t)(rcvdLength));
 
        return pret;
 }
@@ -665,7 +675,7 @@ result Socket::ReceiveFrom(Tizen::Base::ByteBuffer& buffer,
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::ReceiveFrom", VT_NULL,
                        NULL, (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_START,
                        
-                       info, "xs", (unsigned int)&buffer, temp);
+                       info, "xs", (uint64_t)(&buffer), temp);
 
        pret = (this->*ReceiveFromp)(buffer, remoteEndPoint);
 
@@ -683,7 +693,7 @@ result Socket::ReceiveFrom(Tizen::Base::ByteBuffer& buffer,
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::ReceiveFrom", VT_ULONG,
                        pret, (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_END,
-                       info, "xs", (unsigned int)&buffer, temp);
+                       info, "xs", (uint64_t)(&buffer), temp);
        delete [] out;
        return pret;
 }
@@ -706,10 +716,15 @@ result Socket::ReceiveFrom(void* pBuffer, int length,
        info.host_port = remoteEndPoint.GetPort();
        iv4PeerAddr->GetAddress(&info.host_ip);
 
-       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::ReceiveFrom", VT_NULL,
-                       NULL, (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_START,
-                        info, "xdsx",
-                       (unsigned int)&pBuffer, length, temp, rcvdLength);
+       AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::ReceiveFrom",
+                                                 VT_NULL,
+                                                 NULL, (unsigned int)this,
+                                                 (unsigned int)this,
+                                                 SOCKET_API_RECV_START,
+                                                 info, "xdsx",
+                                                 (uint64_t)(&pBuffer),
+                                                 length, temp,
+                                                 (uint64_t)(rcvdLength));
 
        pret = (this->*ReceiveFromp)(pBuffer, length, remoteEndPoint, rcvdLength);
 
@@ -718,8 +733,13 @@ result Socket::ReceiveFrom(void* pBuffer, int length,
        info.msg_pack_size = length > SOCKET_SEND_SIZE ? SOCKET_SEND_SIZE : length;
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::ReceiveFrom", VT_ULONG,
-                       pret, (unsigned int)this, (unsigned int)this, SOCKET_API_RECV_END,
-                       info, "xdsx", (unsigned int)&pBuffer, length, temp, rcvdLength);
+                                               pret, (unsigned int)this,
+                                               (unsigned int)this,
+                                               SOCKET_API_RECV_END,
+                                               info, "xdsx",
+                                               (uint64_t)(&pBuffer),
+                                               length, temp,
+                                               (uint64_t)(rcvdLength));
 
        return pret;
 }
@@ -733,8 +753,11 @@ result Socket::Send(Tizen::Base::ByteBuffer& buffer) {
                        _ZN5Tizen3Net7Sockets6Socket4SendERNS_4Base10ByteBufferE, Sendp);
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::Send", VT_NULL, NULL,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_START,
-                       info, "x", (unsigned int)&buffer);
+                                                 (unsigned int)this,
+                                                 (unsigned int)this,
+                                                 SOCKET_API_SEND_START,
+                                                 info, "x",
+                                                 (uint64_t)(&buffer));
 
        pret = (this->*Sendp)(buffer);
        int bufferSize = buffer.GetLimit();
@@ -750,8 +773,11 @@ result Socket::Send(Tizen::Base::ByteBuffer& buffer) {
        info.msg_pack_size = bufferSize > SOCKET_SEND_SIZE ? SOCKET_SEND_SIZE : bufferSize;
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::Send", VT_ULONG, pret,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_END,
-                       info, "x", (unsigned int)&buffer);
+                                               (unsigned int)this,
+                                               (unsigned int)this,
+                                               SOCKET_API_SEND_END,
+                                               info, "x",
+                                               (uint64_t)(&buffer));
        delete [] out;
        return pret;
 }
@@ -767,9 +793,13 @@ result Socket::Send(void* pBuffer, int length, int& sentLength) {
                        Sendp);
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::Send", VT_NULL, NULL,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_START, 
-                       info, "xdx",
-                       (unsigned int)&pBuffer, length, (unsigned int)&sentLength);
+                                                 (unsigned int)this,
+                                                 (unsigned int)this,
+                                                 SOCKET_API_SEND_START,
+                                                 info, "xdx",
+                                                 (uint64_t)(&pBuffer),
+                                                 length,
+                                                 (uint64_t)(&sentLength));
 
        pret = (this->*Sendp)(pBuffer, length, sentLength);
 
@@ -778,8 +808,12 @@ result Socket::Send(void* pBuffer, int length, int& sentLength) {
        info.msg_pack_size = length > SOCKET_SEND_SIZE ? SOCKET_SEND_SIZE : length;
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::Send", VT_ULONG, pret,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_END,
-                       info, "xdx", (unsigned int)&pBuffer, length, (unsigned int)&sentLength);
+                                               (unsigned int)this,
+                                               (unsigned int)this,
+                                               SOCKET_API_SEND_END,
+                                               info, "xdx",
+                                               (uint64_t)(&pBuffer), length,
+                                               (uint64_t)(&sentLength));
 
        return pret;
 
@@ -805,8 +839,12 @@ result Socket::SendTo(Tizen::Base::ByteBuffer& buffer,
        iv4PeerAddr->GetAddress(&info.host_ip);
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_START("Socket::SendTo", VT_NULL, NULL,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_START, 
-                       info, "xs", (unsigned int)&buffer, temp);
+                                                 (unsigned int)this,
+                                                 (unsigned int)this,
+                                                 SOCKET_API_SEND_START, 
+                                                 info, "xs",
+                                                 (uint64_t)(&buffer),
+                                                 temp);
 
        pret = (this->*SendTop)(buffer, remoteEndPoint);
 
@@ -823,8 +861,12 @@ result Socket::SendTo(Tizen::Base::ByteBuffer& buffer,
        info.msg_pack_size = bufferSize > SOCKET_SEND_SIZE ? SOCKET_SEND_SIZE : bufferSize;
 
        AFTER_ORIGINAL_TIZEN_SOCK_WAIT_FUNC_END("Socket::SendTo", VT_ULONG, pret,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_SEND_END,
-                       info, "xs", (unsigned int)&buffer, temp);
+                                               (unsigned int)this,
+                                               (unsigned int)this,
+                                               SOCKET_API_SEND_END,
+                                               info, "xs",
+                                               (uint64_t)(&buffer),
+                                               temp);
        delete [] out;
        return pret;
 }
@@ -918,8 +960,9 @@ result Socket::Ioctl(NetSocketIoctlCmd cmd, unsigned long& value) const {
        retVal = (this->*Ioctlp)(cmd, value);
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::Ioctl", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "dx", cmd, (unsigned int) &value);
+                                 (unsigned int)this, (unsigned int)this,
+                                 SOCKET_API_OTHER, info,
+                                 "dx", cmd, (uint64_t)(&value));
 
        return retVal;
 }
@@ -957,9 +1000,10 @@ result Socket::SetSockOpt(NetSocketOptLevel optionLevel,
        retVal = (this->*SetSockOptp)(optionLevel, optionName, optionValue);
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::SetSockOpt", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "ddx",
-                       optionLevel, optionName, (unsigned int) &optionValue);
+                                 (unsigned int)this, (unsigned int)this,
+                                 SOCKET_API_OTHER, info,
+                                 "ddx", optionLevel, optionName,
+                                 (uint64_t)(&optionValue));
 
        return retVal;
 }
@@ -979,9 +1023,10 @@ result Socket::SetSockOpt(NetSocketOptLevel optionLevel,
        retVal = (this->*SetSockOptp)(optionLevel, optionName, optionValue);
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::SetSockOpt", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "ddx",
-                       optionLevel, optionName, (unsigned int) &optionValue);
+                                 (unsigned int)this, (unsigned int)this,
+                                 SOCKET_API_OTHER, info,
+                                 "ddx", optionLevel, optionName,
+                                 (uint64_t)(&optionValue));
 
        return retVal;
 }
@@ -1000,9 +1045,10 @@ result Socket::GetSockOpt(NetSocketOptLevel optionLevel,
        retVal = (this->*GetSockOptp)(optionLevel, optionName, optionValue);
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::GetSockOpt", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "ddx",
-                       optionLevel, optionName, (unsigned int) &optionValue);
+                                 (unsigned int)this, (unsigned int)this,
+                                 SOCKET_API_OTHER, info,
+                                 "ddx", optionLevel, optionName,
+                                 (uint64_t)(&optionValue));
 
        return retVal;
 }
@@ -1021,9 +1067,10 @@ result Socket::GetSockOpt(NetSocketOptLevel optionLevel,
        retVal = (this->*GetSockOptp)(optionLevel, optionName, optionValue);
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::GetSockOpt", VT_ULONG, retVal,
-                       (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "ddx",
-                       optionLevel, optionName, (unsigned int) &optionValue);
+                                 (unsigned int)this, (unsigned int)this,
+                                 SOCKET_API_OTHER, info,
+                                 "ddx", optionLevel, optionName,
+                                 (uint64_t)(&optionValue));
 
        return retVal;
 }
@@ -1041,7 +1088,7 @@ result Socket::RemoveSocketListener(ISocketEventListener& listener) {
 
        AFTER_ORIGINAL_TIZEN_SOCK("Socket::RemoveSocketListener", VT_ULONG, retVal,
                        (unsigned int)this, (unsigned int)this, SOCKET_API_OTHER, info,
-                       "x", (unsigned int) &listener);
+                       "x", (uint64_t)(&listener));
 
        return retVal;
 }
index adae77a..30e11c7 100755 (executable)
@@ -470,7 +470,7 @@ result Semaphore::Acquire(long timeout) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
-                                 "x", timeout);
+                                 "x", (uint64_t)(timeout));
                PACK_COMMON_END(0, 0, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
@@ -486,7 +486,7 @@ result Semaphore::Acquire(long timeout) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
-                                 "x", timeout);
+                                 "x", (uint64_t)(timeout));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
index b332012..d8f6b53 100755 (executable)
@@ -162,7 +162,7 @@ _ThreadImpl::ThreadProc(void* params) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
-                                 "p", params);
+                                 "p", voidp_to_uint64(params));
                PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
                PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_START);
                FLUSH_LOCAL_BUF();
@@ -186,7 +186,7 @@ _ThreadImpl::ThreadProc(void* params) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
-                                 "p", params);
+                                 "p", voidp_to_uint64(params));
                PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
                PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_STOP);
                FLUSH_LOCAL_BUF();
@@ -469,7 +469,7 @@ result Thread::Sleep(long milliSeconds) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Sleep_long_milliSeconds_,
-                                 "x", milliSeconds);
+                                 "x", (uint64_t)(milliSeconds));
                PACK_COMMON_END(0, 0, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START);
                FLUSH_LOCAL_BUF();
@@ -488,7 +488,7 @@ result Thread::Sleep(long milliSeconds) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Yield_void_,
-                                 "x", milliSeconds);
+                                 "x", (uint64_t)(milliSeconds));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
@@ -704,7 +704,8 @@ result Thread::Construct(ThreadType threadType, long stackSize,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
-                                 "dxd", threadType, stackSize, priority);
+                                 "dxd", threadType, (uint64_t)(stackSize),
+                                 priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -755,7 +756,7 @@ result Thread::Construct(long stackSize, ThreadPriority priority) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_long_stackSize__ThreadPriority_priority_,
-                                 "xd", stackSize, priority);
+                                 "xd", (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -812,7 +813,7 @@ result Thread::Construct(const Tizen::Base::String &name, long stackSize,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
-                                 "sxd", temp, stackSize, priority);
+                                 "sxd", temp, (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -871,7 +872,8 @@ result Thread::Construct(const Tizen::Base::String &name, ThreadType threadType,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
-                                 "sdxd", temp, threadType, stackSize, priority);
+                                 "sdxd", temp, threadType,
+                                 (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -927,7 +929,8 @@ result Thread::Construct(IRunnable &target, long stackSize,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_IRunnable__target__long_stackSize__ThreadPriority_priority_,
-                                 "xxd", (unsigned int) &target, stackSize, priority);
+                                 "xxd", (uint64_t)(&target),
+                                 (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -986,7 +989,8 @@ result Thread::Construct(const Tizen::Base::String &name, IRunnable &target,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__IRunnable__target__long_stackSize__ThreadPriority_priority_,
-                                 "sxxd", temp, (unsigned int) &target, stackSize, priority);
+                                 "sxxd", temp, (uint64_t)(&target),
+                                 (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -1388,7 +1392,7 @@ result EventDrivenThread::Construct(long stackSize, ThreadPriority priority) {
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_EventDrivenThread__Construct_long_stackSize__ThreadPriority_priority_,
-                                 "xd", stackSize, priority);
+                                 "xd", (uint64_t)(stackSize), priority);
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
@@ -1448,7 +1452,7 @@ result EventDrivenThread::Construct(const Tizen::Base::String &name, long stackS
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_EventDrivenThread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
-                                 "sx", temp, stackSize);
+                                 "sx", temp, (uint64_t)(stackSize));
                PACK_COMMON_END(ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
index d9b18db..2b04036 100755 (executable)
@@ -94,7 +94,9 @@ void SceneManagerEventListener::OnSceneTransitionCompleted(const SceneId &previo
                                PREPARE_LOCAL_BUF();
                                PACK_COMMON_BEGIN(MSG_PROBE_SCENE,
                                                  API_ID_void_SceneManagerEventListener__OnSceneTransitionCompleted_const_SceneId__previousSceneId__const_SceneId__currentSceneId_,
-                                                 "pp", &previousSceneId, &currentSceneId);
+                                                 "pp",
+                                                 voidp_to_uint64(&previousSceneId),
+                                                 voidp_to_uint64(&currentSceneId));
                                PACK_COMMON_END(0, 0, 0);
                                PACK_SCENE(scene_name, formid, pform, panelid, ppanel, transition, user);
                                FLUSH_LOCAL_BUF();