projects / cacao.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c2b6a8e)
* src/vm/jit/alpha/emit.c (vm/options.h): Added.
authortwisti <none@none>
Sat, 11 Nov 2006 18:31:10 +0000 (18:31 +0000)
committertwisti <none@none>
Sat, 11 Nov 2006 18:31:10 +0000 (18:31 +0000)
(emit_arrayindexoutofbounds_check): New function.
(emit_arraystore_check): Likewise.
(emit_classcast_check): Likewise.
(emit_classcast_check): Likewise.
(emit_nullpointer_check): Likewise.

* src/vm/jit/alpha/codegen.c (codegen): Removed patch-NOPs generation,
replaced gen_nullptr_check with emit_nullpointer_check.
(createnativestub): Removed patch-NOPs generation.

* src/vm/jit/alpha/codegen.h (gen_nullptr_check): Removed.
(PATCHER_NOPS): Added.

* src/vm/jit/alpha/patcher.c (patcher_get_putfield): Use opt_shownops
instead of opt_showdisassemble.
(patcher_invokevirtual): Likewise.
(patcher_invokeinterface): Likewise.
(patcher_checkcast_instanceof_interface): Likewise.

* src/vm/jit/emit-common.c (emit_array_checks): Added [__ALPHA__].
* src/vm/jit/codegen-common.c (codegen_add_patch_ref): Likewise.

src/vm/jit/alpha/codegen.c patch | blob | history
src/vm/jit/alpha/codegen.h patch | blob | history
src/vm/jit/alpha/emit.c patch | blob | history
src/vm/jit/alpha/patcher.c patch | blob | history
src/vm/jit/codegen-common.c patch | blob | history
src/vm/jit/emit-common.c patch | blob | history

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 7307450c06f06bcd916608c4c881816f12e9cfb1..b54710a56299ddc4704740f8329f6131bbefe476 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -26,13 +26,12 @@
 
    Authors: Andreas Krall
             Reinhard Grafl
-
-   Changes: Joseph Wenninger
+            Joseph Wenninger
             Christian Thalinger
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5949 2006-11-11 17:05:19Z twisti $
+   $Id: codegen.c 5951 2006-11-11 18:31:10Z twisti $
 
 */
 
@@ -460,9 +459,6 @@ bool codegen(jitdata *jd)
                                codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_classinfo,
                                                                          cr, disp);
 
-                               if (opt_showdisassemble)
-                                       M_NOP;
-
                                M_ALD(d, REG_PV, disp);
                        }
                        else {
@@ -1435,7 +1431,7 @@ bool codegen(jitdata *jd)
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
-                       gen_nullptr_check(s1);
+                       emit_nullpointer_check(cd, s1);
                        M_ILD(d, s1, OFFSET(java_arrayheader, size));
                        emit_store_dst(jd, iptr, d);
                        break;
@@ -1446,7 +1442,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1469,7 +1465,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1492,7 +1488,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1517,7 +1513,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S4ADDQ(s2, s1, REG_ITMP1);
@@ -1531,7 +1527,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S8ADDQ(s2, s1, REG_ITMP1);
@@ -1545,7 +1541,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S4ADDQ(s2, s1, REG_ITMP1);
@@ -1559,7 +1555,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_FTMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S8ADDQ(s2, s1, REG_ITMP1);
@@ -1573,7 +1569,7 @@ bool codegen(jitdata *jd)
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        d = codegen_reg_of_dst(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_SAADDQ(s2, s1, REG_ITMP1);
@@ -1587,7 +1583,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
@@ -1610,7 +1606,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
@@ -1635,7 +1631,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
@@ -1660,7 +1656,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
@@ -1673,7 +1669,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_ITMP3);
@@ -1686,7 +1682,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_FTMP3);
@@ -1699,7 +1695,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_FTMP3);
@@ -1712,7 +1708,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_A0);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        s3 = emit_load_s3(jd, iptr, REG_A1);
@@ -1742,7 +1738,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S4ADDQ(s2, s1, REG_ITMP1);
@@ -1754,7 +1750,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_S8ADDQ(s2, s1, REG_ITMP1);
@@ -1766,7 +1762,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        M_SAADDQ(s2, s1, REG_ITMP1);
@@ -1778,7 +1774,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1801,7 +1797,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1826,7 +1822,7 @@ bool codegen(jitdata *jd)
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2(jd, iptr, REG_ITMP2);
                        if (INSTRUCTION_MUST_CHECK(iptr)) {
-                               gen_nullptr_check(s1);
+                               emit_nullpointer_check(cd, s1);
                                gen_bound_check;
                        }
                        if (has_ext_instr_set) {
@@ -1850,30 +1846,20 @@ bool codegen(jitdata *jd)
                case ICMD_GETSTATIC:  /* ...  ==> ..., value                          */
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf = iptr->sx.s23.s3.uf;
-
+                               uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
-
-                               disp = dseg_add_unique_address(cd, uf);
+                               disp      = dseg_add_unique_address(cd, uf);
 
                                codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
                        else {
-                               fi = iptr->sx.s23.s3.fmiref->p.field;
-
+                               fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp = dseg_add_address(cd, &(fi->value));
+                               disp      = dseg_add_address(cd, &(fi->value));
 
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
                                        codegen_add_patch_ref(cd, PATCHER_initialize_class, fi->class,
                                                                                  0);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-                               }
                        }
 
                        M_ALD(REG_ITMP1, REG_PV, disp);
@@ -1905,30 +1891,20 @@ bool codegen(jitdata *jd)
                case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf = iptr->sx.s23.s3.uf;
-
+                               uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
-
-                               disp = dseg_add_unique_address(cd, uf);
+                               disp      = dseg_add_unique_address(cd, uf);
 
                                codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
                        else {
-                               fi = iptr->sx.s23.s3.fmiref->p.field;
-
+                               fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp = dseg_add_address(cd, &(fi->value));
+                               disp      = dseg_add_address(cd, &(fi->value));
 
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
                                        codegen_add_patch_ref(cd, PATCHER_initialize_class, fi->class,
                                                                                  0);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-                               }
                        }
 
                        M_ALD(REG_ITMP1, REG_PV, disp);
@@ -1961,30 +1937,20 @@ bool codegen(jitdata *jd)
                                          /* following NOP)                           */
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf = iptr->sx.s23.s3.uf;
-
+                               uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
-
-                               disp = dseg_add_unique_address(cd, uf);
+                               disp      = dseg_add_unique_address(cd, uf);
 
                                codegen_add_patch_ref(cd, PATCHER_get_putstatic, uf, disp);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
                        else {
-                               fi = iptr->sx.s23.s3.fmiref->p.field;
-
+                               fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp = dseg_add_address(cd, &(fi->value));
+                               disp      = dseg_add_address(cd, &(fi->value));
 
-                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
+                               if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class))
                                        codegen_add_patch_ref(cd, PATCHER_initialize_class, fi->class,
                                                                                  0);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-                               }
                        }
                        
                        M_ALD(REG_ITMP1, REG_PV, disp);
@@ -2011,25 +1977,19 @@ bool codegen(jitdata *jd)
                case ICMD_GETFIELD:   /* ...  ==> ..., value                          */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
+                       emit_nullpointer_check(cd, s1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf = iptr->sx.s23.s3.uf;
-
+                               uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
+                               disp      = 0;
 
                                codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
-
-                               disp = 0;
                        }
                        else {
-                               fi = iptr->sx.s23.s3.fmiref->p.field;
-
+                               fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp = fi->offset;
+                               disp      = fi->offset;
                        }
 
                        switch (fieldtype) {
@@ -2060,7 +2020,7 @@ bool codegen(jitdata *jd)
                case ICMD_PUTFIELD:   /* ..., objectref, value  ==> ...               */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
+                       emit_nullpointer_check(cd, s1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
                                uf        = iptr->sx.s23.s3.uf;
@@ -2079,13 +2039,9 @@ bool codegen(jitdata *jd)
                        else
                                s2 = emit_load_s2(jd, iptr, REG_FTMP2);
 
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
+                       if (INSTRUCTION_IS_UNRESOLVED(iptr))
                                codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
 
-                               if (opt_showdisassemble)
-                                       M_NOP;
-                       }
-
                        switch (fieldtype) {
                        case TYPE_INT:
                                M_IST(s2, s1, disp);
@@ -2110,25 +2066,19 @@ bool codegen(jitdata *jd)
                                          /* following NOP)                           */
 
                        s1 = emit_load_s1(jd, iptr, REG_ITMP1);
-                       gen_nullptr_check(s1);
+                       emit_nullpointer_check(cd, s1);
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uf = iptr->sx.s23.s3.uf;
-
+                               uf        = iptr->sx.s23.s3.uf;
                                fieldtype = uf->fieldref->parseddesc.fd->type;
+                               disp      = 0;
 
                                codegen_add_patch_ref(cd, PATCHER_get_putfield, uf, 0);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
-
-                               disp = 0;
                        }
                        else {
-                               fi = iptr->sx.s23.s3.fmiref->p.field;
-
+                               fi        = iptr->sx.s23.s3.fmiref->p.field;
                                fieldtype = fi->type;
-                               disp = fi->offset;
+                               disp      = fi->offset;
                        }
 
                        switch (fieldtype) {
@@ -2163,9 +2113,6 @@ bool codegen(jitdata *jd)
                                unresolved_class *uc = iptr->sx.s23.s2.uc;
 
                                codegen_add_patch_ref(cd, PATCHER_resolve_class, uc, 0);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
 #endif /* ENABLE_VERIFIER */
 
@@ -2514,9 +2461,6 @@ bool codegen(jitdata *jd)
                                unresolved_class *uc = iptr->sx.s23.s2.uc;
 
                                codegen_add_patch_ref(cd, PATCHER_resolve_class, uc, 0);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
 #endif /* ENABLE_VERIFIER */
                        goto nowperformreturn;
@@ -2776,9 +2720,6 @@ gen_method:
 
                                        codegen_add_patch_ref(cd, PATCHER_invokestatic_special,
                                                                                  um, disp);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
                                }
                                else
                                        disp = dseg_add_address(cd, lm->stubroutine);
@@ -2787,14 +2728,11 @@ gen_method:
                                break;
 
                        case ICMD_INVOKEVIRTUAL:
-                               gen_nullptr_check(REG_A0);
+                               emit_nullpointer_check(cd, REG_A0);
 
                                if (lm == NULL) {
                                        codegen_add_patch_ref(cd, PATCHER_invokevirtual, um, 0);
 
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-
                                        s1 = 0;
                                }
                                else
@@ -2807,14 +2745,11 @@ gen_method:
                                break;
 
                        case ICMD_INVOKEINTERFACE:
-                               gen_nullptr_check(REG_A0);
+                               emit_nullpointer_check(cd, REG_A0);
 
                                if (lm == NULL) {
                                        codegen_add_patch_ref(cd, PATCHER_invokeinterface, um, 0);
 
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-
                                        s1 = 0;
                                        s2 = 0;
                                }
@@ -2907,18 +2842,18 @@ gen_method:
 
                                s2 = 6;
                                if (super == NULL)
-                                       s2 += opt_showdisassemble ? 1 : 0;
+                                       s2 += opt_shownops ? 1 : 0;
 
                                /* calculate class checkcast code size */
 
                                s3 = 9 /* 8 + (s1 == REG_ITMP1) */;
                                if (super == NULL)
-                                       s3 += opt_showdisassemble ? 1 : 0;
+                                       s3 += opt_shownops ? 1 : 0;
 
                                /* if class is not resolved, check which code to call */
 
                                if (super == NULL) {
-                                       M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+                                       M_BEQZ(s1, 4 + (opt_shownops ? 1 : 0) + s2 + 1 + s3);
 
                                        disp = dseg_add_unique_s4(cd, 0);         /* super->flags */
 
@@ -2926,9 +2861,6 @@ gen_method:
                                                                                  iptr->sx.s23.s3.c.ref,
                                                                                  disp);
 
-                                       if (opt_showdisassemble)
-                                               M_NOP;
-
                                        M_ILD(REG_ITMP2, REG_PV, disp);
                                        disp = dseg_add_s4(cd, ACC_INTERFACE);
                                        M_ILD(REG_ITMP3, REG_PV, disp);
@@ -2944,9 +2876,6 @@ gen_method:
                                                                                          PATCHER_checkcast_instanceof_interface,
                                                                                          iptr->sx.s23.s3.c.ref,
                                                                                          0);
-
-                                               if (opt_showdisassemble)
-                                                       M_NOP;
                                        }
                                        else
                                                M_BEQZ(s1, s2);
@@ -2977,9 +2906,6 @@ gen_method:
                                                                                          PATCHER_resolve_classref_to_vftbl,
                                                                                          iptr->sx.s23.s3.c.ref,
                                                                                          disp);
-
-                                               if (opt_showdisassemble)
-                                                       M_NOP;
                                        }
                                        else {
                                                disp = dseg_add_address(cd, supervftbl);
@@ -3030,9 +2956,6 @@ gen_method:
                                                                                  PATCHER_resolve_classref_to_classinfo,
                                                                                  iptr->sx.s23.s3.c.ref,
                                                                                  disp);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
                                }
 
                                M_ALD(REG_A1, REG_PV, disp);
@@ -3100,28 +3023,25 @@ gen_method:
 
                        s2 = 6;
                        if (super == NULL)
-                               s2 += (d == REG_ITMP2 ? 1 : 0) + (opt_showdisassemble ? 1 : 0);
+                               s2 += (d == REG_ITMP2 ? 1 : 0) + (opt_shownops ? 1 : 0);
 
                        /* calculate class instanceof code size */
 
                        s3 = 7;
                        if (super == NULL)
-                               s3 += (opt_showdisassemble ? 1 : 0);
+                               s3 += (opt_shownops ? 1 : 0);
 
                        /* if class is not resolved, check which code to call */
 
                        if (super == NULL) {
                                M_CLR(d);
-                               M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
+                               M_BEQZ(s1, 4 + (opt_shownops ? 1 : 0) + s2 + 1 + s3);
 
                                disp = dseg_add_unique_s4(cd, 0);             /* super->flags */
 
                                codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_flags,
                                                                          iptr->sx.s23.s3.c.ref, disp);
 
-                               if (opt_showdisassemble)
-                                       M_NOP;
-
                                M_ILD(REG_ITMP3, REG_PV, disp);
 
                                disp = dseg_add_s4(cd, ACC_INTERFACE);
@@ -3142,9 +3062,6 @@ gen_method:
                                        codegen_add_patch_ref(cd,
                                                                                  PATCHER_checkcast_instanceof_interface,
                                                                                  iptr->sx.s23.s3.c.ref, 0);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
                                }
                                else {
                                        M_CLR(d);
@@ -3173,9 +3090,6 @@ gen_method:
                                        codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_vftbl,
                                                                                  iptr->sx.s23.s3.c.ref,
                                                                                  disp);
-
-                                       if (opt_showdisassemble)
-                                               M_NOP;
                                }
                                else {
                                        disp = dseg_add_address(cd, supervftbl);
@@ -3234,9 +3148,6 @@ gen_method:
                                codegen_add_patch_ref(cd, PATCHER_resolve_classref_to_classinfo,
                                                                          iptr->sx.s23.s3.c.ref,
                                                                          disp);
-
-                               if (opt_showdisassemble)
-                                       M_NOP;
                        }
                        else
                                disp = dseg_add_address(cd, iptr->sx.s23.s3.c.cls);
@@ -3425,12 +3336,8 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        funcdisp = dseg_add_functionptr(cd, f);
 
 #if !defined(WITH_STATIC_CLASSPATH)
-       if (f == NULL) {
+       if (f == NULL)
                codegen_add_patch_ref(cd, PATCHER_resolve_native_function, m, funcdisp);
-
-               if (opt_showdisassemble)
-                       M_NOP;
-       }
 #endif
 
        /* save integer and float argument registers */
diff --git a/src/vm/jit/alpha/codegen.h b/src/vm/jit/alpha/codegen.h
index cea648a6e96bc732699a42b7ed66272a0087a03d..298d01463610c5eaa523641b520fd0dd6db4a637 100644 (file)
--- a/src/vm/jit/alpha/codegen.h
+++ b/src/vm/jit/alpha/codegen.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: codegen.h 5948 2006-11-11 16:56:48Z twisti $
+   $Id: codegen.h 5951 2006-11-11 18:31:10Z twisti $
 
 */
 
@@ -45,14 +45,6 @@
 
 /* additional functions and macros to generate code ***************************/
 
-/* gen_nullptr_check(objreg) */
-
-#define gen_nullptr_check(objreg) \
-    if (checknull) { \
-        M_BEQZ((objreg), 0); \
-        codegen_add_nullpointerexception_ref(cd); \
-    }
-
 #define gen_bound_check \
     if (checkbounds) { \
         M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));\
@@ -105,6 +97,14 @@
 #define LCONST(d,c)        emit_lconst(cd, (d), (c))
 
 
+/* some patcher defines *******************************************************/
+
+#define PATCHER_NOPS \
+    do { \
+        M_NOP; \
+    } while (0)
+
+
 /* macros to create code ******************************************************/
 
 #define REG   0
diff --git a/src/vm/jit/alpha/emit.c b/src/vm/jit/alpha/emit.c
index c6e6b03dd9d36b7c2af246673350896027fd9bf6..feef928c8c9d0ce499aaa515eac650bf25e377d5 100644 (file)
--- a/src/vm/jit/alpha/emit.c
+++ b/src/vm/jit/alpha/emit.c
@@ -26,8 +26,6 @@
 
    Authors: Christian Thalinger
 
-   Changes:
-
    $Id: emit.c 4398 2006-01-31 23:43:08Z twisti $
 
 */
@@ -45,6 +43,7 @@
 #endif
 
 #include "vm/builtin.h"
+#include "vm/options.h"
 #include "vm/jit/abi-asm.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/dseg.h"
@@ -191,6 +190,64 @@ void emit_lconst(codegendata *cd, s4 d, s8 value)
 }
 
 
+/* emit_arrayindexoutofbounds_check ********************************************
+
+   Emit an ArrayIndexOutOfBoundsException check.
+
+*******************************************************************************/
+
+void emit_arrayindexoutofbounds_check(codegendata *cd, s4 s1, s4 s2)
+{
+       if (checkbounds) {
+               M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));
+               M_CMPULT(s2, REG_ITMP3, REG_ITMP3);
+               M_BEQZ(REG_ITMP3, 0);
+               codegen_add_arrayindexoutofboundsexception_ref(cd, s2);
+       }
+}
+
+
+/* emit_arraystore_check *******************************************************
+
+   Emit an ArrayStoreException check.
+
+*******************************************************************************/
+
+void emit_arraystore_check(codegendata *cd, s4 reg)
+{
+       M_BEQZ(reg, 0);
+       codegen_add_arraystoreexception_ref(cd);
+}
+
+
+/* emit_classcast_check ********************************************************
+
+   Emit a ClassCastException check.
+
+*******************************************************************************/
+
+void emit_classcast_check(codegendata *cd, s4 condition, s4 reg, s4 s1)
+{
+       M_BNEZ(reg, 0);
+       codegen_add_classcastexception_ref(cd, s1);
+}
+
+
+/* emit_nullpointer_check ******************************************************
+
+   Emit a NullPointerException check.
+
+*******************************************************************************/
+
+void emit_nullpointer_check(codegendata *cd, s4 reg)
+{
+       if (checknull) {
+               M_BEQZ(reg, 0);
+               codegen_add_nullpointerexception_ref(cd);
+       }
+}
+
+
 /* emit_exception_stubs ********************************************************
 
    Generates the code for the exception stubs.
diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c
index a6308c7bc4f5495fbd8f2b5dd7a2928d1c9bfbbe..f0e84e56cf8cc3f935cdfc356a2e605ea4bb3983 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 5290 2006-09-04 17:12:48Z christian $
+   $Id: patcher.c 5951 2006-11-11 18:31:10Z twisti $
 
 */
 
@@ -415,7 +415,7 @@ bool patcher_get_putfield(u1 *sp)
 
        /* if we show disassembly, we have to skip the nop */
 
-       if (opt_showdisassemble) {
+       if (opt_shownops) {
                /* patch the field's offset into the instruction */
 
                *((u4 *) (ra + 4)) |= (s2) (fi->offset & 0x0000ffff);
@@ -495,7 +495,7 @@ bool patcher_invokevirtual(u1 *sp)
 
        /* if we show disassembly, we have to skip the nop */
 
-       if (opt_showdisassemble)
+       if (opt_shownops)
                ra = ra + 4;
 
        /* patch vftbl index */
@@ -537,7 +537,7 @@ bool patcher_invokeinterface(u1 *sp)
 
        /* if we show disassembly, we have to skip the nop */
 
-       if (opt_showdisassemble)
+       if (opt_shownops)
                ra = ra + 4;
 
        /* patch interfacetable index */
@@ -585,7 +585,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp)
 
        /* if we show disassembly, we have to skip the nop */
 
-       if (opt_showdisassemble)
+       if (opt_shownops)
                ra = ra + 4;
 
        /* patch super class index */
diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 5acf064b730496c3f6538b6ee438e04bfc93cac8..f6e51ff2426268b0e8c67a377569663a1f0fd12a 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -26,10 +26,9 @@
 
    Authors: Reinhard Grafl
             Andreas  Krall
-
-   Changes: Christian Thalinger
+            Christian Thalinger
             Joseph Wenninger
-                       Edwin Steiner
+            Edwin Steiner
 
    All functions assume the following code area / data area layout:
 
@@ -48,7 +47,7 @@
    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 5946 2006-11-11 14:28:56Z twisti $
+   $Id: codegen-common.c 5951 2006-11-11 18:31:10Z twisti $
 
 */
 
@@ -478,7 +477,7 @@ void codegen_add_patch_ref(codegendata *cd, functionptr patcher, voidptr ref,
        pr->next      = cd->patchrefs;
        cd->patchrefs = pr;
 
-#if defined(ENABLE_JIT) && (defined(__MIPS__) || defined(__POWERPC__) || defined(__X86_64__))
+#if defined(ENABLE_JIT) && (defined(__ALPHA__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__X86_64__))
        /* Generate NOPs for opt_shownops. */
 
        if (opt_shownops)
diff --git a/src/vm/jit/emit-common.c b/src/vm/jit/emit-common.c
index f79870a958b3a7c57f3a9d4d47a954fc973f7221..8bd270b0478e860f2781c479bbf970d4c08ad240 100644 (file)
--- a/src/vm/jit/emit-common.c
+++ b/src/vm/jit/emit-common.c
@@ -253,7 +253,7 @@ void emit_store_dst(jitdata *jd, instruction *iptr, s4 d)
 
 *******************************************************************************/
 
-#if defined(__POWERPC__)
+#if defined(__ALPHA__) || defined(__POWERPC__)
 void emit_array_checks(codegendata *cd, instruction *iptr, s4 s1, s4 s2)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
inofficial http://www.cacaojvm.org/ git mirror