Commit 6fba4ec0 authored by Brad King's avatar Brad King

Merge branch 'bindexplib-revert-consts' into release-3.9

parents dd69dea3 3250b9a1
......@@ -242,24 +242,26 @@ public:
// Check whether it is "Scalar deleting destructor" and "Vector
// deleting destructor"
// if scalarPrefix and vectorPrefix are not found then print the
// symbol
// if scalarPrefix and vectorPrefix are not found then print
// the symbol
const char* scalarPrefix = "??_G";
const char* vectorPrefix = "??_E";
// The original code had a check for
// symbol.find("real@") == std::string::npos)
// but this disallows member functions with the name "real".
if (symbol.compare(0, 4, scalarPrefix) &&
symbol.compare(0, 4, vectorPrefix)) {
SectChar = this->SectionHeaders[pSymbolTable->SectionNumber - 1]
.Characteristics;
// skip symbols containing a dot
if (symbol.find('.') == std::string::npos) {
if (SectChar & IMAGE_SCN_MEM_EXECUTE) {
this->Symbols.insert(symbol);
} else if (SectChar & IMAGE_SCN_MEM_READ) {
// skip __real@ and __xmm@
if (symbol.find("_real") == std::string::npos &&
symbol.find("_xmm") == std::string::npos) {
this->DataSymbols.insert(symbol);
if (!pSymbolTable->Type && (SectChar & IMAGE_SCN_MEM_WRITE)) {
// Read only (i.e. constants) must be excluded
this->DataSymbols.insert(symbol);
} else {
if (pSymbolTable->Type || !(SectChar & IMAGE_SCN_MEM_READ) ||
(SectChar & IMAGE_SCN_MEM_EXECUTE)) {
this->Symbols.insert(symbol);
}
}
}
......
......@@ -13,5 +13,3 @@ int bar()
{
return 5;
}
const char testconst[] = "testconst";
......@@ -13,14 +13,6 @@ int WINAPI foo();
int bar();
int objlib();
void justnop();
// test const export
#ifdef _WIN32
// data symbols must be explicitly imported
__declspec(dllimport) extern const char testconst[];
#else
extern const char testconst[];
#endif
}
// test c++ functions
......@@ -51,8 +43,6 @@ int main()
bar();
objlib();
printf("\n");
printf("%s", testconst);
printf("\n");
#ifdef HAS_JUSTNOP
justnop();
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment