From a9e2984aaf60c16981d3124ed2179796e3670d65 Mon Sep 17 00:00:00 2001
From: Joshua Warner <joshua.warner@readytalk.com>
Date: Thu, 21 Feb 2013 16:51:31 -0700
Subject: [PATCH] fix arm and powerpc build

---
 src/arm.h                         | 12 ++++++------
 src/codegen/arm/assembler.cpp     |  8 --------
 src/codegen/powerpc/assembler.cpp |  8 --------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/arm.h b/src/arm.h
index 5b8cdab3db..47c79ff099 100644
--- a/src/arm.h
+++ b/src/arm.h
@@ -206,7 +206,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
             ++ stackIndex;
           }
 
-          memcpy(stack + stackIndex, arguments + ai, 8);
+          memcpy(RUNTIME_ARRAY_BODY(stack) + stackIndex, arguments + ai, 8);
           stackIndex += 8 / BytesPerWord;
         }
         ai += 8 / BytesPerWord;
@@ -219,7 +219,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
       } else if (vfpIndex < VfpCount) {
         vfpTable[vfpIndex++] = arguments[ai];
       } else {
-        stack[stackIndex++] = arguments[ai];
+        RUNTIME_ARRAY_BODY(stack)[stackIndex++] = arguments[ai];
       }
       ++ ai;
       break;
@@ -231,7 +231,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
             and gprIndex + Alignment == GprCount)
         {
           gprTable[gprIndex++] = arguments[ai];
-          stack[stackIndex++] = arguments[ai + 1];
+          RUNTIME_ARRAY_BODY(stack)[stackIndex++] = arguments[ai + 1];
         } else {
           if (gprIndex % Alignment) {
             ++gprIndex;
@@ -246,7 +246,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
           ++stackIndex;
         }
 
-        memcpy(stack + stackIndex, arguments + ai, 8);
+        memcpy(RUNTIME_ARRAY_BODY(stack) + stackIndex, arguments + ai, 8);
         stackIndex += 8 / BytesPerWord;
       }
       ai += 8 / BytesPerWord;
@@ -256,7 +256,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
       if (gprIndex < GprCount) {
         gprTable[gprIndex++] = arguments[ai];
       } else {
-        stack[stackIndex++] = arguments[ai];
+        RUNTIME_ARRAY_BODY(stack)[stackIndex++] = arguments[ai];
       }
       ++ ai;
     } break;
@@ -274,7 +274,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
 
   unsigned stackSize = stackIndex*BytesPerWord + ((stackIndex & 1) << 2);
   return vmNativeCall
-    (function, stackSize, stack, stackIndex * BytesPerWord,
+    (function, stackSize, RUNTIME_ARRAY_BODY(stack), stackIndex * BytesPerWord,
      (gprIndex ? gprTable : 0),
      (vfpIndex ? vfpTable : 0), returnType);
 }
diff --git a/src/codegen/arm/assembler.cpp b/src/codegen/arm/assembler.cpp
index 56bd71938d..26e57a5cb5 100644
--- a/src/codegen/arm/assembler.cpp
+++ b/src/codegen/arm/assembler.cpp
@@ -2236,14 +2236,6 @@ class MyArchitecture: public Assembler::Architecture {
   virtual int framePointerOffset() {
     return 0;
   }
-
-  virtual lir::BinaryOperation hasBinaryIntrinsic(Thread*, object) {
-  	return lir::NoBinaryOperation;
-  }
-  
-  virtual lir::TernaryOperation hasTernaryIntrinsic(Thread*, object) {
-  	return lir::NoTernaryOperation;
-  }
   
   virtual bool alwaysCondensed(lir::BinaryOperation) {
     return false;
diff --git a/src/codegen/powerpc/assembler.cpp b/src/codegen/powerpc/assembler.cpp
index 1ef611be1a..5086d48403 100644
--- a/src/codegen/powerpc/assembler.cpp
+++ b/src/codegen/powerpc/assembler.cpp
@@ -2240,14 +2240,6 @@ class MyArchitecture: public Assembler::Architecture {
   virtual int framePointerOffset() {
     return 0;
   }
-
-  virtual lir::BinaryOperation hasBinaryIntrinsic(Thread*, object) {
-  	return lir::NoBinaryOperation;
-  }
-  
-  virtual lir::TernaryOperation hasTernaryIntrinsic(Thread*, object) {
-  	return lir::NoTernaryOperation;
-  }
   
   virtual bool alwaysCondensed(lir::BinaryOperation) {
     return false;