Skip to content

Commit 3d913fe

Browse files
indutnyindutny
committed
Revert "sunos: unbreak build after v8 downgrade"
This reverts commit f80f3c5.
1 parent 88befa6 commit 3d913fe

4 files changed

Lines changed: 259 additions & 303 deletions

File tree

‎node.gyp‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,9 @@
168168
#
169169
'sources': [
170170
'src/node_dtrace.cc',
171-
'src/node_dtrace_provider.cc'
171+
'src/node_dtrace_provider.cc',
172+
'src/node_dtrace_ustack.cc',
172173
],
173-
'conditions': [ [
174-
'target_arch=="ia32"', {
175-
'sources': [ 'src/node_dtrace_ustack.cc' ]
176-
}
177-
] ],
178174
} ],
179175
[ 'node_use_systemtap=="true"', {
180176
'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
@@ -423,7 +419,7 @@
423419
'target_name': 'node_dtrace_ustack',
424420
'type': 'none',
425421
'conditions': [
426-
[ 'node_use_dtrace=="true" and target_arch=="ia32"', {
422+
[ 'node_use_dtrace=="true"', {
427423
'actions': [
428424
{
429425
'action_name': 'node_dtrace_ustack_constants',
@@ -448,9 +444,19 @@
448444
'outputs': [
449445
'<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
450446
],
451-
'action': [
452-
'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
453-
'-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
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+
} ],
454460
]
455461
}
456462
]

‎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 ((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)
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
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 V8_SmiTagMask
25+
#define V8_SmiTagMask (V8DBG_SMITAGMASK)
26+
#define V8_SmiTag (V8DBG_SMITAG)
27+
#define V8_SmiValueShift (V8DBG_SMISHIFTSIZE + V8DBG_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 0x4
48+
#define NODE_OFF_EXTSTR_DATA sizeof(void*)
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_SEQASCIISTRING__CHARS__CHAR)
70+
V8_OFF_HEAP(V8DBG_CLASS_SEQONEBYTESTRING__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)