[Jnode-svn-commits] SF.net SVN: jnode:[5724] trunk/core/src/core/org/jnode/vm/x86/compiler

[<ls...@us...>]

Revision: 5724
          http://jnode.svn.sourceforge.net/jnode/?rev=5724&view=rev
Author:   lsantha
Date:     2010-01-30 20:57:16 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Findbus fixes: removed unneeded checks (condition is always false)

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleWordItem.java
    trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java

Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleWordItem.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleWordItem.java	2010-01-30 20:56:41 UTC (rev 5723)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleWordItem.java	2010-01-30 20:57:16 UTC (rev 5724)
@@ -217,8 +217,8 @@
      * Gets the offset from this item to the FramePointer register. This is only
      * valid if this item has a LOCAL kind.
      *
-     * @return In 32-bit mode, use {@link #getLsbOffsetToFP()}or
-     *         {@link #getMsbOffsetToFP()}instead.
+     * @return In 32-bit mode, use {@link #getLsbOffsetToFP(EmitterContext)} or
+     * {@link #getMsbOffsetToFP(EmitterContext)} instead.
      */
     final short getOffsetToFP(EmitterContext ec) {
         if (ec.getStream().isCode32()) {
@@ -736,7 +736,7 @@
     }
 
     /**
-     * @see org.jnode.vm.x86.compiler.l1a.Item#spill(EmitterContext, Register)
+     * @see org.jnode.vm.x86.compiler.l1a.Item#spill(EmitterContext, org.jnode.assembler.x86.X86Register)
      */
     final void spill(EmitterContext ec, X86Register reg) {
         final X86Assembler os = ec.getStream();
@@ -771,7 +771,7 @@
     }
 
     /**
-     * @see org.jnode.vm.x86.compiler.l1a.Item#uses(org.jnode.assembler.x86.Register)
+     * @see org.jnode.vm.x86.compiler.l1a.Item#uses(org.jnode.assembler.x86.X86Register)
      */
     final boolean uses(X86Register reg) {
         return (isGPR() && ((this.msb == reg) || (this.lsb == reg) || (this.reg == reg)));
@@ -780,7 +780,7 @@
     /**
      * enquire whether the item uses a volatile register
      *
-     * @param reg
+     * @param pool
      * @return true, when this item uses a volatile register.
      */
     final boolean usesVolatileRegister(X86RegisterPool pool) {
@@ -810,19 +810,10 @@
                     if (msb == null) {
                         throw new IllegalStateException("msb cannot be null");
                     }
-                    if (!(lsb instanceof GPR32)) {
-                        throw new IllegalStateException("lsb must be GPR32");
-                    }
-                    if (!(msb instanceof GPR32)) {
-                        throw new IllegalStateException("msb must be GPR32");
-                    }
                 } else {
                     if (reg == null) {
                         throw new IllegalStateException("reg cannot be null");
                     }
-                    if (!(reg instanceof GPR64)) {
-                        throw new IllegalStateException("reg must be GPR64");
-                    }
                 }
                 break;
         }

Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java	2010-01-30 20:56:41 UTC (rev 5723)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java	2010-01-30 20:57:16 UTC (rev 5724)
@@ -217,8 +217,8 @@
      * Gets the offset from this item to the FramePointer register. This is only
      * valid if this item has a LOCAL kind.
      *
-     * @return In 32-bit mode, use {@link #getLsbOffsetToFP()}or
-     *         {@link #getMsbOffsetToFP()}instead.
+     * @return In 32-bit mode, use {@link #getLsbOffsetToFP(EmitterContext)} or
+     * {@link #getMsbOffsetToFP(EmitterContext)} instead.
      */
     final short getOffsetToFP(EmitterContext ec) {
         if (ec.getStream().isCode32()) {
@@ -739,7 +739,8 @@
     }
 
     /**
-     * @see org.jnode.vm.x86.compiler.l1a.Item#spill(EmitterContext, Register)
+     * @see org.jnode.vm.x86.compiler.l1a.Item#spill(org.jnode.vm.x86.compiler.l1a.EmitterContext, 
+     * org.jnode.assembler.x86.X86Register)
      */
     final void spill(EmitterContext ec, X86Register reg) {
         final X86Assembler os = ec.getStream();
@@ -774,7 +775,7 @@
     }
 
     /**
-     * @see org.jnode.vm.x86.compiler.l1a.Item#uses(org.jnode.assembler.x86.Register)
+     * @see org.jnode.vm.x86.compiler.l1a.Item#uses(org.jnode.assembler.x86.X86Register)
      */
     final boolean uses(X86Register reg) {
         return (isGPR() && ((this.msb == reg) || (this.lsb == reg) || (this.reg == reg)));
@@ -783,7 +784,7 @@
     /**
      * enquire whether the item uses a volatile register
      *
-     * @param reg
+     * @param pool
      * @return true, when this item uses a volatile register.
      */
     final boolean usesVolatileRegister(X86RegisterPool pool) {
@@ -813,19 +814,10 @@
                     if (msb == null) {
                         throw new IllegalStateException("msb cannot be null");
                     }
-                    if (!(lsb instanceof GPR32)) {
-                        throw new IllegalStateException("lsb must be GPR32");
-                    }
-                    if (!(msb instanceof GPR32)) {
-                        throw new IllegalStateException("msb must be GPR32");
-                    }
                 } else {
                     if (reg == null) {
                         throw new IllegalStateException("reg cannot be null");
                     }
-                    if (!(reg instanceof GPR64)) {
-                        throw new IllegalStateException("reg must be GPR64");
-                    }
                 }
                 break;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.