Fix 64bit opt long return, char load and integer divide.

codehaus · Sep 29, 2009 · 7664ca4 · 7664ca4
1 parent 302d6f3
commit 7664ca4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/rvm/src-generated/opt-burs/ia32/IA32-Load-64.rules b/rvm/src-generated/opt-burs/ia32/IA32-Load-64.rules
@@ -66,12 +66,12 @@ NOFLAGS
 #####
 # SHORT_LOAD
 #####
-r:      SHORT_LOAD(rlv, riv)
+r:      SHORT_LOAD(rlv, rlv)
 20
 EMIT_INSTRUCTION
 EMIT(MIR_Unary.mutate(P(p), IA32_MOVSX__W, Load.getResult(P(p)), MO_L(P(p), W)));
 
-sload16: SHORT_LOAD(rlv, riv)
+sload16: SHORT_LOAD(rlv, rlv)
 0
 EMIT_INSTRUCTION
 pushMO(MO_L(P(p), W));
@@ -92,12 +92,12 @@ pushMO(MO_AL(P(p), W_S, W));
 #####
 # USHORT_LOAD
 #####
-r:      USHORT_LOAD(rlv, riv)
+r:      USHORT_LOAD(rlv, rlv)
 15
 EMIT_INSTRUCTION
 EMIT(MIR_Unary.mutate(P(p), IA32_MOVZX__W, Load.getResult(P(p)), MO_L(P(p), W)));
 
-uload16: USHORT_LOAD(rlv, riv)
+uload16: USHORT_LOAD(rlv, rlv)
 0
 EMIT_INSTRUCTION
 pushMO(MO_L(P(p), W));

diff --git a/rvm/src-generated/opt-burs/ia32/IA32.rules b/rvm/src-generated/opt-burs/ia32/IA32.rules
@@ -346,19 +346,23 @@ EMIT(MIR_Return.mutate(P(p), IA32_RET, null, Return.getVal(P(p)), null));
 stm:	RETURN(r)
 13
 EMIT_INSTRUCTION
-RegisterOperand ret = R(Return.getVal(P(p)));            \\
-RegisterOperand ret2 = null;	                            \\
-if (ret.getType().isLongType()) {                                 \\
-  ret.setType(TypeReference.Int);                           \\
+RegisterOperand ret = R(Return.getVal(P(p)));         \\
+RegisterOperand ret2 = null;	                      \\
+if (VM.BuildFor32Addr &&ret.getType().isLongType()) { \\
+  ret.setType(TypeReference.Int);                     \\
   ret2 = new RegisterOperand(regpool.getSecondReg(ret.getRegister()), TypeReference.Int); \\
-}                                                            \\
+}                                                     \\
 EMIT(MIR_Return.mutate(P(p), IA32_RET, null, ret, ret2));
 
 stm:	RETURN(LONG_CONSTANT)
 11
 EMIT_INSTRUCTION
 LongConstantOperand val = LC(Return.getVal(P(p))); \\
-EMIT(MIR_Return.mutate(P(p), IA32_RET, null, IC(val.upper32()), IC(val.lower32())));
+if (VM.BuildFor32Addr) {                           \\
+  EMIT(MIR_Return.mutate(P(p), IA32_RET, null, IC(val.upper32()), IC(val.lower32()))); \\
+} else {                                           \\
+  EMIT(MIR_Return.mutate(P(p), IA32_RET, null, val, null)); \\
+}
 
 #####
 # CALL

diff --git a/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java
@@ -645,6 +645,7 @@ boolean isQuad(Instruction inst) {
     for (int i = 0; i < inst.getNumberOfOperands(); i++) {
       Operand op = inst.getOperand(i);
       if (VM.BuildFor64Addr) {
+        if (op == null) continue;
         if (op.isLong() || op.isRef()) {
           return true;
         }