commit 14924fed933f533a427ea36751c497eb21646beb
author Logan Chien <loganchien@google.com> Tue Apr 03 18:33:37 2012 +0800
committer Shih-wei Liao <sliao@google.com> Sat Apr 07 10:35:17 2012 -0700
tree cb4d926f0a5b43909dac45d906f5fe66fc831cb4
parent 8532191c4fc8e005f7d432fec40fd9f2936275c6

Implement GetCodeSize for LLVM build.

Change-Id: I8e271eb809c81615cc4605564cda5dc55251ea01

src/compiler_llvm/elf_loader.cc

diff --git a/src/compiler_llvm/elf_loader.cc b/src/compiler_llvm/elf_loader.cc
index 8f8eff9..07072df 100644
--- a/src/compiler_llvm/elf_loader.cc
+++ b/src/compiler_llvm/elf_loader.cc
@@ -99,6 +99,14 @@
 }
 
 
+size_t ElfLoader::GetCodeSize(uint16_t elf_idx, uint16_t elf_func_idx) const {
+  CHECK_LT(elf_idx, executables_.size());
+  CHECK(executables_[elf_idx] != NULL);
+  return rsloaderGetSymbolSize(executables_[elf_idx],
+                               ElfFuncName(elf_func_idx).c_str());
+}
+
+
 const void* ElfLoader::GetAddr(size_t elf_idx, const char* sym_name) const {
   CHECK_LT(elf_idx, executables_.size());
   CHECK(executables_[elf_idx] != NULL);

src/compiler_llvm/elf_loader.h

diff --git a/src/compiler_llvm/elf_loader.h b/src/compiler_llvm/elf_loader.h
index ea98f61..263a9fa 100644
--- a/src/compiler_llvm/elf_loader.h
+++ b/src/compiler_llvm/elf_loader.h
@@ -43,6 +43,8 @@
   const Method::InvokeStub* GetMethodInvokeStubAddr(uint16_t elf_idx,
                                                     uint16_t elf_func_idx) const;
 
+  size_t GetCodeSize(uint16_t elf_idx, uint16_t elf_func_idx) const;
+
  private:
   const void* GetAddr(size_t elf_idx, const char* sym_name) const;
 

src/oat_file.cc

diff --git a/src/oat_file.cc b/src/oat_file.cc
index 81aa013..261fd60 100644
--- a/src/oat_file.cc
+++ b/src/oat_file.cc
@@ -397,8 +397,13 @@
     code &= ~0x1;
     return reinterpret_cast<uint32_t*>(code)[-1];
   } else {
+#if !defined(ART_USE_LLVM_COMPILER)
     UNIMPLEMENTED(ERROR);
     return 0;
+#else
+    CHECK(elf_loader_ != NULL);
+    return elf_loader_->GetCodeSize(code_elf_idx_, code_elf_func_idx_);
+#endif
   }
 }
 
@@ -428,8 +433,14 @@
     }
     return reinterpret_cast<uint32_t*>(code)[-1];
   } else {
+#if !defined(ART_USE_LLVM_COMPILER)
     UNIMPLEMENTED(WARNING);
     return 0;
+#else
+    CHECK(elf_loader_ != NULL);
+    return elf_loader_->GetCodeSize(invoke_stub_elf_idx_,
+                                    invoke_stub_elf_func_idx_);
+#endif
   }
 }
 

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index 978060d..d2a78af 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -423,16 +423,34 @@
     os << StringPrintf("\t\tgc_map: %p (offset=0x%08x)\n",
                        oat_method.GetGcMap(), oat_method.GetGcMapOffset());
     DumpGcMap(os, oat_method.GetGcMap());
-    os << StringPrintf("\t\tCODE: %p (offset=0x%08x size=%d)%s\n",
+    os << StringPrintf(
+#if defined(ART_USE_LLVM_COMPILER)
+                       "\t\tCODE: %p (offset=0x%08x size=%d elf_idx=%d elf_func_idx=%d)%s\n",
+#else
+                       "\t\tCODE: %p (offset=0x%08x size=%d)%s\n",
+#endif
                        oat_method.GetCode(),
                        oat_method.GetCodeOffset(),
                        oat_method.GetCodeSize(),
+#if defined(ART_USE_LLVM_COMPILER)
+                       static_cast<int>(oat_method.GetCodeElfIndex()),
+                       static_cast<int>(oat_method.GetCodeElfFuncIndex()),
+#endif
                        oat_method.GetCode() != NULL ? "..." : "");
     DumpCode(os, oat_method.GetCode(), oat_method.GetMappingTable(), dex_file, code_item);
-    os << StringPrintf("\t\tINVOKE STUB: %p (offset=0x%08x size=%d)%s\n",
+    os << StringPrintf(
+#if defined(ART_USE_LLVM_COMPILER)
+                       "\t\tINVOKE STUB: %p (offset=0x%08x size=%d elf_idx=%d elf_func_idx=%d)%s\n",
+#else
+                       "\t\tINVOKE STUB: %p (offset=0x%08x size=%d)%s\n",
+#endif
                        oat_method.GetInvokeStub(),
                        oat_method.GetInvokeStubOffset(),
                        oat_method.GetInvokeStubSize(),
+#if defined(ART_USE_LLVM_COMPILER)
+                       static_cast<int>(oat_method.GetInvokeStubElfIndex()),
+                       static_cast<int>(oat_method.GetInvokeStubElfFuncIndex()),
+#endif
                        oat_method.GetInvokeStub() != NULL ? "..." : "");
     DumpCode(os, reinterpret_cast<const void*>(oat_method.GetInvokeStub()), NULL, dex_file, NULL);
   }