sunos: unbreak build after v8 downgrade

Commit 3d67f89 ("fix generation of v8 constants on freebsd") is an unfortunate victim of this rollback. Revert "dtrace: fix generation of v8 constants on freebsd" Revert "dtrace: More style" Revert "dtrace: Make D style more D-ish" Revert "dtrace: x64 ustack helper" Revert "dtrace: fix style in ustack helper" Revert "dtrace: SeqAsciiString was renamed to SeqOneByteString in v8" This reverts commit 3d67f89. This reverts commit 321b8ee. This reverts commit 38df9d5. This reverts commit f9afb3f. This reverts commit 13296e4. This reverts commit 3b715ed.
nodejs · Feb 26, 2013 · f80f3c5 · f80f3c5 · indutny · Feb 26, 2013
1 parent 51f6e6a
commit f80f3c5
Show file tree

Hide file tree

Showing 4 changed files with 303 additions and 259 deletions.
diff --git a/node.gyp b/node.gyp
@@ -168,9 +168,13 @@
           #
           'sources': [
             'src/node_dtrace.cc',
-            'src/node_dtrace_provider.cc',
-            'src/node_dtrace_ustack.cc',
+            'src/node_dtrace_provider.cc'
           ],
+          'conditions': [ [
+            'target_arch=="ia32"', {
+              'sources': [ 'src/node_dtrace_ustack.cc' ]
+            }
+          ] ],
         } ],
         [ 'node_use_systemtap=="true"', {
           'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
@@ -419,7 +423,7 @@
       'target_name': 'node_dtrace_ustack',
       'type': 'none',
       'conditions': [
-        [ 'node_use_dtrace=="true"', {
+        [ 'node_use_dtrace=="true" and target_arch=="ia32"', {
           'actions': [
             {
               'action_name': 'node_dtrace_ustack_constants',
@@ -444,19 +448,9 @@
               'outputs': [
                 '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
               ],
-              '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)',
-                  ]
-                } ],
+              'action': [
+                'dtrace', '-32', '-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              V8DBG_OFF_FP_FUNCTION
-#define V8_OFF_FP_CONTEXT           V8DBG_OFF_FP_CONTEXT
-#define V8_OFF_FP_MARKER            V8DBG_OFF_FP_MARKER
+#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)
 
 /* 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            (V8DBG_SMISHIFTSIZE + V8DBG_SMITAGMASK)
+#define V8_SmiTagMask               V8DBG_SMITAGMASK
+#define V8_SmiTag                   V8DBG_SMITAG
+#define V8_SmiValueShift            V8_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        sizeof(void*)
+#define NODE_OFF_EXTSTR_DATA        0x4
 
 /* Heap class->field offsets */
 #define V8_OFF_HEAP(off)            ((off) - 1)
@@ -67,7 +67,7 @@
 #define V8_OFF_STR_LENGTH \
     V8_OFF_HEAP(V8DBG_CLASS_STRING__LENGTH__SMI)
 #define V8_OFF_STR_CHARS  \
-    V8_OFF_HEAP(V8DBG_CLASS_SEQONEBYTESTRING__CHARS__CHAR)
+    V8_OFF_HEAP(V8DBG_CLASS_SEQASCIISTRING__CHARS__CHAR)
 #define V8_OFF_CONSSTR_CAR  \
     V8_OFF_HEAP(V8DBG_CLASS_CONSSTRING__FIRST__STRING)
 #define V8_OFF_CONSSTR_CDR  \