fix debug build

src/codegen/target/arm/fixup.cpp

@@ -16,6 +16,8 @@ namespace avian {
 namespace codegen {
 namespace arm {
 
+using namespace util;
+
 unsigned padding(MyBlock*, unsigned);
 
 OffsetPromise::OffsetPromise(Context* con, MyBlock* block, unsigned offset, bool forTrace):

src/codegen/target/arm/multimethod.cpp

@@ -16,6 +16,8 @@ namespace avian {
 namespace codegen {
 namespace arm {
 
+using namespace util;
+
 unsigned index(ArchitectureContext*, lir::UnaryOperation operation, lir::OperandType operand)
 {
   return operation + (lir::UnaryOperationCount * operand);

src/codegen/target/powerpc/fixup.cpp

@@ -18,6 +18,7 @@ namespace codegen {
 namespace powerpc {
 
 using namespace isa;
+using namespace util;
 
 unsigned padding(MyBlock*, unsigned);
 

src/codegen/target/powerpc/multimethod.cpp

@@ -19,6 +19,38 @@ namespace avian {
 namespace codegen {
 namespace powerpc {
 
+using namespace util;
+
+unsigned index(ArchitectureContext*, lir::UnaryOperation operation, lir::OperandType operand)
+{
+  return operation + (lir::UnaryOperationCount * operand);
+}
+
+unsigned index(ArchitectureContext*,
+      lir::BinaryOperation operation,
+      lir::OperandType operand1,
+      lir::OperandType operand2)
+{
+  return operation
+    + (lir::BinaryOperationCount * operand1)
+    + (lir::BinaryOperationCount * lir::OperandTypeCount * operand2);
+}
+
+unsigned index(ArchitectureContext* c UNUSED,
+      lir::TernaryOperation operation,
+      lir::OperandType operand1)
+{
+  assert(c, not isBranch(operation));
+
+  return operation + (lir::NonBranchTernaryOperationCount * operand1);
+}
+
+unsigned branchIndex(ArchitectureContext* c UNUSED, lir::OperandType operand1,
+            lir::OperandType operand2)
+{
+  return operand1 + (lir::OperandTypeCount * operand2);
+}
+
 void populateTables(ArchitectureContext* c) {
   const lir::OperandType C = lir::ConstantOperand;
   const lir::OperandType A = lir::AddressOperand;

src/codegen/target/powerpc/multimethod.h

@@ -21,35 +21,19 @@ namespace codegen {
 namespace powerpc {
 
 
-inline unsigned index(ArchitectureContext*, lir::UnaryOperation operation, lir::OperandType operand)
+unsigned index(ArchitectureContext*, lir::UnaryOperation operation, lir::OperandType operand);
-{
-  return operation + (lir::UnaryOperationCount * operand);
-}
 
-inline unsigned index(ArchitectureContext*,
+unsigned index(ArchitectureContext*,
       lir::BinaryOperation operation,
       lir::OperandType operand1,
-      lir::OperandType operand2)
+      lir::OperandType operand2);
-{
-  return operation
-    + (lir::BinaryOperationCount * operand1)
-    + (lir::BinaryOperationCount * lir::OperandTypeCount * operand2);
-}
 
-inline unsigned index(ArchitectureContext* c UNUSED,
+unsigned index(ArchitectureContext* c UNUSED,
       lir::TernaryOperation operation,
-      lir::OperandType operand1)
+      lir::OperandType operand1);
-{
-  assert(c, not isBranch(operation));
 
-  return operation + (lir::NonBranchTernaryOperationCount * operand1);
+unsigned branchIndex(ArchitectureContext* c UNUSED, lir::OperandType operand1,
-}
+            lir::OperandType operand2);
-
-inline unsigned branchIndex(ArchitectureContext* c UNUSED, lir::OperandType operand1,
-            lir::OperandType operand2)
-{
-  return operand1 + (lir::OperandTypeCount * operand2);
-}
 
 void populateTables(ArchitectureContext* c);
 

src/codegen/target/x86/fixup.cpp

@@ -27,6 +27,8 @@ namespace avian {
 namespace codegen {
 namespace x86 {
 
+using namespace util;
+
 ResolvedPromise* resolvedPromise(Context* c, int64_t value) {
   return new(c->zone) ResolvedPromise(value);
 }

src/codegen/target/x86/multimethod.cpp

@@ -22,6 +22,8 @@ namespace avian {
 namespace codegen {
 namespace x86 {
 
+using namespace util;
+
 
 unsigned index(ArchitectureContext*, lir::UnaryOperation operation, lir::OperandType operand) {
   return operation + (lir::UnaryOperationCount * operand);