Changeset 356acd0 in mainline

Timestamp:

2008-09-19T12:35:07Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d1c8287

Parents:

a5c3f73

Message:

trace: Fix display of syscall arguments on 64-bit.

Location:

uspace/app/trace

Files:

• trace.c (modified) (4 diffs)
• trace.h (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -137 +137 @@
 }
 
-void val_print(int val, val_type_t v_type)
+void val_print(sysarg_t val, val_type_t v_type)
 {
         switch (v_type) {
@@ -145 +145 @@
 
         case V_INTEGER:
-                printf("%d", val);
+                printf("%ld", val);
                 break;
 
         case V_HASH:
-                printf("0x%08x", val);
+                printf("0x%08lx", val);
                 break;
 
         case V_ERRNO:
                 if (val >= -15 && val <= 0) {
-                        printf("%d %s (%s)", val,
+                        printf("%ld %s (%s)", val,
                             err_desc[-val].name,
                             err_desc[-val].desc);
                 } else {
-                        printf("%d", val);
+                        printf("%ld", val);
                 }
                 break;
         case V_INT_ERRNO:
                 if (val >= -15 && val < 0) {
-                        printf("%d %s (%s)", val,
+                        printf("%ld %s (%s)", val,
                             err_desc[-val].name,
                             err_desc[-val].desc);
                 } else {
-                        printf("%d", val);
+                        printf("%ld", val);
                 }
                 break;
@@ -182 +182 @@
                         case '\t': printf("'\\t'"); break;
                         case '\\': printf("'\\\\'"); break;
-                        default: printf("'\\x%X'"); break;
+                        default: printf("'\\x%02lX'", val); break;
                         }
                 }
@@ -190 +190 @@
 
 
-static void print_sc_retval(int retval, val_type_t val_type)
+static void print_sc_retval(sysarg_t retval, val_type_t val_type)
 {
         printf(" -> ");

uspace/app/trace/trace.h

@@ -36 +36 @@
 #define TRACE_H_
 
+#include <sys/types.h>
+
 /**
  * Classes of events that can be displayed. Can be or-ed together.
@@ -62 +64 @@
 extern display_mask_t display_mask;
 
-void val_print(int val, val_type_t v_type);
+void val_print(sysarg_t val, val_type_t v_type);
 
 #endif