Fix several issues:

Misreplace library name
Support commenting out nonlocal header files for dxs FileArg.class
Add a new protocol Guid to database

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

diff --git a/Tools/Conf/Migration/Library.csv b/Tools/Conf/Migration/Library.csv
index e65cee24f0d3099a6627b5d82b24fd62eb3903fb..e6e15636287db483fc83640bf33282a8137cf930 100644 (file)
--- a/Tools/Conf/Migration/Library.csv
+++ b/Tools/Conf/Migration/Library.csv
@@ -37,7 +37,7 @@ EfiDriverLib,EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx,UefiLib,MdePk
 EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg\r
 EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg\r
 EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg\r
 EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg\r
 EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg\r
 EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg\r

-EfiDriverLib,EfiLibReportStatusCode,ReportStatusCode,ReportStatusCodeLib,MdePkg\r
+EfiDriverLib,EfiLibReportStatusCode,gRT->ReportStatusCode,ReportStatusCodeLib,MdePkg\r

 EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg\r
 EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg\r
 EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg\r
 EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg\r
 EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg\r
 EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg\r


@@ -71,7 +71,7 @@ EfiCommonLib,BufToHexString,R8_BufToHexString,%,MdePkg
 EfiCommonLib,CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS,PrintLib,MdePkg\r
 EfiCommonLib,CodeTypeToPostCode,CodeTypeToPostCode,ReportStatusCodeLib,MdePkg\r
 EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg\r
 EfiCommonLib,CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS,PrintLib,MdePkg\r
 EfiCommonLib,CodeTypeToPostCode,CodeTypeToPostCode,ReportStatusCodeLib,MdePkg\r
 EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg\r

-EfiCommonLib,DivU64x32,DivU64x64Remainder ,BaseLib,MdePkg\r
+EfiCommonLib,DivU64x32,DivU64x64Remainder,BaseLib,MdePkg\r

 EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg\r
 EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg\r
 EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg\r
 EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg\r
 EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg\r
 EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg\r

diff --git a/Tools/Conf/Migration/Protocol.csv b/Tools/Conf/Migration/Protocol.csv
index 408650d17036ea925332f9ab9a8bb6b1ad444857..6ca3c33659b212d73377897ba092cff6183ac1d6 100644 (file)
--- a/Tools/Conf/Migration/Protocol.csv
+++ b/Tools/Conf/Migration/Protocol.csv
@@ -143,3 +143,4 @@ IsaIo,gEfiIsaIoProtocolGuid,gEfiIsaIoProtocolGuid,7EE2BD44-3DA0-11D4-9A38-009027
 IsaAcpi,gEfiIsaAcpiProtocolGuid,gEfiIsaAcpiProtocolGuid,64A892DC-5561-4536-92C7-799BFC183355,EdkModulePkg\r
 Performance,gPerformanceProtocolGuid,gPerformanceProtocolGuid,76B6BDFA-2ACD-4462-9E3F-CB58C969D937,EdkModulePkg\r
 ScsiIo,gEfiScsiIoProtocolGuid,gEfiScsiIoProtocolGuid,403CD195-F233-48EC-8455-B2E52F1D9E02,EdkModulePkg\r
 IsaAcpi,gEfiIsaAcpiProtocolGuid,gEfiIsaAcpiProtocolGuid,64A892DC-5561-4536-92C7-799BFC183355,EdkModulePkg\r
 Performance,gPerformanceProtocolGuid,gPerformanceProtocolGuid,76B6BDFA-2ACD-4462-9E3F-CB58C969D937,EdkModulePkg\r
 ScsiIo,gEfiScsiIoProtocolGuid,gEfiScsiIoProtocolGuid,403CD195-F233-48EC-8455-B2E52F1D9E02,EdkModulePkg\r

+ApciSupport,gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid,DBFF9D55-89B7-46DA-BDDF-677D3DC0241D,MdePkg\r

diff --git a/Tools/Conf/Migration/Symbols.csv b/Tools/Conf/Migration/Symbols.csv
index 37f0887c5b6dc15e978ad0f9c20a2ed1f006e8cf..c9ab937b0f891983c4a081f433a8121280c3ddbe 100644 (file)
--- a/Tools/Conf/Migration/Symbols.csv
+++ b/Tools/Conf/Migration/Symbols.csv
@@ -222,7 +222,7 @@ EfiLibAllocateRuntimeZeroPool,AllocateRuntimeZeroPool
 EfiLibAllocateZeroPool,AllocateZeroPool\r
 EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx\r
 EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx\r
 EfiLibAllocateZeroPool,AllocateZeroPool\r
 EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx\r
 EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx\r

-EfiLibReportStatusCode,ReportStatusCode\r
+EfiLibReportStatusCode,gRT->ReportStatusCode\r

 EFI_LIST,LIST_ENTRY\r
 EFI_LIST_ENTRY,LIST_ENTRY    \r
 EFI_LIST_NODE,LIST_ENTRY    \r
 EFI_LIST,LIST_ENTRY\r
 EFI_LIST_ENTRY,LIST_ENTRY    \r
 EFI_LIST_NODE,LIST_ENTRY    \r


@@ -241,7 +241,7 @@ ASPrint,AsciiSPrint
 AvSPrint,AsciiVSPrint\r
 BufToHexString,R8_BufToHexString\r
 CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS\r
 AvSPrint,AsciiVSPrint\r
 BufToHexString,R8_BufToHexString\r
 CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS\r

-DivU64x32,DivU64x64Remainder \r
+DivU64x32,DivU64x64Remainder\r

 EfiAsciiStrCpy,AsciiStrCpy\r
 EfiAsciiStrLen,AsciiStrLen\r
 EfiCommonIoRead,n/a\r
 EfiAsciiStrCpy,AsciiStrCpy\r
 EfiAsciiStrLen,AsciiStrLen\r
 EfiCommonIoRead,n/a\r


@@ -319,3 +319,4 @@ PEI_CR,CR
 PEI_DEBUG,DEBUG#\r
 PEI_DEBUG_CODE,DEBUG_CODE#\r
 PEI_DEBUG_SET_MEMORY,DEBUG_CLEAR_MEMORY\r
 PEI_DEBUG,DEBUG#\r
 PEI_DEBUG_CODE,DEBUG_CODE#\r
 PEI_DEBUG_SET_MEMORY,DEBUG_CLEAR_MEMORY\r

+gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid\r

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index f6cfa855822907207ab9dd9d403af4f7304eb8f9..d6a7ed639e0f2eabd00c34e1fe05fa19cffe9c67 100644 (file)
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -310,7 +310,7 @@ public final class ModuleReader implements Common.ForDoAll {
         }\r
         \r
         public boolean recognize(String filename) {\r
         }\r
         \r
         public boolean recognize(String filename) {\r

-            return filename.contains(".c") || filename.contains(".h");\r
+            return filename.contains(".c") || filename.contains(".h") || filename.contains(".dxs");\r

         }\r
         \r
         public String namechange(String oldname) {\r
         }\r
         \r
         public String namechange(String oldname) {\r

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index cdb833db838ff372e79ff6dca6978a814887f0ed..b8d37c3bb6eba234c46e20c0db61d007b9aa574e 100644 (file)
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -315,7 +315,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {\r
                 if (!r8thing.equals(r9thing)) {\r
                     if (wholeline.contains(r8thing)) {\r
             if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {\r
                 if (!r8thing.equals(r9thing)) {\r
                     if (wholeline.contains(r8thing)) {\r

-                        wholeline = wholeline.replaceAll(r8thing, r9thing);\r
+                       String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";\r
+                        wholeline = wholeline.replaceAll(findString, r9thing);\r

                         filefunc.add(new r8tor9(r8thing, r9thing));\r
                         Iterator<r8tor9> rt = filefunc.iterator();\r
                         while (rt.hasNext()) {\r
                         filefunc.add(new r8tor9(r8thing, r9thing));\r
                         Iterator<r8tor9> rt = filefunc.iterator();\r
                         while (rt.hasNext()) {\r