Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

64bit support for dtrace ustack helper #4507

Merged
merged 2 commits into from
Jan 7, 2013
Merged

64bit support for dtrace ustack helper #4507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13296e4
dtrace: fix style in ustack helper
indutny Jan 7, 2013
f9afb3f
dtrace: x64 ustack helper
indutny Dec 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ],
Expand Down Expand Up @@ -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',
Expand All @@ -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)',
]
} ],
]
}
]
Expand Down
14 changes: 7 additions & 7 deletions src/v8abbr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
Loading