From 10442dc7d6eac89779920e8505ee1e40021c256f Mon Sep 17 00:00:00 2001 From: "joshuawarner32@gmail.com" Date: Thu, 4 Dec 2014 18:33:44 -0700 Subject: [PATCH] finish renaming lir:: types (fixup arm) --- src/codegen/target/arm/multimethod.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/codegen/target/arm/multimethod.cpp b/src/codegen/target/arm/multimethod.cpp index c01c934e5b..ec1d96491c 100644 --- a/src/codegen/target/arm/multimethod.cpp +++ b/src/codegen/target/arm/multimethod.cpp @@ -25,8 +25,8 @@ unsigned index(ArchitectureContext*, lir::Operand::Type operand1, lir::Operand::Type operand2) { - return operation + (lir::BinaryOperationCount * operand1) - + (lir::BinaryOperationCount * lir::Operand::TypeCount * operand2); + return operation + (lir::BinaryOperationCount * (unsigned)operand1) + + (lir::BinaryOperationCount * lir::Operand::TypeCount * (unsigned)operand2); } unsigned index(ArchitectureContext* con UNUSED, @@ -35,14 +35,14 @@ unsigned index(ArchitectureContext* con UNUSED, { assertT(con, not isBranch(operation)); - return operation + (lir::NonBranchTernaryOperationCount * operand1); + return operation + (lir::NonBranchTernaryOperationCount * (unsigned)operand1); } unsigned branchIndex(ArchitectureContext* con UNUSED, lir::Operand::Type operand1, lir::Operand::Type operand2) { - return operand1 + (lir::Operand::TypeCount * operand2); + return (unsigned)operand1 + (lir::Operand::TypeCount * (unsigned)operand2); } void populateTables(ArchitectureContext* con)