Handle module entry point special case for self-relocated modules. (Replace reference...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1512 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 446c5e44268c15b58967c8540157733128935f25..2f2579e64e096b9a790ff3adae12c8eaafe5471b 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -88,9 +88,10 @@ public final class SourceFileReplacer implements Common.ForDoAll {
     private class CLaplace extends Common.Laplace {\r
         public  String operation(String wholeline) {\r
             boolean addr8 = false;\r
-\r
             // remove EFI_DRIVER_ENTRY_POINT\r
-            wholeline = wholeline.replaceAll("(EFI_\\w+_ENTRY_POINT)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
+            wholeline = wholeline.replaceAll("(EFI_[A-Z]+_ENTRY_POINT\\s*\\(\\s*" + mi.entrypoint + "\\s*\\)\\s*;)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
+            // redefine module entry point for some self-relocated modules\r
+            wholeline = wholeline.replaceAll (mi.entrypoint + "([^{]*?})", "_ModuleEntryPoint" + "$1");\r
             // remove R8 library contractor\r
             wholeline = wholeline.replaceAll ("(\\b(?:Efi|Dxe)InitializeDriverLib\\b)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
             // Add Library Class for potential reference of gBS, gRT & gDS.\r