* src/vm/jit/powerpc64/codegen.c (codegen_emit): ICMD_INSTANCEOF:

Removed unused supervftbl.

* src/vm/jit/emit-common.h [__POWERPC64__] (emit_bnan): Enabled.

diff --git a/src/vm/jit/emit-common.h b/src/vm/jit/emit-common.h
index b37c063eb9dbabba04411df6592c23b19a7668a0..5d39dc3481066fc8d114c36a713838cd9d06874e 100644 (file)
--- a/src/vm/jit/emit-common.h
+++ b/src/vm/jit/emit-common.h
@@ -145,7 +145,7 @@ void emit_buge(codegendata *cd, basicblock *target);
 void emit_bugt(codegendata *cd, basicblock *target);
 #endif
 
-#if defined(__POWERPC__)
+#if defined(__POWERPC__) || defined(__POWERPC64__)
 void emit_bnan(codegendata *cd, basicblock *target);
 #endif
 

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index 937def193a83c62b6891acb3791bdabc85083d9b..612742af9076de1a8448afe829ebd613a4578e0d 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7944 2007-05-23 14:15:00Z tbfg $
+   $Id: codegen.c 7945 2007-05-23 15:25:18Z twisti $
 
 */
 
@@ -2312,10 +2312,11 @@ gen_method:
                                s4         superindex;
 
                                if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                                       super = NULL;
+                                       super      = NULL;
                                        superindex = 0;
-                               } else {
-                                       super = iptr->sx.s23.s3.c.cls;
+                               }
+                               else {
+                                       super      = iptr->sx.s23.s3.c.cls;
                                        superindex = super->index;
                                }
                
@@ -2477,15 +2478,14 @@ gen_method:
 
                        {
                        classinfo *super;
-                       vftbl_t   *supervftbl;
                        s4         superindex;
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               super = NULL;
+                               super      = NULL;
                                superindex = 0;
                        }
                        else {
-                               super = iptr->sx.s23.s3.c.cls;
+                               super      = iptr->sx.s23.s3.c.cls;
                                superindex = super->index;
                        }