Mercurial > hg > graal-jvmci-8
changeset 22133:dd52addb374d
[SPARC] Remove duplicate/unused code from SPARCAssembler
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Tue, 30 Jun 2015 16:56:46 +0200 |
parents | 32805899dae9 |
children | ae67bd822493 |
files | graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java |
diffstat | 2 files changed, 2 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Tue Jun 30 16:45:31 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Tue Jun 30 16:56:46 2015 +0200 @@ -55,20 +55,9 @@ public static final int CCR_ICC_SHIFT = 0; public static final int CCR_XCC_SHIFT = 4; - public static final int CCR_C_SHIFT = 0; public static final int CCR_V_SHIFT = 1; - public static final int CCR_Z_SHIFT = 2; - public static final int CCR_N_SHIFT = 3; - protected static final int OP_SHIFT = 30; - protected static final int CBCOND_SHIFT = 28; protected static final int OP2_SHIFT = 22; - protected static final int A_SHIFT = 29; - - protected static final int A_MASK = 0b0010_0000_0000_0000_0000_0000_0000_0000; - protected static final int OP_MASK = 0b1100_0000_0000_0000_0000_0000_0000_0000; - protected static final int CBCOND_MASK = 0b0001_0000_0000_0000_0000_0000_0000_0000; // Used for - // distinguish CBcond and BPr instructions protected static final int OP2_MASK = 0b0000_0001_1100_0000_0000_0000_0000_0000; protected static final int DISP22_SHIFT = 0; @@ -997,7 +986,7 @@ } } - private static boolean isCBCond(int inst) { + protected static boolean isCBCond(int inst) { return getOp(inst).equals(Ops.BranchOp) && getOp2(inst).equals(Op2s.Bpr) && getBits(inst, 28, 28) == 1; } @@ -1845,8 +1834,4 @@ public void fpadd32(Register rs1, Register rs2, Register rd) { op3(Impdep1, Fpadd32, rs1, rs2, rd); } - - public boolean isCbcond(int i) { - return (i & 0xC1C00000) == 0xC00000; - } }
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Tue Jun 30 16:45:31 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Tue Jun 30 16:56:46 2015 +0200 @@ -97,8 +97,7 @@ maskBits = DISP19_MASK; break; case Bpr: - boolean isCBcond = (inst & CBCOND_MASK) != 0; - if (isCBcond) { + if (isCBCond(inst)) { assert isSimm10(disp) : String.format("%d: instruction: 0x%x", disp, inst); int d10Split = 0; d10Split |= (disp & 0b11_0000_0000) << D10HI_SHIFT - 8;