commit 823433dbf4afec17169d5ca738031af5b374e140
author TDYa127 <tdy@google.com> Wed Sep 26 16:03:51 2012 -0700
committer TDYa127 <tdy@google.com> Wed Sep 26 16:05:33 2012 -0700
tree 74a1c19c016ce7bf63b043d161d96a56f4b71688
parent 4d980b0e085ea59bc243da3eff5ea84acc7afc24

Corresponding CL of thread flags for portable.

Change-Id: I6ad0c6159115e0d8879e0d9d674d760cd48f29c9

src/compiler_llvm/runtime_support_builder_arm.cc

diff --git a/src/compiler_llvm/runtime_support_builder_arm.cc b/src/compiler_llvm/runtime_support_builder_arm.cc
index 16ecff4..7a166ad 100644
--- a/src/compiler_llvm/runtime_support_builder_arm.cc
+++ b/src/compiler_llvm/runtime_support_builder_arm.cc
@@ -30,6 +30,24 @@
 
 using namespace llvm;
 
+namespace {
+
+char LDRSTRSuffixByType(art::compiler_llvm::IRBuilder& irb, llvm::Type* type) {
+  int width = type->isPointerTy() ?
+              irb.getSizeOfPtrEquivInt()*8 :
+              llvm::cast<IntegerType>(type)->getBitWidth();
+  switch (width) {
+    case 8:  return 'b';
+    case 16: return 'h';
+    case 32: return ' ';
+    default:
+      LOG(FATAL) << "Unsupported width: " << width;
+      return ' ';
+  }
+}
+
+} // namespace
+
 namespace art {
 namespace compiler_llvm {
 
@@ -48,7 +66,9 @@
                                                                 TBAASpecialType s_ty) {
   FunctionType* func_ty = FunctionType::get(/*Result=*/type,
                                             /*isVarArg=*/false);
-  std::string inline_asm(StringPrintf("ldr $0, [r9, #%d]", static_cast<int>(offset)));
+  std::string inline_asm(StringPrintf("ldr%c $0, [r9, #%d]",
+                                      LDRSTRSuffixByType(irb_, type),
+                                      static_cast<int>(offset)));
   InlineAsm* func = InlineAsm::get(func_ty, inline_asm, "=r", true);
   CallInst* result = irb_.CreateCall(func);
   result->setOnlyReadsMemory();
@@ -61,7 +81,9 @@
   FunctionType* func_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_),
                                             /*Params=*/value->getType(),
                                             /*isVarArg=*/false);
-  std::string inline_asm(StringPrintf("str $0, [r9, #%d]", static_cast<int>(offset)));
+  std::string inline_asm(StringPrintf("str%c $0, [r9, #%d]",
+                                      LDRSTRSuffixByType(irb_, value->getType()),
+                                      static_cast<int>(offset)));
   InlineAsm* func = InlineAsm::get(func_ty, inline_asm, "r", true);
   CallInst* call_inst = irb_.CreateCall(func, value);
   irb_.SetTBAA(call_inst, s_ty);