diff --git a/BUILD.gn b/BUILD.gn index 9b365d8ef511e4de1d0a50422e4129c01207aaed..d324fdc2c7d7593e84c175abf9a1794cf09c72aa 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,5 +1,5 @@ group("maple") { deps = [ "${MAPLE_ROOT}/src:mapleall", - ] -} + ] +} diff --git a/src/bin/maple b/src/bin/maple index 91a8cfa45d9ed7e912a6e2784334e0762c43707a..749eb41b0052be75527c43f967293f42d87e0971 100755 Binary files a/src/bin/maple and b/src/bin/maple differ diff --git a/src/bin/mplcg b/src/bin/mplcg index b614723a41d7984bcd877ef886e701293921ff8c..07a4a8539fd4cfc9cc700a5d86bef3cb1ae9fcfa 100755 Binary files a/src/bin/mplcg and b/src/bin/mplcg differ diff --git a/src/mpl2mpl/include/muid_replacement.h b/src/mpl2mpl/include/muid_replacement.h index d6c0005c3523a70807886da2eb050b2ca6c05408..307d1e95534d1f1bc31fa9def86261dc9b3dbd6e 100644 --- a/src/mpl2mpl/include/muid_replacement.h +++ b/src/mpl2mpl/include/muid_replacement.h @@ -46,10 +46,13 @@ enum RangeIdx { kJavatext = 13, kJavajni = 14, kJavajniFunc = 15, - kMaxNum = 16, + kOldMaxNum = 16, // Old num kDataSection = 17, kDecoupleStaticKey = 18, - kDecoupleStaticValue = 19 + kDecoupleStaticValue = 19, + kBssStart = 20, + kLinkerSoHash = 21, + kNewMaxNum = 22 // New num }; class MUIDReplacement : public FuncOptimizeImpl { diff --git a/src/mpl2mpl/src/muid_replacement.cpp b/src/mpl2mpl/src/muid_replacement.cpp index 412a77dac7ed6fe6dd21237c6a0b19530707cdf0..38c02f673f7e0e628760bb46db885d3539ed91bb 100644 --- a/src/mpl2mpl/src/muid_replacement.cpp +++ b/src/mpl2mpl/src/muid_replacement.cpp @@ -644,7 +644,7 @@ void MUIDReplacement::GenerateRangeTable() { builder->AddIntFieldConst(rangeTabEntryType, *entryConst, fieldID++, mplMd5.data.words[1]); rangeTabConst->PushBack(entryConst); } - for (uint32 i = RangeIdx::kVtab; i < RangeIdx::kMaxNum; ++i) { + for (uint32 i = RangeIdx::kVtab; i < RangeIdx::kOldMaxNum; ++i) { // Use an integer to mark which entry is for which table MIRAggConst *entryConst = GetMIRModule().GetMemPool()->New(GetMIRModule(), rangeTabEntryType); uint32 fieldID = 1; @@ -690,7 +690,7 @@ void MUIDReplacement::GenerateRangeTable() { } rangeTabConst->PushBack(entryConst); } - for (int i = RangeIdx::kMaxNum + 1; i <= RangeIdx::kDecoupleStaticValue; ++i) { + for (int i = RangeIdx::kOldMaxNum + 1; i < RangeIdx::kNewMaxNum; ++i) { uint32 fieldID = 1; MIRAggConst *entryConst = GetMIRModule().GetMemPool()->New(GetMIRModule(), rangeTabEntryType); builder->AddIntFieldConst(rangeTabEntryType, *entryConst, fieldID++, i);