commit 48f1d2a5c2ff904feb21b55be086903392e7548c
author Logan Chien <loganchien@google.com> Mon Jan 02 22:49:53 2012 +0800
committer Shih-wei Liao <sliao@google.com> Fri Feb 17 00:57:43 2012 -0800
tree d51b8b0e65f479c6ba9255cc4924927d148b7437
parent 8dabb43c4640b6f64a3c288d670b97ed1cd7b537

Implement iget* instructions.

Change-Id: Ia1ae88d9219d35a0b68acecf586e63e67351fe71

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 596ae87..3f57666 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1688,10 +1688,70 @@
 }
 
 
+void MethodCompiler::PrintUnresolvedFieldWarning(int32_t field_idx) {
+  DexFile const& dex_file = method_helper_.GetDexFile();
+  DexFile::FieldId const& field_id = dex_file.GetFieldId(field_idx);
+
+  LOG(WARNING) << "unable to resolve static field " << field_idx << " ("
+               << dex_file.GetFieldName(field_id) << ") in "
+               << dex_file.GetFieldDeclaringClassDescriptor(field_id);
+}
+
+
 void MethodCompiler::EmitInsn_IGet(uint32_t dex_pc,
                                    Instruction const* insn,
                                    JType field_jty) {
-  // UNIMPLEMENTED(WARNING);
+
+  Instruction::DecodedInstruction dec_insn(insn);
+
+  uint32_t reg_idx = dec_insn.vB_;
+  uint32_t field_idx = dec_insn.vC_;
+
+  Field* field = dex_cache_->GetResolvedField(field_idx);
+
+  llvm::Value* object_addr = EmitLoadDalvikReg(reg_idx, kObject, kAccurate);
+
+  EmitGuard_NullPointerException(dex_pc, object_addr);
+
+  llvm::Value* field_value;
+
+  if (field == NULL) {
+    PrintUnresolvedFieldWarning(field_idx);
+
+    llvm::Function* runtime_func;
+
+    if (field_jty == kObject) {
+      runtime_func = irb_.GetRuntime(SetObjectInstance);
+    } else if (field_jty == kLong || field_jty == kDouble) {
+      runtime_func = irb_.GetRuntime(Set64Instance);
+    } else {
+      runtime_func = irb_.GetRuntime(Set32Instance);
+    }
+
+    llvm::ConstantInt* field_idx_value = irb_.getInt32(field_idx);
+
+    llvm::Value* method_object_addr = EmitLoadMethodObjectAddr();
+
+    field_value = irb_.CreateCall2(runtime_func, field_idx_value,
+                                   method_object_addr);
+
+    EmitGuard_ExceptionLandingPad(dex_pc);
+
+  } else {
+    llvm::PointerType* field_type =
+      irb_.getJType(field_jty, kField)->getPointerTo();
+
+    llvm::ConstantInt* field_offset =
+      irb_.getPtrEquivInt(field->GetOffset().Int32Value());
+
+    llvm::Value* field_addr =
+      irb_.CreatePtrDisp(object_addr, field_offset, field_type);
+
+    field_value = irb_.CreateLoad(field_addr);
+  }
+
+  EmitStoreDalvikReg(dec_insn.vA_, field_jty, kField, field_value);
+
   irb_.CreateBr(GetNextBasicBlock(dex_pc));
 }
 

src/compiler_llvm/method_compiler.h

diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index 46aea81..f86d740 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -318,6 +318,10 @@
   RegCategory GetInferredRegCategory(uint32_t dex_pc, uint16_t reg);
 
 
+  // Diagnostics helper function
+  void PrintUnresolvedFieldWarning(int32_t field_idx);
+
+
   // Basic block helper functions
   llvm::BasicBlock* GetBasicBlock(uint32_t dex_pc);