src/os/solaris/dtrace/generateJvmOffsets.cpp

*** 83,93 ****
  #endif /* COMPILER1 */
  
  #define GEN_OFFS_NAME(Type,Name,OutputType)             \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
!     printf("#define OFFSET_%-33s %d\n",                 \
              #OutputType #Name, offset_of(Type, Name));  \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_OFFSET_%-33s %d\n",             \
              #OutputType #Name, index++);                \
--- 83,93 ----
  #endif /* COMPILER1 */
  
  #define GEN_OFFS_NAME(Type,Name,OutputType)             \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
!     printf("#define OFFSET_%-33s %ld\n",                \
              #OutputType #Name, offset_of(Type, Name));  \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_OFFSET_%-33s %d\n",             \
              #OutputType #Name, index++);                \
*** 101,111 ****
    GEN_OFFS_NAME(Type,Name,Type)
  
  #define GEN_SIZE(Type)                                  \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
!     printf("#define SIZE_%-35s %d\n",                   \
              #Type, sizeof(Type));                       \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_SIZE_%-35s %d\n",               \
              #Type, index++);                            \
--- 101,111 ----
    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));                       \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_SIZE_%-35s %d\n",               \
              #Type, index++);                            \
*** 209,219 ****
  
    GEN_OFFS(Klass, _name);
    GEN_OFFS(ConstantPool, _pool_holder);
    printf("\n");
  
!   GEN_VALUE(OFFSET_HeapBlockHeader_used, offset_of(HeapBlock::Header, _used));
    GEN_OFFS(oopDesc, _metadata);
    printf("\n");
  
    GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE);
    GEN_VALUE(ConstMethod_has_linenumber_table, ConstMethod::_has_linenumber_table);
--- 209,219 ----
  
    GEN_OFFS(Klass, _name);
    GEN_OFFS(ConstantPool, _pool_holder);
    printf("\n");
  
!   GEN_VALUE(OFFSET_HeapBlockHeader_used, (int) offset_of(HeapBlock::Header, _used));
    GEN_OFFS(oopDesc, _metadata);
    printf("\n");
  
    GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE);
    GEN_VALUE(ConstMethod_has_linenumber_table, ConstMethod::_has_linenumber_table);
*** 273,283 ****
  
    GEN_OFFS(NarrowPtrStruct, _base);
    GEN_OFFS(NarrowPtrStruct, _shift);
    printf("\n");
  
!   GEN_VALUE(SIZE_HeapBlockHeader, sizeof(HeapBlock::Header));
    GEN_SIZE(oopDesc);
    GEN_SIZE(ConstantPool);
    printf("\n");
  
    GEN_SIZE(PcDesc);
--- 273,283 ----
  
    GEN_OFFS(NarrowPtrStruct, _base);
    GEN_OFFS(NarrowPtrStruct, _shift);
    printf("\n");
  
!   GEN_VALUE(SIZE_HeapBlockHeader, (int) sizeof(HeapBlock::Header));
    GEN_SIZE(oopDesc);
    GEN_SIZE(ConstantPool);
    printf("\n");
  
    GEN_SIZE(PcDesc);