jdk-sandbox: comparison hotspot/src/os/solaris/dtrace/libjvm

equal deleted inserted replaced

-:e2ed3bec8c2c
+:87fa6860b5ae
 /*
-* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2014, 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.
 uint64_t CodeCache_segmap_high;
 int32_t  SIZE_CodeCache_log2_segment;
 uint64_t methodPtr;
-uint64_t bcx;
+uint64_t bcp;
 Nmethod_t *N;                 /*Inlined methods support */
 Frame_t   prev_fr;
 Frame_t   curr_fr;
 };
 if (debug)
 fprintf(stderr, "name_for_nmethod: FAIL \n\n");
 return err;
 }
-int is_bci(intptr_t bcx) {
-switch (DATA_MODEL) {
-case PR_MODEL_LP64:
-return ((uintptr_t) bcx) <= ((uintptr_t) MAX_METHOD_CODE_SIZE) ;
-case PR_MODEL_ILP32:
-default:
-return 0 <= bcx && bcx <= MAX_METHOD_CODE_SIZE;
-}
-}
 static int
 name_for_imethod(jvm_agent_t* J,
-uint64_t bcx,
+uint64_t bcp,
 uint64_t method,
 char *result,
 size_t size,
 Jframe_t *jframe
 ) {
 int32_t   err;
 err = read_pointer(J, method + OFFSET_Method_constMethod, &constMethod);
 CHECK_FAIL(err);
-bci = is_bci(bcx) ? bcx : bcx - (constMethod + (uint64_t) SIZE_ConstMethod);
+bci = bcp - (constMethod + (uint64_t) SIZE_ConstMethod);
 if (debug)
 fprintf(stderr, "\t name_for_imethod: BEGIN: method: %#llx\n", method);
 err = name_for_methodPtr(J, method, result, size);
 * and regular interpreted frames.
 */
 if (err == PS_OK && strncmp(name, "Interpreter", 11) == 0) {
 *is_interpreted = 1;
 if (is_method(J, J->methodPtr)) {
-return name_for_imethod(J, J->bcx, J->methodPtr, result, size, jframe);
+return name_for_imethod(J, J->bcp, J->methodPtr, result, size, jframe);
 }
 }
 if (err == PS_OK) {
 strncpy(result, name, size);
 uintptr_t fp;
 uintptr_t pc;
 /* arguments given to read_pointer need to be worst case sized */
 uint64_t methodPtr = 0;
 uint64_t sender_sp;
-uint64_t bcx = 0;
+uint64_t bcp = 0;
 int is_interpreted = 0;
 int result = PS_OK;
 int err = PS_OK;
 if (J == NULL) {
 /* The following workaround is for SPARC. CALL instruction occupates 8 bytes.
 * In the pcDesc structure return pc offset is recorded for CALL instructions.
 * regs[R_PC] contains a CALL instruction pc offset.
 */
 pc += 8;
-bcx          = (uintptr_t) regs[R_L1];
+bcp          = (uintptr_t) regs[R_L1];
 methodPtr = (uintptr_t) regs[R_L2];
 sender_sp = regs[R_I5];
 if (debug > 2) {
 fprintf(stderr, "\nregs[R_I1]=%lx, regs[R_I2]=%lx, regs[R_I5]=%lx, regs[R_L1]=%lx, regs[R_L2]=%lx\n",
 regs[R_I1], regs[R_I2], regs[R_I5], regs[R_L1], regs[R_L2]);
 methodPtr = 0;
 }
 if (read_pointer(J,  fp + OFFSET_interpreter_frame_sender_sp, &sender_sp) != PS_OK) {
 sender_sp = 0;
 }
-if (read_pointer(J,  fp + OFFSET_interpreter_frame_bcx_offset, &bcx) != PS_OK) {
+if (read_pointer(J,  fp + OFFSET_interpreter_frame_bcp_offset, &bcp) != PS_OK) {
-bcx = 0;
+bcp = 0;
 }
 #endif /* i386 */
 J->methodPtr = methodPtr;
-J->bcx = bcx;
+J->bcp = bcp;
 /* On x86 with C2 JVM: native frame may have wrong regs[R_FP]
 * For example: JVM_SuspendThread frame poins to the top interpreted frame.
 * If we call is_method(J, methodPtr) before codecache_contains(J, pc)
 * then we go over and omit both: nmethod and I2CAdapter frames.
 * Note, that regs[R_PC] is always correct if frame defined correctly.
 * So it is better to call codecache_contains(J, pc) from the beginning.
 */
 #ifndef X86_COMPILER2
 if (is_method(J, J->methodPtr)) {
-result = name_for_imethod(J, bcx, J->methodPtr, name, size, jframe);
+result = name_for_imethod(J, bcp, J->methodPtr, name, size, jframe);
 /* If the methodPtr is a method then this is highly likely to be
 an interpreter frame */
 if (result >= 0) {
 is_interpreted = 1;
 }
 if (codecache_contains(J, pc)) {
 result = name_for_codecache(J, fp, pc, name, size, jframe, &is_interpreted);
 }
 #ifdef X86_COMPILER2
 else if (is_method(J, J->methodPtr)) {
-result = name_for_imethod(J, bcx, J->methodPtr, name, size, jframe);
+result = name_for_imethod(J, bcp, J->methodPtr, name, size, jframe);
 /* If the methodPtr is a method then this is highly likely to be
 an interpreter frame */
 if (result >= 0) {
 is_interpreted = 1;
 }

changeset 25714	87fa6860b5ae
parent 13728	882756847a04
child 25720	28c69e9cf5e2