* src/vm/jit/i386/codegen.c (codegen): Use code->isleafmethod.

* src/vm/jit/i386/md-abi.c (md_return_alloc): Changed signature.

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index e47e3404db497f8a9523f0197bd680e8268bfc4c..3186a59140aa4751e0e0f35ac3910b33555612a2 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -31,7 +31,7 @@
             Christian Ullrich
                        Edwin Steiner
 
-   $Id: codegen.c 5040 2006-06-19 22:53:53Z twisti $
+   $Id: codegen.c 5080 2006-07-06 12:42:23Z twisti $
 
 */
 
@@ -150,7 +150,7 @@ bool codegen(jitdata *jd)
 
     /* Keep stack of non-leaf functions 16-byte aligned. */
 
-       if (!m->isleafmethod)
+       if (!code->isleafmethod)
                stackframesize |= 0x3;
 
        (void) dseg_addaddress(cd, code);                      /* CodeinfoPointer */
@@ -169,7 +169,7 @@ bool codegen(jitdata *jd)
 #endif
                (void) dseg_adds4(cd, 0);                          /* IsSync          */
                                               
-       (void) dseg_adds4(cd, m->isleafmethod);                /* IsLeaf          */
+       (void) dseg_adds4(cd, code->isleafmethod);             /* IsLeaf          */
        (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave         */
        (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave         */
 
@@ -193,11 +193,11 @@ bool codegen(jitdata *jd)
        
        /* generate method profiling code */
 
-       if (opt_prof) {
+       if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
                /* count frequency */
 
-               M_MOV_IMM(m, REG_ITMP1);
-               M_IADD_IMM_MEMBASE(1, REG_ITMP1, OFFSET(methodinfo, frequency));
+               M_MOV_IMM(code, REG_ITMP3);
+               M_IADD_IMM_MEMBASE(1, REG_ITMP3, OFFSET(codeinfo, frequency));
        }
 
        /* create stack frame (if necessary) */
@@ -467,15 +467,16 @@ bool codegen(jitdata *jd)
                len = bptr->indepth;
                MCODECHECK(512);
 
+#if 0
                /* generate basic block profiling code */
 
-               if (opt_prof) {
+               if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
                        /* count frequency */
 
-                       M_MOV_IMM(m->bbfrequency, REG_ITMP1);
-                       M_IADD_IMM_MEMBASE(1, REG_ITMP1, bptr->debug_nr * 4);
+                       M_MOV_IMM(code->bbfrequency, REG_ITMP3);
+                       M_IADD_IMM_MEMBASE(1, REG_ITMP3, bptr->debug_nr * 4);
                }
-
+#endif
 
 #if defined(ENABLE_LSRA)
                if (opt_lsra) {
@@ -5387,11 +5388,11 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
        /* generate native method profiling code */
 
-       if (opt_prof) {
+       if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
                /* count frequency */
 
-               M_MOV_IMM(m, REG_ITMP1);
-               M_IADD_IMM_MEMBASE(1, REG_ITMP1, OFFSET(methodinfo, frequency));
+               M_MOV_IMM(code, REG_ITMP1);
+               M_IADD_IMM_MEMBASE(1, REG_ITMP1, OFFSET(codeinfo, frequency));
        }
 
        /* calculate stackframe size for native function */

diff --git a/src/vm/jit/i386/md-abi.c b/src/vm/jit/i386/md-abi.c
index 8195157b5ad2014c80dd866e89bbd214f2b0b3c6..1aa8d55b5ec4340c439a21af336805f065634520 100644 (file)
--- a/src/vm/jit/i386/md-abi.c
+++ b/src/vm/jit/i386/md-abi.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: md-abi.c 4357 2006-01-22 23:33:38Z twisti $
+   $Id: md-abi.c 5080 2006-07-06 12:42:23Z twisti $
 
 */
 
@@ -105,8 +105,7 @@ void md_param_alloc(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(methodinfo *m, registerdata *rd, s4 return_type,
-                                        stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackptr stackslot)
 {
        /* nothing */
 }