src/hotspot/os/solaris/dtrace/jhelper.d

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 57,69 ****
  #define copyin_uint16(ADDR) *(uint16_t*) copyin((pointer) (ADDR), sizeof(uint16_t))
  #define copyin_uint32(ADDR) *(uint32_t*) copyin((pointer) (ADDR), sizeof(uint32_t))
  #define copyin_int32(ADDR)  *(int32_t*)  copyin((pointer) (ADDR), sizeof(int32_t))
  #define copyin_uint8(ADDR)  *(uint8_t*)  copyin((pointer) (ADDR), sizeof(uint8_t))
  
- #define SAME(x) x
  #define copyin_offset(JVM_CONST)  JVM_CONST = \
!         copyin_int32(JvmOffsetsPtr + SAME(IDX_)JVM_CONST * sizeof(int32_t))
  
  int init_done;
  
  dtrace:helper:ustack:
  {
--- 57,68 ----
  #define copyin_uint16(ADDR) *(uint16_t*) copyin((pointer) (ADDR), sizeof(uint16_t))
  #define copyin_uint32(ADDR) *(uint32_t*) copyin((pointer) (ADDR), sizeof(uint32_t))
  #define copyin_int32(ADDR)  *(int32_t*)  copyin((pointer) (ADDR), sizeof(int32_t))
  #define copyin_uint8(ADDR)  *(uint8_t*)  copyin((pointer) (ADDR), sizeof(uint8_t))
  
  #define copyin_offset(JVM_CONST)  JVM_CONST = \
!         copyin_int32(JvmOffsetsPtr + IDX_##JVM_CONST * sizeof(int32_t))
  
  int init_done;
  
  dtrace:helper:ustack:
  {
*** 156,176 ****
  #else
  #error "Don't know architecture"
  #endif
  
    /* Read address of GrowableArray<CodeHeaps*> */
!   this->code_heaps_address = copyin_ptr(&``__1cJCodeCacheG_heaps_);
    /* Read address of _data array field in GrowableArray */
    this->code_heaps_array_address = copyin_ptr(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_data);
    this->number_of_heaps = copyin_uint32(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_len);
  
    this->Method_vtbl = (pointer) &``__1cGMethodG__vtbl_;
  
    /*
     * Get Java heap bounds
     */
!   this->Universe_collectedHeap = copyin_ptr(&``__1cIUniverseO_collectedHeap_);
    this->heap_start = copyin_ptr(this->Universe_collectedHeap +
        OFFSET_CollectedHeap_reserved +
        OFFSET_MemRegion_start);
    this->heap_size = SIZE_HeapWord *
      copyin_ptr(this->Universe_collectedHeap +
--- 155,179 ----
  #else
  #error "Don't know architecture"
  #endif
  
    /* Read address of GrowableArray<CodeHeaps*> */
!   // this->code_heaps_address = copyin_ptr(&``__1cJCodeCacheG_heaps_);
!   this->code_heaps_address =  * ( uint64_t * ) copyin ( ( uint64_t ) ( &``__1cJCodeCacheG_heaps_ ) , sizeof ( uint64_t ) );
! 
    /* Read address of _data array field in GrowableArray */
    this->code_heaps_array_address = copyin_ptr(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_data);
    this->number_of_heaps = copyin_uint32(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_len);
  
    this->Method_vtbl = (pointer) &``__1cGMethodG__vtbl_;
  
    /*
     * Get Java heap bounds
     */
!   // this->Universe_collectedHeap = copyin_ptr(&``__1cIUniverseO_collectedHeap_);
!   this->Universe_collectedHeap =  * ( uint64_t * ) copyin ( ( uint64_t ) ( &``__1cIUniverseO_collectedHeap_ ) , sizeof ( uint64_t ) );
! 
    this->heap_start = copyin_ptr(this->Universe_collectedHeap +
        OFFSET_CollectedHeap_reserved +
        OFFSET_MemRegion_start);
    this->heap_size = SIZE_HeapWord *
      copyin_ptr(this->Universe_collectedHeap +