- ifdef's for ICMD_IREM0X10001 and ICMD_LREM0X10001, these should not be implemented...

- bugfix for long shifts with constants, const is a int

diff --git a/jit/stack.c b/jit/stack.c
index 6180268a27a287edf99ff033c76ebf1ad0336ba0..4d7890bde61c2c30fc743bcbfa3bfc9626b3b20c 100644 (file)
--- a/jit/stack.c
+++ b/jit/stack.c
@@ -407,10 +407,12 @@ icmd_iconst_tail:
                                                                                iptr[0].opc = ICMD_IDIVPOW2;
                                                                                goto icmd_iconst_tail;
                                                                        case ICMD_IREM:
+#ifndef __I386__
                                                                                if (iptr[0].val.i == 0x10001) {
                                                                                        iptr[0].opc = ICMD_IREM0X10001;
                                                                                        goto icmd_iconst_tail;
                                                                                        }
+#endif
                                                                                if ((iptr[0].val.i == 0x00000002) ||
                                                                                    (iptr[0].val.i == 0x00000004) ||
                                                                                    (iptr[0].val.i == 0x00000008) ||
@@ -466,6 +468,15 @@ icmd_iconst_tail:
                                                                        case ICMD_IUSHR:
                                                                                iptr[0].opc = ICMD_IUSHRCONST;
                                                                                goto icmd_iconst_tail;
+                                                                       case ICMD_LSHL:
+                                                                               iptr[0].opc = ICMD_LSHLCONST;
+                                                                               goto icmd_lconst_tail;
+                                                                       case ICMD_LSHR:
+                                                                               iptr[0].opc = ICMD_LSHRCONST;
+                                                                               goto icmd_lconst_tail;
+                                                                       case ICMD_LUSHR:
+                                                                               iptr[0].opc = ICMD_LUSHRCONST;
+                                                                               goto icmd_lconst_tail;
                                                                        case ICMD_IF_ICMPEQ:
                                                                                iptr[0].opc = ICMD_IFEQ;
 icmd_if_icmp_tail:
@@ -590,10 +601,12 @@ icmd_lconst_tail:
                                                                                iptr[0].opc = ICMD_LDIVPOW2;
                                                                                goto icmd_lconst_tail;
                                                                        case ICMD_LREM:
+#ifndef __I386__
                                                                                if (iptr[0].val.l == 0x10001) {
                                                                                        iptr[0].opc = ICMD_LREM0X10001;
                                                                                        goto icmd_lconst_tail;
                                                                                        }
+#endif
                                                                                if ((iptr[0].val.l == 0x00000002) ||
                                                                                    (iptr[0].val.l == 0x00000004) ||
                                                                                    (iptr[0].val.l == 0x00000008) ||
@@ -640,15 +653,6 @@ icmd_lconst_tail:
                                                                        case ICMD_LXOR:
                                                                                iptr[0].opc = ICMD_LXORCONST;
                                                                                goto icmd_lconst_tail;
-                                                                       case ICMD_LSHL:
-                                                                               iptr[0].opc = ICMD_LSHLCONST;
-                                                                               goto icmd_lconst_tail;
-                                                                       case ICMD_LSHR:
-                                                                               iptr[0].opc = ICMD_LSHRCONST;
-                                                                               goto icmd_lconst_tail;
-                                                                       case ICMD_LUSHR:
-                                                                               iptr[0].opc = ICMD_LUSHRCONST;
-                                                                               goto icmd_lconst_tail;
                                                                        case ICMD_LCMP:
                                                                                if ((len > 1) && (iptr[2].val.i == 0)) {
                                                                                        switch (iptr[2].opc) {
@@ -1849,6 +1853,9 @@ static void show_icmd_method()
                                case ICMD_ISHLCONST:
                                case ICMD_ISHRCONST:
                                case ICMD_IUSHRCONST:
+                               case ICMD_LSHLCONST:
+                               case ICMD_LSHRCONST:
+                               case ICMD_LUSHRCONST:
                                case ICMD_ICONST:
                                case ICMD_ELSE_ICONST:
                                case ICMD_IFEQ_ICONST:
@@ -1867,11 +1874,12 @@ static void show_icmd_method()
                                case ICMD_LANDCONST:
                                case ICMD_LORCONST:
                                case ICMD_LXORCONST:
-                               case ICMD_LSHLCONST:
-                               case ICMD_LSHRCONST:
-                               case ICMD_LUSHRCONST:
                                case ICMD_LCONST:
+#ifdef __I386__
+                                       printf(" %lld", iptr->val.l);
+#else
                                        printf(" %ld", iptr->val.l);
+#endif
                                        break;
                                case ICMD_FCONST:
                                        printf(" %f", iptr->val.f);

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 6180268a27a287edf99ff033c76ebf1ad0336ba0..4d7890bde61c2c30fc743bcbfa3bfc9626b3b20c 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -407,10 +407,12 @@ icmd_iconst_tail:
                                                                                iptr[0].opc = ICMD_IDIVPOW2;
                                                                                goto icmd_iconst_tail;
                                                                        case ICMD_IREM:
+#ifndef __I386__
                                                                                if (iptr[0].val.i == 0x10001) {
                                                                                        iptr[0].opc = ICMD_IREM0X10001;
                                                                                        goto icmd_iconst_tail;
                                                                                        }
+#endif
                                                                                if ((iptr[0].val.i == 0x00000002) ||
                                                                                    (iptr[0].val.i == 0x00000004) ||
                                                                                    (iptr[0].val.i == 0x00000008) ||
@@ -466,6 +468,15 @@ icmd_iconst_tail:
                                                                        case ICMD_IUSHR:
                                                                                iptr[0].opc = ICMD_IUSHRCONST;
                                                                                goto icmd_iconst_tail;
+                                                                       case ICMD_LSHL:
+                                                                               iptr[0].opc = ICMD_LSHLCONST;
+                                                                               goto icmd_lconst_tail;
+                                                                       case ICMD_LSHR:
+                                                                               iptr[0].opc = ICMD_LSHRCONST;
+                                                                               goto icmd_lconst_tail;
+                                                                       case ICMD_LUSHR:
+                                                                               iptr[0].opc = ICMD_LUSHRCONST;
+                                                                               goto icmd_lconst_tail;
                                                                        case ICMD_IF_ICMPEQ:
                                                                                iptr[0].opc = ICMD_IFEQ;
 icmd_if_icmp_tail:
@@ -590,10 +601,12 @@ icmd_lconst_tail:
                                                                                iptr[0].opc = ICMD_LDIVPOW2;
                                                                                goto icmd_lconst_tail;
                                                                        case ICMD_LREM:
+#ifndef __I386__
                                                                                if (iptr[0].val.l == 0x10001) {
                                                                                        iptr[0].opc = ICMD_LREM0X10001;
                                                                                        goto icmd_lconst_tail;
                                                                                        }
+#endif
                                                                                if ((iptr[0].val.l == 0x00000002) ||
                                                                                    (iptr[0].val.l == 0x00000004) ||
                                                                                    (iptr[0].val.l == 0x00000008) ||
@@ -640,15 +653,6 @@ icmd_lconst_tail:
                                                                        case ICMD_LXOR:
                                                                                iptr[0].opc = ICMD_LXORCONST;
                                                                                goto icmd_lconst_tail;
-                                                                       case ICMD_LSHL:
-                                                                               iptr[0].opc = ICMD_LSHLCONST;
-                                                                               goto icmd_lconst_tail;
-                                                                       case ICMD_LSHR:
-                                                                               iptr[0].opc = ICMD_LSHRCONST;
-                                                                               goto icmd_lconst_tail;
-                                                                       case ICMD_LUSHR:
-                                                                               iptr[0].opc = ICMD_LUSHRCONST;
-                                                                               goto icmd_lconst_tail;
                                                                        case ICMD_LCMP:
                                                                                if ((len > 1) && (iptr[2].val.i == 0)) {
                                                                                        switch (iptr[2].opc) {
@@ -1849,6 +1853,9 @@ static void show_icmd_method()
                                case ICMD_ISHLCONST:
                                case ICMD_ISHRCONST:
                                case ICMD_IUSHRCONST:
+                               case ICMD_LSHLCONST:
+                               case ICMD_LSHRCONST:
+                               case ICMD_LUSHRCONST:
                                case ICMD_ICONST:
                                case ICMD_ELSE_ICONST:
                                case ICMD_IFEQ_ICONST:
@@ -1867,11 +1874,12 @@ static void show_icmd_method()
                                case ICMD_LANDCONST:
                                case ICMD_LORCONST:
                                case ICMD_LXORCONST:
-                               case ICMD_LSHLCONST:
-                               case ICMD_LSHRCONST:
-                               case ICMD_LUSHRCONST:
                                case ICMD_LCONST:
+#ifdef __I386__
+                                       printf(" %lld", iptr->val.l);
+#else
                                        printf(" %ld", iptr->val.l);
+#endif
                                        break;
                                case ICMD_FCONST:
                                        printf(" %f", iptr->val.f);