Remove unused code in MCCacheReader/Writer
Change-Id: I31dd0c401bbd4f979849387c1b34e60c7d33770d
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]]);
diff --git a/lib/ExecutionEngine/MCCacheReader.h b/lib/ExecutionEngine/MCCacheReader.h
index 5077289..d9e4027 100644
--- a/lib/ExecutionEngine/MCCacheReader.h
+++ b/lib/ExecutionEngine/MCCacheReader.h
@@ -89,8 +89,6 @@
bool readHeader();
bool readStringPool();
bool readDependencyTable();
- bool readExportVarList();
- bool readExportFuncList();
bool readPragmaList();
bool readObjectSlotList();
bool readObjFile();
diff --git a/lib/ExecutionEngine/MCCacheWriter.cpp b/lib/ExecutionEngine/MCCacheWriter.cpp
index 10f8237..ef98e79 100644
--- a/lib/ExecutionEngine/MCCacheWriter.cpp
+++ b/lib/ExecutionEngine/MCCacheWriter.cpp
@@ -41,8 +41,6 @@
CHECK_AND_FREE(mpHeaderSection);
CHECK_AND_FREE(mpStringPoolSection);
CHECK_AND_FREE(mpDependencyTableSection);
- CHECK_AND_FREE(mpExportVarListSection);
- CHECK_AND_FREE(mpExportFuncListSection);
CHECK_AND_FREE(mpPragmaListSection);
CHECK_AND_FREE(mpObjectSlotSection);
CHECK_AND_FREE(mpExportVarNameListSection);
@@ -67,8 +65,6 @@
&& prepareExportVarNameList()
&& prepareExportFuncNameList()
&& prepareStringPool()
- && prepareExportVarList()
- && prepareExportFuncList()
&& prepareObjectSlotList()
&& calcSectionOffset()
&& writeAll()
@@ -223,27 +219,6 @@
}
-bool MCCacheWriter::prepareExportVarList() {
- size_t varCount = mpOwner->getExportVarCount();
- size_t listSize = sizeof(OBCC_ExportVarList) + sizeof(void *) * varCount;
-
- OBCC_ExportVarList *list = (OBCC_ExportVarList *)malloc(listSize);
-
- if (!list) {
- LOGE("Unable to allocate for export variable list\n");
- return false;
- }
-
- mpExportVarListSection = list;
- mpHeaderSection->export_var_list_size = listSize;
-
- list->count = static_cast<size_t>(varCount);
-
- mpOwner->getExportVarList(varCount, list->cached_addr_list);
- return true;
-}
-
-
bool MCCacheWriter::prepareExportVarNameList() {
size_t varCount = mpOwner->getExportVarCount();
size_t listSize = sizeof(OBCC_String_Ptr) + sizeof(size_t) * varCount;
@@ -268,27 +243,6 @@
}
-bool MCCacheWriter::prepareExportFuncList() {
- size_t funcCount = mpOwner->getExportFuncCount();
- size_t listSize = sizeof(OBCC_ExportFuncList) + sizeof(void *) * funcCount;
-
- OBCC_ExportFuncList *list = (OBCC_ExportFuncList *)malloc(listSize);
-
- if (!list) {
- LOGE("Unable to allocate for export function list\n");
- return false;
- }
-
- mpExportFuncListSection = list;
- mpHeaderSection->export_func_list_size = listSize;
-
- list->count = static_cast<size_t>(funcCount);
-
- mpOwner->getExportFuncList(funcCount, list->cached_addr_list);
- return true;
-}
-
-
bool MCCacheWriter::prepareExportFuncNameList() {
size_t funcCount = mpOwner->getExportFuncCount();
size_t listSize = sizeof(OBCC_String_Ptr) + sizeof(size_t) * funcCount;
@@ -354,8 +308,6 @@
OFFSET_INCREASE(str_pool);
OFFSET_INCREASE(depend_tab);
- OFFSET_INCREASE(export_var_list);
- OFFSET_INCREASE(export_func_list);
OFFSET_INCREASE(pragma_list);
OFFSET_INCREASE(func_table);
OFFSET_INCREASE(object_slot_list);
@@ -393,8 +345,6 @@
WRITE_SECTION_SIMPLE(str_pool, mpStringPoolSection);
WRITE_SECTION_SIMPLE(depend_tab, mpDependencyTableSection);
- WRITE_SECTION_SIMPLE(export_var_list, mpExportVarListSection);
- WRITE_SECTION_SIMPLE(export_func_list, mpExportFuncListSection);
WRITE_SECTION_SIMPLE(pragma_list, mpPragmaListSection);
WRITE_SECTION_SIMPLE(object_slot_list, mpObjectSlotSection);
diff --git a/lib/ExecutionEngine/MCCacheWriter.h b/lib/ExecutionEngine/MCCacheWriter.h
index eb134cf..bd395d5 100644
--- a/lib/ExecutionEngine/MCCacheWriter.h
+++ b/lib/ExecutionEngine/MCCacheWriter.h
@@ -43,8 +43,6 @@
MCO_Header *mpHeaderSection;
OBCC_StringPool *mpStringPoolSection;
OBCC_DependencyTable *mpDependencyTableSection;
- OBCC_ExportVarList *mpExportVarListSection;
- OBCC_ExportFuncList *mpExportFuncListSection;
OBCC_PragmaList *mpPragmaListSection;
OBCC_ObjectSlotList *mpObjectSlotSection;
@@ -57,8 +55,7 @@
public:
MCCacheWriter()
: mpHeaderSection(NULL), mpStringPoolSection(NULL),
- mpDependencyTableSection(NULL), mpExportVarListSection(NULL),
- mpExportFuncListSection(NULL), mpPragmaListSection(NULL),
+ mpDependencyTableSection(NULL), mpPragmaListSection(NULL),
mpObjectSlotSection(NULL) {
}
@@ -79,8 +76,6 @@
bool prepareStringPool();
bool prepareDependencyTable();
bool prepareRelocationTable();
- bool prepareExportVarList();
- bool prepareExportFuncList();
bool preparePragmaList();
bool prepareObjectSlotList();