summaryrefslogtreecommitdiff
path: root/src/compiler/codegen/mips/Assemble.cc
diff options
context:
space:
mode:
author buzbee <buzbee@google.com> 2012-11-14 13:32:55 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-11-14 13:32:55 -0800
commit8bb8e8653b4c3ad5d87863f98ffec5f95a96c1fa (patch)
treefa64f9ad72867a7928ade0708533d8fe51f99db4 /src/compiler/codegen/mips/Assemble.cc
parent725a957985171d712d5c048cc3d00ff14968784b (diff)
parentf0504cdc5b6400edd4b39eea64ac280465042d5b (diff)
Merge "Quick backend: rename target-specific #defines" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/mips/Assemble.cc')
-rw-r--r--src/compiler/codegen/mips/Assemble.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/codegen/mips/Assemble.cc b/src/compiler/codegen/mips/Assemble.cc
index 9f8a68638f..e9dd2197e3 100644
--- a/src/compiler/codegen/mips/Assemble.cc
+++ b/src/compiler/codegen/mips/Assemble.cc
@@ -677,16 +677,16 @@ AssemblerStatus oatAssembleInstructions(CompilationUnit *cUnit,
bits |= (value << encoder->fieldLoc[i].end);
break;
case kFmtDfp: {
- DCHECK(DOUBLEREG(operand));
+ DCHECK(MIPS_DOUBLEREG(operand));
DCHECK_EQ((operand & 0x1), 0U);
- value = ((operand & FP_REG_MASK) << encoder->fieldLoc[i].start) &
+ value = ((operand & MIPS_FP_REG_MASK) << encoder->fieldLoc[i].start) &
((1 << (encoder->fieldLoc[i].end + 1)) - 1);
bits |= value;
break;
}
case kFmtSfp:
- DCHECK(SINGLEREG(operand));
- value = ((operand & FP_REG_MASK) << encoder->fieldLoc[i].start) &
+ DCHECK(MIPS_SINGLEREG(operand));
+ value = ((operand & MIPS_FP_REG_MASK) << encoder->fieldLoc[i].start) &
((1 << (encoder->fieldLoc[i].end + 1)) - 1);
bits |= value;
break;