commit 8eabcbf188f6e58217ad316271ea5e984d6eacce
author Joseph Wen <josephwen@google.com> Thu Jul 07 12:37:48 2011 -0700
committer Joseph Wen <josephwen@google.com> Thu Jul 07 12:37:48 2011 -0700
tree 373965553eadc685294608f70434695e907478a1
parent f36637f60d8fd35c43ad52bd06d3372c9bc8fb19

Remove unused code in MCCacheReader/Writer

Change-Id: I31dd0c401bbd4f979849387c1b34e60c7d33770d

lib/ExecutionEngine/MCCacheReader.cpp

diff --git a/lib/ExecutionEngine/MCCacheReader.cpp b/lib/ExecutionEngine/MCCacheReader.cpp
index 8c70e39..8404027 100644
--- a/lib/ExecutionEngine/MCCacheReader.cpp
+++ b/lib/ExecutionEngine/MCCacheReader.cpp
@@ -80,8 +80,6 @@
              && checkStringPool()
              && readDependencyTable()
              && checkDependency()
-             && readExportVarList()
-             && readExportFuncList()
              && readPragmaList()
              && readObjectSlotList()
              && readObjFile()
@@ -202,8 +200,6 @@
   CHECK_SECTION_OFFSET(str_pool);
   CHECK_SECTION_OFFSET(depend_tab);
   //CHECK_SECTION_OFFSET(reloc_tab);
-  CHECK_SECTION_OFFSET(export_var_list);
-  CHECK_SECTION_OFFSET(export_func_list);
   CHECK_SECTION_OFFSET(pragma_list);
 
 #undef CHECK_SECTION_OFFSET
@@ -331,16 +327,19 @@
   return true;
 }
 
-bool MCCacheReader::readExportVarList() {
-  CACHE_READER_READ_SECTION(OBCC_ExportVarList,
-                            mpResult->mpExportVars, export_var_list);
-  return true;
-}
-
 bool MCCacheReader::readVarNameList() {
   CACHE_READER_READ_SECTION(OBCC_String_Ptr, mpVarNameList, export_var_name_list);
   vector<char const *> const &strPool = mpResult->mStringPool;
 
+  mpResult->mpExportVars = (OBCC_ExportVarList*)
+                            malloc(sizeof(size_t) +
+                                   sizeof(void*) * export_var_name_list_raw->count);
+  if (!mpResult->mpExportVars) {
+    LOGE("Unable to allocate for mpExportVars\n");
+    return false;
+  }
+  mpResult->mpExportVars->count = export_var_name_list_raw->count;
+
   for (size_t i = 0; i < export_var_name_list_raw->count; ++i) {
     mpResult->mpExportVars->cached_addr_list[i] =
       rsloaderGetSymbolAddress(mpResult->mRSExecutable, strPool[export_var_name_list_raw->strp_indexs[i]]);
@@ -352,17 +351,19 @@
   return true;
 }
 
-bool MCCacheReader::readExportFuncList() {
-  CACHE_READER_READ_SECTION(OBCC_ExportFuncList,
-                            mpResult->mpExportFuncs, export_func_list);
-  return true;
-}
-
-
 bool MCCacheReader::readFuncNameList() {
   CACHE_READER_READ_SECTION(OBCC_String_Ptr, mpFuncNameList, export_func_name_list);
   vector<char const *> const &strPool = mpResult->mStringPool;
 
+  mpResult->mpExportFuncs = (OBCC_ExportFuncList*)
+                            malloc(sizeof(size_t) +
+                                   sizeof(void*) * export_func_name_list_raw->count);
+  if (!mpResult->mpExportFuncs) {
+    LOGE("Unable to allocate for mpExportFuncs\n");
+    return false;
+  }
+  mpResult->mpExportFuncs->count = export_func_name_list_raw->count;
+
   for (size_t i = 0; i < export_func_name_list_raw->count; ++i) {
     mpResult->mpExportFuncs->cached_addr_list[i] =
       rsloaderGetSymbolAddress(mpResult->mRSExecutable, strPool[export_func_name_list_raw->strp_indexs[i]]);