src/os/bsd/dtrace/generateJvmOffsets.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File
*** old/src/os/bsd/dtrace/generateJvmOffsets.cpp	Wed Oct  9 15:17:11 2013
--- new/src/os/bsd/dtrace/generateJvmOffsets.cpp	Wed Oct  9 15:17:11 2013

*** 65,75 **** --- 65,75 ---- /* * To avoid the most part of potential link errors * we link this program with -z nodefs . * * But for 'debug1' and 'fastdebug1' we still have to provide ! * a particular workaround for the following symbols bellow. ! * a particular workaround for the following symbols below. * It will be good to find out a generic way in the future. */ #pragma weak tty #pragma weak CMSExpAvgFactor
*** 85,109 **** --- 85,112 ---- StubQueue* AbstractInterpreter::_code = NULL; #endif /* ASSERT */ #endif /* COMPILER1 */ ! #define GEN_OFFS(Type,Name) \ ! #define GEN_OFFS_NAME(Type,Name,OutputType) \ switch(gen_variant) { \ case GEN_OFFSET: \ printf("#define OFFSET_%-33s %ld\n", \ ! #Type #Name, offset_of(Type, Name)); \ ! #OutputType #Name, offset_of(Type, Name)); \ break; \ case GEN_INDEX: \ printf("#define IDX_OFFSET_%-33s %d\n", \ ! #Type #Name, index++); \ ! #OutputType #Name, index++); \ break; \ case GEN_TABLE: \ ! printf("\tOFFSET_%s,\n", #Type #Name); \ ! printf("\tOFFSET_%s,\n", #OutputType #Name); \ break; \ } + #define GEN_OFFS(Type,Name) \ + GEN_OFFS_NAME(Type,Name,Type) + #define GEN_SIZE(Type) \ switch(gen_variant) { \ case GEN_OFFSET: \ printf("#define SIZE_%-35s %ld\n", \ #Type, sizeof(Type)); \
*** 244,253 **** --- 247,261 ---- GEN_OFFS(VirtualSpace, _high_boundary); GEN_OFFS(VirtualSpace, _low); GEN_OFFS(VirtualSpace, _high); printf("\n"); + /* We need to use different names here because of the template parameter */ + GEN_OFFS_NAME(GrowableArray<CodeHeap*>, _data, GrowableArray_CodeHeap); + GEN_OFFS_NAME(GrowableArray<CodeHeap*>, _len, GrowableArray_CodeHeap); + printf("\n"); + GEN_OFFS(CodeBlob, _name); GEN_OFFS(CodeBlob, _header_size); GEN_OFFS(CodeBlob, _content_offset); GEN_OFFS(CodeBlob, _code_offset); GEN_OFFS(CodeBlob, _data_offset);

src/os/bsd/dtrace/generateJvmOffsets.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File