dtrace: x64 ustack helper

indutny · Jan 7, 2013 · f9afb3f · f9afb3f
1 parent 13296e4
commit f9afb3f
Show file tree

Hide file tree

Showing 4 changed files with 173 additions and 219 deletions.
diff --git a/node.gyp b/node.gyp
@@ -169,13 +169,9 @@
           #
           'sources': [
             'src/node_dtrace.cc',
-            'src/node_dtrace_provider.cc'
+            'src/node_dtrace_provider.cc',
+            'src/node_dtrace_ustack.cc',
           ],
-          'conditions': [ [
-            'target_arch=="ia32"', {
-              'sources': [ 'src/node_dtrace_ustack.cc' ]
-            }
-          ] ],
         } ],
         [ 'node_use_systemtap=="true"', {
           'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
@@ -424,7 +420,7 @@
       'target_name': 'node_dtrace_ustack',
       'type': 'none',
       'conditions': [
-        [ 'node_use_dtrace=="true" and target_arch=="ia32"', {
+        [ 'node_use_dtrace=="true"', {
           'actions': [
             {
               'action_name': 'node_dtrace_ustack_constants',
@@ -449,9 +445,19 @@
               'outputs': [
                 '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
               ],
-              'action': [
-                'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
-                '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
+              'conditions': [
+                [ 'target_arch=="ia32"', {
+                  'action': [
+                    'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
+                    '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
+                  ]
+                } ],
+                [ 'target_arch=="x64"', {
+                  'action': [
+                    'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
+                    '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
+                  ]
+                } ],
               ]
             }
           ]

diff --git a/src/v8abbr.h b/src/v8abbr.h
@@ -7,9 +7,9 @@
 #define V8_ABBR_H
 
 /* Frame pointer offsets */
-#define V8_OFF_FP_FUNC              ((uint32_t)V8DBG_OFF_FP_FUNCTION)
-#define V8_OFF_FP_CONTEXT           ((uint32_t)V8DBG_OFF_FP_CONTEXT)
-#define V8_OFF_FP_MARKER            ((uint32_t)V8DBG_OFF_FP_MARKER)
+#define V8_OFF_FP_FUNC              V8DBG_OFF_FP_FUNCTION
+#define V8_OFF_FP_CONTEXT           V8DBG_OFF_FP_CONTEXT
+#define V8_OFF_FP_MARKER            V8DBG_OFF_FP_MARKER
 
 /* Stack frame types */
 #define V8_FT_ENTRY                 V8DBG_FRAMETYPE_ENTRYFRAME
@@ -22,9 +22,9 @@
 #define V8_FT_ADAPTOR               V8DBG_FRAMETYPE_ARGUMENTSADAPTORFRAME
 
 /* Identification masks and tags */
-#define V8_SmiTagMask               V8DBG_SMITAGMASK
-#define V8_SmiTag                   V8DBG_SMITAG
-#define V8_SmiValueShift            V8_SmiTagMask
+#define V8_SmiTagMask               (V8DBG_SMITAGMASK)
+#define V8_SmiTag                   (V8DBG_SMITAG)
+#define V8_SmiValueShift            (V8DBG_SMISHIFTSIZE + V8DBG_SMITAGMASK)
 
 #define V8_HeapObjectTagMask        V8DBG_HEAPOBJECTTAGMASK
 #define V8_HeapObjectTag            V8DBG_HEAPOBJECTTAG
@@ -45,7 +45,7 @@
 #define V8_IT_CODE                  V8DBG_TYPE_CODE__CODE_TYPE
 
 /* Node-specific offsets */
-#define NODE_OFF_EXTSTR_DATA        0x4
+#define NODE_OFF_EXTSTR_DATA        sizeof(void*)
 
 /* Heap class->field offsets */
 #define V8_OFF_HEAP(off)            ((off) - 1)