codegen_get_pv_from_pc.
* src/vm/jit/codegen-common.h (codegen_findmethod): Likewise.
(md_codegen_findmethod): Renamed to md_codegen_get_pv_from_pc.
* src/vm/jit/stacktrace.c (stacktrace_create_stackframeinfo):
Likewise.
(stacktrace_create_inline_stackframeinfo): Likewise.
(stacktrace_create_extern_stackframe): Likewise.
(stacktrace_create): Likewise.
* src/vm/jit/alpha/md.c (md_codegen_findmethod): Renamed to
md_codegen_get_pv_from_pc.
* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: Likewise.
* src/vm/jit/i386/asmpart.S: Likewise.
* src/vm/jit/mips/asmpart.S: Likewise.
* src/vm/jit/powerpc/asmpart.S: Likewise.
* src/vm/jit/x86_64/asmpart.S: Likewise.
* src/vm/jit/intrp/asmpart.c: Likewise.
* src/vm/jit/i386/patcher.c (patcher_wrapper): Fixed comment.
* src/vm/jit/x86_64/patcher.c: Likewise.
Christian Thalinger
Edwin Steiner
- $Id: md.c 4817 2006-04-23 23:03:50Z twisti $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
Machine code:
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
offset = (s2) (mcode & 0x0000ffff);
pv += offset;
-
- } else {
+ }
+ else {
/* get displacement of first instruction (lda) */
assert((mcode >> 16) == 0x237a);
memory. All functions writing values into the data area return the offset
relative the begin of the code area (start of procedure).
- $Id: codegen-common.c 5204 2006-08-01 15:51:07Z twisti $
+ $Id: codegen-common.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* codegen_findmethod **********************************************************
+/* codegen_get_pv_from_pc ******************************************************
Find the PV for the given PC by searching in the AVL tree of
methods.
*******************************************************************************/
-u1 *codegen_findmethod(u1 *pc)
+u1 *codegen_get_pv_from_pc(u1 *pc)
{
methodtree_element mtepc;
methodtree_element *mte;
Changes: Christian Ullrich
Edwin Steiner
- $Id: codegen-common.h 5186 2006-07-28 13:24:43Z twisti $
+ $Id: codegen-common.h 5233 2006-08-14 10:59:39Z twisti $
*/
s4 disp);
void codegen_insertmethod(u1 *startpc, u1 *endpc);
-u1 *codegen_findmethod(u1 *pc);
+u1 *codegen_get_pv_from_pc(u1 *pc);
u1 *codegen_get_pv_from_pc_nocheck(u1 *pc);
void codegen_finish(jitdata *jd);
#endif
/* machine dependent functions */
-u1 *md_codegen_findmethod(u1 *ra);
+u1 *md_codegen_get_pv_from_pc(u1 *ra);
bool codegen(jitdata *jd);
Changes: Joseph Wenninger
Edwin Steiner
- $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $
+ $Id: asmpart.S 5233 2006-08-14 10:59:39Z twisti $
*/
mov t0,8*4(sp) /* save maybe-leaf flag */
mov xpc,0*4(sp) /* pass exception pc */
- call codegen_findmethod
+ call codegen_get_pv_from_pc
mov v0,6*4(sp) /* save data segment pointer */
mov 4*4(sp),itmp3 /* pass exception pointer */
Changes: Edwin Steiner
- $Id: md.c 5109 2006-07-11 19:17:23Z twisti $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
- On this architecture just a wrapper function to codegen_findmethod.
+ On this architecture just a wrapper function to
+ codegen_get_pv_from_pc.
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
- /* the the start address of the function which contains this
- address from the method table */
+ /* Get the start address of the function which contains this
+ address from the method table. */
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
return pv;
}
Changes:
- $Id: patcher.c 5109 2006-07-11 19:17:23Z twisti $
+ $Id: patcher.c 5233 2006-08-14 10:59:39Z twisti $
*/
/* RA is passed as NULL, but the XPC is correct and can be used in
stacktrace_create_extern_stackframeinfo for
- md_codegen_findmethod. */
+ md_codegen_get_pv_from_pc. */
stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 7 * 4, xpc, xpc);
Changes:
- $Id: asmpart.c 5055 2006-06-28 20:33:38Z edwin $
+ $Id: asmpart.c 5233 2006-08-14 10:59:39Z twisti $
*/
/* for a description of the stack see IRETURN in java.vmg */
for (; fp != NULL; ) {
- u1 *f = codegen_findmethod((u1 *) (ip - 1));
+ u1 *f = codegen_get_pv_from_pc((u1 *) (ip - 1));
/* get methodinfo pointer from method header */
Changes: Christian Thalinger
Edwin Steiner
- $Id: asmpart.S 5164 2006-07-19 15:54:01Z twisti $
+ $Id: asmpart.S 5233 2006-08-14 10:59:39Z twisti $
*/
ast zero,4*8(sp) /* save maybe-leaf flag (cleared) */
move a0,ra /* pass return address */
- jal md_codegen_findmethod /* get PV from RA */
+ jal md_codegen_get_pv_from_pc /* get PV from RA */
ast v0,2*8(sp) /* save data segment pointer */
ald a0,0*8(sp) /* pass exception pointer */
Changes: Edwin Steiner
- $Id: md.c 4821 2006-04-24 10:08:07Z twisti $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
Machine code:
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
#endif
offset += (s2) (mcode & 0x0000ffff);
-
- } else {
+ }
+ else {
/* get offset of first instruction (daddiu) */
mcode = *((u4 *) ra);
Changes: Christian Thalinger
Edwin Steiner
- $Id: asmpart.S 5231 2006-08-11 10:13:28Z twisti $
+ $Id: asmpart.S 5233 2006-08-14 10:59:39Z twisti $
*/
stw zero,LA_SIZE+4*8(sp) /* save maybe-leaf flag (cleared) */
mr a0,r0 /* pass return address */
- bl md_codegen_findmethod /* get PV from RA */
+ bl md_codegen_get_pv_from_pc /* get PV from RA */
stw v0,LA_SIZE+2*8(sp) /* save data segment pointer */
lwz a0,LA_SIZE+0*8(sp) /* pass exception pointer */
Changes: Edwin Steiner
- $Id: md.c 4820 2006-04-24 10:00:13Z twisti $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
Machine code:
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
Changes: Edwin Steiner
- $Id: md.c 5232 2006-08-11 13:11:44Z tbfg $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
Machine code:
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
}
-/* md_codegen_findmethod *******************************************************
-
+/* md_codegen_get_pv_from_pc ***************************************************
This reconstructs and returns the PV of a method given a return address
pointer. (basically, same was as the generated code following the jump does)
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
Changes: Christian Thalinger
Edwin Steiner
- $Id: stacktrace.c 5088 2006-07-08 20:16:05Z twisti $
+ $Id: stacktrace.c 5233 2006-08-14 10:59:39Z twisti $
*/
if (pv == NULL) {
#if defined(ENABLE_INTRP)
if (opt_intrp)
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
else
#endif
{
#if defined(ENABLE_JIT)
- pv = md_codegen_findmethod(ra);
+ pv = md_codegen_get_pv_from_pc(ra);
#endif
}
}
/* if we don't have pv handy */
if (pv == NULL)
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
}
#endif
if (pv == NULL) {
#if defined(ENABLE_INTRP)
if (opt_intrp)
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
else
#endif
{
#if defined(ENABLE_JIT)
- pv = md_codegen_findmethod(ra);
+ pv = md_codegen_get_pv_from_pc(ra);
#endif
}
}
#if defined(ENABLE_INTRP)
if (opt_intrp)
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
else
#endif
{
#if defined(ENABLE_JIT)
- pv = md_codegen_findmethod(ra);
+ pv = md_codegen_get_pv_from_pc(ra);
#endif
}
parent method */
#if defined(ENABLE_JIT)
- pv = md_codegen_findmethod(ra);
+ pv = md_codegen_get_pv_from_pc(ra);
#endif
code = *((codeinfo **) (pv + CodeinfoPointer));
#if defined(ENABLE_INTRP)
if (opt_intrp)
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
else
#endif
{
#if defined(ENABLE_JIT)
- pv = md_codegen_findmethod(ra);
+ pv = md_codegen_get_pv_from_pc(ra);
#endif
}
Changes: Edwin Steiner
- $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $
+ $Id: asmpart.S 5233 2006-08-14 10:59:39Z twisti $
*/
mov t0,4*8(sp) /* save maybe-leaf flag */
mov xpc,a0 /* exception pc */
- call codegen_findmethod@PLT
+ call codegen_get_pv_from_pc@PLT
mov v0,2*8(sp) /* save data segment pointer */
mov 0*8(sp),a0 /* pass exception pointer */
Changes: Edwin Steiner
- $Id: md.c 5201 2006-07-31 20:42:46Z twisti $
+ $Id: md.c 5233 2006-08-14 10:59:39Z twisti $
*/
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
- On this architecture just a wrapper function to codegen_findmethod.
+ On this architecture just a wrapper function to
+ codegen_get_pv_from_pc.
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
- /* the the start address of the function which contains this
- address from the method table */
+ /* Get the start address of the function which contains this
+ address from the method table. */
- pv = codegen_findmethod(ra);
+ pv = codegen_get_pv_from_pc(ra);
return pv;
}
Changes:
- $Id: patcher.c 5201 2006-07-31 20:42:46Z twisti $
+ $Id: patcher.c 5233 2006-08-14 10:59:39Z twisti $
*/
/* RA is passed as NULL, but the XPC is correct and can be used in
stacktrace_create_extern_stackframeinfo for
- md_codegen_findmethod. */
+ md_codegen_get_pv_from_pc. */
stacktrace_create_extern_stackframeinfo(&sfi, pv, sp + 6 * 8, xpc, xpc);
projects / cacao.git / commitdiff