Skip to content

Commit f80f3c5

Browse files
bnoordhuisbnoordhuis
committed
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.
1 parent 51f6e6a commit f80f3c5

4 files changed

Lines changed: 303 additions & 259 deletions

File tree

‎node.gyp‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,13 @@
168168
#
169169
'sources': [
170170
'src/node_dtrace.cc',
171-
'src/node_dtrace_provider.cc',
172-
'src/node_dtrace_ustack.cc',
171+
'src/node_dtrace_provider.cc'
173172
],
173+
'conditions': [ [
174+
'target_arch=="ia32"', {
175+
'sources': [ 'src/node_dtrace_ustack.cc' ]
176+
}
177+
] ],
174178
} ],
175179
[ 'node_use_systemtap=="true"', {
176180
'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
@@ -419,7 +423,7 @@
419423
'target_name': 'node_dtrace_ustack',
420424
'type': 'none',
421425
'conditions': [
422-
[ 'node_use_dtrace=="true"', {
426+
[ 'node_use_dtrace=="true" and target_arch=="ia32"', {
423427
'actions': [
424428
{
425429
'action_name': 'node_dtrace_ustack_constants',
@@ -444,19 +448,9 @@
444448
'outputs': [
445449
'<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
446450
],
447-
'conditions': [
448-
[ 'target_arch=="ia32"', {
449-
'action': [
450-
'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
451-
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
452-
]
453-
} ],
454-
[ 'target_arch=="x64"', {
455-
'action': [
456-
'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
457-
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
458-
]
459-
} ],
451+
'action': [
452+
'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
453+
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
460454
]
461455
}
462456
]

‎src/v8abbr.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#define V8_ABBR_H
88

99
/* Frame pointer offsets */
10-
#define V8_OFF_FP_FUNC V8DBG_OFF_FP_FUNCTION
11-
#define V8_OFF_FP_CONTEXT V8DBG_OFF_FP_CONTEXT
12-
#define V8_OFF_FP_MARKER V8DBG_OFF_FP_MARKER
10+
#define V8_OFF_FP_FUNC ((uint32_t)V8DBG_OFF_FP_FUNCTION)
11+
#define V8_OFF_FP_CONTEXT ((uint32_t)V8DBG_OFF_FP_CONTEXT)
12+
#define V8_OFF_FP_MARKER ((uint32_t)V8DBG_OFF_FP_MARKER)
1313

1414
/* Stack frame types */
1515
#define V8_FT_ENTRY V8DBG_FRAMETYPE_ENTRYFRAME
@@ -22,9 +22,9 @@
2222
#define V8_FT_ADAPTOR V8DBG_FRAMETYPE_ARGUMENTSADAPTORFRAME
2323

2424
/* Identification masks and tags */
25-
#define V8_SmiTagMask (V8DBG_SMITAGMASK)
26-
#define V8_SmiTag (V8DBG_SMITAG)
27-
#define V8_SmiValueShift (V8DBG_SMISHIFTSIZE + V8DBG_SMITAGMASK)
25+
#define V8_SmiTagMask V8DBG_SMITAGMASK
26+
#define V8_SmiTag V8DBG_SMITAG
27+
#define V8_SmiValueShift V8_SmiTagMask
2828

2929
#define V8_HeapObjectTagMask V8DBG_HEAPOBJECTTAGMASK
3030
#define V8_HeapObjectTag V8DBG_HEAPOBJECTTAG
@@ -45,7 +45,7 @@
4545
#define V8_IT_CODE V8DBG_TYPE_CODE__CODE_TYPE
4646

4747
/* Node-specific offsets */
48-
#define NODE_OFF_EXTSTR_DATA sizeof(void*)
48+
#define NODE_OFF_EXTSTR_DATA 0x4
4949

5050
/* Heap class->field offsets */
5151
#define V8_OFF_HEAP(off) ((off) - 1)
@@ -67,7 +67,7 @@
6767
#define V8_OFF_STR_LENGTH \
6868
V8_OFF_HEAP(V8DBG_CLASS_STRING__LENGTH__SMI)
6969
#define V8_OFF_STR_CHARS \
70-
V8_OFF_HEAP(V8DBG_CLASS_SEQONEBYTESTRING__CHARS__CHAR)
70+
V8_OFF_HEAP(V8DBG_CLASS_SEQASCIISTRING__CHARS__CHAR)
7171
#define V8_OFF_CONSSTR_CAR \
7272
V8_OFF_HEAP(V8DBG_CLASS_CONSSTRING__FIRST__STRING)
7373
#define V8_OFF_CONSSTR_CDR \

0 commit comments

Comments
 (0)