* src/vm/resolve.c: Removed new_ prefix from function names.

* src/vm/resolve.h: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/stack.h: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/show.h: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/allocator/simplereg.h: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/parse.h: Likewise.
* src/vm/jit/jit.c: Likewise.

diff --git a/src/vm/jit/allocator/simplereg.c b/src/vm/jit/allocator/simplereg.c
index d3f27c1414ea4584e7c1390ccbf68f6b952a05cd..4a15c36d96f1c40cdb0723cc4671e5ff9e807c77 100644 (file)
--- a/src/vm/jit/allocator/simplereg.c
+++ b/src/vm/jit/allocator/simplereg.c
@@ -32,7 +32,7 @@
             Michael Starzinger
             Edwin Steiner
 
-   $Id: simplereg.c 5654 2006-10-03 20:27:47Z edwin $
+   $Id: simplereg.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -60,7 +60,7 @@
 
 static void interface_regalloc(jitdata *jd);
 static void local_regalloc(jitdata *jd);
-static void new_allocate_scratch_registers(jitdata *jd);
+static void allocate_scratch_registers(jitdata *jd);
 
 
 /* regalloc ********************************************************************
@@ -69,7 +69,7 @@ static void new_allocate_scratch_registers(jitdata *jd);
        
 *******************************************************************************/
        
-bool new_regalloc(jitdata *jd)
+bool regalloc(jitdata *jd)
 {
        /* There is a problem with the use of unused float argument
           registers in leafmethods for stackslots on c7 (2 * Dual Core
@@ -80,7 +80,7 @@ bool new_regalloc(jitdata *jd)
           value before calling local_regalloc.  */
 
        interface_regalloc(jd);
-       new_allocate_scratch_registers(jd);
+       allocate_scratch_registers(jd);
        local_regalloc(jd);
 
        /* everthing's ok */
@@ -1161,7 +1161,7 @@ static bool reg_alloc_dup(jitdata *jd, s4 srcindex, s4 dstindex)
 
 *******************************************************************************/
 
-static void new_allocate_scratch_registers(jitdata *jd)
+static void allocate_scratch_registers(jitdata *jd)
 {
        methodinfo         *m;
        registerdata       *rd;

diff --git a/src/vm/jit/allocator/simplereg.h b/src/vm/jit/allocator/simplereg.h
index 3231fc0ff43bef4aa82a7f920c647cef4b477c11..71a04f96e5f568801997c742ebac42c36c8d7d6f 100644 (file)
--- a/src/vm/jit/allocator/simplereg.h
+++ b/src/vm/jit/allocator/simplereg.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: simplereg.h 5305 2006-09-05 10:47:11Z edwin $
+   $Id: simplereg.h 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -48,7 +48,7 @@
 
 /* function prototypes ********************************************************/
 
-bool new_regalloc(jitdata *jd);
+bool regalloc(jitdata *jd);
 
 #if defined(ENABLE_STATISTICS)
 void reg_make_statistics(jitdata *jd);

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index c682c1438762d2db9bf0bbf514196490ab28ab05..21ef8aa8b929b2b457bdb280192af5e0cf8fe631 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -31,7 +31,7 @@
             Christian Thalinger
             Christian Ullrich
 
-   $Id: jit.c 5597 2006-09-30 23:28:27Z edwin $
+   $Id: jit.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -1583,7 +1583,7 @@ static u1 *jit_compile_intern(jitdata *jd)
 
        /* call parse pass */
 
-       if (!new_parse(jd)) {
+       if (!parse(jd)) {
                DEBUG_JIT_COMPILEVERBOSE("Exception while parsing: ");
 
                return NULL;
@@ -1596,7 +1596,7 @@ static u1 *jit_compile_intern(jitdata *jd)
 
        /* call stack analysis pass */
 
-       if (!new_stack_analyse(jd)) {
+       if (!stack_analyse(jd)) {
                DEBUG_JIT_COMPILEVERBOSE("Exception while analysing: ");
 
                return NULL;
@@ -1680,7 +1680,7 @@ static u1 *jit_compile_intern(jitdata *jd)
                {
                        STATISTICS(count_locals_conflicts += (cd->maxlocals - 1) * (cd->maxlocals));
 
-                       new_regalloc(jd);
+                       regalloc(jd);
                }
 
                STATISTICS(reg_make_statistics(jd));
@@ -1742,7 +1742,7 @@ static u1 *jit_compile_intern(jitdata *jd)
        /* intermediate and assembly code listings */
                
        if (JITDATA_HAS_FLAG_SHOWINTERMEDIATE(jd)) {
-               new_show_method(jd, SHOW_CODE);
+               show_method(jd, SHOW_CODE);
        }
        else if (JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd)) {
 # if defined(ENABLE_DISASSEMBLER)

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index e3652aec50e2f90ac5a29a5ad4e4059056301b8e..c3b8687d02659dd6f5b59888bd73cf9317e7b668 100644 (file)
--- a/src/vm/jit/parse.c
+++ b/src/vm/jit/parse.c
@@ -31,7 +31,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: parse.c 5595 2006-09-30 23:06:36Z edwin $
+   $Id: parse.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -160,7 +160,7 @@ static instruction *parse_realloc_instructions(parsedata_t *pd, s4 ipc, s4 n)
 
 *******************************************************************************/
 
-static exceptiontable * new_fillextable(
+static exceptiontable * fillextable(
                                                                        jitdata *jd,
                                                                        methodinfo *m, 
                                                                        exceptiontable *extable, 
@@ -237,7 +237,7 @@ throw_invalid_bytecode_index:
 #define CHECK_END_OF_BYTECODE(neededlength)
 #endif /* ENABLE_VERIFIER */
 
-bool new_parse(jitdata *jd)
+bool parse(jitdata *jd)
 {
        methodinfo  *m;                     /* method being parsed                */
        codeinfo    *code;
@@ -297,7 +297,7 @@ bool new_parse(jitdata *jd)
   
        /* compute branch targets of exception table */
 
-       if (!new_fillextable(jd, m,
+       if (!fillextable(jd, m,
                        &(cd->exceptiontable[cd->exceptiontablelength-1]),
                        m->exceptiontable,
                        m->exceptiontablelength,
@@ -1032,12 +1032,12 @@ jsr_tail:
 #if defined(ENABLE_VERIFIER)
                                if (!JITDATA_HAS_FLAG_VERIFY(jd)) {
 #endif
-                                       result = new_resolve_field_lazy(jd, iptr, m);
+                                       result = resolve_field_lazy(jd, iptr, m);
                                        if (result == resolveFailed)
                                                return false;
 
                                        if (result != resolveSucceeded) {
-                                               uf = new_create_unresolved_field(m->class, m, iptr);
+                                               uf = create_unresolved_field(m->class, m, iptr);
 
                                                if (uf == NULL)
                                                        return false;
@@ -1105,12 +1105,12 @@ invoke_method:
 #if defined(ENABLE_VERIFIER)
                        if (!JITDATA_HAS_FLAG_VERIFY(jd)) {
 #endif
-                               result = new_resolve_method_lazy(jd, iptr, m);
+                               result = resolve_method_lazy(jd, iptr, m);
                                if (result == resolveFailed)
                                        return false;
 
                                if (result != resolveSucceeded) {
-                                       um = new_create_unresolved_method(m->class, m, iptr);
+                                       um = create_unresolved_method(m->class, m, iptr);
 
                                        if (!um)
                                                return false;

diff --git a/src/vm/jit/parse.h b/src/vm/jit/parse.h
index d61b7745e909ba6286613e36594f065313597da5..0394f29d5a78d3f4dd89cfa48597007eb31a29f4 100644 (file)
--- a/src/vm/jit/parse.h
+++ b/src/vm/jit/parse.h
@@ -28,7 +28,7 @@
 
    Changes: Edwin Steiner
 
-   $Id: parse.h 5482 2006-09-12 21:34:03Z edwin $
+   $Id: parse.h 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -281,7 +281,7 @@
 
 /* function prototypes ********************************************************/
 
-bool new_parse(jitdata *jd);
+bool parse(jitdata *jd);
 
 #endif /* _PARSE_H */
 

diff --git a/src/vm/jit/show.c b/src/vm/jit/show.c
index 53de5bb1ec5fb5c1d9f654e08ed08a3a87f3dbb1..21c358112ba9867d6500e6aeb30e504b9ffe4c01 100644 (file)
--- a/src/vm/jit/show.c
+++ b/src/vm/jit/show.c
@@ -68,7 +68,7 @@ static java_objectheader *show_global_lock;
 /* forward declarations *******************************************************/
 
 #if !defined(NDEBUG)
-static void new_show_variable_array(jitdata *jd, s4 *vars, int n, int stage);
+static void show_variable_array(jitdata *jd, s4 *vars, int n, int stage);
 static void show_allocation(s4 type, s4 flags, s4 regoff);
 static void show_variable(jitdata *jd, s4 index, int stage);
 #endif
@@ -133,7 +133,7 @@ char show_jit_type_letters[] = {
 *******************************************************************************/
 
 #if !defined(NDEBUG)
-void new_show_method(jitdata *jd, int stage)
+void show_method(jitdata *jd, int stage)
 {
        methodinfo     *m;
        codeinfo       *code;
@@ -348,7 +348,7 @@ void new_show_method(jitdata *jd, int stage)
        /* show code of all basic blocks */
 
        for (bptr = jd->new_basicblocks; bptr != NULL; bptr = bptr->next)
-               new_show_basicblock(jd, bptr, stage);
+               show_basicblock(jd, bptr, stage);
 
 #if defined(ENABLE_DISASSEMBLER)
        /* show stubs code */
@@ -385,7 +385,7 @@ void new_show_method(jitdata *jd, int stage)
 *******************************************************************************/
 
 #if !defined(NDEBUG)
-void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
+void show_basicblock(jitdata *jd, basicblock *bptr, int stage)
 {
        methodinfo  *m;
        codeinfo    *code;
@@ -452,7 +452,7 @@ void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
 
                if (stage >= SHOW_STACK) {
                        printf("IN:  ");
-                       new_show_variable_array(jd, bptr->invars, bptr->indepth, stage);
+                       show_variable_array(jd, bptr->invars, bptr->indepth, stage);
                        printf("\n");
                }
 
@@ -461,13 +461,13 @@ void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
                for (i = 0; i < bptr->icount; i++, iptr++) {
                        printf("%4d:  ", iptr->line);
 
-                       new_show_icmd(jd, iptr, deadcode, stage);
+                       show_icmd(jd, iptr, deadcode, stage);
                        printf("\n");
                }
 
                if (stage >= SHOW_STACK) {
                        printf("OUT: ");
-                       new_show_variable_array(jd, bptr->outvars, bptr->outdepth, stage);
+                       show_variable_array(jd, bptr->outvars, bptr->outdepth, stage);
                        printf("\n");
                }
 
@@ -729,7 +729,7 @@ static void show_variable(jitdata *jd, s4 index, int stage)
        fflush(stdout);
 }
 
-static void new_show_variable_array(jitdata *jd, s4 *vars, int n, int stage)
+static void show_variable_array(jitdata *jd, s4 *vars, int n, int stage)
 {
        int i;
 
@@ -742,7 +742,7 @@ static void new_show_variable_array(jitdata *jd, s4 *vars, int n, int stage)
        printf("]");
 }
 
-void new_show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage)
+void show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage)
 {
        u2                 opcode;
        branch_target_t   *table;

diff --git a/src/vm/jit/show.h b/src/vm/jit/show.h
index e82d3ff1c0bfb2b3bb5940b35144d1c9d4efc445..91a9941d8412e9c23360f97636f5eebbb0e71868 100644 (file)
--- a/src/vm/jit/show.h
+++ b/src/vm/jit/show.h
@@ -62,9 +62,9 @@ extern char show_jit_type_letters[];
 
 bool show_init(void);
 
-void new_show_method(jitdata *jd, int stage);
-void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage);
-void new_show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage);
+void show_method(jitdata *jd, int stage);
+void show_basicblock(jitdata *jd, basicblock *bptr, int stage);
+void show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage);
 #endif /* !defined(NDEBUG) */
 
 #endif /* _SHOW_H */

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 52f6630ef90d1e4377cf4952a297ee8215a8a43a..6e46c43e5eb83dd876af48b31533cc3f90b71998 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -30,7 +30,7 @@
             Christian Thalinger
             Christian Ullrich
 
-   $Id: stack.c 5652 2006-10-03 20:22:28Z edwin $
+   $Id: stack.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -1254,7 +1254,7 @@ bool stack_reanalyse_block(stackdata_t *sd)
                        ex = DNEW(exceptiontable);
                        ex->handler = sd->handlers[i]->handler;
                        ex->start = b;
-                       ex->end = b; /* XXX hack, see end of new_stack_analyse */
+                       ex->end = b; /* XXX hack, see end of stack_analyse */
                        ex->catchtype = sd->handlers[i]->catchtype;
                        ex->down = NULL;
 
@@ -1312,7 +1312,7 @@ bool stack_reanalyse_block(stackdata_t *sd)
 
        for (len = b->icount; len--; iptr++) {
 #if defined(STACK_VERBOSE)
-               new_show_icmd(sd->jd, iptr, false, SHOW_STACK);
+               show_icmd(sd->jd, iptr, false, SHOW_STACK);
                printf("\n");
 #endif
 
@@ -1726,7 +1726,7 @@ bool stack_reanalyse_block(stackdata_t *sd)
                } /* switch */
 
 #if defined(STACK_VERBOSE)
-               new_show_icmd(sd->jd, iptr, false, SHOW_STACK);
+               show_icmd(sd->jd, iptr, false, SHOW_STACK);
                printf("\n");
 #endif
        }
@@ -1775,7 +1775,7 @@ bool stack_reanalyse_block(stackdata_t *sd)
 
 *******************************************************************************/
 
-bool new_stack_analyse(jitdata *jd)
+bool stack_analyse(jitdata *jd)
 {
        methodinfo   *m;              /* method being analyzed                    */
        codeinfo     *code;
@@ -1819,7 +1819,7 @@ bool new_stack_analyse(jitdata *jd)
        int           new_index; /* used to get a new var index with GET_NEW_INDEX*/
 
 #if defined(STACK_VERBOSE)
-       new_show_method(jd, SHOW_PARSE);
+       show_method(jd, SHOW_PARSE);
 #endif
 
        /* get required compiler data - initialization */
@@ -2022,7 +2022,7 @@ bool new_stack_analyse(jitdata *jd)
                                while (--len >= 0)  {
 
 #if defined(STACK_VERBOSE)
-                                       new_show_icmd(jd, iptr, false, SHOW_PARSE); printf("\n");
+                                       show_icmd(jd, iptr, false, SHOW_PARSE); printf("\n");
                                        for( copy = curstack; copy; copy = copy->prev ) {
                                                printf("%2d(%d", copy->varnum, copy->type);
                                                if (IS_INOUT(copy))

diff --git a/src/vm/jit/stack.h b/src/vm/jit/stack.h
index d8432ebd5bde146246010a3649a4c970cb3c95d4..97d7b220fe018c0454814a158d8323adca0a232c 100644 (file)
--- a/src/vm/jit/stack.h
+++ b/src/vm/jit/stack.h
@@ -29,7 +29,7 @@
    Changes: Christian Ullrich
                        Edwin Steiner
 
-   $Id: stack.h 5652 2006-10-03 20:22:28Z edwin $
+   $Id: stack.h 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -137,7 +137,7 @@
 
 bool stack_init(void);
 
-bool new_stack_analyse(jitdata *jd);
+bool stack_analyse(jitdata *jd);
 
 #endif /* _STACK_H */
 

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index 2e626838f1daad15abff9914c943e5b4583ebd07..264a4f745aa2818e6953fcc948dea100c5952609 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: typecheck.c 5604 2006-10-01 15:25:21Z edwin $
+   $Id: typecheck.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -964,13 +964,13 @@ verify_invocation(verifier_state *state)
 
        /* try to resolve the method lazily */
 
-       result = new_resolve_method_lazy(jd, state->iptr, state->m);
+       result = resolve_method_lazy(jd, state->iptr, state->m);
        if (result == resolveFailed)
                return false;
 
        if (result != resolveSucceeded) {
                if (!um) {
-                       um = new_create_unresolved_method(state->m->class,
+                       um = create_unresolved_method(state->m->class,
                                        state->m, state->iptr);
 
                        if (!um)
@@ -979,7 +979,7 @@ verify_invocation(verifier_state *state)
 
                /* record subtype constraints for parameters */
 
-               if (!new_constrain_unresolved_method(jd, um, state->m->class, 
+               if (!constrain_unresolved_method(jd, um, state->m->class, 
                                        state->m, state->iptr))
                        return false; /* XXX maybe wrap exception */
 
@@ -1336,7 +1336,7 @@ verify_basic_block(verifier_state *state)
 
        LOGSTR1("\n---- BLOCK %04d ------------------------------------------------\n",state->bptr->nr);
        LOGFLUSH;
-       DOLOG(new_show_basicblock(jd, state->bptr, SHOW_STACK));
+       DOLOG(show_basicblock(jd, state->bptr, SHOW_STACK));
 
        superblockend = false;
        state->bptr->flags = BBFINISHED;
@@ -1375,7 +1375,7 @@ verify_basic_block(verifier_state *state)
 
                DOLOG(typevector_print(stdout, jd->var, state->numlocals));
                LOGNL; LOGFLUSH;
-               DOLOG(new_show_icmd(jd, state->iptr, false, SHOW_STACK)); LOGNL; LOGFLUSH;
+               DOLOG(show_icmd(jd, state->iptr, false, SHOW_STACK)); LOGNL; LOGFLUSH;
 
                opcode = iptr->opc;
                dv = VAROP(iptr->dst);
@@ -1500,13 +1500,13 @@ verify_basic_block(verifier_state *state)
                                }
 
                                /* try to resolve the field reference lazily */
-                               result = new_resolve_field_lazy(jd, state->iptr, state->m);
+                               result = resolve_field_lazy(jd, state->iptr, state->m);
                                if (result == resolveFailed)
                                        return false;
 
                                if (result != resolveSucceeded) {
                                        if (!uf) {
-                                               uf = new_create_unresolved_field(state->m->class, state->m, state->iptr);
+                                               uf = create_unresolved_field(state->m->class, state->m, state->iptr);
                                                if (!uf)
                                                        return false;
 
@@ -1515,7 +1515,7 @@ verify_basic_block(verifier_state *state)
                                        }
 
                                        /* record the subtype constraints for this field access */
-                                       if (!new_constrain_unresolved_field(jd, uf,state->m->class,state->m,state->iptr))
+                                       if (!constrain_unresolved_field(jd, uf,state->m->class,state->m,state->iptr))
                                                return false; /* XXX maybe wrap exception? */
 
                                        TYPECHECK_COUNTIF(INSTRUCTION_IS_UNRESOLVED(state->iptr),stat_ins_field_unresolved);
@@ -2407,7 +2407,7 @@ bool typecheck(jitdata *jd)
 
 
     LOGSTR("\n==============================================================================\n");
-    DOLOG( new_show_method(jd, SHOW_STACK) );
+    DOLOG( show_method(jd, SHOW_STACK) );
     LOGSTR("\n==============================================================================\n");
     LOGMETHOD("Entering typecheck: ",cd->method);
 

diff --git a/src/vm/resolve.c b/src/vm/resolve.c
index 0eb59f1eb687d2f53bdc71a35af99080365284f2..76eb3192937976e437f120b35b0a8d2ee95e0e3c 100644 (file)
--- a/src/vm/resolve.c
+++ b/src/vm/resolve.c
@@ -28,7 +28,7 @@
 
    Changes: Christan Thalinger
 
-   $Id: resolve.c 5511 2006-09-15 12:51:12Z edwin $
+   $Id: resolve.c 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -930,7 +930,7 @@ classinfo * resolve_class_eager(unresolved_class *ref)
 /* FIELD RESOLUTION                                                           */
 /******************************************************************************/
 
-/* new_resolve_field_verifier_checks *******************************************
+/* resolve_field_verifier_checks *******************************************
  
    Do the verifier checks necessary after field has been resolved.
   
@@ -950,7 +950,7 @@ classinfo * resolve_class_eager(unresolved_class *ref)
 *******************************************************************************/
 
 #if defined(ENABLE_VERIFIER)
-resolve_result_t new_resolve_field_verifier_checks(jitdata *jd,
+resolve_result_t resolve_field_verifier_checks(jitdata *jd,
                                                                                           methodinfo *refmethod,
                                                                                           constant_FMIref *fieldref,
                                                                                           classinfo *container,
@@ -1171,7 +1171,7 @@ resolve_result_t new_resolve_field_verifier_checks(jitdata *jd,
    
 *******************************************************************************/
 
-resolve_result_t new_resolve_field_lazy(jitdata *jd,
+resolve_result_t resolve_field_lazy(jitdata *jd,
                                                                                instruction *iptr,
                                                                                methodinfo *refmethod)
 {
@@ -1239,7 +1239,7 @@ resolved_the_field:
 
 #if defined(ENABLE_VERIFIER)
        if (JITDATA_HAS_FLAG_VERIFY(jd)) {
-               result = new_resolve_field_verifier_checks(jd,
+               result = resolve_field_verifier_checks(jd,
                                refmethod, fieldref, container, fi,
                                iptr->opc, iptr);
 
@@ -1355,7 +1355,7 @@ resolved_the_field:
        /* Checking opt_verify is ok here, because the NULL iptr guarantees */
        /* that no missing parts of an instruction will be accessed.        */
        if (opt_verify) {
-               checkresult = new_resolve_field_verifier_checks(NULL,
+               checkresult = resolve_field_verifier_checks(NULL,
                                ref->referermethod,
                                ref->fieldref,
                                container,
@@ -1512,7 +1512,7 @@ methodinfo * resolve_method_invokespecial_lookup(methodinfo *refmethod,
        return mi;
 }
 
-/* new_resolve_method_verifier_checks ******************************************
+/* resolve_method_verifier_checks ******************************************
  
    Do the verifier checks necessary after a method has been resolved.
   
@@ -1532,7 +1532,7 @@ methodinfo * resolve_method_invokespecial_lookup(methodinfo *refmethod,
 *******************************************************************************/
 
 #if defined(ENABLE_VERIFIER)
-resolve_result_t new_resolve_method_verifier_checks(jitdata *jd,
+resolve_result_t resolve_method_verifier_checks(jitdata *jd,
                                                                                                methodinfo *refmethod,
                                                                                                constant_FMIref *methodref,
                                                                                                classinfo *container,
@@ -1746,7 +1746,7 @@ resolve_result_t new_resolve_method_verifier_checks(jitdata *jd,
    
 *******************************************************************************/
 
-resolve_result_t new_resolve_method_lazy(jitdata *jd,
+resolve_result_t resolve_method_lazy(jitdata *jd,
                                                                                 instruction *iptr,
                                                                                 methodinfo *refmethod)
 {
@@ -1838,7 +1838,7 @@ resolved_the_method:
 
 #if defined(ENABLE_VERIFIER)
        if (JITDATA_HAS_FLAG_VERIFY(jd)) {
-               result = new_resolve_method_verifier_checks(jd,
+               result = resolve_method_verifier_checks(jd,
                                                                                                refmethod, methodref,
                                                                                                container,
                                                                                                mi,
@@ -1988,7 +1988,7 @@ resolved_the_method:
        /* that no missing parts of an instruction will be accessed.        */
        if (opt_verify) {
 
-               checkresult = new_resolve_method_verifier_checks(NULL,
+               checkresult = resolve_method_verifier_checks(NULL,
                                ref->referermethod,
                                ref->methodref,
                                container,
@@ -2241,7 +2241,7 @@ unresolved_class * create_unresolved_class(methodinfo *refmethod,
 
 *******************************************************************************/
 
-unresolved_field * new_create_unresolved_field(classinfo *referer,
+unresolved_field * create_unresolved_field(classinfo *referer,
                                                                                           methodinfo *refmethod,
                                                                                           instruction *iptr)
 {
@@ -2308,7 +2308,7 @@ unresolved_field * new_create_unresolved_field(classinfo *referer,
        return ref;
 }
 
-/* new_constrain_unresolved_field **********************************************
+/* constrain_unresolved_field **********************************************
  
    Record subtype constraints for a field access.
   
@@ -2325,7 +2325,7 @@ unresolved_field * new_create_unresolved_field(classinfo *referer,
 *******************************************************************************/
 
 #ifdef ENABLE_VERIFIER
-bool new_constrain_unresolved_field(jitdata *jd,
+bool constrain_unresolved_field(jitdata *jd,
                                                                        unresolved_field *ref,
                                                                        classinfo *referer, methodinfo *refmethod,
                                                                        instruction *iptr)
@@ -2467,7 +2467,7 @@ bool new_constrain_unresolved_field(jitdata *jd,
 
 *******************************************************************************/
 
-unresolved_method * new_create_unresolved_method(classinfo *referer,
+unresolved_method * create_unresolved_method(classinfo *referer,
                                                                                                 methodinfo *refmethod,
                                                                                                 instruction *iptr)
 {
@@ -2508,7 +2508,7 @@ unresolved_method * new_create_unresolved_method(classinfo *referer,
        return ref;
 }
 
-/* new_constrain_unresolved_method *********************************************
+/* constrain_unresolved_method *********************************************
  
    Record subtype constraints for the arguments of a method call.
   
@@ -2525,7 +2525,7 @@ unresolved_method * new_create_unresolved_method(classinfo *referer,
 *******************************************************************************/
 
 #ifdef ENABLE_VERIFIER
-bool new_constrain_unresolved_method(jitdata *jd,
+bool constrain_unresolved_method(jitdata *jd,
                                                                         unresolved_method *ref,
                                                                         classinfo *referer, methodinfo *refmethod,
                                                                         instruction *iptr)

diff --git a/src/vm/resolve.h b/src/vm/resolve.h
index 5724322afe2fff03a4deba8d7f507c314088b381..23c5ac0a964c2f8282ced2d02e0af626788b8129 100644 (file)
--- a/src/vm/resolve.h
+++ b/src/vm/resolve.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: resolve.h 5497 2006-09-14 18:55:03Z edwin $
+   $Id: resolve.h 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -169,11 +169,11 @@ unresolved_class * create_unresolved_class(methodinfo *refmethod,
                                                typeinfo *valuetype);
 #endif
 
-unresolved_field *new_create_unresolved_field(classinfo *referer,
+unresolved_field *create_unresolved_field(classinfo *referer,
                                                                                          methodinfo *refmethod,
                                                                                          instruction *iptr);
 
-unresolved_method *new_create_unresolved_method(classinfo *referer,
+unresolved_method *create_unresolved_method(classinfo *referer,
                                                                                                methodinfo *refmethod,
                                                                                                instruction *iptr);
 
@@ -181,20 +181,20 @@ void unresolved_class_free(unresolved_class *ref);
 void unresolved_field_free(unresolved_field *ref);
 void unresolved_method_free(unresolved_method *ref);
 
-resolve_result_t new_resolve_method_lazy(jitdata *jd,
+resolve_result_t resolve_method_lazy(jitdata *jd,
                                                                                 instruction *iptr,
                                                                                 methodinfo *refmethod);
 
-resolve_result_t new_resolve_field_lazy(jitdata *jd,
+resolve_result_t resolve_field_lazy(jitdata *jd,
                                                                                instruction *iptr,
                                                                                methodinfo *refmethod);
 
 #ifdef ENABLE_VERIFIER
-bool new_constrain_unresolved_field(jitdata *jd, 
+bool constrain_unresolved_field(jitdata *jd, 
                                                                        unresolved_field *ref, classinfo *referer,
                                                                        methodinfo *refmethod, instruction *iptr);
 
-bool new_constrain_unresolved_method(jitdata *jd,
+bool constrain_unresolved_method(jitdata *jd,
                                                                         unresolved_method *ref, classinfo *referer,
                                                                         methodinfo *refmethod, instruction *iptr);