X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FSourceFileReplacer.java;h=e37f7f46b243ede6a5a45d8634153414ac9616d8;hp=01678a3d0283e17bbeeb55eaab9dcff0581f0a49;hb=49324055442ba901c0baf751963452cac7e8542a;hpb=6ceb38158a4f04f11cf0a0607a00ae8cda9e9d66

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 01678a3d02..e37f7f46b2 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -86,6 +86,7 @@ public final class SourceFileReplacer implements Common.ForDoAll {
     }
     private class DxsLaplace extends Common.Laplace {
         public String operation(String wholeline) {
+            wholeline = replaceMacro(wholeline, mi.hashnonlocalmacro);
             if (mi.getModuleType().equals("PEIM")) {
                 return addincludefile(wholeline, "\\<PeimDepex.h\\>");
             } else {
@@ -105,7 +106,7 @@ public final class SourceFileReplacer implements Common.ForDoAll {
     private class CLaplace extends Common.Laplace {
         public  String operation(String wholeline) {
             // remove EFI_DRIVER_ENTRY_POINT
-            wholeline = wholeline.replaceAll("(EFI_[A-Z]+_ENTRY_POINT\\s*\\(\\s*" + mi.entrypoint + "\\s*\\)\\s*;)", MigrationTool.MIGRATIONCOMMENT + " $1");
+            wholeline = wholeline.replaceAll("(EFI_[A-Z]+_ENTRY_POINT\\s*\\(\\s*\\w(\\w|\\d)*\\s*\\))", MigrationTool.MIGRATIONCOMMENT + " $1");
             // redefine module entry point for some self-relocated modules
             wholeline = wholeline.replaceAll (mi.entrypoint + "([^{]*?})", "_ModuleEntryPoint" + "$1");
             // remove R8 library contractor
@@ -277,7 +278,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             //mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));        
             if ((r9thing = MigrationTool.db.getR9Macro(r8thing)) != null) {
                 if (wholeline.contains(r8thing)) {
-                    wholeline = wholeline.replaceAll(r8thing, r9thing);
+                    String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";
+                    wholeline = wholeline.replaceAll(findString, r9thing);
                     filemacro.add(new r8tor9(r8thing, r9thing));
                 }
             }